Eliminate scala.version and scala.micro.version

These properties are interfering with scala-maven-plugin, which is
using scala.version to control target versions.

Change-Id: I501cd941b35f2c0ca738209ca2db1c722743b2e8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/features-akka/pom.xml b/features/features-akka/pom.xml
index 4fa039b589ddf48900c3888742572bdbd280a0d3..b36a062df0e68bdc7b8deae127b78eeadbce5c3e 100644 (file)
--- a/features/features-akka/pom.xml
+++ b/features/features-akka/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-akka-scala-${scala.version}</artifactId>
+            <artifactId>odl-akka-scala-2.12</artifactId>
             <version>${project.version}</version>
             <classifier>features</classifier>
             <type>xml</type>

diff --git a/features/odl-akka-clustering-2.5/pom.xml b/features/odl-akka-clustering-2.5/pom.xml
index fc175cc701fe87b3f08e9343e54ae313edc634f3..e364d74d4322d580a34717dcb0ad6daf1892d538 100644 (file)
--- a/features/odl-akka-clustering-2.5/pom.xml
+++ b/features/odl-akka-clustering-2.5/pom.xml
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-cluster_${scala.version}</artifactId>
+            <artifactId>akka-cluster_2.12</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/features/odl-akka-persistence-2.5/pom.xml b/features/odl-akka-persistence-2.5/pom.xml
index 9ec9c07e76a6b087ae0beb24f179bb4b4f731196..f11fc97a67189c68f4d81de39363bdb5983e1d24 100644 (file)
--- a/features/odl-akka-persistence-2.5/pom.xml
+++ b/features/odl-akka-persistence-2.5/pom.xml
@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-persistence_${scala.version}</artifactId>
+            <artifactId>akka-persistence_2.12</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/features/odl-akka-scala-2.12/pom.xml b/features/odl-akka-scala-2.12/pom.xml
index 8b9ebdbde935b3e76f7c782cd4e1437fa2dbbd2e..a6a63a24973ebaa34ddac02b6ab676110d3a8a1e 100644 (file)
--- a/features/odl-akka-scala-2.12/pom.xml
+++ b/features/odl-akka-scala-2.12/pom.xml
@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>org.scala-lang.modules</groupId>
-            <artifactId>scala-java8-compat_${scala.version}</artifactId>
+            <artifactId>scala-java8-compat_2.12</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/features/odl-akka-system-2.5/pom.xml b/features/odl-akka-system-2.5/pom.xml
index f5ebd3fc715eb563409b0f89ad3acf08c5dd6a5b..c223c29d237b1675ca8b571fee011a19fdb28457 100644 (file)
--- a/features/odl-akka-system-2.5/pom.xml
+++ b/features/odl-akka-system-2.5/pom.xml
@@ -33,18 +33,18 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-akka-scala-${scala.version}</artifactId>
+            <artifactId>odl-akka-scala-2.12</artifactId>
             <version>${project.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-actor_${scala.version}</artifactId>
+            <artifactId>akka-actor_2.12</artifactId>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-slf4j_${scala.version}</artifactId>
+            <artifactId>akka-slf4j_2.12</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -54,7 +54,7 @@
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-osgi_${scala.version}</artifactId>
+            <artifactId>akka-osgi_2.12</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index ccae59a6ed753db6ff0fec509da403c90a51d9af..0d4b6fc851ca6cf8b9f246cd340535e9a46d4192 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -105,8 +105,6 @@
     <osgi.core.version>5.0.0</osgi.core.version>
 
     <akka.version>2.5.4</akka.version>
-    <scala.version>2.12</scala.version>
-    <scala.micro.version>3</scala.micro.version>
     <leveldb.version>0.7</leveldb.version>
 
     <!-- Default Sonar configuration -->
@@ -989,74 +987,74 @@
       <!-- Akka -->
       <dependency>
         <groupId>com.typesafe</groupId>
-        <artifactId>ssl-config-akka_${scala.version}</artifactId>
+        <artifactId>ssl-config-akka_2.12</artifactId>
         <version>0.2.1</version>
       </dependency>
       <dependency>
         <groupId>com.typesafe</groupId>
-        <artifactId>ssl-config-core_${scala.version}</artifactId>
+        <artifactId>ssl-config-core_2.12</artifactId>
         <version>0.2.1</version>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-actor_${scala.version}</artifactId>
+        <artifactId>akka-actor_2.12</artifactId>
         <version>${akka.version}</version>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-cluster_${scala.version}</artifactId>
+        <artifactId>akka-cluster_2.12</artifactId>
         <version>${akka.version}</version>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-osgi_${scala.version}</artifactId>
+        <artifactId>akka-osgi_2.12</artifactId>
         <version>${akka.version}</version>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-persistence_${scala.version}</artifactId>
+        <artifactId>akka-persistence_2.12</artifactId>
         <version>${akka.version}</version>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-persistence-tck_${scala.version}</artifactId>
+        <artifactId>akka-persistence-tck_2.12</artifactId>
         <version>${akka.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-protobuf_${scala.version}</artifactId>
+        <artifactId>akka-protobuf_2.12</artifactId>
         <version>${akka.version}</version>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-remote_${scala.version}</artifactId>
+        <artifactId>akka-remote_2.12</artifactId>
         <version>${akka.version}</version>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-slf4j_${scala.version}</artifactId>
+        <artifactId>akka-slf4j_2.12</artifactId>
         <version>${akka.version}</version>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-stream_${scala.version}</artifactId>
+        <artifactId>akka-stream_2.12</artifactId>
         <version>${akka.version}</version>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-testkit_${scala.version}</artifactId>
+        <artifactId>akka-testkit_2.12</artifactId>
         <version>${akka.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.scala-lang.modules</groupId>
-        <artifactId>scala-java8-compat_${scala.version}</artifactId>
+        <artifactId>scala-java8-compat_2.12</artifactId>
         <version>0.8.0</version>
       </dependency>
       <dependency>
         <groupId>org.scala-lang.modules</groupId>
-        <artifactId>scala-parser-combinators_${scala.version}</artifactId>
+        <artifactId>scala-parser-combinators_2.12</artifactId>
         <version>1.0.6</version>
       </dependency>
       <dependency>
@@ -1101,12 +1099,12 @@
       <dependency>
         <groupId>org.scala-lang</groupId>
         <artifactId>scala-library</artifactId>
-        <version>${scala.version}.${scala.micro.version}</version>
+        <version>2.12.3</version>
       </dependency>
       <dependency>
         <groupId>org.scala-lang</groupId>
         <artifactId>scala-reflect</artifactId>
-        <version>${scala.version}.${scala.micro.version}</version>
+        <version>2.12.3</version>
       </dependency>
 
       <!-- LMAX Disruptor -->