From b60b1fcbc2bab95d87e58444b7ada993a1c8a0c2 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 28 Jan 2014 17:05:08 -0800
Subject: [PATCH] CSPACE-6291: Consolidate remaining <repository> references in
 POMs to the project's top level POM. Move the repository reference to the
 project Maven repo's 'nuxeo-public' repo earlier, above two references to
 remote maven.nuxeo.org repos, to help ensure that cached copies of artifacts
 in the project repo are preferentially downloaded. Replace a non-existent
 pluginRepository reference."

---
 pom.xml                 | 48 +++++++++++++++++++++++------------------
 services/common/pom.xml | 25 ---------------------
 services/config/pom.xml | 14 ------------
 3 files changed, 27 insertions(+), 60 deletions(-)

diff --git a/pom.xml b/pom.xml
index d98d4aac9..2fb4108c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,6 +117,18 @@
 			</snapshots>
 		</repository>
 
+		<repository>
+			<id>nuxeo-public</id>
+			<name>nuxeo-public</name>
+			<url>http://nightly.collectionspace.org:8081/artifactory/nuxeo-public</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+    
 		<repository>
 			<id>public-snapshot</id>
 			<url>http://maven.nuxeo.org/public-snapshot</url>
@@ -142,23 +154,6 @@
 			</snapshots>
 		</repository>
 
-		<repository>
-			<id>nuxeo-public</id>
-			<name>nuxeo-public</name>
-			<url>http://nightly.collectionspace.org:8081/artifactory/nuxeo-public</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<!-- This should no longer be needed since we're using only "releases" 
-			artifacts <repository> <id>nuxeo-public-snapshot</id> <name>nuxeo-public-snapshot</name> 
-			<url>http://nightly.collectionspace.org:8081/artifactory/nuxeo-public-snapshot</url> 
-			<releases> <enabled>false</enabled> </releases> <snapshots> <enabled>true</enabled> 
-			<updatePolicy>never</updatePolicy> </snapshots> </repository> -->
-
 		<repository>
 			<snapshots>
 				<enabled>false</enabled>
@@ -170,15 +165,26 @@
 			<name>External release repository of the EL4J project</name>
 			<url>http://public-el4.elca-services.ch/el4j/maven2repository</url>
 		</repository>
-
+    
+    <repository>
+      <snapshots>
+          <enabled>false</enabled>
+      </snapshots>
+      <releases>
+          <enabled>true</enabled>
+      </releases>
+      <id>Apache</id>
+      <name>External release repository of the Apache projects</name>
+      <url>https://repository.apache.org/content/groups/public/</url>
+    </repository>
 
 	</repositories>
 
 	<pluginRepositories>
 		<pluginRepository>
-			<id>collectionspace-plugins-remote-repos</id>
-			<name>collectionspace-plugins-remote-repos</name>
-			<url>http://nightly.collectionspace.org:8081/artifactory/plugins-remote-repos</url>
+			<id>collectionspace-remote-repos</id>
+			<name>collectionspace-remote-repos</name>
+			<url>http://nightly.collectionspace.org:8081/artifactory/remote-repos</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
diff --git a/services/common/pom.xml b/services/common/pom.xml
index c0bf985a0..6a6e6e6b8 100644
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -380,31 +380,6 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <id>el4jReleaseRepositoryExternal</id>
-            <name>External release repository of the EL4J project</name>
-            <url>http://public-el4.elca-services.ch/el4j/maven2repository</url>
-        </repository>
-        <repository>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <id>Apache</id>
-            <name>External release repository of the Apache projects</name>
-            <url>https://repository.apache.org/content/groups/public/</url>
-        </repository>
-    </repositories>
-
     <build>
         <finalName>collectionspace-services-common</finalName>
     	<defaultGoal>install</defaultGoal>
diff --git a/services/config/pom.xml b/services/config/pom.xml
index 2faefecd2..a775cf46e 100644
--- a/services/config/pom.xml
+++ b/services/config/pom.xml
@@ -60,20 +60,6 @@
 		</dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <id>el4jReleaseRepositoryExternal</id>
-            <name>External release repository of the EL4J project</name>
-            <url>http://public-el4.elca-services.ch/el4j/maven2repository</url>
-        </repository>
-    </repositories>
-
     <build>
         <finalName>collectionspace-services-config</finalName>
     	<defaultGoal>install</defaultGoal>
-- 
2.47.3