Code Review / odlparent.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: a9ef026)
Upgrade Maven plugins 98/40298/4
authorStephen Kitt <skitt@redhat.com>
Fri, 10 Jun 2016 09:01:57 +0000 (11:01 +0200)
committerRobert Varga <nite@hq.sk>
Wed, 29 Jun 2016 11:10:37 +0000 (11:10 +0000)
(maven-surefire-plugin is left out because 2.19.1 breaks our tests.)

build-helper-maven-plugin 1.9.1 -> 1.10
 * 1.10: http://www.mojohaus.org/build-helper-maven-plugin/github-report.html

maven-bundle-plugin 3.0.0 -> 3.0.1
 * http://www.mail-archive.com/users%40felix.apache.org/msg16914.html

maven-clean-plugin 2.6.1 -> 3.0.0
 * 3.0.0: http://mail-archives.apache.org/mod_mbox/maven-announce/201510.mbox/%3C20151023060827.136D6188B5%40minotaur.apache.org%3E

maven-compiler-plugin 3.3 -> 3.5.1
 * 3.5.1: http://mail-archives.apache.org/mod_mbox/maven-announce/201602.mbox/%3CCAK2FUK3FfTSZSeQybK_4KXhFbtRNZ1uo6wxEbfnnyy5MCh1DsQ%40mail.gmail.com%3E
 * 3.5: http://mail-archives.apache.org/mod_mbox/maven-announce/201601.mbox/%3CCAK2FUK1kNz9di_SAUDBO2VjD3XLEL%3D0XLJkLkg68Q7x4ChJh-w%40mail.gmail.com%3E

