Bump versions by x.y.(z+1)

[odlparent.git] / odlparent / pom.xml

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index ece8eed2f3311a72094a0db98a8149563111b449..a50e74e5a3b63c6f87af04568645739a72973dd2 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.5-SNAPSHOT</version>
     <relativePath>../odlparent-lite</relativePath>
   </parent>
 
@@ -72,7 +72,7 @@
          toolkit -->
     <checkstyle.version>2.17</checkstyle.version>
     <!-- Used in controller, packetcable -->
-    <odl.checkstyle.version>0.3.0-SNAPSHOT</odl.checkstyle.version>
+    <odl.checkstyle.version>0.3.5-SNAPSHOT</odl.checkstyle.version>
     <!-- Used in snmp4sdn; see also toolkit -->
     <compiler.version>${maven.compile.plugin.version}</compiler.version>
     <!-- Used in controller, l2switch, netide, openflowjava, openflowplugin, snbi, tsdr, ttp; see also toolkit -->
@@ -105,9 +105,9 @@
     <!-- Used by controller, snbi; see also centinel, dlux, toolkit -->
     <osgi.core.version>5.0.0</osgi.core.version>
 
-    <akka.version>2.4.17</akka.version>
+    <akka.version>2.4.20</akka.version>
     <scala.version>2.11</scala.version>
-    <scala.micro.version>8</scala.micro.version>
+    <scala.micro.version>12</scala.micro.version>
     <leveldb.version>0.7</leveldb.version>
 
     <!-- Default Sonar configuration -->
@@ -127,7 +127,7 @@
       <dependency>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-artifacts</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.8.5-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -864,6 +864,11 @@
         <artifactId>bcprov-jdk15on</artifactId>
         <version>${bouncycastle.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcprov-ext-jdk15on</artifactId>
+        <version>${bouncycastle.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.codehaus.enunciate</groupId>
         <artifactId>enunciate-core-annotations</artifactId>
@@ -931,7 +936,7 @@
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.compendium</artifactId>
-        <version>5.0.0</version>
+        <version>${osgi.core.version}</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -1054,11 +1059,6 @@
         <artifactId>akka-cluster_${scala.version}</artifactId>
         <version>${akka.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-distributed-data-experimental_${scala.version}</artifactId>
-        <version>${akka.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
         <artifactId>akka-osgi_${scala.version}</artifactId>
@@ -1136,17 +1136,17 @@
       <dependency>
         <groupId>org.agrona</groupId>
         <artifactId>agrona</artifactId>
-        <version>0.9.2</version>
+        <version>0.9.5</version>
       </dependency>
       <dependency>
         <groupId>io.aeron</groupId>
         <artifactId>aeron-client</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.5</version>
       </dependency>
       <dependency>
         <groupId>io.aeron</groupId>
         <artifactId>aeron-driver</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.5</version>
       </dependency>
 
       <!-- Scala -->
@@ -1290,6 +1290,12 @@
         <artifactId>javax.inject</artifactId>
         <version>1</version>
       </dependency>
+      <dependency>
+        <groupId>org.ops4j.pax.cdi</groupId>
+        <artifactId>pax-cdi-api</artifactId>
+        <version>1.0.0.RC2</version>
+        <optional>true</optional>
+      </dependency>
 
       <!-- Cassandra -->
       <dependency>
@@ -1380,7 +1386,7 @@
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>odl-license</artifactId>
-              <version>0.2.0-SNAPSHOT</version>
+              <version>0.2.5-SNAPSHOT</version>
             </dependency>
             <dependency>
               <groupId>com.github.sevntu.checkstyle</groupId>
@@ -1508,7 +1514,7 @@
                   <artifactItem>
                     <groupId>org.opendaylight.odlparent</groupId>
                     <artifactId>odl-license</artifactId>
-                    <version>0.2.0-SNAPSHOT</version>
+                    <version>0.2.5-SNAPSHOT</version>
                   </artifactItem>
                 </artifactItems>
                 <outputDirectory>${project.build.outputDirectory}</outputDirectory>
@@ -1644,7 +1650,7 @@
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>findbugs</artifactId>
-              <version>1.8.0-SNAPSHOT</version>
+              <version>1.8.5-SNAPSHOT</version>
             </dependency>
           </dependencies>
           <configuration>