X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=odlparent%2Fpom.xml;h=ffd3083f26d943e33959c65a8f2fb16ee21b2a3c;hb=04d822f807a47120e3c7267a55a1ada65efe9d7e;hp=cd72124a10473ceccbc5ad8545958f3217aa0a33;hpb=35c294b684b4393544d36a3d5ae674d812daf450;p=odlparent.git

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index cd72124a1..ffd3083f2 100644
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>6.0.1-SNAPSHOT</version>
     <relativePath>../odlparent-lite</relativePath>
   </parent>
 
@@ -41,11 +41,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
     <!-- Java Versions -->
-    <!-- FIXME: confirm these two are picked by maven-compiler-plugin -->
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <java.version.source>${maven.compiler.source}</java.version.source>
-    <java.version.target>${maven.compiler.target}</java.version.target>
+    <maven.compiler.release>11</maven.compiler.release>
 
     <!-- Used in openflowplugin -->
     <enforcer.version>3.0.0-M2</enforcer.version>
@@ -56,7 +52,7 @@
 
     <!-- Supporting Libraries -->
     <!-- Only used internally -->
-    <bouncycastle.version>1.61</bouncycastle.version>
+    <bouncycastle.version>1.63</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. -->
@@ -77,6 +73,26 @@
 
     <!-- Redirect test output to files (overridable) -->
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
+
+    <!-- Opt-out from maven-checkstyle-plugin failing the build on violations. Defaults
+         to true. Set to 'false' in pom.xml of project which desires to not enforce
+         no reported violations. -->
+    <odlparent.checkstyle.enforce>true</odlparent.checkstyle.enforce>
+
+    <!-- Opt-in into modernizer-maven-plugin failing the build on violations. Defaults
+         to false. Set to 'true' in pom.xml of project which desires to enforce
+         no reported violations. -->
+    <odlparent.modernizer.enforce>false</odlparent.modernizer.enforce>
+
+    <!-- Target release for modernizer-maven-plugin. It defaults to '1.8',
+         meaning Java 8, but can be set to any version in pom.xml of project
+         which desires to override it (such as '1.11' for Java 11). -->
+    <odlparent.modernizer.target>1.8</odlparent.modernizer.target>
+
+    <!-- Opt-out from spotbugs-maven-plugin failing the build on violations. Defaults
+         to true. Set to 'false' in pom.xml of project which desires to not enforce
+         no reported violations. -->
+    <odlparent.spotbugs.enforce>true</odlparent.spotbugs.enforce>
   </properties>
 
   <dependencyManagement>
@@ -85,7 +101,7 @@
       <dependency>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-artifacts</artifactId>
-        <version>5.0.0-SNAPSHOT</version>
+        <version>6.0.1-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -108,7 +124,7 @@
         <groupId>com.puppycrawl.tools</groupId>
         <artifactId>checkstyle</artifactId>
         <!-- This should match the plugin management on maven-checkstyle-plugin below -->
-        <version>8.16</version>
+        <version>8.20</version>
       </dependency>
 
       <!-- Testing Dependencies -->
@@ -132,39 +148,45 @@
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>2.23.4</version>
+        <version>2.25.1</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-inline</artifactId>
-        <version>2.23.4</version>
+        <version>2.25.1</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-core</artifactId>
+        <artifactId>hamcrest</artifactId>
         <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
-        <version>1.3</version>
+        <version>2.1</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-core</artifactId>
+        <version>2.1</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>hamcrest-library</artifactId>
-        <version>1.3</version>
+        <version>2.1</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>com.google.truth</groupId>
         <artifactId>truth</artifactId>
         <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
-        <version>0.42</version>
+        <version>0.43</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>com.google.truth.extensions</groupId>
         <artifactId>truth-java8-extension</artifactId>
-        <version>0.42</version>
+        <version>0.43</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -182,31 +204,31 @@
       <dependency>
         <groupId>org.powermock</groupId>
         <artifactId>powermock-api-mockito2</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.powermock</groupId>
         <artifactId>powermock-api-support</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.powermock</groupId>
         <artifactId>powermock-core</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.powermock</groupId>
         <artifactId>powermock-module-junit4</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.powermock</groupId>
         <artifactId>powermock-reflect</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
         <scope>test</scope>
       </dependency>
 
