[MNG-6055] Move the release profile out of Maven's core so it can be more easily changed.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b15d8909 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b15d8909 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b15d8909 Branch: refs/heads/jigsaw Commit: b15d89090bfc66b295c4d7025770019cfa54307c Parents: 15a9c32 Author: Christian Schulte <schu...@apache.org> Authored: Thu Jun 30 21:20:40 2016 +0200 Committer: Christian Schulte <schu...@apache.org> Committed: Thu Jun 30 21:20:40 2016 +0200 ---------------------------------------------------------------------- apache-maven/src/conf/settings.xml | 54 +++++++++++++++++++- .../org/apache/maven/model/pom-4.0.0.xml | 51 ------------------ 2 files changed, 52 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/b15d8909/apache-maven/src/conf/settings.xml ---------------------------------------------------------------------- diff --git a/apache-maven/src/conf/settings.xml b/apache-maven/src/conf/settings.xml index 8d903f2..ec9e264 100644 --- a/apache-maven/src/conf/settings.xml +++ b/apache-maven/src/conf/settings.xml @@ -281,11 +281,61 @@ under the License. </pluginRepository> </pluginRepositories> </profile> + + <!-- + | Release profile activated by the 'maven-release-plugin' when performing a release by default. + --> + <profile> + <id>release-profile</id> + + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <plugins> + <plugin> + <inherited>true</inherited> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <inherited>true</inherited> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <inherited>true</inherited> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <updateReleaseInfo>true</updateReleaseInfo> + </configuration> + </plugin> + </plugins> + </build> + </profile> </profiles> <!-- activeProfiles - | List of profiles that are active for all builds. - |--> + | List of profiles that are active for all builds. + |--> <activeProfiles> <!-- <activeProfile>alwaysActiveProfile</activeProfile> http://git-wip-us.apache.org/repos/asf/maven/blob/b15d8909/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml index 7565dfb..e0f72d4 100644 --- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml +++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml @@ -54,56 +54,5 @@ under the License. <reporting> <outputDirectory>${project.build.directory}/site</outputDirectory> </reporting> - - <profiles> - <!-- NOTE: The release profile will be removed from future versions of the super POM --> - <profile> - <id>release-profile</id> - - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <build> - <plugins> - <plugin> - <inherited>true</inherited> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <inherited>true</inherited> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>attach-javadocs</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <inherited>true</inherited> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - </project> <!-- END SNIPPET: superpom -->
