You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2016/07/02 17:37:23 UTC

maven-integration-testing git commit: [MNG-6055] Move the release profile out of Maven's core so it can be more easily changed.

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 7bb0503ac -> 31780e49d


[MNG-6055] Move the release profile out of Maven's core so it can be more easily changed.

This reverts commit 7bb0503ac735bb8b3b61d37cbc65de8001a6bab9.


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

Branch: refs/heads/master
Commit: 31780e49d00ad5be0dd80ee5b37483f624bbf394
Parents: 7bb0503
Author: Christian Schulte <sc...@apache.org>
Authored: Sat Jul 2 19:36:15 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Sat Jul 2 19:36:15 2016 +0200

----------------------------------------------------------------------
 .../test/resources-filtered/settings-remote.xml | 47 --------------------
 .../src/test/resources-filtered/settings.xml    | 47 --------------------
 2 files changed, 94 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/31780e49/core-it-suite/src/test/resources-filtered/settings-remote.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources-filtered/settings-remote.xml b/core-it-suite/src/test/resources-filtered/settings-remote.xml
index b2f4c14..6cac118 100644
--- a/core-it-suite/src/test/resources-filtered/settings-remote.xml
+++ b/core-it-suite/src/test/resources-filtered/settings-remote.xml
@@ -67,53 +67,6 @@ plugins/artifacts from test repos so use of these settings should be the excepti
         </pluginRepository>
       </pluginRepositories>
     </profile>
-    <!--
-    | As of Maven 3.4, the release profile has been moved from the super POM to the default settings.
-    -->
-    <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>
     <activeProfile>it-defaults</activeProfile>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/31780e49/core-it-suite/src/test/resources-filtered/settings.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources-filtered/settings.xml b/core-it-suite/src/test/resources-filtered/settings.xml
index bd9127a..4a456c2 100644
--- a/core-it-suite/src/test/resources-filtered/settings.xml
+++ b/core-it-suite/src/test/resources-filtered/settings.xml
@@ -56,53 +56,6 @@ own test repos or can employ the local repository (after bootstrapping). This co
         </pluginRepository>
       </pluginRepositories>
     </profile>
-    <!--
-    | As of Maven 3.4, the release profile has been moved from the super POM to the default settings.
-    -->
-    <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>
     <activeProfile>it-defaults</activeProfile>