update to maven-parent:26, fix configuration for rat-plugin, update r…

…elease-plugin to 2.5.1 and add workaround for MRELEASE-799
Tibor17 · Dec 22, 2014 · 33e6819 · 33e6819
1 parent 5693c81
commit 33e6819
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 52 deletions.
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
@@ -105,7 +105,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>${shadedVersion}</version>
+            <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
       </plugin>

diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
@@ -124,7 +124,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>${shadedVersion}</version>
+            <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
       </plugin>

diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml
@@ -97,7 +97,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>${shadedVersion}</version>
+            <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
       </plugin>

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>maven-parent</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>25</version>
+    <version>26</version>
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
 
@@ -85,7 +85,7 @@
 
   <properties>
     <mavenVersion>2.2.1</mavenVersion>
-    <shadedVersion>2.12.4</shadedVersion>
+    <!-- <shadedVersion>2.12.4</shadedVersion> commented out due to http://jira.codehaus.org/browse/MRELEASE-799 -->
     <mavenPluginPluginVersion>3.3</mavenPluginPluginVersion>
     <maven.surefire.scm.devConnection>scm:git:https://git-wip-us.apache.org/repos/asf/maven-surefire.git</maven.surefire.scm.devConnection>
     <maven.site.path>surefire-archives/surefire-LATEST</maven.site.path>
@@ -271,15 +271,15 @@
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>${shadedVersion}</version>
+          <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 -->
           <configuration>
             <!-- NOTE: Be sure to isolate the Surefire version under test from the version running the tests! -->
             <useSystemClassLoader>false</useSystemClassLoader>
           </configuration>
         </plugin>
         <plugin>
           <artifactId>maven-release-plugin</artifactId>
-          <version>2.2.1</version>
+          <version>2.5.1</version>
           <configuration>
             <autoVersionSubmodules>true</autoVersionSubmodules>
             <preparationGoals>clean install</preparationGoals>
@@ -296,43 +296,43 @@
             <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
           </configuration>
         </plugin>
-        <plugin><!-- TODO remove when upgrading maven-parent to 25 -->
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-site-plugin</artifactId>
-          <configuration>
-            <topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</topSiteURL>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <configuration>
-            <excludes>
-              <exclude>.git/**/*</exclude>
-              <exclude>**/.idea</exclude>
-              <exclude>**/.svn/**/*</exclude>
-              <exclude>src/test/resources/**/*</exclude>
-              <exclude>**/*.jj</exclude>
-              <exclude>src/test/resources/**/*.css</exclude>
-              <exclude>**/*.iml</exclude>
-              <exclude>**/*.ipr</exclude>
-              <exclude>**/*.iws</exclude>
-              <exclude>**/*.versionsBackup</exclude>
-              <exclude>**/dependency-reduced-pom.xml</exclude>
-              <exclude>.gitignore</exclude>
-              <exclude>DEPENDENCIES</exclude>
-              <exclude>src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
-              </exclude>
-            </excludes>
-          </configuration>
-        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
       </plugin>
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>rat-check</id>
+              <goals>
+                <goal>check</goal>
+              </goals>
+              <configuration>
+                <excludes combine.children="append">
+                  <exclude>.git/**/*</exclude>
+                  <exclude>**/.idea</exclude>
+                  <exclude>**/.svn/**/*</exclude>
+                  <exclude>src/test/resources/**/*</exclude>
+                  <exclude>**/*.jj</exclude>
+                  <exclude>src/test/resources/**/*.css</exclude>
+                  <exclude>**/*.iml</exclude>
+                  <exclude>**/*.ipr</exclude>
+                  <exclude>**/*.iws</exclude>
+                  <exclude>**/*.versionsBackup</exclude>
+                  <exclude>**/dependency-reduced-pom.xml</exclude>
+                  <exclude>.gitignore</exclude>
+                  <exclude>src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
+                  </exclude>
+                </excludes>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
     </plugins>
   </build>
 
@@ -373,7 +373,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>${shadedVersion}</version>
+        <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 -->
       </plugin>
       <!-- plugin>
         <groupId>org.apache.maven.plugins</groupId>

diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml
@@ -46,7 +46,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>${shadedVersion}</version>
+            <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
       </plugin>

diff --git a/surefire-booter/pom.xml b/surefire-booter/pom.xml
@@ -46,7 +46,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>${shadedVersion}</version>
+            <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
       </plugin>

diff --git a/surefire-grouper/pom.xml b/surefire-grouper/pom.xml
@@ -57,7 +57,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>${shadedVersion}</version>
+            <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
       </plugin>

diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml
@@ -94,7 +94,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>${shadedVersion}</version>
+        <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 -->
         <configuration>
           <threadCount>1</threadCount>
           <perCoreThreadCount>false</perCoreThreadCount>
@@ -123,7 +123,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-junit47</artifactId>
-            <version>${shadedVersion}</version>
+            <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
 
@@ -241,7 +241,7 @@
           </plugin>
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
-            <version>${shadedVersion}</version>
+            <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 -->
             <configuration>
               <excludedGroups>org.apache.maven.surefire.its.Not2xCompatible</excludedGroups>
             </configuration>

diff --git a/surefire-providers/pom.xml b/surefire-providers/pom.xml
@@ -56,12 +56,12 @@
     <plugins>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>${shadedVersion}</version>
+        <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 -->
         <dependencies>
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>${shadedVersion}</version>
+            <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
       </plugin>

diff --git a/surefire-report-parser/pom.xml b/surefire-report-parser/pom.xml
@@ -58,7 +58,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>${shadedVersion}</version>
+            <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
       </plugin>

diff --git a/surefire-setup-integration-tests/pom.xml b/surefire-setup-integration-tests/pom.xml
@@ -219,7 +219,7 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>${shadedVersion}</version>
+            <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
       </plugin>

diff --git a/surefire-shadefire/pom.xml b/surefire-shadefire/pom.xml
@@ -46,17 +46,17 @@
     <dependency>
       <groupId>org.apache.maven.surefire</groupId>
       <artifactId>surefire-junit3</artifactId>
-      <version>${shadedVersion}</version>
+      <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 -->
     </dependency>
     <dependency>
       <groupId>org.apache.maven.surefire</groupId>
       <artifactId>surefire-api</artifactId>
-      <version>${shadedVersion}</version>
+      <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 -->
     </dependency>
     <dependency>
       <groupId>org.apache.maven.surefire</groupId>
       <artifactId>surefire-booter</artifactId>
-      <version>${shadedVersion}</version>
+      <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 -->
     </dependency>
   </dependencies>
 
@@ -93,7 +93,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>${shadedVersion}</version>
+        <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 -->
         <configuration>
           <skip>true</skip>
         </configuration>