Code Review / odlparent.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Bump akka to 2.4.20
[odlparent.git] / odlparent / pom.xml
diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index c444734e3930f4e69d7d8847e99d467e6fd701a3..5f12309bd51459d29b498a4c80cd4d5d082f684d 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>2.0.0-SNAPSHOT</version>
+    <version>2.0.6-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>2.0.0-SNAPSHOT</odl.checkstyle.version>
+    <odl.checkstyle.version>2.0.3-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 -->
@@ -88,8 +88,8 @@
     <jacoco.version>0.7.7.201606060606</jacoco.version>
     <!-- Used in aaa, controller, coretutorials, integration/distribution, l2switch, lacp, lispflowmapping, netide,
          nic, openflowplugin, ovsdb, persistence, sfc, snbi, snmp4sdn?, sxp, topoprocessing, unimgr, vtn -->
-    <karaf.version>4.0.9</karaf.version>
-    <karaf.plugin.version>4.0.9</karaf.plugin.version>
+    <karaf.version>4.0.10</karaf.version>
+    <karaf.plugin.version>4.0.10</karaf.plugin.version>
     <!-- Used in lispflowmapping, snmp4sdn, vtn -->
     <projectinfo>2.8.1</projectinfo>
     <!-- Used in of-config; see also snmp4sdn -->
@@ -99,14 +99,14 @@
 
     <!-- Supporting Libraries -->
     <!-- Used by controller -->
-    <bouncycastle.version>1.56</bouncycastle.version>
+    <bouncycastle.version>1.57</bouncycastle.version>
 
     <!-- Used by controller, snbi; see also centinel, dlux, toolkit -->
     <osgi.core.version>5.0.0</osgi.core.version>
 
-    <akka.version>2.4.18</akka.version>
+    <akka.version>2.4.20</akka.version>
     <scala.version>2.11</scala.version>
-    <scala.micro.version>11</scala.micro.version>
+    <scala.micro.version>12</scala.micro.version>
     <leveldb.version>0.7</leveldb.version>
 
     <!-- Default Sonar configuration -->
@@ -126,7 +126,7 @@
       <dependency>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-artifacts</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.6-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -309,12 +309,12 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>18.0</version>
+        <version>22.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava-testlib</artifactId>
-        <version>18.0</version>
+        <version>22.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -449,6 +449,13 @@
         <artifactId>plexus-slf4j-logging</artifactId>
         <version>1.1</version>
       </dependency>
+
+      <dependency>
+        <groupId>org.codehaus.woodstox</groupId>
+        <artifactId>stax2-api</artifactId>
+        <!-- Needs to match jackson's idea of import -->
+        <version>3.1.4</version>
+      </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-annotations</artifactId>
@@ -474,13 +481,6 @@
         <artifactId>jackson-datatype-json-org</artifactId>
         <version>2.3.2</version>
       </dependency>
-      <!-- TODO do we really need resteasy ? -->
-      <dependency>
-          <groupId>org.jboss.resteasy</groupId>
-          <artifactId>jaxrs-api</artifactId>
-          <version>3.0.12.Final</version>
-      </dependency>
-
       <dependency>
         <groupId>com.fasterxml.jackson.jaxrs</groupId>
         <artifactId>jackson-jaxrs-base</artifactId>
@@ -496,6 +496,14 @@
         <artifactId>jackson-module-jaxb-annotations</artifactId>
         <version>2.3.2</version>
       </dependency>
+
+      <!-- TODO do we really need resteasy ? -->
+      <dependency>
+        <groupId>org.jboss.resteasy</groupId>
+        <artifactId>jaxrs-api</artifactId>
+        <version>3.0.12.Final</version>
+      </dependency>
+
       <dependency>
         <groupId>com.sun.xml.txw2</groupId>
         <artifactId>txw2</artifactId>
@@ -763,7 +771,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>3.0.1</version>
+        <version>3.1.0</version>
       </dependency>
       <dependency>
         <groupId>orbit</groupId>
