Merge "Remove maven repo2 from poms because no need for 2 maven repos, especially...

diff --git a/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
index b84346514f17c85a3b4d24c2f1f1878747bcd623..671c782f2114e35077310d67e68e0e359d3323ab 100644 (file)
--- a/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
+++ b/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
@@ -136,9 +136,9 @@
   </build>\r
   <pluginRepositories>\r
     <pluginRepository>\r
-      <id>central2</id>\r
-      <name>central2</name>\r
-      <url>http://repo2.maven.org/maven2</url>\r
+      <id>central</id>\r
+      <name>maven repo1</name>\r
+      <url>http://repo1.maven.org/maven2</url>\r
        <snapshots>\r
         <enabled>false</enabled>\r
       </snapshots>\r
@@ -168,17 +168,6 @@
       <name>ebr-bundles-external</name>\r
       <url>${nexusproxy}/repositories/ebr-bundles-external/</url>\r
     </repository>\r
-    <repository>\r
-      <id>central2</id>\r
-      <name>central2</name>\r
-      <url>http://repo2.maven.org/maven2</url>\r
-      <snapshots>\r
-        <enabled>false</enabled>\r
-      </snapshots>\r
-      <releases>\r
-        <enabled>true</enabled>\r
-      </releases>\r
-    </repository>\r
     <repository>\r
       <id>central</id>\r
       <name>central</name>\r

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 8b0b93718768bfaea24619feb029a8f95c7ce931..31dd741cfdb0d7cfa8328e26cc639c94769f208b 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -60,9 +60,9 @@
 
   <pluginRepositories>
     <pluginRepository>
-      <id>central2</id>
-      <name>central2</name>
-      <url>http://repo2.maven.org/maven2</url>
+      <id>central</id>
+      <name>maven repo1</name>
+      <url>http://repo1.maven.org/maven2</url>
     </pluginRepository>
   </pluginRepositories>
 
@@ -207,17 +207,6 @@
       <name>ebr-bundles-external</name>
       <url>${nexusproxy}/repositories/ebr-bundles-external/</url>
     </repository>
-    <repository>
-      <id>central2</id>
-      <name>central2</name>
-      <url>http://repo2.maven.org/maven2</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-          <enabled>true</enabled>
-      </releases>
-    </repository>
     <repository>
       <id>central</id>
       <name>central</name>

diff --git a/opendaylight/northbound/integrationtest/pom.xml b/opendaylight/northbound/integrationtest/pom.xml
index 9f4e05dff0ba81df97abb2fde6159667608da026..3f2585e0c2f215e343f567c1ecb9331ca6555307 100644 (file)
--- a/opendaylight/northbound/integrationtest/pom.xml
+++ b/opendaylight/northbound/integrationtest/pom.xml
@@ -20,9 +20,9 @@
   <version>0.4.0-SNAPSHOT</version>
   <pluginRepositories>
     <pluginRepository>
-      <id>central2</id>
-      <name>central2</name>
-      <url>http://repo2.maven.org/maven2</url>
+      <id>central</id>
+      <name>maven repo1</name>
+      <url>http://repo1.maven.org/maven2</url>
       <snapshots>
         <enabled>false</enabled>
       </snapshots>

diff --git a/opendaylight/sal/yang-prototype/pom.xml b/opendaylight/sal/yang-prototype/pom.xml
index b1107594f50fb3d60390f71b081e2b495dc89f8c..3f84ff09a47b875a63bf18873a3d06e9b09cd80f 100644 (file)
--- a/opendaylight/sal/yang-prototype/pom.xml
+++ b/opendaylight/sal/yang-prototype/pom.xml
@@ -43,9 +43,9 @@
 
     <pluginRepositories>
         <pluginRepository>
-          <id>central2</id>
-          <name>central2</name>
-          <url>http://repo2.maven.org/maven2</url>
+          <id>central</id>
+          <name>maven repo1</name>
+          <url>http://repo1.maven.org/maven2</url>
           <snapshots>
              <enabled>false</enabled>
           </snapshots>
@@ -76,17 +76,6 @@
             <name>ebr-bundles-external</name>
             <url>${nexusproxy}/repositories/ebr-bundles-external/</url>
         </repository>
-        <repository>
-          <id>central2</id>
-          <name>central2</name>
-          <url>http://repo2.maven.org/maven2</url>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-        </repository>
         <repository>
           <id>central</id>
           <name>central</name>

diff --git a/opendaylight/sal/yang-prototype/sal/pom.xml b/opendaylight/sal/yang-prototype/sal/pom.xml
index 75f9d68bdd816c88a1d85802c386592c24cf9054..d70338e4e0d1623e385ba1d72b1e4976aa8e4c4e 100644 (file)
--- a/opendaylight/sal/yang-prototype/sal/pom.xml
+++ b/opendaylight/sal/yang-prototype/sal/pom.xml
@@ -33,9 +33,9 @@
 
     <pluginRepositories>
         <pluginRepository>
-          <id>central2</id>
-          <name>central2</name>
-          <url>http://repo2.maven.org/maven2</url>
+          <id>central</id>
+          <name>maven repo1</name>
+          <url>http://repo1.maven.org/maven2</url>
           <snapshots>
               <enabled>false</enabled>
           </snapshots>
@@ -52,17 +52,6 @@
 
 
        <repositories>
-      <repository>
-        <id>central2</id>
-        <name>central2</name>
-        <url>http://repo2.maven.org/maven2</url>
-        <snapshots>
-            <enabled>false</enabled>
-        </snapshots>
-        <releases>
-            <enabled>true</enabled>
-        </releases>
-      </repository>
       <repository>
         <id>central</id>
         <name>central</name>