Merge "Checksum errors seen on some setup while downloading guava"

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 a6fd98e3233bdf15e3c9883fac96d146630b93eb..d9b4720503a49f55119279040557bf4b744e8b21 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
@@ -135,15 +135,10 @@
     </pluginManagement>\r
   </build>\r
   <pluginRepositories>\r
-    <pluginRepository>\r
-      <id>central</id>\r
-      <name>central</name>\r
-      <url>${nexusproxy}/repositories/central/</url>\r
-    </pluginRepository>\r
     <pluginRepository>\r
       <id>central2</id>\r
       <name>central2</name>\r
-      <url>${nexusproxy}/repositories/central2/</url>\r
+      <url>http://repo2.maven.org/maven2</url>\r
     </pluginRepository>\r
     <pluginRepository>\r
       <id>opendaylight.snapshot</id>\r
@@ -167,19 +162,15 @@
       <name>ebr-bundles-external</name>\r
       <url>${nexusproxy}/repositories/ebr-bundles-external/</url>\r
     </repository>\r
-    <!-- Maven repo2 mirror -->\r
-    <!-- http://repo2.maven.org/maven2 -->\r
     <repository>\r
       <id>central2</id>\r
       <name>central2</name>\r
-      <url>${nexusproxy}/repositories/central2/</url>\r
+      <url>http://repo2.maven.org/maven2</url>\r
     </repository>\r
-    <!-- Maven repo1 mirror -->\r
-    <!-- http://repo1.maven.org/maven2 -->\r
     <repository>\r
       <id>central</id>\r
       <name>central</name>\r
-      <url>${nexusproxy}/repositories/central/</url>\r
+      <url>http://repo1.maven.org/maven2</url>\r
     </repository>\r
     <!-- Pax mirror -->\r
     <!-- https://oss.sonatype.org/content/repositories/ops4j-releases -->\r

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 56df36a934acef5ac3fb6618862fbd6d77ebff8b..7c6a618a31717a70f6dc66903d8c5d645527956e 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -60,7 +60,7 @@
     <pluginRepository>
       <id>central2</id>
       <name>central2</name>
-      <url>${nexusproxy}/repositories/central2/</url>
+      <url>http://repo2.maven.org/maven2</url>
     </pluginRepository>
   </pluginRepositories>
 
@@ -206,19 +206,15 @@
       <name>ebr-bundles-external</name>
       <url>${nexusproxy}/repositories/ebr-bundles-external/</url>
     </repository>
-    <!-- Maven repo2 mirror -->
-    <!-- http://repo2.maven.org/maven2 -->
     <repository>
       <id>central2</id>
       <name>central2</name>
-      <url>${nexusproxy}/repositories/central2/</url>
+      <url>http://repo2.maven.org/maven2</url>
     </repository>
-    <!-- Maven repo1 mirror -->
-    <!-- http://repo1.maven.org/maven2 -->
     <repository>
       <id>central</id>
       <name>central</name>
-      <url>${nexusproxy}/repositories/central/</url>
+      <url>http://repo1.maven.org/maven2</url>
     </repository>
     <!-- Pax mirror -->
     <!-- https://oss.sonatype.org/content/repositories/ops4j-releases -->

diff --git a/opendaylight/northbound/integrationtest/pom.xml b/opendaylight/northbound/integrationtest/pom.xml
index 000b750427dbd6ec102742d1460ea35556baec47..9432d6f622114f1fb16d019ed2c33f96e043e914 100644 (file)
--- a/opendaylight/northbound/integrationtest/pom.xml
+++ b/opendaylight/northbound/integrationtest/pom.xml
@@ -22,7 +22,7 @@
     <pluginRepository>
       <id>central2</id>
       <name>central2</name>
-      <url>${nexusproxy}/repositories/central2/</url>
+      <url>http://repo2.maven.org/maven2</url>
     </pluginRepository>
   </pluginRepositories>
   <dependencies>

diff --git a/opendaylight/sal/yang-prototype/pom.xml b/opendaylight/sal/yang-prototype/pom.xml
index c9af69c436fa8db395a6770cecfb6ca50478e6e7..4c5db1086c098cf936a1daaf0b70902368f159eb 100644 (file)
--- a/opendaylight/sal/yang-prototype/pom.xml
+++ b/opendaylight/sal/yang-prototype/pom.xml
@@ -43,14 +43,9 @@
 
     <pluginRepositories>
         <pluginRepository>
-            <id>central</id>
-            <name>central</name>
-            <url>${nexusproxy}/repositories/central/</url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>central2</id>
-            <name>central2</name>
-            <url>${nexusproxy}/repositories/central2/</url>
+          <id>central2</id>
+          <name>central2</name>
+          <url>http://repo2.maven.org/maven2</url>
         </pluginRepository>
         <pluginRepository>
             <id>opendaylight.snapshot</id>
