change semantic versioning scheme to scala_version-spark_version-cima…

…pplication_version similar to CIMReader
derrickoswald · Nov 23, 2017 · 47d9e94 · 47d9e94
1 parent 50f4b45
commit 47d9e94
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 38 deletions.
diff --git a/CIMConnector/pom.xml b/CIMConnector/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>ch.ninecode.cim</groupId>
         <artifactId>CIMApplication</artifactId>
-        <version>2.3.4</version>
+        <version>2.11-2.2.0-2.3.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>CIMConnector</artifactId>

diff --git 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
@@ -9,7 +9,7 @@
         <groupId>ch.ninecode.cim</groupId>
         <artifactId>CIMApplication</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>2.3.4</version>
+        <version>2.11-2.2.0-2.3.5</version>
     </parent>
     <artifactId>CIMEar</artifactId>
     <packaging>ear</packaging>

diff --git a/CIMWeb/pom.xml b/CIMWeb/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>ch.ninecode.cim</groupId>
         <artifactId>CIMApplication</artifactId>
-        <version>2.3.4</version>
+        <version>2.11-2.2.0-2.3.5</version>
     </parent>
     <artifactId>CIMWeb</artifactId>
     <packaging>war</packaging>
@@ -34,6 +34,26 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>org.xerial</groupId>
+            <artifactId>sqlite-jdbc</artifactId>
+            <version>${version.dependency.sqlite}</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.datastax.spark</groupId>
+            <artifactId>spark-cassandra-connector_${version.dependency.scala}</artifactId>
+            <version>${version.dependency.cassandra}</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.scala-lang</groupId>
+                    <artifactId>scala-reflect</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>ch.ninecode.cim</groupId>
             <artifactId>CIMConnector</artifactId>
@@ -76,13 +96,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.xerial</groupId>
-            <artifactId>sqlite-jdbc</artifactId>
-            <version>${version.dependency.sqlite}</version>
-            <scope>compile</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-core_${version.dependency.scala}</artifactId>
@@ -108,20 +121,7 @@
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>
             <version>${version.dependency.scalalibrary}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.datastax.spark</groupId>
-            <artifactId>spark-cassandra-connector_${version.dependency.scala}</artifactId>
-            <version>${version.dependency.cassandra}</version>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.scala-lang</groupId>
-                    <artifactId>scala-reflect</artifactId>
-                </exclusion>
-            </exclusions>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Test Dependencies -->

diff --git a/GridLAB-D/pom.xml b/GridLAB-D/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>CIMApplication</artifactId>
         <groupId>ch.ninecode.cim</groupId>
-        <version>2.3.4</version>
+        <version>2.11-2.2.0-2.3.5</version>
     </parent>
     <artifactId>GridLAB-D</artifactId>
     <groupId>ch.ninecode.gl</groupId>
@@ -26,6 +26,12 @@
             <artifactId>CIMReader</artifactId>
             <version>${version.dependency.cimreader}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.ninecode.gl</groupId>
+                    <artifactId>GridLAB-D</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -111,6 +117,9 @@
                 <configuration>
                     <scalaCompatVersion>${version.dependency.scala}</scalaCompatVersion>
                     <scalaVersion>${version.dependency.scalalibrary}</scalaVersion>
+                    <archive>
+                        <addMavenDescriptor>false</addMavenDescriptor>
+                    </archive>
                 </configuration>
                 <executions>
                     <execution>

diff --git a/ShortCircuit/pom.xml b/ShortCircuit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>CIMApplication</artifactId>
         <groupId>ch.ninecode.cim</groupId>
-        <version>2.3.4</version>
+        <version>2.11-2.2.0-2.3.5</version>
     </parent>
     <artifactId>ShortCircuit</artifactId>
     <groupId>ch.ninecode.sc</groupId>
@@ -20,6 +20,19 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>com.github.scopt</groupId>
+            <artifactId>scopt_${version.dependency.scala}</artifactId>
+            <version>${version.dependency.scopt}</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.ninecode.gl</groupId>
+                    <artifactId>ShortCircuit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>ch.ninecode.cim</groupId>
             <artifactId>CIMReader</artifactId>
@@ -62,13 +75,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.github.scopt</groupId>
-            <artifactId>scopt_${version.dependency.scala}</artifactId>
-            <version>${version.dependency.scopt}</version>
-            <scope>compile</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.scalatest</groupId>
             <artifactId>scalatest_${version.dependency.scala}</artifactId>
@@ -156,6 +162,7 @@
                         <manifest>
                             <mainClass>ch.ninecode.sc.Main</mainClass>
                         </manifest>
+                        <addMavenDescriptor>false</addMavenDescriptor>
                     </archive>
                 </configuration>
                 <executions>

diff --git a/SmartMeter/pom.xml b/SmartMeter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>CIMApplication</artifactId>
         <groupId>ch.ninecode.cim</groupId>
-        <version>2.3.4</version>
+        <version>2.11-2.2.0-2.3.5</version>
     </parent>
     <artifactId>SmartMeter</artifactId>
     <groupId>ch.ninecode.sm</groupId>

diff --git a/Spatial/pom.xml b/Spatial/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>ch.ninecode.cim</groupId>
         <artifactId>CIMApplication</artifactId>
-        <version>2.3.4</version>
+        <version>2.11-2.2.0-2.3.5</version>
     </parent>
     <groupId>ch.ninecode.sp</groupId>
     <artifactId>Spatial</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,8 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ch.ninecode.cim</groupId>
     <artifactId>CIMApplication</artifactId>
-    <version>2.3.4</version>
+    <!-- version>${version.dependency.scala}-${version.dependency.spark}-CIMAPPLICATION_VERSION</version -->
+    <version>2.11-2.2.0-2.3.5</version>
     <packaging>pom</packaging>
     <name>CIM Application Multimodule</name>
 
@@ -18,7 +19,6 @@
         <!-- Scala versions -->
         <version.dependency.scala>2.11</version.dependency.scala>
         <version.dependency.scalalibrary>2.11.8</version.dependency.scalalibrary>
-        <version.dependency.scalatest>3.0.3</version.dependency.scalatest>
 
         <!-- Spark versions -->
         <version.dependency.hadoop>2.7.3</version.dependency.hadoop>
@@ -27,6 +27,7 @@
 
         <!-- test versions -->
         <version.dependency.junit>4.12</version.dependency.junit>
+        <version.dependency.scalatest>3.0.3</version.dependency.scalatest>
 
     </properties>