maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From schu...@apache.org
Subject [3/6] maven git commit: [MNG-6055] Move the release profile out of Maven's core so it can be more easily changed.
Date Fri, 01 Jul 2016 17:25:38 GMT
[MNG-6055] Move the release profile out of Maven's core so it can be more easily changed.

o This reverts commit b15d89090bfc66b295c4d7025770019cfa54307c.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c2018a47
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c2018a47
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c2018a47

Branch: refs/heads/MNG-6006
Commit: c2018a47e9cc10ae34b2726e36ad62523b6c1534
Parents: b15d890
Author: Christian Schulte <schulte@apache.org>
Authored: Fri Jul 1 07:10:51 2016 +0200
Committer: Christian Schulte <schulte@apache.org>
Committed: Fri Jul 1 07:12:07 2016 +0200

----------------------------------------------------------------------
 apache-maven/src/conf/settings.xml              | 54 +-------------------
 .../org/apache/maven/model/pom-4.0.0.xml        | 51 ++++++++++++++++++
 2 files changed, 53 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/c2018a47/apache-maven/src/conf/settings.xml
----------------------------------------------------------------------
diff --git a/apache-maven/src/conf/settings.xml b/apache-maven/src/conf/settings.xml
index ec9e264..8d903f2 100644
--- a/apache-maven/src/conf/settings.xml
+++ b/apache-maven/src/conf/settings.xml
@@ -281,61 +281,11 @@ 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/c2018a47/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 e0f72d4..7565dfb 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,5 +54,56 @@ 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 -->


Mime
View raw message