diff --git a/CIMConnector/pom.xml b/CIMConnector/pom.xml
index 572990a91..82c7692b1 100644
--- a/CIMConnector/pom.xml
+++ b/CIMConnector/pom.xml
@@ -8,7 +8,7 @@
ch.ninecode.cim
CIMApplication
- 2.3.4
+ 2.11-2.2.0-2.3.5
../pom.xml
CIMConnector
diff --git a/CIMConnector/src/main/java/ch/ninecode/cim/connector/CIMManagedConnection.java b/CIMConnector/src/main/java/ch/ninecode/cim/connector/CIMManagedConnection.java
index 3b9edd22d..9ae8c7e61 100644
--- a/CIMConnector/src/main/java/ch/ninecode/cim/connector/CIMManagedConnection.java
+++ b/CIMConnector/src/main/java/ch/ninecode/cim/connector/CIMManagedConnection.java
@@ -126,7 +126,7 @@ protected String CIMConnectorLibJarPath ()
throws ResourceException
{
// ToDo: find a better way to find the CIMConnector.rar
- String ret = "/usr/local/tomee/apps/CIMApplication/CIMConnector/CIMConnector-2.3.4-lib.jar";
+ String ret = "/usr/local/tomee/apps/CIMApplication/CIMConnector/CIMConnector-2.11-2.2.0-2.3.5-lib.jar";
return (ret);
}
diff --git a/CIMEar/pom.xml b/CIMEar/pom.xml
index 5253ba130..bd6b98c39 100644
--- a/CIMEar/pom.xml
+++ b/CIMEar/pom.xml
@@ -9,7 +9,7 @@
ch.ninecode.cim
CIMApplication
../pom.xml
- 2.3.4
+ 2.11-2.2.0-2.3.5
CIMEar
ear
diff --git a/CIMWeb/pom.xml b/CIMWeb/pom.xml
index 34f6b3fb2..6dcb64291 100644
--- a/CIMWeb/pom.xml
+++ b/CIMWeb/pom.xml
@@ -8,7 +8,7 @@
ch.ninecode.cim
CIMApplication
- 2.3.4
+ 2.11-2.2.0-2.3.5
CIMWeb
war
@@ -34,6 +34,26 @@
+
+ org.xerial
+ sqlite-jdbc
+ ${version.dependency.sqlite}
+ compile
+
+
+
+ com.datastax.spark
+ spark-cassandra-connector_${version.dependency.scala}
+ ${version.dependency.cassandra}
+ compile
+
+
+ org.scala-lang
+ scala-reflect
+
+
+
+
ch.ninecode.cim
CIMConnector
@@ -76,13 +96,6 @@
provided
-
- org.xerial
- sqlite-jdbc
- ${version.dependency.sqlite}
- compile
-
-
org.apache.spark
spark-core_${version.dependency.scala}
@@ -108,20 +121,7 @@
org.scala-lang
scala-library
${version.dependency.scalalibrary}
- compile
-
-
-
- com.datastax.spark
- spark-cassandra-connector_${version.dependency.scala}
- ${version.dependency.cassandra}
- compile
-
-
- org.scala-lang
- scala-reflect
-
-
+ provided
diff --git a/GridLAB-D/pom.xml b/GridLAB-D/pom.xml
index 9fc8935b0..851716349 100644
--- a/GridLAB-D/pom.xml
+++ b/GridLAB-D/pom.xml
@@ -5,7 +5,7 @@
CIMApplication
ch.ninecode.cim
- 2.3.4
+ 2.11-2.2.0-2.3.5
GridLAB-D
ch.ninecode.gl
@@ -26,6 +26,12 @@
CIMReader
${version.dependency.cimreader}
compile
+
+
+ ch.ninecode.gl
+ GridLAB-D
+
+
@@ -111,6 +117,9 @@
${version.dependency.scala}
${version.dependency.scalalibrary}
+
+ false
+
diff --git a/ShortCircuit/pom.xml b/ShortCircuit/pom.xml
index b49aa7b30..bd74bccce 100644
--- a/ShortCircuit/pom.xml
+++ b/ShortCircuit/pom.xml
@@ -5,7 +5,7 @@
CIMApplication
ch.ninecode.cim
- 2.3.4
+ 2.11-2.2.0-2.3.5
ShortCircuit
ch.ninecode.sc
@@ -20,6 +20,19 @@
+
+ com.github.scopt
+ scopt_${version.dependency.scala}
+ ${version.dependency.scopt}
+ compile
+
+
+ ch.ninecode.gl
+ ShortCircuit
+
+
+
+
ch.ninecode.cim
CIMReader
@@ -62,13 +75,6 @@
provided
-
- com.github.scopt
- scopt_${version.dependency.scala}
- ${version.dependency.scopt}
- compile
-
-
org.scalatest
scalatest_${version.dependency.scala}
@@ -156,6 +162,7 @@
ch.ninecode.sc.Main
+ false
diff --git a/SmartMeter/pom.xml b/SmartMeter/pom.xml
index 9287885e8..d6d5b9dbc 100644
--- a/SmartMeter/pom.xml
+++ b/SmartMeter/pom.xml
@@ -5,7 +5,7 @@
CIMApplication
ch.ninecode.cim
- 2.3.4
+ 2.11-2.2.0-2.3.5
SmartMeter
ch.ninecode.sm
diff --git a/Spatial/pom.xml b/Spatial/pom.xml
index 74a234dd1..af24c4e5c 100644
--- a/Spatial/pom.xml
+++ b/Spatial/pom.xml
@@ -3,7 +3,7 @@
ch.ninecode.cim
CIMApplication
- 2.3.4
+ 2.11-2.2.0-2.3.5
ch.ninecode.sp
Spatial
diff --git a/pom.xml b/pom.xml
index a9f4076f9..7f03755e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,8 @@
4.0.0
ch.ninecode.cim
CIMApplication
- 2.3.4
+
+ 2.11-2.2.0-2.3.5
pom
CIM Application Multimodule
@@ -18,7 +19,6 @@
2.11
2.11.8
- 3.0.3
2.7.3
@@ -27,6 +27,7 @@
4.12
+ 3.0.3