@@ -868,6 +876,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>
@@ -1251,19 +1264,19 @@
       <dependency>
         <groupId>org.ops4j.pax.url</groupId>
         <artifactId>pax-url-link</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.url</groupId>
         <artifactId>pax-url-aether</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.url</groupId>
         <artifactId>pax-url-wrap</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
       </dependency>
 
       <dependency>
@@ -1305,11 +1318,6 @@
         <artifactId>jetty-webapp</artifactId>
         <version>9.2.19.v20160908</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.aries.blueprint</groupId>
-        <artifactId>org.apache.aries.blueprint.core</artifactId>
-        <version>1.4.2</version>
-      </dependency>
 
       <dependency>
         <groupId>com.h2database</groupId>
@@ -1373,6 +1381,11 @@
       </dependency>
 
       <!-- Karaf console support -->
+      <dependency>
+        <groupId>org.apache.karaf.shell</groupId>
+        <artifactId>org.apache.karaf.shell.core</artifactId>
+        <version>${karaf.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.karaf.shell</groupId>
         <artifactId>org.apache.karaf.shell.console</artifactId>
@@ -1385,6 +1398,14 @@
         <artifactId>antlr4-runtime</artifactId>
         <version>4.7</version>
       </dependency>
+      <!-- Aries' Blueprint version should be kept in sync to the version actually
+           used by our ${karaf[4].version} ... please bump this when increasing that.
+           TODO Find a smarter way to inherit this from a (TBD..) Karaf artifacts BOM! -->
+      <dependency>
+        <groupId>org.apache.aries.blueprint</groupId>
+        <artifactId>org.apache.aries.blueprint.core</artifactId>
+        <version>1.7.1</version>
+      </dependency>
 
     </dependencies>
   </dependencyManagement>
@@ -1444,12 +1465,12 @@
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>2.0.0-SNAPSHOT</version>
+              <version>2.0.6-SNAPSHOT</version>
             </dependency>
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>odl-license</artifactId>
-              <version>2.0.0-SNAPSHOT</version>
+              <version>2.0.6-SNAPSHOT</version>
             </dependency>
             <dependency>
               <groupId>com.github.sevntu.checkstyle</groupId>
@@ -1576,7 +1597,7 @@
                   <artifactItem>
                     <groupId>org.opendaylight.odlparent</groupId>
                     <artifactId>odl-license</artifactId>
-                    <version>2.0.0-SNAPSHOT</version>
+                    <version>2.0.6-SNAPSHOT</version>
                   </artifactItem>
                 </artifactItems>
                 <outputDirectory>${project.build.outputDirectory}</outputDirectory>
@@ -1664,7 +1685,7 @@
               <!-- Note the '-' for git.properties.. this is required because git-commit-id-plugin has <failOnNoGitDirectory>false,
                    so that the build doesn't fail if there is no .../.git/ - so git.properties is effectively optional;
                    and so the '-' there is needed to make the maven-bundle-plugin if that resource is not present.  -->
-              <Include-Resource>{maven-resources},target/classes/LICENSE,META-INF/git.properties=-target/classes/META-INF/git.properties</Include-Resource>
+              <Include-Resource>{maven-resources},${project.build.directory}/classes/LICENSE,META-INF/git.properties=-${project.build.directory}/classes/META-INF/git.properties</Include-Resource>
             </instructions>
           </configuration>
         </plugin>
@@ -1712,7 +1733,7 @@
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>findbugs</artifactId>
-              <version>2.0.0-SNAPSHOT</version>
+              <version>2.0.6-SNAPSHOT</version>
             </dependency>
           </dependencies>
           <configuration>
@@ -2167,8 +2188,7 @@
         <configuration>
           <links>
             <link>http://doc.akka.io/japi/akka/${akka.version}/</link>
-            <link>https://google.github.io/guava/releases/18.0/api/docs/</link>
-            <link>https://google.github.io/guava/releases/19.0/api/docs/</link>
+            <link>https://google.github.io/guava/releases/22.0/api/docs/</link>
             <link>http://netty.io/4.1/api/</link>
           </links>
         </configuration>
odlparent