@@ -217,7 +239,7 @@
         <!-- Generates immutable implementations, builders, the works -->
         <groupId>org.immutables</groupId>
         <artifactId>value</artifactId>
-        <version>2.7.3</version>
+        <version>2.7.5</version>
         <!-- Must be provided; scope=test here breaks APT in Eclipse :( -->
         <scope>provided</scope>
       </dependency>
@@ -236,27 +258,27 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>jcl-over-slf4j</artifactId>
-        <version>1.7.25</version>
+        <version>1.7.28</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>1.7.25</version>
+        <version>1.7.28</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
-        <version>1.7.25</version>
+        <version>1.7.28</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>log4j-over-slf4j</artifactId>
-        <version>1.7.25</version>
+        <version>1.7.28</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-simple</artifactId>
-        <version>1.7.25</version>
+        <version>1.7.28</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -283,11 +305,11 @@
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
         <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
-        <version>25.1-jre</version>
+        <version>27.1-jre</version>
         <exclusions>
           <exclusion>
+            <!-- Do not leak JSR305 onto the classpath by default -->
             <groupId>com.google.code.findbugs</groupId>
-            <!-- Use com.google.code.findbugs:annotations instead of jsr305 -->
             <artifactId>jsr305</artifactId>
           </exclusion>
         </exclusions>
@@ -295,16 +317,30 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava-testlib</artifactId>
-        <version>25.1-jre</version>
+        <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
+        <version>27.1-jre</version>
         <scope>test</scope>
         <exclusions>
           <exclusion>
+            <!-- Do not leak JSR305 onto the classpath by default -->
             <groupId>com.google.code.findbugs</groupId>
-            <!-- Use com.google.code.findbugs:annotations instead of jsr305 -->
             <artifactId>jsr305</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
+
+      <!-- Caffeine plus bridges to Guava and JCache -->
+      <dependency>
+        <groupId>com.github.ben-manes.caffeine</groupId>
+        <artifactId>caffeine</artifactId>
+        <version>2.7.0</version>
+      </dependency>
+      <dependency>
+        <groupId>com.github.ben-manes.caffeine</groupId>
+        <artifactId>guava</artifactId>
+        <version>2.7.0</version>
+      </dependency>
+
       <dependency>
         <groupId>com.mycila.guice.extensions</groupId>
         <artifactId>mycila-guice-jsr250</artifactId>
@@ -315,24 +351,27 @@
         <groupId>com.google.inject</groupId>
         <artifactId>guice</artifactId>
         <!-- Make sure this version is in sync with the one used by mycila-guice-jsr250 above
-             by checking it here: https://github.com/mycila/guice/blob/master/pom.xml#L103 -->
-        <version>4.1.0</version>
+             by checking it here: https://github.com/mycila/guice/blob/master/pom.xml#L103.
+
+             Well, mycila is dead as a dodo and we need to support Java 11. This is the best
+             we can do in the interim. -->
+        <version>4.2.2</version>
       </dependency>
       <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
-        <version>1.9.3</version>
+        <version>1.9.4</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
         <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
-        <version>3.8.1</version>
+        <version>3.9</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-text</artifactId>
-        <version>1.6</version>
+        <version>1.8</version>
       </dependency>
       <dependency>
         <groupId>commons-lang</groupId>
@@ -343,7 +382,7 @@
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
-        <version>1.12</version>
+        <version>1.13</version>
       </dependency>
       <!-- Jersey for JAXRS -->
       <dependency>
@@ -372,7 +411,7 @@
       <dependency>
         <groupId>com.google.errorprone</groupId>
         <artifactId>error_prone_annotations</artifactId>
-        <version>2.3.2</version>
+        <version>2.3.3</version>
       </dependency>
 
       <dependency>
@@ -421,46 +460,42 @@
       </dependency>
 
       <!-- These three need to be consistent:
-        jackson-2.9 needs woodstox-5.0.x
-        woodstox-5.0 needs stax2-api-3.1.x
+        jackson-2.9.10 needs woodstox-5.3.x
+        woodstox-5.3 needs stax2-api-4.2.x
         -->
       <dependency>
         <groupId>org.codehaus.woodstox</groupId>
         <artifactId>stax2-api</artifactId>
-        <version>3.1.4</version>
+        <version>4.2</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.woodstox</groupId>
         <artifactId>woodstox-core</artifactId>
-        <version>5.0.3</version>
+        <version>5.3.0</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson</groupId>
         <artifactId>jackson-bom</artifactId>
-        <version>2.9.8</version>
+        <version>2.9.10</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
 
       <dependency>
-        <groupId>com.google.code.findbugs</groupId>
-        <artifactId>annotations</artifactId>
-        <version>3.0.0</version>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-annotations</artifactId>
+        <version>3.1.12</version>
+        <scope>provided</scope>
+        <!-- Contains retention=RUNTIME annotations, which are not really needed -->
+        <optional>true</optional>
         <exclusions>
-          <!-- We'd like (have) to eventually exclude :jsr305 here as well, because
-               the types of this artifact are already shaded inside the :annotations artifact.
-               This state is a temporary solution to allow all projects to gradually switch over
-               switch their <dependency><groupId>com.google.code.findbugs from
-               <artifactId>jsr305 to <artifactId>annotations in all pom.xml.
-               The target solution is https://git.opendaylight.org/gerrit/#/c/47337/
-            -->
           <exclusion>
-            <groupId>net.jcip</groupId>
-            <!-- The types of this artifact are already shaded inside the :annotations artifact -->
-            <artifactId>jcip-annotations</artifactId>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
+
       <dependency>
         <groupId>org.eclipse.jdt</groupId>
         <artifactId>org.eclipse.jdt.annotation</artifactId>
@@ -494,37 +529,37 @@
         <artifactId>netty-all</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.33.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-buffer</artifactId>
-        <version>4.1.33.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-codec</artifactId>
-        <version>4.1.33.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-codec-http</artifactId>
-        <version>4.1.33.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-common</artifactId>
-        <version>4.1.33.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-handler</artifactId>
-        <version>4.1.33.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-transport</artifactId>
-        <version>4.1.33.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <!-- Here we need to define all available native epoll implementations; we can't limit ourselves to the build
       platform and we can't require the build platform to have an implementation (e.g. OS X) -->
@@ -532,7 +567,7 @@
         <groupId>io.netty</groupId>
         <artifactId>netty-transport-native-epoll</artifactId>
         <classifier>linux-x86_64</classifier>
-        <version>4.1.33.Final</version>
+        <version>4.1.42.Final</version>
       </dependency>
       <dependency>
         <groupId>javax.ws.rs</groupId>
@@ -613,7 +648,7 @@
       <dependency>
         <groupId>org.javassist</groupId>
         <artifactId>javassist</artifactId>
-        <version>3.24.0-GA</version>
+        <version>3.26.0-GA</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.spec.javax.transaction</groupId>
@@ -623,7 +658,7 @@
       <dependency>
         <groupId>org.jolokia</groupId>
         <artifactId>jolokia-osgi</artifactId>
-        <version>1.6.0</version>
+        <version>1.6.2</version>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
@@ -659,73 +694,73 @@
       <dependency>
         <groupId>com.typesafe</groupId>
         <artifactId>config</artifactId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
       </dependency>
 
       <!-- Reactive Streams, used by Akka -->
       <dependency>
         <groupId>org.reactivestreams</groupId>
         <artifactId>reactive-streams</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.3</version>
       </dependency>
 
       <!-- Akka -->
       <dependency>
         <groupId>com.typesafe</groupId>
         <artifactId>ssl-config-core_2.12</artifactId>
-        <version>0.3.6</version>
+        <version>0.3.8</version>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
         <artifactId>akka-actor_2.12</artifactId>
         <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
-        <version>2.5.21</version>
+        <version>2.5.25</version>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
         <artifactId>akka-cluster_2.12</artifactId>
-        <version>2.5.21</version>
+        <version>2.5.25</version>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
         <artifactId>akka-osgi_2.12</artifactId>
-        <version>2.5.21</version>
+        <version>2.5.25</version>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
         <artifactId>akka-persistence_2.12</artifactId>
-        <version>2.5.21</version>
+        <version>2.5.25</version>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
         <artifactId>akka-persistence-tck_2.12</artifactId>
-        <version>2.5.21</version>
+        <version>2.5.25</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
         <artifactId>akka-protobuf_2.12</artifactId>
-        <version>2.5.21</version>
+        <version>2.5.25</version>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
         <artifactId>akka-remote_2.12</artifactId>
-        <version>2.5.21</version>
+        <version>2.5.25</version>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
         <artifactId>akka-slf4j_2.12</artifactId>
-        <version>2.5.21</version>
+        <version>2.5.25</version>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
         <artifactId>akka-stream_2.12</artifactId>
-        <version>2.5.21</version>
+        <version>2.5.25</version>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
         <artifactId>akka-testkit_2.12</artifactId>
-        <version>2.5.21</version>
+        <version>2.5.25</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -736,7 +771,7 @@
       <dependency>
         <groupId>org.scala-lang.modules</groupId>
         <artifactId>scala-parser-combinators_2.12</artifactId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
       </dependency>
       <dependency>
         <groupId>org.uncommons.maths</groupId>
@@ -765,12 +800,12 @@
       <dependency>
         <groupId>org.scala-lang</groupId>
         <artifactId>scala-library</artifactId>
-        <version>2.12.8</version>
+        <version>2.12.10</version>
       </dependency>
       <dependency>
         <groupId>org.scala-lang</groupId>
         <artifactId>scala-reflect</artifactId>
-        <version>2.12.8</version>
+        <version>2.12.10</version>
       </dependency>
 
       <!-- LMAX Disruptor -->
@@ -884,48 +919,50 @@
       <dependency>
         <groupId>org.xmlunit</groupId>
         <artifactId>xmlunit-core</artifactId>
-        <version>2.6.2</version>
+        <version>2.6.3</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.xmlunit</groupId>
+        <artifactId>xmlunit-assertj</artifactId>
+        <version>2.6.3</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.xmlunit</groupId>
         <artifactId>xmlunit-matchers</artifactId>
-        <version>2.6.2</version>
+        <version>2.6.3</version>
         <scope>test</scope>
       </dependency>
       <!-- FIXME: remove this once we have migrated over -->
       <dependency>
         <groupId>org.xmlunit</groupId>
         <artifactId>xmlunit-legacy</artifactId>
-        <version>2.6.2</version>
+        <version>2.6.3</version>
         <scope>test</scope>
       </dependency>
 
+      <!-- Annotations for modernizer-maven-plugin -->
       <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-client</artifactId>
-        <version>9.4.12.v20180830</version>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-server</artifactId>
-        <version>9.4.12.v20180830</version>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-servlets</artifactId>
-        <version>9.4.12.v20180830</version>
+        <groupId>org.gaul</groupId>
+        <artifactId>modernizer-maven-annotations</artifactId>
+        <!-- This should match the plugin version below -->
+        <version>1.9.0</version>
+        <scope>provided</scope>
       </dependency>
+
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-webapp</artifactId>
+        <artifactId>jetty-bom</artifactId>
         <version>9.4.12.v20180830</version>
+        <scope>import</scope>
+        <type>pom</type>
       </dependency>
 
       <dependency>
         <groupId>com.h2database</groupId>
         <artifactId>h2</artifactId>
-        <version>1.4.198</version>
+        <version>1.4.199</version>
       </dependency>
 
       <!-- Xtend http://xtend-lang.org
@@ -937,17 +974,17 @@
       <dependency>
           <groupId>org.eclipse.xtend</groupId>
           <artifactId>org.eclipse.xtend.lib</artifactId>
-          <version>2.16.0</version>
+          <version>2.19.0</version>
       </dependency>
       <dependency>
           <groupId>org.eclipse.xtend</groupId>
           <artifactId>org.eclipse.xtend.lib.macro</artifactId>
-          <version>2.16.0</version>
+          <version>2.19.0</version>
       </dependency>
       <dependency>
           <groupId>org.eclipse.xtext</groupId>
           <artifactId>org.eclipse.xtext.xbase.lib</artifactId>
-          <version>2.16.0</version>
+          <version>2.19.0</version>
       </dependency>
 
       <!-- Annotations -->
@@ -980,18 +1017,20 @@
         <groupId>org.apache.karaf.shell</groupId>
         <artifactId>org.apache.karaf.shell.core</artifactId>
         <version>${karaf.version}</version>
+        <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.karaf.shell</groupId>
         <artifactId>org.apache.karaf.shell.console</artifactId>
         <version>${karaf.version}</version>
+        <scope>provided</scope>
       </dependency>
 
       <!-- ThreeTen-Extra, date/time complements -->
       <dependency>
         <groupId>org.threeten</groupId>
         <artifactId>threeten-extra</artifactId>
-        <version>1.4</version>
+        <version>1.5.0</version>
       </dependency>
 
       <!-- When updating this version, consider antl4-maven-plugin below -->
@@ -1019,7 +1058,7 @@
       <dependency>
         <groupId>org.apache.sshd</groupId>
         <artifactId>sshd-netty</artifactId>
-        <version>2.2.0</version>
+        <version>2.3.0</version>
         <exclusions>
           <exclusion>
             <!-- We provide sshd-osgi instead -->
@@ -1031,7 +1070,7 @@
       <dependency>
         <groupId>org.apache.sshd</groupId>
         <artifactId>sshd-osgi</artifactId>
-        <version>2.2.0</version>
+        <version>2.3.0</version>
       </dependency>
       <dependency>
         <groupId>net.i2p.crypto</groupId>
@@ -1043,7 +1082,7 @@
       <dependency>
         <groupId>tech.pantheon.triemap</groupId>
         <artifactId>bom</artifactId>
-        <version>1.0.4</version>
+        <version>1.1.0</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -1057,32 +1096,16 @@
         <type>pom</type>
       </dependency>
 
-      <!-- JAXB for Java 11+ -->
-      <!--
-           FIXME: bump this to 2.3.0 once we require Java 9+
-           FIXME: bump this to whatever karaf provides once we require Java 11+
-      -->
+      <!-- JAXB for Java 11+, match this with Karaf -->
       <dependency>
         <groupId>javax.xml.bind</groupId>
         <artifactId>jaxb-api</artifactId>
-        <version>2.2.8</version>
-        <exclusions>
-          <exclusion>
-            <!-- Provided by JRE -->
-            <groupId>javax.xml.stream</groupId>
-            <artifactId>stax-api</artifactId>
-          </exclusion>
-        </exclusions>
+        <version>2.3.0</version>
       </dependency>
       <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-core</artifactId>
-        <version>2.2.11</version>
-      </dependency>
-      <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-impl</artifactId>
-        <version>2.2.11</version>
+        <groupId>org.glassfish.jaxb</groupId>
+        <artifactId>jaxb-runtime</artifactId>
+        <version>2.3.1</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -1103,15 +1126,19 @@
           are not required at runtime.
     -->
     <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>annotations</artifactId>
+      <groupId>org.eclipse.jdt</groupId>
+      <artifactId>org.eclipse.jdt.annotation</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.github.spotbugs</groupId>
+      <artifactId>spotbugs-annotations</artifactId>
       <scope>provided</scope>
-      <!-- Contains retention=RUNTIME annotations, which are not really needed -->
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jdt</groupId>
-      <artifactId>org.eclipse.jdt.annotation</artifactId>
+      <groupId>org.gaul</groupId>
+      <artifactId>modernizer-maven-annotations</artifactId>
       <scope>provided</scope>
     </dependency>
 
@@ -1127,6 +1154,17 @@
     <!--
           Unit tests can use JUnit + Mockito + Hamcrest by default.
     -->
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <!-- This dependency needs to come before junit until we upgrade to JUnit 5. -->
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -1144,34 +1182,25 @@
       <plugins>
         <!-- Official maven plugins, alpha-sorted by artifactId.
              We do not need to specify the groupId. -->
-        <plugin>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.8</version>
-        </plugin>
         <plugin>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.1.0</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.16</version>
+              <version>8.20</version>
             </dependency>
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>5.0.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-              <groupId>org.opendaylight.odlparent</groupId>
-              <artifactId>odl-license</artifactId>
-              <version>5.0.0-SNAPSHOT</version>
+              <version>6.0.1-SNAPSHOT</version>
             </dependency>
             <dependency>
               <groupId>com.github.sevntu-checkstyle</groupId>
               <artifactId>sevntu-checkstyle-maven-plugin</artifactId>
-              <version>1.32.0</version>
+              <version>1.35.0</version>
             </dependency>
           </dependencies>
           <configuration>
@@ -1189,7 +1218,8 @@
             <excludes>
               org/opendaylight/yang/gen/**,
               **/protobuff/messages/**,
-              **/thrift/gen/*.java
+              **/thrift/gen/*.java,
+              **/module-info.java
             </excludes>
             <failsOnError>false</failsOnError>
             <consoleOutput>true</consoleOutput>
@@ -1224,13 +1254,18 @@
                 <goal>check</goal>
               </goals>
               <phase>process-sources</phase>
+              <configuration>
+                <failOnViolation>${odlparent.checkstyle.enforce}</failOnViolation>
+                <skip>${odlparent.checkstyle.skip}</skip>
+                <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+              </configuration>
             </execution>
           </executions>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-pmd-plugin</artifactId>
-          <version>3.11.0</version>
+          <version>3.12.0</version>
           <executions>
             <execution>
               <id>cpd</id>
@@ -1260,10 +1295,8 @@
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.0</version>
+          <version>3.8.1</version>
           <configuration>
-            <source>1.8</source>
-            <target>1.8</target>
             <showWarnings>true</showWarnings>
             <compilerArgs>
               <arg>-parameters</arg>
@@ -1278,33 +1311,34 @@
         </plugin>
         <plugin>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>2.22.1</version>
+          <version>2.22.2</version>
         </plugin>
         <plugin>
           <artifactId>maven-invoker-plugin</artifactId>
           <version>3.2.0</version>
         </plugin>
-        <plugin>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>3.1.1</version>
-        </plugin>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
           <executions>
             <execution>
               <id>unpack-license</id>
               <phase>generate-resources</phase>
-              <goals><goal>unpack</goal></goals>
+              <goals>
+                <goal>copy</goal>
+              </goals>
               <configuration>
                 <artifactItems>
                   <artifactItem>
                     <groupId>org.opendaylight.odlparent</groupId>
                     <artifactId>odl-license</artifactId>
-                    <version>5.0.0-SNAPSHOT</version>
+                    <version>6.0.1-SNAPSHOT</version>
+                    <type>license</type>
+                    <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                    <destFileName>LICENSE</destFileName>
+                    <overWrite>false</overWrite>
                   </artifactItem>
                 </artifactItems>
-                <outputDirectory>${project.build.outputDirectory}</outputDirectory>
-                <excludes>META-INF/**</excludes>
+                <silent>true</silent>
               </configuration>
             </execution>
           </executions>
@@ -1312,7 +1346,7 @@
 
         <plugin>
           <artifactId>maven-plugin-plugin</artifactId>
-          <version>3.5.2</version>
+          <version>3.6.0</version>
         </plugin>
 
         <plugin>
@@ -1329,7 +1363,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-source-plugin</artifactId>
-          <version>3.0.1</version>
+          <version>3.1.0</version>
           <executions>
             <execution>
               <id>attach-sources</id>
@@ -1342,7 +1376,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.1</version>
+          <version>2.22.2</version>
           <configuration>
             <redirectTestOutputToFile>${maven.test.redirectTestOutputToFile}</redirectTestOutputToFile>
             <trimStackTrace>false</trimStackTrace>
@@ -1361,12 +1395,12 @@
             <dependency>
               <groupId>org.apache.xbean</groupId>
               <artifactId>xbean-finder-shaded</artifactId>
-              <version>4.12</version>
+              <version>4.14</version>
             </dependency>
           </dependencies>
           <configuration>
             <scanPaths>
-              <scanPath>org.opendaylight</scanPath>
+              <scanPath>${project.groupId}</scanPath>
             </scanPaths>
           </configuration>
           <executions>
@@ -1381,7 +1415,7 @@
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
-          <version>4.1.0</version>
+          <version>4.2.0</version>
           <extensions>true</extensions>
           <configuration>
             <instructions>
@@ -1425,24 +1459,40 @@
         </plugin>
 
         <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>build-helper-maven-plugin</artifactId>
-          <version>3.0.0</version>
+          <groupId>org.gaul</groupId>
+          <artifactId>modernizer-maven-plugin</artifactId>
+          <version>1.9.0</version>
+          <configuration>
+            <javaVersion>${odlparent.modernizer.target}</javaVersion>
+            <failOnViolations>${odlparent.modernizer.enforce}</failOnViolations>
+            <skip>${odlparent.modernizer.skip}</skip>
+          </configuration>
+
+          <executions>
+            <execution>
+              <id>modernizer</id>
+              <phase>verify</phase>
+              <goals>
+                <goal>modernizer</goal>
+              </goals>
+            </execution>
+          </executions>
         </plugin>
+
         <plugin>
           <groupId>com.github.spotbugs</groupId>
           <artifactId>spotbugs-maven-plugin</artifactId>
-          <version>3.1.8</version>
+          <version>3.1.12.2</version>
           <dependencies>
             <dependency>
               <groupId>com.github.spotbugs</groupId>
               <artifactId>spotbugs</artifactId>
-              <version>3.1.9</version>
+              <version>3.1.12</version>
             </dependency>
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>spotbugs</artifactId>
-              <version>5.0.0-SNAPSHOT</version>
+              <version>6.0.1-SNAPSHOT</version>
             </dependency>
             <dependency>
               <!-- The SpotBugs Maven plugin uses SLF4J 1.8 beta 2 -->
@@ -1457,7 +1507,7 @@
                 <groupId>jp.skypencil.findbugs.slf4j</groupId>
                 <artifactId>bug-pattern</artifactId>
                 <!-- NOTE: This version MUST be kept in sync with the same version in the old findbugs-maven-plugin above, if possible -->
-                <version>1.4.1</version>
+                <version>1.4.2</version>
               </plugin>
             </plugins>
             <!--
@@ -1469,7 +1519,8 @@
             <!-- Reports all bugs (other values are medium and max) -->
             <threshold>Low</threshold>
             <!-- Build doesn't fail if problems are found -->
-            <failOnError>false</failOnError>
+            <failOnError>${odlparent.spotbugs.enforce}</failOnError>
+            <skip>${odlparent.spotbugs.skip}</skip>
             <!-- References the excluded rules -->
             <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
             <!-- Produces XML report -->
@@ -1499,7 +1550,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.16.0</version>
+          <version>2.19.0</version>
           <executions>
             <execution>
               <goals>
@@ -1552,7 +1603,7 @@
                     <artifactId>maven-dependency-plugin</artifactId>
                     <versionRange>[2.10,)</versionRange>
                     <goals>
-                      <goal>unpack</goal>
+                      <goal>copy</goal>
                     </goals>
                   </pluginExecutionFilter>
                   <action>
@@ -1672,20 +1723,6 @@
           <version>1.2.4</version>
         </plugin>
 
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>jdepend-maven-plugin</artifactId>
-          <version>2.0</version>
-          <executions>
-            <execution>
-              <phase>site</phase>
-              <goals>
-                <goal>generate-no-fork</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-
         <!-- When updating this version, consider antl4-runtime above -->
         <plugin>
           <groupId>org.antlr</groupId>
@@ -1707,17 +1744,10 @@
             <configuration>
               <rules>
                 <bannedDependencies>
-                  <message>Please always use mockito-core instead of mockito-all, and findbugs:annotations instead of findbugs:jsr305 (see https://bugs.opendaylight.org/show_bug.cgi?id=7662 &amp; https://bugs.opendaylight.org/show_bug.cgi?id=7663)</message>
+                  <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message>
                   <excludes>
                     <exclude>org.mockito:mockito-all</exclude>
-                    <!-- https://github.com/facebook/facebook-oss-pom/blob/master/pom.xml#L331-L336 -->
-                    <!-- Clashes with com.google.code.findbugs:annotations and having both jars -->
-                    <!-- as a dependency then clashes with the dependency checker (because it   -->
-                    <!-- is not very good at handling annotations). Use the annotations jar     -->
-                    <!-- instead which has all jsr305 annotations and the additional findbugs   -->
-                    <!-- stuff. -->
-                    <exclude>com.google.code.findbugs:jsr305</exclude>
-                    <exclude>net.jcip:jcip-annotations</exclude>
+                    <exclude>com.google.code.findbugs:annotations</exclude>
                   </excludes>
                 </bannedDependencies>
               </rules>
@@ -1788,6 +1818,14 @@
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.gaul</groupId>
+        <artifactId>modernizer-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+      </plugin>
 
       <!-- Jacoco / Sonar -->
       <plugin>
@@ -1866,7 +1904,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.1.0</version>
       </plugin>
 
       <!-- FIXME: activate this