[maven-release-plugin] prepare release maven-parent-31
[maven-parent.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 76118b7..a21b260 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -26,13 +26,13 @@ under the License.
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>18</version>
+    <version>19</version>
     <relativePath>../asf/pom.xml</relativePath>
   </parent>
 
   <groupId>org.apache.maven</groupId>
   <artifactId>maven-parent</artifactId>
-  <version>30</version>
+  <version>31</version>
   <packaging>pom</packaging>
 
   <name>Apache Maven</name>
@@ -43,28 +43,27 @@ under the License.
   <!-- Developers listed by PMC Chair, PMC, Committers, Contributers, all alphabetical-->
   <developers>
     <developer>
-      <id>hboutemy</id>
-      <name>Hervé Boutemy</name>
-      <email>hboutemy@apache.org</email>
-      <organization>ASF</organization>
+      <id>rfscholte</id>
+      <name>Robert Scholte</name>
+      <email>rfscholte@apache.org</email>
       <roles>
         <role>PMC Chair</role>
       </roles>
-      <timezone>Europe/Paris</timezone>
+      <timezone>Europe/Amsterdam</timezone>
     </developer>
     <developer>
-      <id>agudian</id>
-      <name>Andreas Gudian</name>
-      <email>agudian@apache.org</email>
+      <id>aheritier</id>
+      <name>Arnaud Héritier</name>
+      <email>aheritier@apache.org</email>
       <roles>
         <role>PMC Member</role>
       </roles>
-      <timezone>Europe/Berlin</timezone>
+      <timezone>+1</timezone>
     </developer>
     <developer>
-      <id>aheritier</id>
-      <name>Arnaud Héritier</name>
-      <email>aheritier@apache.org</email>
+      <id>andham</id>
+      <name>Anders Hammar</name>
+      <email>andham@apache.org</email>
       <roles>
         <role>PMC Member</role>
       </roles>
@@ -101,7 +100,6 @@ under the License.
     <developer>
       <id>cstamas</id>
       <name>Tamas Cservenak</name>
-      <organization>Sonatype</organization>
       <email>cstamas@apache.org</email>
       <timezone>+1</timezone>
       <roles>
@@ -139,6 +137,25 @@ under the License.
       <timezone>+1</timezone>
     </developer>
     <developer>
+      <id>gboue</id>
+      <name>Guillaume Boué</name>
+      <email>gboue@apache.org</email>
+      <roles>
+        <role>PMC Member</role>
+      </roles>
+      <timezone>Europe/Paris</timezone>
+    </developer>
+    <developer>
+      <id>hboutemy</id>
+      <name>Hervé Boutemy</name>
+      <email>hboutemy@apache.org</email>
+      <organization>ASF</organization>
+      <roles>
+        <role>PMC Member</role>
+      </roles>
+      <timezone>Europe/Paris</timezone>
+    </developer>
+    <developer>
       <id>ifedorenko</id>
       <name>Igor Fedorenko</name>
       <email>igor@ifedorenko.com</email>
@@ -201,15 +218,6 @@ under the License.
       <timezone>Europe/Berlin</timezone>
     </developer>
     <developer>
-      <id>rfscholte</id>
-      <name>Robert Scholte</name>
-      <email>rfscholte@apache.org</email>
-      <roles>
-        <role>PMC Member</role>
-      </roles>
-      <timezone>Europe/Amsterdam</timezone>
-    </developer>
-    <developer>
       <id>rgoers</id>
       <name>Ralph Goers</name>
       <email>rgoers@apache.org</email>
@@ -279,15 +287,6 @@ under the License.
       </roles>
     </developer>
     <developer>
-      <id>andham</id>
-      <name>Anders Hammar</name>
-      <email>andham@apache.org</email>
-      <timezone>+1</timezone>
-      <roles>
-        <role>Committer</role>
-      </roles>
-    </developer>
-    <developer>
       <id>bdemers</id>
       <name>Brian Demers</name>
       <organization>Sonatype</organization>
@@ -541,6 +540,15 @@ under the License.
     <!--End Committers-->
 
     <developer>
+      <id>agudian</id>
+      <name>Andreas Gudian</name>
+      <email>agudian@apache.org</email>
+      <roles>
+        <role>Emeritus</role>
+      </roles>
+      <timezone>Europe/Berlin</timezone>
+    </developer>
+    <developer>
       <id>aramirez</id>
       <name>Allan Q. Ramirez</name>
       <roles>
@@ -740,8 +748,9 @@ under the License.
       <subscribe>users-subscribe@maven.apache.org</subscribe>
       <unsubscribe>users-unsubscribe@maven.apache.org</unsubscribe>
       <post>users@maven.apache.org</post>
-      <archive>https://mail-archives.apache.org/mod_mbox/maven-users</archive>
+      <archive>https://lists.apache.org/list.html?users@maven.apache.org</archive>
       <otherArchives>
+        <otherArchive>https://mail-archives.apache.org/mod_mbox/maven-users</otherArchive>
         <otherArchive>http://www.mail-archive.com/users@maven.apache.org/</otherArchive>
         <otherArchive>http://maven.40175.n5.nabble.com/Maven-Users-f40176.html</otherArchive>
         <otherArchive>http://maven-users.markmail.org/</otherArchive>
@@ -752,8 +761,9 @@ under the License.
       <subscribe>dev-subscribe@maven.apache.org</subscribe>
       <unsubscribe>dev-unsubscribe@maven.apache.org</unsubscribe>
       <post>dev@maven.apache.org</post>
-      <archive>https://mail-archives.apache.org/mod_mbox/maven-dev</archive>
+      <archive>https://lists.apache.org/list.html?dev@maven.apache.org</archive>
       <otherArchives>
+        <otherArchive>https://mail-archives.apache.org/mod_mbox/maven-dev</otherArchive>
         <otherArchive>http://www.mail-archive.com/dev@maven.apache.org/</otherArchive>
         <otherArchive>http://maven.40175.n5.nabble.com/Maven-Developers-f142166.html</otherArchive>
         <otherArchive>http://maven-dev.markmail.org/</otherArchive>
@@ -763,8 +773,9 @@ under the License.
       <name>Maven Issues List</name>
       <subscribe>issues-subscribe@maven.apache.org</subscribe>
       <unsubscribe>issues-unsubscribe@maven.apache.org</unsubscribe>
-      <archive>https://mail-archives.apache.org/mod_mbox/maven-issues/</archive>
+      <archive>https://lists.apache.org/list.html?issues@maven.apache.org</archive>
       <otherArchives>
+        <otherArchive>https://mail-archives.apache.org/mod_mbox/maven-issues/</otherArchive>
         <otherArchive>http://www.mail-archive.com/issues@maven.apache.org</otherArchive>
         <otherArchive>http://maven.40175.n5.nabble.com/Maven-Issues-f219593.html</otherArchive>
         <otherArchive>http://maven-issues.markmail.org/</otherArchive>
@@ -774,8 +785,9 @@ under the License.
       <name>Maven Commits List</name>
       <subscribe>commits-subscribe@maven.apache.org</subscribe>
       <unsubscribe>commits-unsubscribe@maven.apache.org</unsubscribe>
-      <archive>https://mail-archives.apache.org/mod_mbox/maven-commits/</archive>
+      <archive>https://lists.apache.org/list.html?commits@maven.apache.org</archive>
       <otherArchives>
+        <otherArchive>https://mail-archives.apache.org/mod_mbox/maven-commits/</otherArchive>
         <otherArchive>http://www.mail-archive.com/commits@maven.apache.org</otherArchive>
         <otherArchive>http://maven.40175.n5.nabble.com/Maven-Commits-f277168.html</otherArchive>
         <otherArchive>http://maven-commits.markmail.org/</otherArchive>
@@ -786,8 +798,9 @@ under the License.
       <post>announce@maven.apache.org</post>
       <subscribe>announce-subscribe@maven.apache.org</subscribe>
       <unsubscribe>announce-unsubscribe@maven.apache.org</unsubscribe>
-      <archive>https://mail-archives.apache.org/mod_mbox/maven-announce/</archive>
+      <archive>https://lists.apache.org/list.html?announce@maven.apache.org</archive>
       <otherArchives>
+        <otherArchive>https://mail-archives.apache.org/mod_mbox/maven-announce/</otherArchive>
         <otherArchive>http://www.mail-archive.com/announce@maven.apache.org</otherArchive>
         <otherArchive>http://maven.40175.n5.nabble.com/Maven-Announcements-f326045.html</otherArchive>
         <otherArchive>http://maven-announce.markmail.org/</otherArchive>
@@ -797,8 +810,9 @@ under the License.
       <name>Maven Notifications List</name>
       <subscribe>notifications-subscribe@maven.apache.org</subscribe>
       <unsubscribe>notifications-unsubscribe@maven.apache.org</unsubscribe>
-      <archive>https://mail-archives.apache.org/mod_mbox/maven-notifications/</archive>
+      <archive>https://lists.apache.org/list.html?notifications@maven.apache.org</archive>
       <otherArchives>
+        <otherArchive>https://mail-archives.apache.org/mod_mbox/maven-notifications/</otherArchive>
         <otherArchive>http://www.mail-archive.com/notifications@maven.apache.org</otherArchive>
         <otherArchive>http://maven.40175.n5.nabble.com/Maven-Notifications-f301718.html</otherArchive>
         <otherArchive>http://maven-notifications.markmail.org/</otherArchive>
@@ -816,14 +830,15 @@ under the License.
   </modules>
 
   <scm>
-    <connection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-30</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-30</developerConnection>
-    <url>https://svn.apache.org/viewvc/maven/pom/tags/maven-parent-30</url>
+    <connection>scm:git:https://gitbox.apache.org/repos/asf/maven-parent.git</connection>
+    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-parent.git</developerConnection>
+    <url>https://github.com/apache/maven-parent/tree/${project.scm.tag}</url>
+    <tag>maven-parent-31</tag>
   </scm>
 
   <ciManagement>
     <system>Jenkins</system>
-    <url>https://builds.apache.org/view/M-R/view/Maven</url>
+    <url>https://builds.apache.org/view/M-R/view/Maven/job/maven-box/</url>
     <notifiers>
       <notifier>
         <type>mail</type>
@@ -844,10 +859,10 @@ under the License.
     <javaVersion>6</javaVersion>
     <maven.compiler.source>1.${javaVersion}</maven.compiler.source>
     <maven.compiler.target>1.${javaVersion}</maven.compiler.target>    
-    <sonar.host.url>https://analysis.apache.org/</sonar.host.url>
+    <sonar.host.url>https://builds.apache.org/analysis/</sonar.host.url>
     <maven.site.cache>${user.home}/maven-sites</maven.site.cache>
     <maven.site.path>../..</maven.site.path><!-- to be overridden -->
-    <mavenPluginToolsVersion>3.4</mavenPluginToolsVersion>
+    <mavenPluginToolsVersion>3.5.1</mavenPluginToolsVersion>
     <!-- don't fail check for some rules that are too hard to enforce (could even be told broken for some) -->
     <checkstyle.violation.ignore>RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength</checkstyle.violation.ignore>
   </properties>
@@ -857,7 +872,7 @@ under the License.
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-component-annotations</artifactId>
-        <version>1.6</version>
+        <version>1.7.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.plugin-tools</groupId>
@@ -882,6 +897,11 @@ under the License.
   <build>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.7.0</version>
+        </plugin>
         <!-- The Maven universe targets Java 5 minimum, with generics -->
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -894,7 +914,7 @@ under the License.
         <plugin>
           <groupId>org.codehaus.modello</groupId>
           <artifactId>modello-maven-plugin</artifactId>
-          <version>1.8.1</version>
+          <version>1.9.1</version>
           <configuration>
             <useJava5>true</useJava5>
           </configuration>
@@ -911,6 +931,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-scm-publish-plugin</artifactId>
+          <version>3.0.0</version>
           <configuration>
             <checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirectory>
             <tryUpdate>true</tryUpdate>
@@ -925,19 +946,31 @@ under the License.
         <plugin>
           <groupId>org.codehaus.plexus</groupId>
           <artifactId>plexus-component-metadata</artifactId>
-          <version>1.6</version>
+          <version>1.7.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>2.15</version>
+          <version>3.0.0</version>
           <configuration>
             <configLocation>config/maven_checks.xml</configLocation>
             <headerLocation>config/maven-header.txt</headerLocation>
             <!-- workaround to avoid analysing generated content (Modello, plugin help mojo, ...) -->
-            <sourceDirectory>src/main/java</sourceDirectory>
-            <testSourceDirectory>src/test/java</testSourceDirectory>
+            <sourceDirectories>
+              <sourceDirectory>src/main/java</sourceDirectory>
+            </sourceDirectories>
+            <testSourceDirectories>
+              <testSourceDirectory>src/test/java</testSourceDirectory>
+            </testSourceDirectories>
           </configuration>
+          <dependencies>
+            <!-- MCHECKSTYLE-327: the maven_checks.xml was moved to a shared project -->
+            <dependency>
+              <groupId>org.apache.maven.shared</groupId>
+              <artifactId>maven-shared-resources</artifactId>
+              <version>2</version>
+            </dependency>
+          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -947,7 +980,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-pmd-plugin</artifactId>
-          <version>3.6</version>
+          <version>3.8</version>
           <configuration>
             <targetJdk>${maven.compiler.target}</targetJdk>
             <rulesets>
@@ -963,7 +996,6 @@ under the License.
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
           <configuration>
-            <useReleaseProfiles>true</useReleaseProfiles>
             <releaseProfiles>apache-release</releaseProfiles>
             <goals>deploy</goals>
             <arguments>${arguments}</arguments>
@@ -977,7 +1009,7 @@ under the License.
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>findbugs-maven-plugin</artifactId>
-          <version>3.0.3</version>
+          <version>3.0.5</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -987,7 +1019,56 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-changes-plugin</artifactId>
-          <version>2.12</version>
+          <version>2.12.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>3.0.0</version>
+          <configuration>
+            <notimestamp>true</notimestamp>
+            <quiet>true</quiet>
+            <detectLinks>true</detectLinks>
+            <locale>en</locale>
+            <tagletArtifacts>
+              <tagletArtifact combine.id="org.codehaus.plexus:plexus-javadoc">
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-javadoc</artifactId>
+                <version>1.0</version>
+              </tagletArtifact>
+            </tagletArtifacts>
+          </configuration>
+        </plugin>
+        <!-- 
+          The Maven TLP's sub-projects are likely to fork Maven for tests
+          ensure such forked tests do not get picked up by CI
+        -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <configuration>
+            <environmentVariables>
+              <JENKINS_MAVEN_AGENT_DISABLED>true</JENKINS_MAVEN_AGENT_DISABLED>
+            </environmentVariables>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <configuration>
+            <environmentVariables>
+              <JENKINS_MAVEN_AGENT_DISABLED>true</JENKINS_MAVEN_AGENT_DISABLED>
+            </environmentVariables>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-invoker-plugin</artifactId>
+          <configuration>
+            <environmentVariables>
+              <JENKINS_MAVEN_AGENT_DISABLED>true</JENKINS_MAVEN_AGENT_DISABLED>
+            </environmentVariables>
+          </configuration>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -1041,13 +1122,21 @@ under the License.
           <dependency>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>extra-enforcer-rules</artifactId>
-            <version>1.0-beta-3</version>
+            <version>1.0-beta-7</version>
           </dependency>
         </dependencies>
       </plugin>
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <excludes combine.children="append">
+            <exclude>.repository/**</exclude><!-- Jenkins job with local Maven repository -->
+            <exclude>.maven/spy.log</exclude><!-- Hudson Maven3 integration log -->
+            <exclude>dependency-reduced-pom.xml</exclude><!-- Maven shade plugin -->
+            <exclude>.java-version</exclude>
+          </excludes>
+        </configuration>
         <executions>
           <execution>
             <id>rat-check</id>
@@ -1056,7 +1145,7 @@ under the License.
             </goals>
           </execution>
         </executions>
-      </plugin>      
+      </plugin>
     </plugins>
   </build>
 
@@ -1249,18 +1338,6 @@ under the License.
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <configuration>
-              <notimestamp>true</notimestamp>
-              <quiet>true</quiet>
-              <detectLinks>true</detectLinks>
-              <tagletArtifacts>
-                <tagletArtifact combine.id="org.codehaus.plexus:plexus-javadoc">
-                  <groupId>org.codehaus.plexus</groupId>
-                  <artifactId>plexus-javadoc</artifactId>
-                  <version>1.0</version>
-                </tagletArtifact>
-              </tagletArtifacts>
-            </configuration>
             <reportSets>
               <reportSet>
                 <id>default</id>
@@ -1288,38 +1365,5 @@ under the License.
         </plugins>
       </reporting>
     </profile>
-    <profile>
-      <id>site.scm-deploy</id>
-      <activation>
-        <property><name>maven.site.scm-deploy</name><value>deploy</value></property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-site-plugin</artifactId>
-            <configuration>
-              <skipDeploy>true</skipDeploy><!-- don't deploy site with maven-site-plugin -->
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-scm-publish-plugin</artifactId>
-            <configuration>
-              <content>${project.reporting.outputDirectory}</content><!-- no need for site:stage, use target/site -->
-            </configuration>
-            <executions>
-              <execution>
-                <id>scm-publish</id>
-                <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin -->
-                <goals>
-                  <goal>publish-scm</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 </project>