Clean up PAX URL repos: remove dead repos, use codice-nexus ID to avoid auth conflicts

Author: jaymcnallie

distribution/ddf-common/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg

@@ -124,7 +124,7 @@ org.ops4j.pax.url.mvn.defaultRepositories=\
 #
 org.ops4j.pax.url.mvn.repositories= \
     https://repo1.maven.org/maven2@id=central, \
-    https://repo.codice.org/repository/maven-public/@id=codice@snapshots, \
+    https://repo.codice.org/repository/maven-public/@id=codice-nexus@snapshots, \
     https://repo.osgeo.org/repository/release/@id=osgeo
 
 #

distribution/test/itests/test-itests-common/src/main/java/org/codice/ddf/itests/common/AbstractIntegrationTest.java

@@ -572,15 +572,8 @@ protected Option[] configureMavenRepos() {
             "etc/org.ops4j.pax.url.mvn.cfg",
             "org.ops4j.pax.url.mvn.repositories",
             "https://repo1.maven.org/maven2@id=central,"
-                + "https://oss.sonatype.org/content/repositories/snapshots@snapshots@noreleases@id=sonatype-snapshot,"
-                + "https://oss.sonatype.org/content/repositories/ops4j-snapshots@snapshots@noreleases@id=ops4j-snapshot,"
-                + "https://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache,"
-                + "https://svn.apache.org/repos/asf/servicemix/m2-repo@id=servicemix,"
-                + "https://repository.springsource.com/maven/bundles/release@id=springsource,"
-                + "https://repository.springsource.com/maven/bundles/external@id=springsourceext,"
-                + "https://oss.sonatype.org/content/repositories/releases/@id=sonatype,"
-                + "https://repo.osgeo.org/repository/release/@id=osgeo,"
-                + "https://repo.codice.org/repository/maven-public/@id=codice@snapshots"),
+                + "https://repo.codice.org/repository/maven-public/@id=codice-nexus@snapshots,"
+                + "https://repo.osgeo.org/repository/release/@id=osgeo"),
         when(System.getProperty(MVN_LOCAL_REPO) != null)
             .useOptions(
                 editConfigurationFilePut(

libs/test-common/src/main/java/org/codice/ddf/test/common/options/DistributionOptions.java

@@ -82,14 +82,7 @@ private static Option mavenRepos() {
         "etc/org.ops4j.pax.url.mvn.cfg",
         "org.ops4j.pax.url.mvn.repositories",
         "https://repo1.maven.org/maven2@id=central,"
-            + "http://oss.sonatype.org/content/repositories/snapshots@snapshots@noreleases@id=sonatype-snapshot,"
-            + "http://oss.sonatype.org/content/repositories/ops4j-snapshots@snapshots@noreleases@id=ops4j-snapshot,"
-            + "https://repo.codice.org/repository/maven-public/@id=codice,"
-            + "https://repo.osgeo.org/repository/release/@id=osgeo,"
-            + "http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache,"
-            + "http://svn.apache.org/repos/asf/servicemix/m2-repo@id=servicemix,"
-            + "http://repository.springsource.com/maven/bundles/release@id=springsource,"
-            + "http://repository.springsource.com/maven/bundles/external@id=springsourceext,"
-            + "http://oss.sonatype.org/content/repositories/releases/@id=sonatype");
+            + "https://repo.codice.org/repository/maven-public/@id=codice-nexus@snapshots,"
+            + "https://repo.osgeo.org/repository/release/@id=osgeo");
   }
 }