From: Olivier Lamy <olamy@apache.org>
Date: Thu, 8 Mar 2012 09:35:58 +0000 (+0000)
Subject: snapshots repositories directly in pom not in a profile as doesn't work fine when... 
X-Git-Tag: archiva-1.4-M3~1087
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1d2a88e13808b4ba25c894fe1fe0c18c86bd07a8;p=archiva.git

snapshots repositories directly in pom not in a profile as doesn't work fine when using other profiles

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1298327 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/pom.xml b/pom.xml
index 440d55064..99be1b59f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1759,59 +1759,7 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>snapshots-build</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <repositories>
-        <repository>
-          <id>redback.snapshots</id>
-          <name>Codehaus Redback Snapshots Repository</name>
-          <url>http://snapshots.repository.codehaus.org/</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </repository>
-        <repository>
-          <id>apache.snapshots</id>
-          <name>Apache Snapshots</name>
-          <url>https://repository.apache.org/content/groups/snapshots/</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>apache.snapshots</id>
-          <name>Apache Snapshots</name>
-          <url>https://repository.apache.org/content/groups/snapshots/</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-          <id>codehaus.snapshots</id>
-          <url>https://nexus.codehaus.org/content/groups/snapshots-group/</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
+
 
     <profile>
       <!-- profile to run struts webapp it test -->
@@ -1845,4 +1793,53 @@
       </modules>
     </profile>
   </profiles>
+
+  <repositories>
+    <repository>
+      <id>redback.snapshots</id>
+      <name>Codehaus Redback Snapshots Repository</name>
+      <url>http://snapshots.repository.codehaus.org/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>apache.snapshots</id>
+      <name>Apache Snapshots</name>
+      <url>https://repository.apache.org/content/groups/snapshots/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache.snapshots</id>
+      <name>Apache Snapshots</name>
+      <url>https://repository.apache.org/content/groups/snapshots/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+    <pluginRepository>
+      <id>codehaus.snapshots</id>
+      <url>https://nexus.codehaus.org/content/groups/snapshots-group/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
 </project>