X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=odlparent%2Fpom.xml;h=1061e40ccb8e9dc90c572aa68b5173b0710b8bb8;hb=1a20d2f8af7bdf04430030ab2ccb3a7a2192b685;hp=2f8f1b9c89be9bdee4faeae83a56a000669e26b8;hpb=b0c11434199b0cbe2f86be8324a99473ce38b6b4;p=odlparent.git

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 2f8f1b9c8..1061e40cc 100644
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.2-SNAPSHOT</version>
     <relativePath>../odlparent-lite</relativePath>
   </parent>
 
@@ -47,56 +47,36 @@
     <java.version.source>${maven.compiler.source}</java.version.source>
     <java.version.target>${maven.compiler.target}</java.version.target>
 
-    <!-- Maven plugin versions, in the 'canonical' format -->
-    <!-- Used in didm, l2switch, lacp, persistence; see also controller -->
-    <maven.compile.plugin.version>3.7.0</maven.compile.plugin.version>
-    <!-- Used in snmp -->
-    <maven.plugin.version>3.5</maven.plugin.version>
-    <!-- Used in controller, iotdm, neutron, of-config -->
-    <!-- Later versions break tests in downstream projects -->
-    <maven.surefire.version>2.18.1</maven.surefire.version>
-
-    <!-- Used in packetcable -->
-    <odl.checkstyle.version>3.0.0-SNAPSHOT</odl.checkstyle.version>
-    <!-- Used in l2switch, lacp, netide, ocpplugin, openflowjava, openflowplugin, snbi, tsdr -->
-    <enforcer.version>3.0.0-M1</enforcer.version>
-    <!-- Used in snmp4sdn; see also nemo -->
-    <enunciate.version>1.31</enunciate.version>
-    <!-- Used in controller, infrautils, netide, openflowplugin -->
-    <exam.version>4.12.0</exam.version>
-    <!-- Used in of-config, snmp4sdn -->
-    <failsafe.version>2.20.1</failsafe.version>
-    <!-- Used in genius, neutron, of-config, ovsdb, persistence, snmp4sdn, usc, vtn -->
-    <jacoco.version>0.8.1</jacoco.version>
-    <!-- Used in aaa, alto, bgpcep, bier, controller, coretutorials, genius, infrautils, iotdm,
-         l2switch, lacp, netconf, netide, netvirt, nic, ocpplugin, ovsdb, persistence, snbi, sxp,
-         tsdr, unimgr, vtn -->
-    <karaf.version>4.2.0</karaf.version>
-    <!-- Used in sxp -->
-    <karaf.plugin.version>4.2.0</karaf.plugin.version>
-    <!-- Used in lispflowmapping, snmp4sdn, vtn -->
+    <!-- Used in openflowplugin -->
+    <enforcer.version>3.0.0-M2</enforcer.version>
+    <!-- Used in controller, genius, infrautils, netconf, netvirt, ovsdb, serviceutils -->
+    <karaf.version>4.2.1</karaf.version>
+    <!-- Used in bgpcep, lispflowmapping -->
     <projectinfo>2.8.1</projectinfo>
-    <!-- Used in of-config; see also snmp4sdn -->
-    <propertymavenplugin.version>1.0.0</propertymavenplugin.version>
 
     <!-- Supporting Libraries -->
     <!-- Only used internally -->
     <bouncycastle.version>1.60</bouncycastle.version>
 
-    <!-- Used by snbi; see also bier, dlux, iotdm, tsdr, unimgr -->
-    <osgi.core.version>5.0.0</osgi.core.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. -->
+    <jacoco.destFile>${project.build.directory}/code-coverage/jacoco.exec</jacoco.destFile>
 
     <!-- Default Sonar configuration -->
     <sonar-jacoco-listeners.version>3.8</sonar-jacoco-listeners.version>
     <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-    <sonar.jacoco.reportPath>${project.build.directory}/code-coverage/jacoco.exec</sonar.jacoco.reportPath>
