X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=odlparent%2Fpom.xml;h=6dd4d224f735d01f10ad6b39a078588759d7dfee;hb=a5d3646983bf1daf2504d6b9ecaf6e20e19e6fef;hp=f7bcdded812eeceb9965d852455bc3bea45ab935;hpb=e63ee8b9742c6eddb4b1a08bd02bb361d29a44ef;p=odlparent.git

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index f7bcdded8..6dd4d224f 100644
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../odlparent-lite</relativePath>
   </parent>
 
@@ -57,12 +57,12 @@
     <!-- Used in controller, didm, l2switch, lacp, persistence; see also toolkit, tsdr, ttp -->
     <maven.compile.plugin.version>3.5.1</maven.compile.plugin.version>
     <!-- Used in mdsal, yangtools -->
-    <maven.jar.version>3.0.0</maven.jar.version>
-    <!-- Used in controller, coretutorials, mdsal, snbi, tcpmd5, yangtools -->
-    <maven.javadoc.version>2.10.3</maven.javadoc.version>
+    <maven.jar.version>3.0.2</maven.jar.version>
+    <!-- Used in controller, coretutorials, mdsal, snbi, yangtools -->
+    <maven.javadoc.version>2.10.4</maven.javadoc.version>
     <!-- Used in snmp -->
-    <maven.plugin.version>3.4</maven.plugin.version>
-    <!-- Used in neutron, of-config, tcpmd5, tsdr, yangtools -->
+    <maven.plugin.version>3.5</maven.plugin.version>
+    <!-- Used in neutron, of-config, tsdr, yangtools -->
     <!-- Later versions break tests in downstream projects -->
     <maven.surefire.version>2.18.1</maven.surefire.version>
 
@@ -76,7 +76,7 @@
          toolkit -->
     <checkstyle.version>2.17</checkstyle.version>
     <!-- Used in controller, packetcable -->
-    <odl.checkstyle.version>0.2.0-SNAPSHOT</odl.checkstyle.version>
+    <odl.checkstyle.version>0.3.0-SNAPSHOT</odl.checkstyle.version>
     <!-- Used in snmp4sdn; see also toolkit -->
     <compiler.version>${maven.compile.plugin.version}</compiler.version>
     <!-- Used in controller, l2switch, netide, openflowjava, openflowplugin, snbi, tsdr, ttp; see also toolkit -->
@@ -101,7 +101,7 @@
     <jacoco.version>0.7.2.201409121644</jacoco.version>
     <!-- Used in aaa, controller, coretutorials, integration/distribution, l2switch, lacp, lispflowmapping, netide,
          nic, openflowplugin, ovsdb, persistence, sfc, snbi, snmp4sdn?, sxp, topoprocessing, unimgr, vtn -->
-    <karaf.version>3.0.6</karaf.version>
+    <karaf.version>3.0.8</karaf.version>
     <!-- Used in lispflowmapping, snmp4sdn, vtn -->
     <projectinfo>2.8.1</projectinfo>
     <!-- Used in of-config; see also snmp4sdn -->
@@ -111,7 +111,7 @@
 
     <!-- Supporting Libraries -->
     <!-- Used by controller -->
-    <bouncycastle.version>1.54</bouncycastle.version>
+    <bouncycastle.version>1.55</bouncycastle.version>
 
     <!-- Used by controller, snbi; see also centinel, dlux, toolkit -->
     <osgi.core.version>5.0.0</osgi.core.version>
@@ -124,10 +124,12 @@
     <!-- Default Sonar configuration -->
     <sonar-jacoco-listeners.version>2.4</sonar-jacoco-listeners.version>
     <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-    <sonar.jacoco.reportPath>target/code-coverage/jacoco.exec</sonar.jacoco.reportPath>
-    <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+    <sonar.jacoco.reportPath>${project.build.directory}/code-coverage/jacoco.exec</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/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+
+    <pmd.cpd.fail>false</pmd.cpd.fail>
   </properties>
 
   <dependencyManagement>
@@ -136,7 +138,7 @@
       <dependency>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-artifacts</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -173,7 +175,7 @@
       <dependency>
          <groupId>org.skyscreamer</groupId>
          <artifactId>jsonassert</artifactId>
-         <version>1.2.3</version>
+         <version>1.3.0</version>
          <scope>test</scope>
       </dependency>
       <dependency>
@@ -194,6 +196,18 @@
         <version>1.3</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-library</artifactId>
