Code Review / odlparent.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Bump commons-lang 3.11 → 3.12.0
[odlparent.git] / odlparent / pom.xml
diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 61c5bdea8468fbbd0fa29a5837f70cb7435386eb..285383bb93421e459770821360aa5656349f5ced 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>8.0.1-SNAPSHOT</version>
+    <version>8.1.2-SNAPSHOT</version>
     <relativePath>../odlparent-lite</relativePath>
   </parent>
 
@@ -44,11 +44,11 @@
     <maven.compiler.release>11</maven.compiler.release>
 
     <!-- Used in controller, genius, infrautils, netconf, netvirt, ovsdb, serviceutils -->
-    <karaf.version>4.2.10</karaf.version>
+    <karaf.version>4.3.0</karaf.version>
 
     <!-- Supporting Libraries -->
     <!-- Only used internally -->
-    <bouncycastle.version>1.66</bouncycastle.version>
+    <bouncycastle.version>1.68</bouncycastle.version>
 
     <!-- JaCoCo configuration, by default tied to Sonar configuration, but can be overridden separately
          to allow projects to report Sonar values from the entire project. -->
@@ -97,7 +97,7 @@
       <dependency>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-artifacts</artifactId>
-        <version>8.0.1-SNAPSHOT</version>
+        <version>8.1.2-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -120,7 +120,7 @@
         <groupId>com.puppycrawl.tools</groupId>
         <artifactId>checkstyle</artifactId>
         <!-- This should match the plugin management on maven-checkstyle-plugin below -->
-        <version>8.36.1</version>
+        <version>8.40</version>
       </dependency>
 
       <!-- Testing Dependencies -->
@@ -129,7 +129,7 @@
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
-        <version>4.13</version>
+        <version>4.13.1</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -173,13 +173,13 @@
         <groupId>com.google.truth</groupId>
         <artifactId>truth</artifactId>
         <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
-        <version>1.0.1</version>
+        <version>1.1.2</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>com.google.truth.extensions</groupId>
         <artifactId>truth-java8-extension</artifactId>
-        <version>1.0.1</version>
+        <version>1.1.2</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -191,31 +191,31 @@
       <dependency>
         <groupId>org.powermock</groupId>
         <artifactId>powermock-api-mockito2</artifactId>
-        <version>2.0.7</version>
+        <version>2.0.9</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.powermock</groupId>
         <artifactId>powermock-api-support</artifactId>
-        <version>2.0.7</version>
+        <version>2.0.9</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.powermock</groupId>
         <artifactId>powermock-core</artifactId>
-        <version>2.0.7</version>
+        <version>2.0.9</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.powermock</groupId>
         <artifactId>powermock-module-junit4</artifactId>
-        <version>2.0.7</version>
+        <version>2.0.9</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.powermock</groupId>
         <artifactId>powermock-reflect</artifactId>
-        <version>2.0.7</version>
+        <version>2.0.9</version>
         <scope>test</scope>
       </dependency>
 
@@ -338,8 +338,7 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
-        <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite and docs -->
-        <version>3.11</version>
+        <version>3.12.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
@@ -372,10 +371,11 @@
       </dependency>
 
       <dependency>
-        <groupId>javax.activation</groupId>
-        <artifactId>activation</artifactId>
-        <version>1.1.1</version>
+        <groupId>jakarta.activation</groupId>
+        <artifactId>jakarta.activation-api</artifactId>
+        <version>1.2.2</version>
       </dependency>
+
       <dependency>
         <groupId>javax.annotation</groupId>
         <artifactId>javax.annotation-api</artifactId>
@@ -406,7 +406,7 @@
       </dependency>
 
       <!-- These three need to be consistent:
-        jackson-2.10.4 needs woodstox-6.2.x
+        jackson-2.11.4 needs woodstox-6.2.3+
         woodstox-5.3+ needs stax2-api-4.2.x
         -->
       <dependency>
@@ -417,12 +417,12 @@
       <dependency>
         <groupId>com.fasterxml.woodstox</groupId>
         <artifactId>woodstox-core</artifactId>
-        <version>6.2.1</version>
+        <version>6.2.4</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson</groupId>
         <artifactId>jackson-bom</artifactId>
-        <version>2.10.4</version>
+        <version>2.11.4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -472,7 +472,7 @@
       <dependency>
         <groupId>commons-net</groupId>
         <artifactId>commons-net</artifactId>
-        <version>3.7</version>
+        <version>3.8.0</version>
       </dependency>
 
       <!-- Netty -->
@@ -481,7 +481,7 @@
         <artifactId>netty-bom</artifactId>
         <!-- If these are updated, the version in features.xml needs to be changed too -->
         <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
-        <version>4.1.52.Final</version>
+        <version>4.1.59.Final</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -521,7 +521,7 @@
         <groupId>com.webcohesion.enunciate</groupId>
         <artifactId>enunciate-core-annotations</artifactId>
         <!-- This must be aligned with the version of enunciate-maven-plugin specified below -->