+    <sonar.jacoco.reportPath>${jacoco.destFile}</sonar.jacoco.reportPath>
     <sonar.jacoco.itReportPath>${project.build.directory}/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+
     <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
     <sonar.exclusions>**/gen/**,**/generated-sources/**,**/generated-test-sources/**,**/yang-gen/**,**/yang-gen-config/**,**/yang-gen-sal/**,**/yang-gen-code/**,**/pax/**</sonar.exclusions>
 
     <!-- Opt-in code quality checks -->
     <pmd.cpd.fail>false</pmd.cpd.fail>                  <!-- Copy/paste detection -->
     <duplicate-finder.skip>true</duplicate-finder.skip> <!-- Classpath duplicates -->
+
+    <!-- Redirect test output to files (overridable) -->
+    <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
   </properties>
 
   <dependencyManagement>
@@ -105,7 +85,7 @@
       <dependency>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-artifacts</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.2-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -119,7 +99,7 @@
         <groupId>com.puppycrawl.tools</groupId>
         <artifactId>checkstyle</artifactId>
         <!-- This should match the plugin management on maven-checkstyle-plugin below -->
-        <version>8.10</version>
+        <version>8.12</version>
       </dependency>
 
       <!-- Testing Dependencies -->
@@ -130,6 +110,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
+        <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
         <version>4.11</version>
         <scope>test</scope>
       </dependency>
@@ -142,12 +123,19 @@
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>1.10.19</version>
+        <version>2.20.1</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-inline</artifactId>
+        <version>2.20.1</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>hamcrest-core</artifactId>
+        <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
         <version>1.3</version>
         <scope>test</scope>
       </dependency>
@@ -160,6 +148,7 @@
       <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>
         <scope>test</scope>
       </dependency>
@@ -219,7 +208,7 @@
         <!-- Generates immutable implementations, builders, the works -->
         <groupId>org.immutables</groupId>
         <artifactId>value</artifactId>
-        <version>2.6.3</version>
+        <version>2.7.1</version>
         <!-- Must be provided; scope=test here breaks APT in Eclipse :( -->
         <scope>provided</scope>
       </dependency>
@@ -271,9 +260,20 @@
         <artifactId>logback-classic</artifactId>
         <version>1.2.3</version>
       </dependency>
+
+      <!-- log4j2 -->
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-bom</artifactId>
+        <version>2.11.1</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+
       <dependency>
         <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>
         <exclusions>
           <exclusion>
@@ -286,7 +286,7 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava-testlib</artifactId>
-        <version>23.6.1-jre</version>
+        <version>25.1-jre</version>
         <scope>test</scope>
         <exclusions>
           <exclusion>
@@ -312,7 +312,8 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
-        <version>3.7</version>
+        <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
+        <version>3.8</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
@@ -322,6 +323,7 @@
       <dependency>
         <groupId>commons-lang</groupId>
         <artifactId>commons-lang</artifactId>
+        <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
         <version>2.6</version>
       </dependency>
       <dependency>
@@ -500,37 +502,38 @@
         <groupId>io.netty</groupId>
         <artifactId>netty-all</artifactId>
         <!-- If these are updated, the version in features.xml needs to be changed too -->
-        <version>4.1.24.Final</version>
+        <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
+        <version>4.1.28.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-buffer</artifactId>
-        <version>4.1.24.Final</version>
+        <version>4.1.28.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-codec</artifactId>
-        <version>4.1.24.Final</version>
+        <version>4.1.28.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-codec-http</artifactId>
-        <version>4.1.24.Final</version>
+        <version>4.1.28.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-common</artifactId>
-        <version>4.1.24.Final</version>
+        <version>4.1.28.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-handler</artifactId>
-        <version>4.1.24.Final</version>
+        <version>4.1.28.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-transport</artifactId>
-        <version>4.1.24.Final</version>
+        <version>4.1.28.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) -->
@@ -538,7 +541,7 @@
         <groupId>io.netty</groupId>
         <artifactId>netty-transport-native-epoll</artifactId>
         <classifier>linux-x86_64</classifier>
-        <version>4.1.24.Final</version>
+        <version>4.1.28.Final</version>
       </dependency>
       <dependency>
         <groupId>javax.ws.rs</groupId>
@@ -563,7 +566,7 @@
       <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.metatype</artifactId>
-        <version>1.1.6</version>
+        <version>1.2.0</version>
       </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
@@ -583,7 +586,8 @@
       <dependency>
         <groupId>org.codehaus.enunciate</groupId>
         <artifactId>enunciate-core-annotations</artifactId>
-        <version>${enunciate.version}</version>
+        <!-- This must be aligned with the version of maven-enunciate-plugin specified below -->
+        <version>1.31</version>
         <exclusions>
           <exclusion>
             <!-- JSR 250 API has 6 very old versions of javax.annotation @PreDestroy & Co.
@@ -618,17 +622,17 @@
       <dependency>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.antlr</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.3</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.core</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.3</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.moxy</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.3</version>
       </dependency>
       <dependency>
         <groupId>javax.validation</groupId>
@@ -638,7 +642,7 @@
       <dependency>
         <groupId>org.javassist</groupId>
         <artifactId>javassist</artifactId>
-        <version>3.22.0-GA</version>
+        <version>3.23.1-GA</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.spec.javax.transaction</groupId>
@@ -648,7 +652,7 @@
       <dependency>
         <groupId>org.jolokia</groupId>
         <artifactId>jolokia-osgi</artifactId>
-        <version>1.5.0</version>
+        <version>1.6.0</version>
       </dependency>
       <dependency>
         <groupId>org.json</groupId>
@@ -658,13 +662,13 @@
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.compendium</artifactId>
-        <version>${osgi.core.version}</version>
+        <version>5.0.0</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.core</artifactId>
-        <version>${osgi.core.version}</version>
+        <version>5.0.0</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -681,7 +685,7 @@
       <dependency>
         <groupId>org.ow2.asm</groupId>
         <artifactId>asm</artifactId>
-        <version>6.0</version>
+        <version>6.2.1</version>
       </dependency>
 
       <!-- Configuration library -->
@@ -708,6 +712,7 @@
       <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.14</version>
       </dependency>
       <dependency>
@@ -767,26 +772,11 @@
         <artifactId>scala-parser-combinators_2.12</artifactId>
         <version>1.1.1</version>
       </dependency>
-      <dependency>
-        <groupId>org.iq80.leveldb</groupId>
-        <artifactId>leveldb</artifactId>
-        <version>0.7</version>
-      </dependency>
-      <dependency>
-        <groupId>org.fusesource.leveldbjni</groupId>
-        <artifactId>leveldbjni-all</artifactId>
-        <version>1.8-odl</version>
-      </dependency>
       <dependency>
         <groupId>org.uncommons.maths</groupId>
         <artifactId>uncommons-maths</artifactId>
         <version>1.2.2a</version>
       </dependency>
-      <dependency>
-        <groupId>com.google.protobuf</groupId>
-        <artifactId>protobuf-java</artifactId>
-        <version>2.5.0</version>
-      </dependency>
 
       <!-- Aeron, required by Akka -->
       <dependency>
@@ -828,68 +818,68 @@
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam</artifactId>
-        <version>${exam.version}</version>
+        <version>4.12.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-container-forked</artifactId>
-        <version>${exam.version}</version>
+        <version>4.12.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-container-karaf</artifactId>
-        <version>${exam.version}</version>
+        <version>4.12.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-container-native</artifactId>
-        <version>${exam.version}</version>
+        <version>4.12.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-extender-service</artifactId>
-        <version>${exam.version}</version>
+        <version>4.12.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-inject</artifactId>
-        <version>${exam.version}</version>
+        <version>4.12.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-invoker-junit</artifactId>
-        <version>${exam.version}</version>
+        <version>4.12.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-features</artifactId>
-        <version>${exam.version}</version>
+        <version>4.12.0</version>
         <type>xml</type>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-junit4</artifactId>
-        <version>${exam.version}</version>
+        <version>4.12.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-link-mvn</artifactId>
-        <version>${exam.version}</version>
+        <version>4.12.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-link-assembly</artifactId>
-        <version>${exam.version}</version>
+        <version>4.12.0</version>
         <scope>test</scope>
       </dependency>
 
@@ -911,38 +901,59 @@
         <version>2.5.4</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.ops4j.pax.web</groupId>
+        <artifactId>pax-web-api</artifactId>
+        <!-- Note: keep this version synchronized with karaf -->
+        <version>7.2.3</version>
+      </dependency>
+
       <dependency>
         <groupId>org.springframework.osgi</groupId>
         <artifactId>spring-osgi-mock</artifactId>
         <version>1.2.1</version>
         <scope>test</scope>
       </dependency>
+
+      <dependency>
+        <groupId>org.xmlunit</groupId>
+        <artifactId>xmlunit-core</artifactId>
+        <version>2.6.2</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.xmlunit</groupId>
+        <artifactId>xmlunit-matchers</artifactId>
+        <version>2.6.2</version>
+        <scope>test</scope>
+      </dependency>
+      <!-- FIXME: remove this once we have migrated over -->
       <dependency>
-        <groupId>xmlunit</groupId>
-        <artifactId>xmlunit</artifactId>
-        <version>1.6</version>
+        <groupId>org.xmlunit</groupId>
+        <artifactId>xmlunit-legacy</artifactId>
+        <version>2.6.2</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-client</artifactId>
-        <version>9.3.21.v20170918</version>
+        <version>9.4.11.v20180605</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-server</artifactId>
-        <version>9.3.21.v20170918</version>
+        <version>9.4.11.v20180605</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-servlets</artifactId>
-        <version>9.3.21.v20170918</version>
+        <version>9.4.11.v20180605</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-webapp</artifactId>
-        <version>9.3.21.v20170918</version>
+        <version>9.4.11.v20180605</version>
       </dependency>
 
       <dependency>
@@ -980,12 +991,6 @@
         <version>1</version>
         <optional>true</optional>
       </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>
@@ -1027,7 +1032,7 @@
       <dependency>
         <groupId>org.threeten</groupId>
         <artifactId>threeten-extra</artifactId>
-        <version>1.3.2</version>
+        <version>1.4</version>
       </dependency>
 
       <!-- When updating this version, consider antl4-maven-plugin below -->
@@ -1044,7 +1049,29 @@
         <artifactId>org.apache.aries.blueprint.core</artifactId>
         <version>1.9.0</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.aries.blueprint</groupId>
+        <artifactId>blueprint-maven-plugin-annotation</artifactId>
+        <version>1.3.0</version>
+        <optional>true</optional>
+      </dependency>
 
+      <!-- Apache SSHD with netty -->
+      <dependency>
+        <groupId>org.apache.sshd</groupId>
+        <artifactId>sshd-core</artifactId>
+        <version>2.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.sshd</groupId>
+        <artifactId>sshd-netty</artifactId>
+        <version>2.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>net.i2p.crypto</groupId>
+        <artifactId>eddsa</artifactId>
+        <version>0.3.0</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -1115,22 +1142,22 @@
               <groupId>com.puppycrawl.tools</groupId>
               <artifactId>checkstyle</artifactId>
               <!-- This should match the dependency management on com.puppycrawl.tools:checkstyle above -->
-              <version>8.10.1</version>
+              <version>8.12</version>
             </dependency>
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>4.0.0-SNAPSHOT</version>
+              <version>4.0.2-SNAPSHOT</version>
             </dependency>
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>odl-license</artifactId>
-              <version>4.0.0-SNAPSHOT</version>
+              <version>4.0.2-SNAPSHOT</version>
             </dependency>
             <dependency>
               <groupId>com.github.sevntu-checkstyle</groupId>
               <artifactId>sevntu-checkstyle-maven-plugin</artifactId>
-              <version>1.29.0</version>
+              <version>1.32.0</version>
             </dependency>
           </dependencies>
           <configuration>
@@ -1219,7 +1246,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>${maven.compile.plugin.version}</version>
+          <version>3.8.0</version>
           <configuration>
             <source>1.8</source>
             <target>1.8</target>
@@ -1227,6 +1254,7 @@
             <compilerArgs>
               <arg>-parameters</arg>
               <arg>-Xlint:deprecation</arg>
+              <arg>-Xlint:unchecked</arg>
             </compilerArgs>
           </configuration>
         </plugin>
@@ -1236,15 +1264,15 @@
         </plugin>
         <plugin>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>${failsafe.version}</version>
+          <version>2.22.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-invoker-plugin</artifactId>
-          <version>2.0.0</version>
+          <version>3.1.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.0.2</version>
+          <version>3.1.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
@@ -1258,7 +1286,7 @@
                   <artifactItem>
                     <groupId>org.opendaylight.odlparent</groupId>
                     <artifactId>odl-license</artifactId>
-                    <version>4.0.0-SNAPSHOT</version>
+                    <version>4.0.2-SNAPSHOT</version>
                   </artifactItem>
                 </artifactItems>
                 <outputDirectory>${project.build.outputDirectory}</outputDirectory>
@@ -1270,7 +1298,7 @@
 
         <plugin>
           <artifactId>maven-plugin-plugin</artifactId>
-          <version>${maven.plugin.version}</version>
+          <version>3.5</version>
         </plugin>
 
         <plugin>
@@ -1279,11 +1307,11 @@
         </plugin>
         <plugin>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>3.0.1</version>
+          <version>3.1.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>3.2.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-source-plugin</artifactId>
@@ -1300,9 +1328,9 @@
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>${maven.surefire.version}</version>
+          <version>2.22.0</version>
           <configuration>
-            <redirectTestOutputToFile>true</redirectTestOutputToFile>
+            <redirectTestOutputToFile>${maven.test.redirectTestOutputToFile}</redirectTestOutputToFile>
             <trimStackTrace>false</trimStackTrace>
           </configuration>
         </plugin>
@@ -1313,11 +1341,19 @@
           <groupId>org.apache.aries.blueprint</groupId>
           <artifactId>blueprint-maven-plugin</artifactId>
           <version>1.10.0</version>
+          <!-- TODO remove dependencies when we bump from 1.10.0 to 1.11.0 (or 1.10.1);
+             see https://jira.opendaylight.org/browse/ODLPARENT-167 & https://jira.apache.org/jira/browse/ARIES-1826 -->
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.xbean</groupId>
+              <artifactId>xbean-finder-shaded</artifactId>
+              <version>4.9</version>
+            </dependency>
+          </dependencies>
           <configuration>
             <scanPaths>
               <scanPath>org.opendaylight</scanPath>
             </scanPaths>
-            <generatedDir>org/opendaylight/blueprint/</generatedDir>
           </configuration>
           <executions>
             <execution>
@@ -1331,7 +1367,7 @@
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
-          <version>3.5.0</version>
+          <version>4.0.0</version>
           <extensions>true</extensions>
           <configuration>
             <instructions>
@@ -1339,6 +1375,10 @@
                    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},${project.build.directory}/classes/LICENSE,META-INF/git.properties=-${project.build.directory}/classes/META-INF/git.properties</Include-Resource>
+
+              <!-- Based on https://dev.eclipse.org/mhonarc/lists/equinox-dev/msg01088.html we do want
+                   to generate Import-Service and Export-Service headers. -->
+              <_removeheaders>Import-Service,Export-Service</_removeheaders>
             </instructions>
           </configuration>
         </plugin>
@@ -1366,7 +1406,8 @@
         <plugin>
           <groupId>org.codehaus.enunciate</groupId>
           <artifactId>maven-enunciate-plugin</artifactId>
-          <version>${enunciate.version}</version>
+          <!-- This must be aligned with the version of enunciate-core-annotations specified above -->
+          <version>1.31</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.groovy.maven</groupId>
@@ -1386,7 +1427,7 @@
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>findbugs</artifactId>
-              <version>4.0.0-SNAPSHOT</version>
+              <version>4.0.2-SNAPSHOT</version>
             </dependency>
           </dependencies>
           <configuration>
@@ -1437,12 +1478,12 @@
             <dependency>
               <groupId>com.github.spotbugs</groupId>
               <artifactId>spotbugs</artifactId>
-              <version>3.1.6</version>
+              <version>3.1.7</version>
             </dependency>
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>spotbugs</artifactId>
-              <version>4.0.0-SNAPSHOT</version>
+              <version>4.0.2-SNAPSHOT</version>
             </dependency>
           </dependencies>
           <configuration>
@@ -1487,7 +1528,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>properties-maven-plugin</artifactId>
-          <version>${propertymavenplugin.version}</version>
+          <version>1.0.0</version>
         </plugin>
         <plugin>
           <groupId>org.eclipse.xtend</groupId>
@@ -1610,7 +1651,6 @@
                     <versionRange>[0.7.0,)</versionRange>
                     <goals>
                       <goal>prepare-agent</goal>
-                      <goal>report</goal>
                     </goals>
                   </pluginExecutionFilter>
                   <action>
@@ -1655,7 +1695,6 @@
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
-          <version>${jacoco.version}</version>
           <configuration>
             <!-- Note: This exclusion list should match <sonar.exclusions>
                        property above -->
@@ -1803,16 +1842,7 @@
               <goal>prepare-agent</goal>
             </goals>
             <configuration>
-              <destFile>${sonar.jacoco.reportPath}</destFile>
-            </configuration>
-          </execution>
-          <execution>
-            <id>post-unit-test</id>
-            <goals>
-              <goal>report</goal>
-            </goals>
-            <configuration>
-              <dataFile>${sonar.jacoco.reportPath}</dataFile>
+              <destFile>${jacoco.destFile}</destFile>
             </configuration>
           </execution>
         </executions>
@@ -1900,21 +1930,27 @@
     </plugins>
   </reporting>
 
-  <!--
-    Maven Site Configuration
-
-    The following configuration is necessary for maven-site-plugin to
-    correctly identify the correct deployment path for OpenDaylight Maven
-    sites.
-  -->
-  <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
-
-  <distributionManagement>
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/${project.artifactId}/</url>
-    </site>
-  </distributionManagement>
+  <profiles>
+    <profile>
+      <!-- On JDK9-and-later findbugs fails -->
+      <id>jdk9-findbugs</id>
+      <activation>
+        <jdk>[9,)</jdk>
+      </activation>
+
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>findbugs-maven-plugin</artifactId>
+            <configuration combine.children="append">
+              <skip>true</skip>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
 </project>