+        <version>1.3</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.google.truth</groupId>
+        <artifactId>truth</artifactId>
+        <version>0.28</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.powermock</groupId>
         <artifactId>powermock-api-mockito</artifactId>
@@ -276,10 +290,23 @@
         <artifactId>guava</artifactId>
         <version>18.0</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava-testlib</artifactId>
+        <version>18.0</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.mycila.guice.extensions</groupId>
+        <!-- This transitively pulls com.google.inject:guice along -->
+        <artifactId>mycila-guice-jsr250</artifactId>
+        <version>4.0.rc1</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
-        <version>3.4</version>
+        <version>3.5</version>
       </dependency>
       <dependency>
         <groupId>commons-lang</groupId>
@@ -370,12 +397,12 @@
       <dependency>
         <groupId>org.apache.shiro</groupId>
         <artifactId>shiro-core</artifactId>
-        <version>1.2.5</version>
+        <version>1.3.2</version>
       </dependency>
       <dependency>
         <groupId>org.apache.shiro</groupId>
         <artifactId>shiro-web</artifactId>
-        <version>1.2.5</version>
+        <version>1.3.2</version>
       </dependency>
 
       <!-- Plugin integration -->
@@ -451,10 +478,29 @@
         <artifactId>jsr305</artifactId>
         <version>3.0.0</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>annotations</artifactId>
+        <version>3.0.0</version>
+        <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>
+          </exclusion>
+        </exclusions>
+      </dependency>
       <dependency>
         <groupId>com.google.code.gson</groupId>
         <artifactId>gson</artifactId>
-        <version>2.3.1</version>
+        <version>2.7</version>
       </dependency>
       <dependency>
         <groupId>commons-fileupload</groupId>
@@ -748,17 +794,17 @@
       <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.dependencymanager</artifactId>
-        <version>3.1.0</version>
+        <version>4.3.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.dependencymanager.shell</artifactId>
-        <version>3.0.1</version>
+        <version>4.0.4</version>
       </dependency>
       <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.fileinstall</artifactId>
-        <version>3.1.6</version>
+        <version>3.5.4</version>
       </dependency>
       <dependency>
         <groupId>org.apache.felix</groupId>
@@ -769,7 +815,7 @@
       <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.webconsole</artifactId>
-        <version>4.2.0</version>
+        <version>4.2.14</version>
         <!-- the all bundle includes all the necessary plugins -->
         <classifier>all</classifier>
       </dependency>
@@ -791,7 +837,7 @@
       <dependency>
         <groupId>com.webcohesion.enunciate</groupId>
         <artifactId>enunciate-core-annotations</artifactId>
-        <version>2.1.1</version>
+        <version>2.6.0</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.jettison</groupId>
@@ -975,6 +1021,7 @@
         <groupId>com.typesafe.akka</groupId>
         <artifactId>akka-testkit_${scala.version}</artifactId>
         <version>${akka.version}</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
@@ -1067,13 +1114,13 @@
       <dependency>
         <groupId>org.ops4j.pax.url</groupId>
         <artifactId>pax-url-aether</artifactId>
-        <version>1.5.0</version>
+        <version>2.4.7</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.url</groupId>
         <artifactId>pax-url-wrap</artifactId>
-        <version>1.5.0</version>
+        <version>2.4.7</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.osgi</groupId>
@@ -1118,9 +1165,93 @@
         <artifactId>org.apache.aries.blueprint.core</artifactId>
         <version>1.4.2</version>
       </dependency>
+
+      <!-- Xtend http://xtend-lang.org
+           NOTE: When you increase the version here,
+           then remember to also increase it for the
+           xtend-maven-plugin below! (We don't want to
+           use a Maven property, in order not to "leak" that.)
+       -->
+      <dependency>
+          <groupId>org.eclipse.xtend</groupId>
+          <artifactId>org.eclipse.xtend.lib</artifactId>
+          <version>2.9.2</version>
+      </dependency>
+      <dependency>
+          <groupId>org.eclipse.xtend</groupId>
+          <artifactId>org.eclipse.xtend.lib.macro</artifactId>
+          <version>2.9.2</version>
+      </dependency>
+      <dependency>
+          <groupId>org.eclipse.xtext</groupId>
+          <artifactId>org.eclipse.xtext.xbase.lib</artifactId>
+          <version>2.9.2</version>
+      </dependency>
+
+      <!-- Annotations -->
+      <dependency>
+        <groupId>javax.inject</groupId>
+        <artifactId>javax.inject</artifactId>
+        <version>1</version>
+      </dependency>
+
+      <!-- Cassandra -->
+      <dependency>
+        <groupId>com.datastax.cassandra</groupId>
+        <artifactId>cassandra-driver-core</artifactId>
+        <version>2.1.9</version>
+      </dependency>
+
+      <!-- Metrics -->
+      <dependency>
+        <groupId>io.dropwizard.metrics</groupId>
+        <artifactId>metrics-core</artifactId>
+        <version>3.1.2</version>
+      </dependency>
+      <dependency>
+        <groupId>io.dropwizard.metrics</groupId>
+        <artifactId>metrics-graphite</artifactId>
+        <version>3.1.2</version>
+      </dependency>
+
+      <!-- Karaf console support -->
+      <dependency>
+        <groupId>org.apache.karaf.shell</groupId>
+        <artifactId>org.apache.karaf.shell.console</artifactId>
+        <version>${karaf.version}</version>
+      </dependency>
+
     </dependencies>
   </dependencyManagement>
 
