Code Review / odlparent.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Remove outdated src/site documentation
[odlparent.git] / odlparent / pom.xml
diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index d6e3387eca1a53f358ea207848224cb8a25297b0..0bd2b0f5ff6d16ad6168a6823d1cd5efda7fc01d 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.9.0-SNAPSHOT</version>
+    <version>2.1.0-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.4.0-SNAPSHOT</odl.checkstyle.version>
+    <odl.checkstyle.version>2.1.0-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,9 +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>3.0.8</karaf.version>
-    <karaf4.version>4.0.9</karaf4.version>
-    <karaf4.plugin.version>4.0.9</karaf4.plugin.version>
+    <karaf.version>4.0.9</karaf.version>
+    <karaf.plugin.version>4.0.9</karaf.plugin.version>
     <!-- Used in lispflowmapping, snmp4sdn, vtn -->
     <projectinfo>2.8.1</projectinfo>
     <!-- Used in of-config; see also snmp4sdn -->
@@ -100,7 +99,7 @@
 
     <!-- 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>
@@ -127,7 +126,7 @@
       <dependency>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-artifacts</artifactId>
-        <version>1.9.0-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -300,22 +299,22 @@
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-core</artifactId>
-        <version>1.1.9</version>
+        <version>1.2.2</version>
       </dependency>
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
-        <version>1.1.9</version>
+        <version>1.2.2</version>
       </dependency>
       <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>
@@ -926,7 +925,7 @@
       <dependency>
         <groupId>org.jolokia</groupId>
         <artifactId>jolokia-osgi</artifactId>
-        <version>1.3.3</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.json</groupId>
@@ -1187,6 +1186,12 @@
         <version>${exam.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam-container-forked</artifactId>
+        <version>${exam.version}</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-container-karaf</artifactId>
@@ -1199,6 +1204,31 @@
         <version>${exam.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam-extender-service</artifactId>
+        <version>${exam.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam-inject</artifactId>
+        <version>${exam.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam-invoker-junit</artifactId>
+        <version>${exam.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam-features</artifactId>
+        <version>${exam.version}</version>
+        <type>xml</type>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-junit4</artifactId>
@@ -1275,11 +1305,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>
@@ -1296,17 +1321,17 @@
       <dependency>
           <groupId>org.eclipse.xtend</groupId>
           <artifactId>org.eclipse.xtend.lib</artifactId>
-          <version>2.11.0</version>
+          <version>2.12.0</version>
       </dependency>
       <dependency>
           <groupId>org.eclipse.xtend</groupId>
           <artifactId>org.eclipse.xtend.lib.macro</artifactId>
-          <version>2.11.0</version>
+          <version>2.12.0</version>
       </dependency>
       <dependency>
           <groupId>org.eclipse.xtext</groupId>
           <artifactId>org.eclipse.xtext.xbase.lib</artifactId>
-          <version>2.11.0</version>
+          <version>2.12.0</version>
       </dependency>
 
       <!-- Annotations -->
@@ -1349,6 +1374,21 @@
         <version>${karaf.version}</version>
       </dependency>
 
+      <!-- When updating this version, consider antl4-maven-plugin below -->
+      <dependency>
+        <groupId>org.antlr</groupId>
+        <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>
 
@@ -1407,12 +1447,12 @@
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>${odl.checkstyle.version}</version>
+              <version>2.1.0-SNAPSHOT</version>
             </dependency>
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>odl-license</artifactId>
-              <version>0.3.0-SNAPSHOT</version>
+              <version>2.1.0-SNAPSHOT</version>
             </dependency>
             <dependency>
               <groupId>com.github.sevntu.checkstyle</groupId>
@@ -1472,7 +1512,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-pmd-plugin</artifactId>
-          <version>3.6</version>
+          <version>3.8</version>
           <executions>
             <execution>
               <id>cpd</id>
@@ -1539,7 +1579,7 @@
                   <artifactItem>
                     <groupId>org.opendaylight.odlparent</groupId>
                     <artifactId>odl-license</artifactId>
-                    <version>0.3.0-SNAPSHOT</version>
+                    <version>2.1.0-SNAPSHOT</version>
                   </artifactItem>
                 </artifactItems>
                 <outputDirectory>${project.build.outputDirectory}</outputDirectory>
@@ -1627,7 +1667,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>
@@ -1675,7 +1715,7 @@
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>findbugs</artifactId>
-              <version>1.9.0-SNAPSHOT</version>
+              <version>2.1.0-SNAPSHOT</version>
             </dependency>
           </dependencies>
           <configuration>
@@ -1718,7 +1758,7 @@
           <groupId>org.eclipse.xtend</groupId>
           <artifactId>xtend-maven-plugin</artifactId>
           <!-- NOTE: This version MUST be kept in sync with the Xtend version in <dependencyManagement> -->
-          <version>2.11.0</version>
+          <version>2.12.0</version>
           <executions>
             <execution>
               <goals>
@@ -1891,6 +1931,13 @@
             </execution>
           </executions>
         </plugin>
+
+        <!-- When updating this version, consider antl4-runtime above -->
+        <plugin>
+          <groupId>org.antlr</groupId>
+          <artifactId>antlr4-maven-plugin</artifactId>
+          <version>4.7</version>
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -2123,8 +2170,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