-        <version>2.13.1</version>
+        <version>2.13.2</version>
       </dependency>
 
       <dependency>
@@ -539,23 +539,62 @@
         <artifactId>jolokia-osgi</artifactId>
         <version>1.6.2</version>
       </dependency>
+
+      <!--
+        These are usually used through osgi.cmpn, except when you also want
+        to be a JPMS module. In that case you need to depend on these and
+        have a 'require static org.osgi.service.component.annotations;'.
+        This incurs a warning about publishing the module to a public place.
+        We do not heed that warning, as nothing in this package is seen by
+        the runtime - thus the warning can be safely ignored :)
+
+        Keep this in sync with rest of OSGi:
+        - OSGi R7 (now) = 1.4.0
+      -->
+      <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi.service.component.annotations</artifactId>
+        <version>1.4.0</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi.service.metatype.annotations</artifactId>
+        <version>1.4.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>osgi.annotation</artifactId>
+        <version>7.0.0</version>
+        <scope>provided</scope>
+      </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>osgi.cmpn</artifactId>
-        <version>6.0.0</version>
+        <version>7.0.0</version>
         <scope>provided</scope>
       </dependency>
+      <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>osgi.core</artifactId>
+        <version>7.0.0</version>
+        <scope>provided</scope>
+      </dependency>
+      <!-- For backwards compatibility -->
+      <!-- FIXME: 9.0.0: remove this declaration -->
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.core</artifactId>
         <version>6.0.0</version>
         <scope>provided</scope>
       </dependency>
+
       <dependency>
         <groupId>org.osgi</groupId>
         <!-- for https://bugs.opendaylight.org/show_bug.cgi?id=4290 -->
         <artifactId>org.osgi.service.event</artifactId>
-        <version>1.3.1</version>
+        <version>1.4.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.aries.quiesce</groupId>
@@ -574,68 +613,68 @@
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam</artifactId>
-        <version>4.13.3</version>
+        <version>4.13.4</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-container-forked</artifactId>
-        <version>4.13.3</version>
+        <version>4.13.4</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-container-karaf</artifactId>
-        <version>4.13.3</version>
+        <version>4.13.4</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-container-native</artifactId>
-        <version>4.13.3</version>
+        <version>4.13.4</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-extender-service</artifactId>
-        <version>4.13.3</version>
+        <version>4.13.4</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-inject</artifactId>
-        <version>4.13.3</version>
+        <version>4.13.4</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-invoker-junit</artifactId>
-        <version>4.13.3</version>
+        <version>4.13.4</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-features</artifactId>
-        <version>4.13.3</version>
+        <version>4.13.4</version>
         <type>xml</type>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-junit4</artifactId>
-        <version>4.13.3</version>
+        <version>4.13.4</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-link-mvn</artifactId>
-        <version>4.13.3</version>
+        <version>4.13.4</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-link-assembly</artifactId>
-        <version>4.13.3</version>
+        <version>4.13.4</version>
         <scope>test</scope>
       </dependency>
 
@@ -661,7 +700,7 @@
         <groupId>org.ops4j.pax.web</groupId>
         <artifactId>pax-web-api</artifactId>
         <!-- Note: keep this version synchronized with karaf -->
-        <version>7.2.16</version>
+        <version>7.3.9</version>
       </dependency>
 
       <dependency>
@@ -674,26 +713,32 @@
       <dependency>
         <groupId>org.xmlunit</groupId>
         <artifactId>xmlunit-core</artifactId>
-        <version>2.7.0</version>
+        <version>2.8.2</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.xmlunit</groupId>
         <artifactId>xmlunit-assertj</artifactId>
-        <version>2.7.0</version>
+        <version>2.8.2</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.xmlunit</groupId>
+        <artifactId>xmlunit-assertj3</artifactId>
+        <version>2.8.2</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.xmlunit</groupId>
         <artifactId>xmlunit-matchers</artifactId>
-        <version>2.7.0</version>
+        <version>2.8.2</version>
         <scope>test</scope>
       </dependency>
       <!-- FIXME: remove this once we have migrated over -->
       <dependency>
         <groupId>org.xmlunit</groupId>
         <artifactId>xmlunit-legacy</artifactId>
-        <version>2.7.0</version>
+        <version>2.8.2</version>
         <scope>test</scope>
       </dependency>
 
@@ -709,7 +754,7 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-bom</artifactId>
-        <version>9.4.28.v20200408</version>
+        <version>9.4.31.v20200723</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -729,26 +774,35 @@
       <dependency>
           <groupId>org.eclipse.xtend</groupId>
           <artifactId>org.eclipse.xtend.lib</artifactId>