+  <dependencies>
+    <!-- Karaf provides SL4FJ encapsulation -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <!-- Enable JSR-305 annotations everywhere -->
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <!-- See note above; having both :jsr305 and :annotations here is an intermediate step -->
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
   <build>
     <pluginManagement>
       <plugins>
@@ -1148,7 +1279,12 @@
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>odl-license</artifactId>
-              <version>0.1.0-SNAPSHOT</version>
+              <version>0.2.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+              <groupId>com.github.sevntu.checkstyle</groupId>
+              <artifactId>sevntu-checkstyle-maven-plugin</artifactId>
+              <version>1.21.0</version>
             </dependency>
           </dependencies>
           <configuration>
@@ -1156,6 +1292,9 @@
             <!-- <sourceDirectory> is needed so that checkstyle ignores the
                  generated sources directory -->
             <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+            <includeResources>true</includeResources>
+            <includeTestSourceDirectory>true</includeTestSourceDirectory>
+            <includeTestResources>true</includeTestResources>
             <excludes>
               org/opendaylight/yang/gen/**,
               **/protobuff/messages/**,
@@ -1175,6 +1314,7 @@
                 <configLocation>check-license.xml</configLocation>
                 <headerLocation>EPL-LICENSE.regexp.txt</headerLocation>
                 <includeResources>false</includeResources>
+                <includeTestSourceDirectory>true</includeTestSourceDirectory>
                 <includeTestResources>false</includeTestResources>
                 <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
                 <excludes>
@@ -1194,12 +1334,45 @@
             </execution>
           </executions>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-pmd-plugin</artifactId>
+          <version>3.6</version>
+          <executions>
+            <execution>
+              <id>cpd</id>
+              <phase>process-sources</phase>
+              <goals>
+                <goal>cpd-check</goal>
+              </goals>
+              <configuration>
+                <failOnViolation>${pmd.cpd.fail}</failOnViolation>
+                <!-- 100 "tokens" here correspond to approx. 5-10 lines of code -->
+                <minimumTokens>101</minimumTokens>
+                <printFailingErrors>true</printFailingErrors>
+                <excludeRoots>
+                  <!-- FIXME: this should be a wildcard, but PMD is brain-damaged and does
+                              not understand path prefixes nor wildcards. Details are available
+                              at http://stackoverflow.com/questions/15647771/pmd-exclude-not-working
+                              Hence people introducing new generated sources have to include
+                              PMD config too.
+                   -->
+                  <excludeRoot>${project.build.directory}/generated-sources</excludeRoot>
+                </excludeRoots>
+                <linkXRef>false</linkXRef>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
           <version>${maven.compile.plugin.version}</version>
           <configuration>
             <source>1.8</source>
             <target>1.8</target>
+            <compilerArgs>
+              <arg>-parameters</arg>
+            </compilerArgs>
           </configuration>
         </plugin>
         <plugin>
@@ -1231,7 +1404,7 @@
                   <artifactItem>
                     <groupId>org.opendaylight.odlparent</groupId>
                     <artifactId>odl-license</artifactId>
-                    <version>0.1.0-SNAPSHOT</version>
+                    <version>0.2.0-SNAPSHOT</version>
                   </artifactItem>
                 </artifactItems>
                 <outputDirectory>${project.build.outputDirectory}</outputDirectory>
@@ -1256,7 +1429,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-source-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.0.1</version>
           <executions>
             <execution>
               <id>attach-sources</id>
@@ -1272,10 +1445,39 @@
           <version>${maven.surefire.version}</version>
           <configuration>
             <redirectTestOutputToFile>true</redirectTestOutputToFile>
+            <trimStackTrace>false</trimStackTrace>
           </configuration>
         </plugin>
 
         <!-- Third-party plugins, grouped by groupId, alpha-sorted by artifactId -->
+        <plugin>
+          <!-- Support Blueprint XML construction using annotations -->
+          <groupId>org.apache.aries.blueprint</groupId>
+          <artifactId>blueprint-maven-plugin</artifactId>
+          <version>1.4.0</version>
+          <configuration>
+            <scanPaths>
+              <scanPath>org.opendaylight</scanPath>
+            </scanPaths>
+          </configuration>
+          <dependencies>
+            <dependency>
+              <!-- See https://issues.apache.org/jira/browse/ARIES-1596 -->
+              <!-- This shouldn't be necessary with plugin version 1.5.0 -->
+              <groupId>org.apache.xbean</groupId>
+              <artifactId>xbean-finder-shaded</artifactId>
+              <version>4.5</version>
+            </dependency>
+          </dependencies>
+          <executions>
+            <execution>
+              <goals>
+                <goal>blueprint-generate</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
@@ -1308,11 +1510,6 @@
           <artifactId>maven-enunciate-plugin</artifactId>
           <version>${enunciate.version}</version>
         </plugin>
-        <plugin>
-          <groupId>com.webcohesion.enunciate</groupId>
-          <artifactId>enunciate-maven-plugin</artifactId>
-          <version>2.1.1</version>
-        </plugin>
         <plugin>
           <groupId>org.codehaus.groovy.maven</groupId>
           <artifactId>gmaven-plugin</artifactId>
@@ -1321,19 +1518,73 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
-          <version>1.10</version>
+          <version>1.12</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>findbugs-maven-plugin</artifactId>
-          <version>3.0.3</version>
+          <version>3.0.4</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.opendaylight.odlparent</groupId>
+              <artifactId>findbugs</artifactId>
+              <version>1.8.0-SNAPSHOT</version>
+            </dependency>
+          </dependencies>
+          <configuration>
+            <!--
+              Enables analysis which takes more memory but finds more bugs.
+              If you run out of memory, changes the value of the effort element
+              to 'Low'.
+            -->
+            <effort>Max</effort>
+            <!-- Reports all bugs (other values are medium and max) -->
+            <threshold>Low</threshold>
+            <!-- Build doesn't fail if problems are found -->
+            <failOnError>false</failOnError>
+            <!-- References the excluded rules -->
+            <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
+            <!-- Produces XML report -->
+            <xmlOutput>true</xmlOutput>
+            <!-- Configures the directory in which the XML report is created -->
+            <findbugsXmlOutputDirectory>${project.build.directory}/findbugs</findbugsXmlOutputDirectory>
+            </configuration>
+            <executions>
+              <!--
+                Ensures that FindBugs inspects source code when project is compiled.
+              -->
+              <execution>
+                <id>analyze-compile</id>
+                <phase>compile</phase>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>properties-maven-plugin</artifactId>
           <version>${propertymavenplugin.version}</version>
         </plugin>
-
+        <plugin>
+          <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.9.2</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>compile</goal>
+                <goal>testCompile</goal>
+              </goals>
+              <configuration>
+                <outputDirectory>${project.build.directory}/generated-sources/xtend/main</outputDirectory>
+                <testOutputDirectory>${project.build.directory}/generated-sources/xtend/test</testOutputDirectory>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
         <plugin>
           <groupId>org.eclipse.m2e</groupId>
           <artifactId>lifecycle-mapping</artifactId>
@@ -1380,6 +1631,33 @@
                     <ignore/>
                   </action>
                 </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-pmd-plugin</artifactId>
+                    <versionRange>[3.6,)</versionRange>
+                    <goals>
+                      <goal>cpd-check</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore/>
+                  </action>
+                </pluginExecution>
+                <!-- The plugin will eventually be removed, remove this too at that point -->
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <versionRange>[1.8,)</versionRange>
+                    <goals>
+                      <goal>run</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore/>
+                  </action>
+                </pluginExecution>
                 <pluginExecution>
                   <pluginExecutionFilter>
                     <groupId>org.apache.servicemix.tooling</groupId>
@@ -1451,33 +1729,15 @@
     </pluginManagement>
 
     <plugins>
-      <plugin>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>enforce-maven</id>
-            <configuration>
-              <rules>
-                <requireJavaVersion>
-                  <version>1.8.0</version>
-                </requireJavaVersion>
-                <requireMavenVersion>
-                  <version>3.1.1</version>
-                </requireMavenVersion>
-              </rules>
-            </configuration>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
       </plugin>
       <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>
       </plugin>
+      <plugin>
+          <artifactId>maven-pmd-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
       </plugin>
@@ -1510,6 +1770,103 @@
           </execution>
         </executions>
       </plugin>
+
+      <plugin>
+        <groupId>com.alexecollins.maven.plugin</groupId>
+        <artifactId>script-maven-plugin</artifactId>
+        <version>1.0.0</version>
+        <executions>
+           <execution>
+             <phase>prepare-package</phase>
+             <goals>
+               <goal>execute</goal>
+             </goals>
+             <configuration>
+               <script>
+                 // BeanShell is 2005-ish and thus doesn't support generics, varargs, try-with-resources or lambdas, so:
+                 // (If we do this kind of inline code in pom.xml more often, we shold have a new simple module in
+                 //  odl-parent, which has *.java that we compile, and then just depend on it here and call one-line
+                 //  static class methods only - it will be MUCH easier to write!)
+                 void copy(File root, String glob, File target) {
+                     java.nio.file.DirectoryStream dirStream = java.nio.file.Files.newDirectoryStream(root.toPath(), glob);
+                     Iterator dirStreamIterator = dirStream.iterator();
+                     while (dirStreamIterator.hasNext()) {
+                         java.nio.file.Path path = dirStreamIterator.next();
+                         java.nio.file.Files.copy(path, new File(target, path.toFile().getName()).toPath(),
+                             new java.nio.file.CopyOption[] {
+                                 java.nio.file.StandardCopyOption.REPLACE_EXISTING,
+                                 java.nio.file.StandardCopyOption.COPY_ATTRIBUTES
+                             }
+                         );
+                     }
+                     dirStream.close();
+                 }
+
+                 File gitRepoRootDir = project.basedir;
+                 while (!new File(gitRepoRootDir, ".git").exists() &amp;&amp; gitRepoRootDir.getParentFile() != null) {
+                     gitRepoRootDir = gitRepoRootDir.getParentFile();
+                 }
+
+                 File target = new File(project.build.outputDirectory);
+                 target.mkdirs();
+                 copy(gitRepoRootDir, "README*", target);
+                 copy(gitRepoRootDir, "CONTRIBUTING*", target);
+                 copy(gitRepoRootDir, "PROJECT_INFO.yaml", target);
+               </script>
+             </configuration>
+           </execution>
+         </executions>
+         <dependencies>
+           <dependency>
+             <groupId>org.apache-extras.beanshell</groupId>
+             <artifactId>bsh</artifactId>
+             <version>2.0b6</version>
+           </dependency>
+         </dependencies>
+      </plugin>
+
+      <!-- Blueprint dependency injection -->
+      <!-- Remove when upgrading to plugin 1.5.0, and use
+           <configuration><generatedDir>org/opendaylight/blueprint/</...></...> -->
+      <!-- See https://issues.apache.org/jira/browse/ARIES-1597 -->
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <!-- This should only run once, in the process-classes phase; but we need it to run after
+               process-classes in child projects. Attaching to process-test-classes and prepare-package
+               ensures that the file will be moved whether tests are skipped or not. -->
+          <execution>
+            <id>move-autowire-test</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <echo>Moving autowire.xml to org/opendaylight/blueprint</echo>
+                <move file="${project.build.directory}/generated-resources/OSGI-INF/blueprint/autowire.xml"
+                      todir="${project.build.directory}/generated-resources/org/opendaylight/blueprint"
+                      failonerror="false" quiet="true" />
+              </target>
+            </configuration>
+          </execution>
+          <execution>
+            <id>move-autowire-package</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <echo>Moving autowire.xml to org/opendaylight/blueprint</echo>
+                <move file="${project.build.directory}/generated-resources/OSGI-INF/blueprint/autowire.xml"
+                      todir="${project.build.directory}/generated-resources/org/opendaylight/blueprint"
+                      failonerror="false" quiet="true" />
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
@@ -1525,15 +1882,6 @@
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <version>${projectinfo}</version>
       </plugin-->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <configuration>
-          <effort>Max</effort>
-          <threshold>Low</threshold>
-          <goal>site</goal>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>jdepend-maven-plugin</artifactId>
@@ -1574,4 +1922,5 @@
       <url>${nexus.site.url}/${project.artifactId}/</url>
     </site>
   </distributionManagement>
+
 </project>