You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2015/04/12 22:03:29 UTC
svn commit: r1673051 - in /maven/pom/trunk/asf: pom.xml site-pom.xml
src/site-docs/apt/index.apt.vm
Author: hboutemy
Date: Sun Apr 12 20:03:28 2015
New Revision: 1673051
URL: http://svn.apache.org/r1673051
Log:
[MPOM-71] removed Maven 2.x support
Modified:
maven/pom/trunk/asf/pom.xml
maven/pom/trunk/asf/site-pom.xml
maven/pom/trunk/asf/src/site-docs/apt/index.apt.vm
Modified: maven/pom/trunk/asf/pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=1673051&r1=1673050&r2=1673051&view=diff
==============================================================================
--- maven/pom/trunk/asf/pom.xml (original)
+++ maven/pom/trunk/asf/pom.xml Sun Apr 12 20:03:28 2015
@@ -60,7 +60,7 @@ under the License.
</mailingLists>
<prerequisites><!-- just for information: not inherited in child poms -->
- <maven>2.2.1</maven><!-- prerequisite of some plugins -->
+ <maven>3.0</maven><!-- prerequisite of some plugins -->
</prerequisites>
<scm>
@@ -198,6 +198,11 @@ under the License.
<artifactId>maven-plugin-plugin</artifactId>
<version>3.4</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
<!-- START SNIPPET: release-plugin-configuration -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -229,7 +234,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
- <version>1.0-beta-2</version><!-- last version compatible with Maven 2: latest is configured in profile -->
+ <version>1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -317,6 +322,18 @@ under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-descriptor</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -404,41 +421,6 @@ under the License.
</build>
</profile>
<!-- END SNIPPET: release-profile -->
-
- <profile>
- <id>maven-3</id>
- <activation>
- <file>
- <!-- This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
- <exists>${basedir}</exists>
- </file>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <version>1.1</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-descriptor</id>
- <goals>
- <goal>attach-descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
Modified: maven/pom/trunk/asf/site-pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/site-pom.xml?rev=1673051&r1=1673050&r2=1673051&view=diff
==============================================================================
--- maven/pom/trunk/asf/site-pom.xml (original)
+++ maven/pom/trunk/asf/site-pom.xml Sun Apr 12 20:03:28 2015
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>16</version>
+ <version>17-SNAPSHOT</version>
<relativePath>./pom.xml</relativePath>
</parent>
Modified: maven/pom/trunk/asf/src/site-docs/apt/index.apt.vm
URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/src/site-docs/apt/index.apt.vm?rev=1673051&r1=1673050&r2=1673051&view=diff
==============================================================================
--- maven/pom/trunk/asf/src/site-docs/apt/index.apt.vm (original)
+++ maven/pom/trunk/asf/src/site-docs/apt/index.apt.vm Sun Apr 12 20:03:28 2015
@@ -31,7 +31,7 @@ Apache Software Foundation Parent POM
This project consists of a POM that contains settings that are
likely to be useful to any Apache project that is building and
- releasing code with Maven 2/3. By using this project as a parent,
+ releasing code with Maven 3 (Maven 2.x is not supported any more since version 17). By using this project as a parent,
a project gets these settings.
Most project will want to override some of these settings.
@@ -78,8 +78,9 @@ Apache Software Foundation Parent POM
* <<plugins>>: The plugins section configures one execution:
- ** maven-remote-resources-plugin for
- org.apache:apache-jar-resource-bundle:1.4.
+ ** maven-remote-resources-plugin for org.apache:apache-jar-resource-bundle:1.4.
+
+ ** maven-site-plugin:attach-descriptor
The <<<apache-release>>> Profile
@@ -88,8 +89,8 @@ The <<<apache-release>>> Profile
plugin. The profile includes the following plugins:
* maven-assembly-plugin:
- org.apache.apache.resources:apache-source-release-assembly-descriptor:1.0.3
- is in the dependencies, and an execution is configured.The plugin
+ org.apache.apache.resources:apache-source-release-assembly-descriptor:1.0.5
+ is in the dependencies, and an execution is configured. The plugin
is configured to take a descriptorRef name from the
<<sourceReleaseAssemblyDescriptor>> property, which by default is
set to 'source-release'.
@@ -101,7 +102,7 @@ The <<<apache-release>>> Profile
* maven-javadoc-plugin: configured to build and attach a javadoc jar.
* maven-gpg-plugin: configured to sign everything. It expects to find
- a passphrase in $\{gpg.passphrase\}, presumably in your <<<settings.xml>>>.
+ a passphrase in <<<$\{gpg.passphrase\}>>>, presumably in your <<<settings.xml>>>.
Settings Configuration
@@ -113,7 +114,7 @@ Settings Configuration
History
#if( $project.version.endsWith( "SNAPSHOT" ) )
- trunk: {{{http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?view=markup}16-SNAPSHOT}} ({{{http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?r1=HEAD&r2=1627336&diff_format=h}diff}})
+ trunk: {{{http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?view=markup}$project.version}} ({{{http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?r1=HEAD&r2=1627336&diff_format=h}diff}})
#end
*--------------+------------+