You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2016/09/24 15:13:29 UTC

[08/40] maven git commit: [MNG-4645] Move central repo definition out of Maven's core so it can be more easily changed [MNG-6070] [REGRESSION] Profile activation based on a property does not work correctly

[MNG-4645] Move central repo definition out of Maven's core so it can be more easily changed
[MNG-6070] [REGRESSION] Profile activation based on a property does not work correctly


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

Branch: refs/heads/MNG-6012-Missing-Profile-At-End
Commit: 6d9ffe351814f5482def88066ce9dd2011567689
Parents: 90f26c2
Author: Christian Schulte <sc...@apache.org>
Authored: Sat Jul 23 20:15:18 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Sat Jul 23 20:15:18 2016 +0200

----------------------------------------------------------------------
 apache-maven/src/conf/settings.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/6d9ffe35/apache-maven/src/conf/settings.xml
----------------------------------------------------------------------
diff --git a/apache-maven/src/conf/settings.xml b/apache-maven/src/conf/settings.xml
index 8d903f2..3fa2f14 100644
--- a/apache-maven/src/conf/settings.xml
+++ b/apache-maven/src/conf/settings.xml
@@ -249,7 +249,11 @@ under the License.
     | Default profile holding various defaults.
     |-->
     <profile>
-      <id>default</id>
+      <!--
+      This intentionally uses a UUID to not clash with any profile
+      id already in use before this profile got added to the settings.
+      -->
+      <id>f06abaa7-178e-441e-bb0d-10a92d7ce014</id>
 
       <repositories>
         <repository>
@@ -291,7 +295,7 @@ under the License.
     <activeProfile>alwaysActiveProfile</activeProfile>
     <activeProfile>anotherAlwaysActiveProfile</activeProfile>
     -->
-    <activeProfile>default</activeProfile>
+    <activeProfile>f06abaa7-178e-441e-bb0d-10a92d7ce014</activeProfile>
   </activeProfiles>
 
 </settings>