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/06/29 02:35:20 UTC

maven git commit: [MNG-4645] Move central repo definition out of Maven's core so it can be more easily changed

Repository: maven
Updated Branches:
  refs/heads/master 96630be42 -> 1b00a9e15


[MNG-4645] Move central repo definition 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/1b00a9e1
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/1b00a9e1
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/1b00a9e1

Branch: refs/heads/master
Commit: 1b00a9e1591fe0f7c14b251126d9326e9a6bd401
Parents: 96630be
Author: Christian Schulte <sc...@apache.org>
Authored: Wed Jun 29 04:34:44 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Jun 29 04:34:44 2016 +0200

----------------------------------------------------------------------
 apache-maven/src/conf/settings.xml              | 38 ++++++++++++++++++--
 .../org/apache/maven/model/pom-4.0.0.xml        | 27 --------------
 2 files changed, 36 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/1b00a9e1/apache-maven/src/conf/settings.xml
----------------------------------------------------------------------
diff --git a/apache-maven/src/conf/settings.xml b/apache-maven/src/conf/settings.xml
index 19d7a97..81f3560 100644
--- a/apache-maven/src/conf/settings.xml
+++ b/apache-maven/src/conf/settings.xml
@@ -244,14 +244,48 @@ under the License.
       </properties>
     </profile>
     -->
+
+    <profile>
+      <id>default</id>
+
+      <repositories>
+        <repository>
+          <id>central</id>
+          <name>Central Repository</name>
+          <url>https://repo.maven.apache.org/maven2</url>
+          <layout>default</layout>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+
+      <pluginRepositories>
+        <pluginRepository>
+          <id>central</id>
+          <name>Central Repository</name>
+          <url>https://repo.maven.apache.org/maven2</url>
+          <layout>default</layout>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <releases>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
   </profiles>
 
   <!-- activeProfiles
    | List of profiles that are active for all builds.
-   |
+   |-->
   <activeProfiles>
+    <!--
     <activeProfile>alwaysActiveProfile</activeProfile>
     <activeProfile>anotherAlwaysActiveProfile</activeProfile>
+    -->
+    <activeProfile>default</activeProfile>
   </activeProfiles>
-  -->
+
 </settings>

http://git-wip-us.apache.org/repos/asf/maven/blob/1b00a9e1/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 cc55dac..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
@@ -23,33 +23,6 @@ under the License.
 <project>
   <modelVersion>4.0.0</modelVersion>
 
-  <repositories>
-    <repository>
-      <id>central</id>
-      <name>Central Repository</name>
-      <url>https://repo.maven.apache.org/maven2</url>
-      <layout>default</layout>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <id>central</id>
-      <name>Central Repository</name>
-      <url>https://repo.maven.apache.org/maven2</url>
-      <layout>default</layout>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-
   <build>
     <directory>${project.basedir}/target</directory>
     <outputDirectory>${project.build.directory}/classes</outputDirectory>