-          <version>2.23.0</version>
+          <version>2.24.0</version>
       </dependency>
       <dependency>
           <groupId>org.eclipse.xtend</groupId>
           <artifactId>org.eclipse.xtend.lib.macro</artifactId>
-          <version>2.23.0</version>
+          <version>2.24.0</version>
       </dependency>
       <dependency>
           <groupId>org.eclipse.xtext</groupId>
           <artifactId>org.eclipse.xtext.xbase.lib</artifactId>
-          <version>2.23.0</version>
+          <version>2.24.0</version>
       </dependency>
 
       <!-- Annotations -->
+      <!-- FIXME: ODLPARENT-246: remove this declaration -->
       <dependency>
         <groupId>javax.inject</groupId>
         <artifactId>javax.inject</artifactId>
         <version>1</version>
         <optional>true</optional>
       </dependency>
+      <!-- A better alternative for javax.inject, from https://guicedee.com/ -->
+      <dependency>
+        <groupId>com.guicedee.services</groupId>
+        <artifactId>javax.inject</artifactId>
+        <version>1.0.20.0</version>
+        <scope>provided</scope>
+        <optional>true</optional>
+      </dependency>
 
       <!-- jung, a graph library -->
       <dependency>
@@ -915,23 +969,23 @@
              We do not need to specify the groupId. -->
         <plugin>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>3.1.1</version>
+          <version>3.1.2</version>
           <dependencies>
             <dependency>
               <groupId>com.puppycrawl.tools</groupId>
               <artifactId>checkstyle</artifactId>
               <!-- This should match the dependency management on com.puppycrawl.tools:checkstyle above -->
-              <version>8.36.1</version>
+              <version>8.40</version>
             </dependency>
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>8.0.1-SNAPSHOT</version>
+              <version>8.1.2-SNAPSHOT</version>
             </dependency>
             <dependency>
               <groupId>com.github.sevntu-checkstyle</groupId>
               <artifactId>sevntu-checks</artifactId>
-              <version>1.37.1</version>
+              <version>1.38.0</version>
             </dependency>
           </dependencies>
           <configuration>
@@ -996,7 +1050,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-pmd-plugin</artifactId>
-          <version>3.13.0</version>
+          <version>3.14.0</version>
           <executions>
             <execution>
               <id>cpd</id>
@@ -1056,7 +1110,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-invoker-plugin</artifactId>
-          <version>3.2.1</version>
+          <version>3.2.2</version>
         </plugin>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
@@ -1072,7 +1126,7 @@
                   <artifactItem>
                     <groupId>org.opendaylight.odlparent</groupId>
                     <artifactId>odl-license</artifactId>
-                    <version>8.0.1-SNAPSHOT</version>
+                    <version>8.1.2-SNAPSHOT</version>
                     <type>license</type>
                     <outputDirectory>${project.build.outputDirectory}</outputDirectory>
                     <destFileName>LICENSE</destFileName>
@@ -1094,10 +1148,6 @@
           <artifactId>maven-remote-resources-plugin</artifactId>
           <version>1.7.0</version>
         </plugin>
-        <plugin>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>3.1.0</version>
-        </plugin>
         <plugin>
           <artifactId>maven-shade-plugin</artifactId>
           <version>3.2.4</version>
@@ -1136,7 +1186,7 @@
             <dependency>
               <groupId>org.apache.xbean</groupId>
               <artifactId>xbean-finder-shaded</artifactId>
-              <version>4.17</version>
+              <version>4.18</version>
             </dependency>
           </dependencies>
           <configuration>
@@ -1176,6 +1226,7 @@
           <groupId>org.apache.karaf.tooling</groupId>
           <artifactId>karaf-maven-plugin</artifactId>
           <version>${karaf.version}</version>
+          <extensions>true</extensions>
         </plugin>
 
         <plugin>
@@ -1196,7 +1247,7 @@
           <groupId>com.webcohesion.enunciate</groupId>
           <artifactId>enunciate-maven-plugin</artifactId>
           <!-- This must be aligned with the version of enunciate-core-annotations specified above -->
-          <version>2.13.1</version>
+          <version>2.13.2</version>
         </plugin>
 
         <plugin>
@@ -1247,7 +1298,7 @@
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>spotbugs</artifactId>
-              <version>8.0.1-SNAPSHOT</version>
+              <version>8.1.2-SNAPSHOT</version>
             </dependency>
             <dependency>
               <!-- The SpotBugs Maven plugin uses SLF4J 1.8 beta 2 -->
@@ -1304,7 +1355,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.23.0</version>
+          <version>2.24.0</version>
           <executions>
             <execution>
               <goals>
@@ -1513,7 +1564,7 @@
       <plugin>
         <groupId>org.basepom.maven</groupId>
         <artifactId>duplicate-finder-maven-plugin</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
         <executions>
           <execution>
             <id>find-duplicate-classpath-entries</id>
odlparent