CSPACE-6291: Consolidate remaining <repository> references in POMs to the project...

diff --git a/pom.xml b/pom.xml
index d98d4aac967e9bdc66aeedf9c21e8cc6f730af11..2fb4108c8441a9298c123157006e9300f835c395 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -117,6 +117,18 @@
                        </snapshots>\r
                </repository>\r
 \r
+               <repository>\r
+                       <id>nuxeo-public</id>\r
+                       <name>nuxeo-public</name>\r
+                       <url>http://nightly.collectionspace.org:8081/artifactory/nuxeo-public</url>\r
+                       <releases>\r
+                               <enabled>true</enabled>\r
+                       </releases>\r
+                       <snapshots>\r
+                               <enabled>false</enabled>\r
+                       </snapshots>\r
+               </repository>\r
+    \r
                <repository>\r
                        <id>public-snapshot</id>\r
                        <url>http://maven.nuxeo.org/public-snapshot</url>\r
@@ -142,23 +154,6 @@
                        </snapshots>\r
                </repository>\r
 \r
-               <repository>\r
-                       <id>nuxeo-public</id>\r
-                       <name>nuxeo-public</name>\r
-                       <url>http://nightly.collectionspace.org:8081/artifactory/nuxeo-public</url>\r
-                       <releases>\r
-                               <enabled>true</enabled>\r
-                       </releases>\r
-                       <snapshots>\r
-                               <enabled>false</enabled>\r
-                       </snapshots>\r
-               </repository>\r
-               <!-- This should no longer be needed since we're using only "releases" \r
-                       artifacts <repository> <id>nuxeo-public-snapshot</id> <name>nuxeo-public-snapshot</name> \r
-                       <url>http://nightly.collectionspace.org:8081/artifactory/nuxeo-public-snapshot</url> \r
-                       <releases> <enabled>false</enabled> </releases> <snapshots> <enabled>true</enabled> \r
-                       <updatePolicy>never</updatePolicy> </snapshots> </repository> -->\r
-\r
                <repository>\r
                        <snapshots>\r
                                <enabled>false</enabled>\r
@@ -170,15 +165,26 @@
                        <name>External release repository of the EL4J project</name>\r
                        <url>http://public-el4.elca-services.ch/el4j/maven2repository</url>\r
                </repository>\r
-\r
+    \r
+    <repository>\r
+      <snapshots>\r
+          <enabled>false</enabled>\r
+      </snapshots>\r
+      <releases>\r
+          <enabled>true</enabled>\r
+      </releases>\r
+      <id>Apache</id>\r
+      <name>External release repository of the Apache projects</name>\r
+      <url>https://repository.apache.org/content/groups/public/</url>\r
+    </repository>\r
 \r
        </repositories>\r
 \r
        <pluginRepositories>\r
                <pluginRepository>\r
-                       <id>collectionspace-plugins-remote-repos</id>\r
-                       <name>collectionspace-plugins-remote-repos</name>\r
-                       <url>http://nightly.collectionspace.org:8081/artifactory/plugins-remote-repos</url>\r
+                       <id>collectionspace-remote-repos</id>\r
+                       <name>collectionspace-remote-repos</name>\r
+                       <url>http://nightly.collectionspace.org:8081/artifactory/remote-repos</url>\r
                        <snapshots>\r
                                <enabled>false</enabled>\r
                        </snapshots>\r

diff --git a/services/common/pom.xml b/services/common/pom.xml
index c0bf985a0a5154403992f0a0ee9cdeab9ab2f0f1..6a6e6e6b8de56a87fe2cc29ae2a1e3153975e902 100644 (file)
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -380,31 +380,6 @@
         </dependency>\r
     </dependencies>\r
 \r
-    <repositories>\r
-        <repository>\r
-            <snapshots>\r
-                <enabled>false</enabled>\r
-            </snapshots>\r
-            <releases>\r
-                <enabled>true</enabled>\r
-            </releases>\r
-            <id>el4jReleaseRepositoryExternal</id>\r
-            <name>External release repository of the EL4J project</name>\r
-            <url>http://public-el4.elca-services.ch/el4j/maven2repository</url>\r
-        </repository>\r
-        <repository>\r
-            <snapshots>\r
-                <enabled>false</enabled>\r
-            </snapshots>\r
-            <releases>\r
-                <enabled>true</enabled>\r
-            </releases>\r
-            <id>Apache</id>\r
-            <name>External release repository of the Apache projects</name>\r
-            <url>https://repository.apache.org/content/groups/public/</url>\r
-        </repository>\r
-    </repositories>\r
-\r
     <build>\r
         <finalName>collectionspace-services-common</finalName>\r
        <defaultGoal>install</defaultGoal>\r

diff --git a/services/config/pom.xml b/services/config/pom.xml
index 2faefecd20da1daf82521c76f6e49e333c819f4b..a775cf46e9f1fe51a87a1acec29de306f1acd26f 100644 (file)
--- 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>