maven-jar-plugin 2.6 -> 3.0.0 (pending
https://git.opendaylight.org/gerrit/40175)
 * 3.0.0: http://mail-archives.apache.org/mod_mbox/maven-announce/201605.mbox/%3C20160515194703.8B01819730%40minotaur.apache.org%3E

maven-project-info-reports-plugin 2.8.1 -> 2.9
 * 2.9: http://mail-archives.apache.org/mod_mbox/maven-announce/201603.mbox/%3C56DC1611.1050409%40apache.org%3E

maven-release-plugin 2.5.2 -> 2.5.3
 * http://mail-archives.apache.org/mod_mbox/maven-announce/201510.mbox/%3CCALhtWkezhk9ykpxzx-1T7qiyt7VZ88Nn1R%2BsSz9iK%2Buv3r%2B4aA%40mail.gmail.com%3E

maven-resources-plugin 2.7 -> 3.0.1
 * 3.0.1: http://mail-archives.apache.org/mod_mbox/maven-announce/201606.mbox/%3C20160608173951.D512D19E18%40minotaur.apache.org%3E
 * 3.0.0: http://mail-archives.apache.org/mod_mbox/maven-announce/201605.mbox/%3C20160521184859.A223F18263%40minotaur.apache.org%3E

maven-shade-plugin 2.4.1 -> 2.4.3
 * 2.4.3: http://mail-archives.apache.org/mod_mbox/maven-announce/201601.mbox/%3CCAKuVzBS2BeJoxXi3Yotbbyy5kGJemVSSCNr3%2BYW3ytz51G2wbQ%40mail.gmail.com%3E
 * 2.4.2: http://mail-archives.apache.org/mod_mbox/maven-announce/201510.mbox/%3C20151029055337.CB8AC18CD5%40minotaur.apache.org%3E

maven-site-plugin 3.4 -> 3.5.1
 * 3.5.1: http://mail-archives.apache.org/mod_mbox/maven-announce/201604.mbox/%3C7199325.eTch8dpi9I%40herve-desktop%3E
 * 3.5: http://mail-archives.apache.org/mod_mbox/maven-announce/201602.mbox/%3C1518487.5YI36Fm8fR%40herve-desktop%3E

maven-source-plugin 2.4 -> 3.0.0
 * 3.0.0: http://mail-archives.apache.org/mod_mbox/maven-announce/201602.mbox/%3C20160218044420.1FAD3185C6%40minotaur.apache.org%3E

propertymavenplugin 1.0-alpha-2 -> 1.0.0
 * http://www.mojohaus.org/properties-maven-plugin/github-report.html

Change-Id: I7e6a04f98d37d3beb1adc0b270f00c9bc323c0ef
Signed-off-by: Stephen Kitt <skitt@redhat.com>
checkstyle/pom.xml patch | blob | history
features-parent/pom.xml patch | blob | history
license/pom.xml patch | blob | history
odlparent-artifacts/pom.xml patch | blob | history
odlparent-lite/pom.xml patch | blob | history
odlparent/pom.xml patch | blob | history

diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index a434bab6dd8ff669b3049c4b243d74768c7e39a0..0cb25be0f40ae8e2ceb2be0e207329a42a8f7d10 100644 (file)
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -33,19 +33,19 @@
       <plugins>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.3</version>
+          <version>3.5.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>2.6</version>
+          <version>3.0.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>2.7</version>
+          <version>3.0.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.18.1</version>
+          <version>2.19.1</version>
         </plugin>
       </plugins>
     </pluginManagement>
diff --git a/features-parent/pom.xml b/features-parent/pom.xml
index 5ce823d91c235140f5c0711cd01f8d2085f59567..c5b640ccd9c85fc67cd062c2c68309de42058680 100644 (file)
--- a/features-parent/pom.xml
+++ b/features-parent/pom.xml
@@ -226,7 +226,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.9.1</version>
+                    <version>1.10</version>
                     <executions>
                         <execution>
                         <phase>generate-resources</phase>
@@ -260,7 +260,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.7</version>
+                    <version>3.0.1</version>
                     <executions>
                         <execution>
                             <id>filter</id>
diff --git a/license/pom.xml b/license/pom.xml
index 44f90893c4902460f36b66136e193ceccc749bff..4dc5da809f948dc7160201c432dcdb7a56c540c4 100644 (file)
--- a/license/pom.xml
+++ b/license/pom.xml
@@ -33,19 +33,19 @@
       <plugins>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.3</version>
+          <version>3.5.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>2.6</version>
+          <version>3.0.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>2.7</version>
+          <version>3.0.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.18.1</version>
+          <version>2.19.1</version>
         </plugin>
       </plugins>
     </pluginManagement>
diff --git a/odlparent-artifacts/pom.xml b/odlparent-artifacts/pom.xml
index 1f885475634ea05cf4bce1b705d1447dfa98c2a2..3cbd374bbc69110892125641a259e8f75a6f761b 100644 (file)
--- a/odlparent-artifacts/pom.xml
+++ b/odlparent-artifacts/pom.xml
@@ -31,19 +31,19 @@
             <plugins>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.3</version>
+                    <version>3.5.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.6</version>
+                    <version>3.0.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.7</version>
+                    <version>3.0.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.18.1</version>
+                    <version>2.19.1</version>
                 </plugin>
             </plugins>
         </pluginManagement>
diff --git a/odlparent-lite/pom.xml b/odlparent-lite/pom.xml
index ff12655fa3d591cc860965ffa43c8eb652a378e7..c8a6f917fa424d224f6a991cc5fb1d1e8e22898f 100644 (file)
--- a/odlparent-lite/pom.xml
+++ b/odlparent-lite/pom.xml
@@ -67,7 +67,7 @@
       <plugins>
         <plugin>
           <artifactId>maven-clean-plugin</artifactId>
-          <version>2.6.1</version>
+          <version>3.0.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
@@ -119,11 +119,15 @@
         </plugin>
         <plugin>
           <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>2.8.1</version>
+          <version>2.9</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>2.5.3</version>
         </plugin>
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.4</version>
+          <version>3.5.1</version>
           <configuration>
             <asciidoc>
               <attributes>
@@ -139,6 +143,18 @@
             </asciidoc>
           </configuration>
           <dependencies>
+            <dependency>
+              <!-- Downgrade Velocity; the Asciidoctor templates don't work with Velocity 1.7 -->
+              <!-- See https://maven.apache.org/plugins/maven-site-plugin/migrate.html -->
+              <groupId>org.apache.velocity</groupId>
+              <artifactId>velocity</artifactId>
+              <version>1.5</version>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.maven.doxia</groupId>
+              <artifactId>doxia-core</artifactId>
+              <version>1.7</version>
+            </dependency>
             <dependency>
               <groupId>org.asciidoctor</groupId>
               <artifactId>asciidoctor-maven-plugin</artifactId>
diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index a3970ec00e689ce524ad31285dad294db5599845..f9b66aafdd900c06dd7e15e58fea2227cb044f7b 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -51,13 +51,13 @@
     <!-- Used in controller -->
     <maven.antrun.plugin.version>1.8</maven.antrun.plugin.version>
     <!-- Used in controller, didm, neutron, openflowplugin, persistence; see also affinity -->
-    <maven.bundle.version>3.0.0</maven.bundle.version>
+    <maven.bundle.version>3.0.1</maven.bundle.version>
     <!-- Used in sxp -->
     <maven.clean.plugin.version>2.6.1</maven.clean.plugin.version>
     <!-- Used in controller, didm, l2switch, lacp, persistence; see also toolkit, tsdr, ttp -->
-    <maven.compile.plugin.version>3.3</maven.compile.plugin.version>
+    <maven.compile.plugin.version>3.5.1</maven.compile.plugin.version>
     <!-- Used in mdsal, yangtools -->
-    <maven.jar.version>2.6</maven.jar.version>
+    <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>
     <!-- Used in snmp -->
@@ -105,9 +105,9 @@
     <!-- Used in lispflowmapping, snmp4sdn, vtn -->
     <projectinfo>2.8.1</projectinfo>
     <!-- Used in of-config; see also snmp4sdn -->
-    <propertymavenplugin.version>1.0-alpha-2</propertymavenplugin.version>
+    <propertymavenplugin.version>1.0.0</propertymavenplugin.version>
     <!-- Used in topoprocessing; see also defense4all, snmp4sdn, toolkit -->
-    <releaseplugin.version>2.5.2</releaseplugin.version>
+    <releaseplugin.version>2.5.3</releaseplugin.version>
 
     <!-- Supporting Libraries -->
     <!-- Used by controller -->
@@ -1218,10 +1218,6 @@
           <artifactId>maven-jar-plugin</artifactId>
           <version>${maven.jar.version}</version>
         </plugin>
-        <plugin>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>${releaseplugin.version}</version>
-        </plugin>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
           <version>2.10</version>
@@ -1252,15 +1248,11 @@
 
         <plugin>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>2.7</version>
+          <version>3.0.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>2.4.1</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>3.4</version>
+          <version>2.4.3</version>
         </plugin>
         <plugin>
           <artifactId>maven-source-plugin</artifactId>
@@ -1329,7 +1321,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
-          <version>1.9.1</version>
+          <version>1.10</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
odlparent