@@ -75,19 +70,15 @@
             <name>ebr-bundles-external</name>
             <url>${nexusproxy}/repositories/ebr-bundles-external/</url>
         </repository>
-        <!-- Maven repo2 mirror -->
-        <!-- http://repo2.maven.org/maven2 -->
         <repository>
-            <id>central2</id>
-            <name>central2</name>
-            <url>${nexusproxy}/repositories/central2/</url>
+          <id>central2</id>
+          <name>central2</name>
+          <url>http://repo2.maven.org/maven2</url>
         </repository>
-        <!-- Maven repo1 mirror -->
-        <!-- http://repo1.maven.org/maven2 -->
         <repository>
-            <id>central</id>
-            <name>central</name>
-            <url>${nexusproxy}/repositories/central/</url>
+          <id>central</id>
+          <name>central</name>
+          <url>http://repo1.maven.org/maven2</url>
         </repository>
         <!-- Pax mirror -->
         <!-- https://oss.sonatype.org/content/repositories/ops4j-releases -->

diff --git a/opendaylight/sal/yang-prototype/sal/pom.xml b/opendaylight/sal/yang-prototype/sal/pom.xml
index 45743160fb57b81830279a54926a8fd21f3889de..fc6fb8eaed40561c666d5468484cf89e6cc84d73 100644 (file)
--- a/opendaylight/sal/yang-prototype/sal/pom.xml
+++ b/opendaylight/sal/yang-prototype/sal/pom.xml
@@ -32,14 +32,9 @@
 
     <pluginRepositories>
         <pluginRepository>
-            <id>central</id>
-            <name>central</name>
-            <url>${nexusproxy}/repositories/central/</url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>central2</id>
-            <name>central2</name>
-            <url>${nexusproxy}/repositories/central2/</url>
+          <id>central2</id>
+          <name>central2</name>
+          <url>http://repo2.maven.org/maven2</url>
         </pluginRepository>
         <pluginRepository>
             <id>opendaylight.snapshot</id>
@@ -50,6 +45,16 @@
 
 
        <repositories>
+      <repository>
+        <id>central2</id>
+        <name>central2</name>
+        <url>http://repo2.maven.org/maven2</url>
+      </repository>
+      <repository>
+        <id>central</id>
+        <name>central</name>
+        <url>http://repo1.maven.org/maven2</url>
+      </repository>
                <!-- EBR release -->
                <!-- http://repository.springsource.com/maven/bundles/release -->
                <repository>
@@ -64,20 +69,6 @@
                        <name>ebr-bundles-external</name>
                        <url>${nexusproxy}/repositories/ebr-bundles-external/</url>
                </repository>
-               <!-- Maven repo2 mirror -->
-               <!-- http://repo2.maven.org/maven2 -->
-               <repository>
-                       <id>central2</id>
-                       <name>central2</name>
-                       <url>${nexusproxy}/repositories/central2/</url>
-               </repository>
-               <!-- Maven repo1 mirror -->
-               <!-- http://repo1.maven.org/maven2 -->
-               <repository>
-                       <id>central</id>
-                       <name>central</name>
-                       <url>${nexusproxy}/repositories/central/</url>
-               </repository>
                <!-- Pax mirror -->
                <!-- https://oss.sonatype.org/content/repositories/ops4j-releases -->
                <repository>

diff --git a/third-party/commons/thirdparty/pom.xml b/third-party/commons/thirdparty/pom.xml
index 6be5e8690fc31095362a2e8b2b34debbeb2ccf41..9e95701a0d9b24eb376e11ae9b3e66b8bdee93a3 100644 (file)
--- a/third-party/commons/thirdparty/pom.xml
+++ b/third-party/commons/thirdparty/pom.xml
@@ -28,10 +28,10 @@
   </properties>
 
   <pluginRepositories>
-    <pluginRepository>
+    <pluginRepository>    
       <id>central2</id>
       <name>central2</name>
-      <url>${nexusproxy}/repositories/central2/</url>
+      <url>http://repo2.maven.org/maven2</url>
     </pluginRepository>
   </pluginRepositories>
 
@@ -161,17 +161,15 @@
   </build>
 
   <repositories>
-    <!-- Maven repo2 mirror -->
     <repository>
       <id>central2</id>
       <name>central2</name>
-      <url>${nexusproxy}/repositories/central2/</url>
+      <url>http://repo2.maven.org/maven2</url>
     </repository>
-    <!-- Maven repo1 mirror -->
     <repository>
       <id>central</id>
       <name>central</name>
-      <url>${nexusproxy}/repositories/central/</url>
+      <url>http://repo1.maven.org/maven2</url>
     </repository>
     <!-- Third Packages hosted in local maven because not available in
          other places -->