update the pom files to enable the nexus repository path to be configured by properti...

Change-Id: Ie96244a1a2a3f6b2f3760f366899017a44aa381d
Signed-off-by: David K. Bainbridge <dbainbri@ciena.com>

diff --git a/opendaylight/archetypes/odl-model-project/pom.xml b/opendaylight/archetypes/odl-model-project/pom.xml
index 63759c63dd4c913178826e112a6ee97602dd2cc0..d2896027fb330edc255739d740847cd7fb10b00a 100644 (file)
--- a/opendaylight/archetypes/odl-model-project/pom.xml
+++ b/opendaylight/archetypes/odl-model-project/pom.xml
@@ -7,6 +7,12 @@
   <version>1.1-SNAPSHOT</version>
   <packaging>maven-archetype</packaging>
 
   <version>1.1-SNAPSHOT</version>
   <packaging>maven-archetype</packaging>
 

+  <properties>
+    <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
+    <nexus.repository.release>opendaylight.release</nexus.repository.release>
+    <nexus.repository.snapshot>opendaylight.snapshot</nexus.repository.snapshot>
+  </properties>
+

   <name>odl-model-project</name>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
   <name>odl-model-project</name>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>


@@ -37,11 +43,11 @@
   <distributionManagement>
     <repository>
       <id>opendaylight-release</id>
   <distributionManagement>
     <repository>
       <id>opendaylight-release</id>

-      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.release/</url>
+      <url>${nexusproxy}/repositories/${nexus.repository.release}/</url>

     </repository>
     <snapshotRepository>
       <id>opendaylight-snapshot</id>
     </repository>
     <snapshotRepository>
       <id>opendaylight-snapshot</id>

-      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+      <url>${nexusproxy}/repositories/${nexus.repository.snapshot}/</url>

     </snapshotRepository>
     <site>
       <id>website</id>
     </snapshotRepository>
     <site>
       <id>website</id>

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 ebb9302b78487282f2e40c802429161809ea6c4b..016c30d787bde6a7871f012fb40d3df7c52c85b3 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
@@ -9,6 +9,8 @@
   <properties>\r
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>\r
   <properties>\r
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>\r

+    <nexus.repository.release>opendaylight.release</nexus.repository.release>
+    <nexus.repository.snapshot>opendaylight.release</nexus.repository.snaphot>

     <yang.version>0.6.2-SNAPSHOT</yang.version>\r
     <yang.codegen.version>0.6.2-SNAPSHOT</yang.codegen.version>\r
     <bundle.plugin.version>2.3.7</bundle.plugin.version>\r
     <yang.version>0.6.2-SNAPSHOT</yang.version>\r
     <yang.codegen.version>0.6.2-SNAPSHOT</yang.codegen.version>\r
     <bundle.plugin.version>2.3.7</bundle.plugin.version>\r


@@ -158,7 +160,7 @@
     <pluginRepository>\r
       <id>opendaylight-snapshot</id>\r
       <name>opendaylight-snapshot</name>\r
     <pluginRepository>\r
       <id>opendaylight-snapshot</id>\r
       <name>opendaylight-snapshot</name>\r

-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>\r
+      <url>${nexusproxy}/repositories/${nexus.repository.snapshot}/</url>

       <snapshots>\r
           <enabled>true</enabled>\r
       </snapshots>\r
       <snapshots>\r
           <enabled>true</enabled>\r
       </snapshots>\r


@@ -186,7 +188,7 @@
     <repository>\r
       <id>opendaylight-snapshot</id>\r
       <name>opendaylight-snapshot</name>\r
     <repository>\r
       <id>opendaylight-snapshot</id>\r
       <name>opendaylight-snapshot</name>\r

-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>\r
+      <url>${nexusproxy}/repositories/${nexus.repository.snapshot}/</url>

       <snapshots>\r
           <enabled>true</enabled>\r
       </snapshots>\r
       <snapshots>\r
           <enabled>true</enabled>\r
       </snapshots>\r


@@ -200,12 +202,12 @@
     <!-- OpenDayLight Released artifact -->\r
     <repository>\r
       <id>opendaylight-release</id>\r
     <!-- OpenDayLight Released artifact -->\r
     <repository>\r
       <id>opendaylight-release</id>\r

-      <url>${nexusproxy}/repositories/opendaylight.release/</url>\r
+      <url>${nexusproxy}/repositories/${nexus.repository.release}/</url>

     </repository>\r
     <!-- OpenDayLight Snapshot artifact -->\r
     <snapshotRepository>\r
       <id>opendaylight-snapshot</id>\r
     </repository>\r
     <!-- OpenDayLight Snapshot artifact -->\r
     <snapshotRepository>\r
       <id>opendaylight-snapshot</id>\r

-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>\r
+      <url>${nexusproxy}/repositories/${nexus.repository.snapshot}/</url>

     </snapshotRepository>\r
     <!-- Site deployment -->\r
     <site>\r
     </snapshotRepository>\r
     <!-- Site deployment -->\r
     <site>\r

diff --git a/opendaylight/archetypes/pom.xml b/opendaylight/archetypes/pom.xml
index 7924ade6252795b803d1673c7a96c97e51e2d807..36af861e84826e109ed53e97fadee123b6056c18 100644 (file)
--- a/opendaylight/archetypes/pom.xml
+++ b/opendaylight/archetypes/pom.xml
@@ -24,12 +24,12 @@
     <!-- OpenDayLight Released artifact -->
     <repository>
       <id>opendaylight-release</id>
     <!-- OpenDayLight Released artifact -->
     <repository>
       <id>opendaylight-release</id>

-      <url>${nexusproxy}/repositories/opendaylight.release/</url>
+      <url>${nexusproxy}/repositories/${nexus.repository.release}/</url>

     </repository>
     <!-- OpenDayLight Snapshot artifact -->
     <snapshotRepository>
       <id>opendaylight-snapshot</id>
     </repository>
     <!-- OpenDayLight Snapshot artifact -->
     <snapshotRepository>
       <id>opendaylight-snapshot</id>

-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+      <url>${nexusproxy}/repositories/${nexus.repository.snapshot}/</url>

     </snapshotRepository>
     <!-- Site deployment -->
     <site>
     </snapshotRepository>
     <!-- Site deployment -->
     <site>

diff --git a/opendaylight/commons/checkstyle/pom.xml b/opendaylight/commons/checkstyle/pom.xml
index 9f2bf9040e979e8294366f9220f2ced0d341d1d2..55567af43783a229118086be282c898b753f38fa 100644 (file)
--- a/opendaylight/commons/checkstyle/pom.xml
+++ b/opendaylight/commons/checkstyle/pom.xml
@@ -12,18 +12,20 @@
 
   <properties>
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
 
   <properties>
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>

+    <nexus.repository.release>opendaylight.release</nexus.repository.release>
+    <nexus.repository.snapshot>opendaylight.snapshot</nexus.repository.snapshot>

     <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
   </properties>
   <distributionManagement>
     <!-- OpenDayLight Released artifact -->
     <repository>
       <id>opendaylight-release</id>
     <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
   </properties>
   <distributionManagement>
     <!-- OpenDayLight Released artifact -->
     <repository>
       <id>opendaylight-release</id>

-      <url>${nexusproxy}/repositories/opendaylight.release/</url>
+      <url>${nexusproxy}/repositories/${nexus.repository.release}/</url>

     </repository>
     <!-- OpenDayLight Snapshot artifact -->
     <snapshotRepository>
       <id>opendaylight-snapshot</id>
     </repository>
     <!-- OpenDayLight Snapshot artifact -->
     <snapshotRepository>
       <id>opendaylight-snapshot</id>

-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+      <url>${nexusproxy}/repositories/${nexus.repository.snapshot}/</url>

     </snapshotRepository>
     <!-- Site deployment -->
     <site>
     </snapshotRepository>
     <!-- Site deployment -->
     <site>

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 77c807b0ed936fa27361274591aeb749e034f141..3858f1a33e40952c640ad20c665b1c125851998c 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -1508,7 +1508,7 @@
     <pluginRepository>
       <id>opendaylight-snapshot</id>
       <name>opendaylight-snapshot</name>
     <pluginRepository>
       <id>opendaylight-snapshot</id>
       <name>opendaylight-snapshot</name>

-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+      <url>${nexusproxy}/repositories/${nexus.repository.snapshot}/</url>

       <snapshots>
           <enabled>true</enabled>
       </snapshots>
       <snapshots>
           <enabled>true</enabled>
       </snapshots>


@@ -1604,7 +1604,7 @@
     <repository>
       <id>opendaylight-snapshot</id>
       <name>opendaylight-snapshot</name>
     <repository>
       <id>opendaylight-snapshot</id>
       <name>opendaylight-snapshot</name>

-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+      <url>${nexusproxy}/repositories/${nexus.repository.snapshot}/</url>

       <snapshots>
           <enabled>true</enabled>
       </snapshots>
       <snapshots>
           <enabled>true</enabled>
       </snapshots>


@@ -1617,12 +1617,12 @@
     <!-- OpenDayLight Released artifact -->
     <repository>
       <id>opendaylight-release</id>
     <!-- OpenDayLight Released artifact -->
     <repository>
       <id>opendaylight-release</id>

-      <url>${nexusproxy}/repositories/opendaylight.release/</url>
+      <url>${nexusproxy}/repositories/${nexus.repository.release}/</url>

     </repository>
     <!-- OpenDayLight Snapshot artifact -->
     <snapshotRepository>
       <id>opendaylight-snapshot</id>
     </repository>
     <!-- OpenDayLight Snapshot artifact -->
     <snapshotRepository>
       <id>opendaylight-snapshot</id>

-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+      <url>${nexusproxy}/repositories/${nexus.repository.snapshot}/</url>

     </snapshotRepository>
     <!-- Site deployment -->
     <site>
     </snapshotRepository>
     <!-- Site deployment -->
     <site>

diff --git a/opendaylight/commons/parent/pom.xml b/opendaylight/commons/parent/pom.xml
index 085096d206b5aa8d13ebc4ff34f5b9a3eb0fef74..c81dba75de1064a561d536ba1ddc709c241d9a25 100644 (file)
--- a/opendaylight/commons/parent/pom.xml
+++ b/opendaylight/commons/parent/pom.xml
@@ -16,7 +16,9 @@
   </scm>
 
   <properties>
   </scm>
 
   <properties>

-    <nexusdeploy>http://nexus.opendaylight.org/content</nexusdeploy>
+    <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
+    <nexus.repository.release>opendaylight.release</nexus.repository.release>
+    <nexus.repository.snapshot>opendaylight.snapshot</nexus.repository.snapshot>

     <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
     <releaseplugin.version>2.3.2</releaseplugin.version>
   </properties>
     <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
     <releaseplugin.version>2.3.2</releaseplugin.version>
   </properties>


@@ -33,12 +35,12 @@
     <!-- OpenDayLight Released artifact -->
     <repository>
       <id>opendaylight-release</id>
     <!-- OpenDayLight Released artifact -->
     <repository>
       <id>opendaylight-release</id>

-      <url>${nexusdeploy}/repositories/opendaylight.release/</url>
+      <url>${nexusproxy}/repositories/${nexus.repository.release}/</url>

     </repository>
     <!-- OpenDayLight Snapshot artifact -->
     <snapshotRepository>
       <id>opendaylight-snapshot</id>
     </repository>
     <!-- OpenDayLight Snapshot artifact -->
     <snapshotRepository>
       <id>opendaylight-snapshot</id>

-      <url>${nexusdeploy}/repositories/opendaylight.snapshot/</url>
+      <url>${nexusproxy}/repositories/${nexus.repository.snapshot}/</url>

     </snapshotRepository>
     <!-- Site deployment -->
     <site>
     </snapshotRepository>
     <!-- Site deployment -->
     <site>

diff --git a/opendaylight/networkconfiguration/neutron/implementation/pom.xml b/opendaylight/networkconfiguration/neutron/implementation/pom.xml
index 821ac92021683e8d0cccdd6409b28f09add1ad0d..f539f1ca69c4cbf08b6c6cf8abc90cdfcc45d465 100644 (file)
--- a/opendaylight/networkconfiguration/neutron/implementation/pom.xml
+++ b/opendaylight/networkconfiguration/neutron/implementation/pom.xml
@@ -7,7 +7,6 @@
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
   <properties>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
   <properties>

-    <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>

     <enunciate.version>1.26.2</enunciate.version>
   </properties>
   <scm>
     <enunciate.version>1.26.2</enunciate.version>
   </properties>
   <scm>


@@ -21,12 +20,12 @@
     <!-- OpenDayLight Released artifact -->
     <repository>
       <id>opendaylight-release</id>
     <!-- OpenDayLight Released artifact -->
     <repository>
       <id>opendaylight-release</id>

-      <url>${nexusproxy}/repositories/opendaylight.release/</url>
+      <url>${nexusproxy}/repositories/${nexus.repository.release}/</url>

     </repository>
     <!-- OpenDayLight Snapshot artifact -->
     <snapshotRepository>
       <id>opendaylight-snapshot</id>
     </repository>
     <!-- OpenDayLight Snapshot artifact -->
     <snapshotRepository>
       <id>opendaylight-snapshot</id>

-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+      <url>${nexusproxy}/repositories/${nexus.repository.snapshot}/</url>

     </snapshotRepository>
     <!-- Site deployment -->
     <site>
     </snapshotRepository>
     <!-- Site deployment -->
     <site>

diff --git a/opendaylight/networkconfiguration/neutron/pom.xml b/opendaylight/networkconfiguration/neutron/pom.xml
index 27588b8bee907b8015df57daa5140d77d935dd8a..b25e99e420e677f87e1ccbc1f11c1a1ac36b83d4 100644 (file)
--- a/opendaylight/networkconfiguration/neutron/pom.xml
+++ b/opendaylight/networkconfiguration/neutron/pom.xml
@@ -7,7 +7,6 @@
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <properties>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <properties>

-    <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>

     <enunciate.version>1.26.2</enunciate.version>
   </properties>
   <scm>
     <enunciate.version>1.26.2</enunciate.version>
   </properties>
   <scm>


@@ -20,12 +19,12 @@
     <!-- OpenDayLight Released artifact -->
     <repository>
       <id>opendaylight-release</id>
     <!-- OpenDayLight Released artifact -->
     <repository>
       <id>opendaylight-release</id>

-      <url>${nexusproxy}/repositories/opendaylight.release/</url>
+      <url>${nexusproxy}/repositories/${nexus.repository.release}/</url>

     </repository>
     <!-- OpenDayLight Snapshot artifact -->
     <snapshotRepository>
       <id>opendaylight-snapshot</id>
     </repository>
     <!-- OpenDayLight Snapshot artifact -->
     <snapshotRepository>
       <id>opendaylight-snapshot</id>

-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+      <url>${nexusproxy}/repositories/${nexus.repository.snapshot}/</url>

     </snapshotRepository>
     <!-- Site deployment -->
     <site>
     </snapshotRepository>
     <!-- Site deployment -->
     <site>

diff --git a/opendaylight/northbound/networkconfiguration/neutron/pom.xml b/opendaylight/northbound/networkconfiguration/neutron/pom.xml
index 7590a976b6fe6f2e0abcf35a1ca900a8967e3413..774a12547944e9b943dde61a31535d1efe150960 100644 (file)
--- a/opendaylight/northbound/networkconfiguration/neutron/pom.xml
+++ b/opendaylight/northbound/networkconfiguration/neutron/pom.xml
@@ -7,7 +7,6 @@
         <relativePath>../../../commons/opendaylight</relativePath>
     </parent>
     <properties>
         <relativePath>../../../commons/opendaylight</relativePath>
     </parent>
     <properties>

-        <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>

         <enunciate.version>1.26.2</enunciate.version>
     </properties>
   <scm>
         <enunciate.version>1.26.2</enunciate.version>
     </properties>
   <scm>


@@ -21,12 +20,12 @@
         <!-- OpenDayLight Released artifact -->
         <repository>
             <id>opendaylight-release</id>
         <!-- OpenDayLight Released artifact -->
         <repository>
             <id>opendaylight-release</id>

-            <url>${nexusproxy}/repositories/opendaylight.release/</url>
+            <url>${nexusproxy}/repositories/${nexus.repository.release}/</url>

         </repository>
         <!-- OpenDayLight Snapshot artifact -->
         <snapshotRepository>
             <id>opendaylight-snapshot</id>
         </repository>
         <!-- OpenDayLight Snapshot artifact -->
         <snapshotRepository>
             <id>opendaylight-snapshot</id>

-            <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+            <url>${nexusproxy}/repositories/${nexus.repository.snapshot}/</url>

         </snapshotRepository>
         <!-- Site deployment -->
         <site>
         </snapshotRepository>
         <!-- Site deployment -->
         <site>

diff --git a/third-party/commons/thirdparty/pom.xml b/third-party/commons/thirdparty/pom.xml
index ccd07865a8d2b0e67ee22e8b3f13e5fec2081d75..e38829926220bb65eb9f6b326966fadad6110ff0 100644 (file)
--- a/third-party/commons/thirdparty/pom.xml
+++ b/third-party/commons/thirdparty/pom.xml
@@ -18,6 +18,8 @@
   <properties>
     <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
   <properties>
     <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>

+    <nexus.repository.release>opendaylight.release</nexus.repository.release>
+    <nexus.repository.snapshot>opendaylight.snapshot</nexus.repository.snapshot>

     <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
     <siteplugin>3.2</siteplugin>
     <projectinfo>2.6</projectinfo>
     <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
     <siteplugin>3.2</siteplugin>
     <projectinfo>2.6</projectinfo>


@@ -29,7 +31,7 @@
   </properties>
 
   <pluginRepositories>
   </properties>
 
   <pluginRepositories>

-    <pluginRepository>    
+    <pluginRepository>

       <id>central2</id>
       <name>central2</name>
       <url>http://repo2.maven.org/maven2</url>
       <id>central2</id>
       <name>central2</name>
       <url>http://repo2.maven.org/maven2</url>


@@ -205,12 +207,12 @@
     <!-- OpenDayLight Released artifact -->
     <repository>
       <id>opendaylight-release</id>
     <!-- OpenDayLight Released artifact -->
     <repository>
       <id>opendaylight-release</id>

-      <url>${nexusproxy}/repositories/opendaylight.release/</url>
+      <url>${nexusproxy}/repositories/${nexus.repository.release}/</url>

     </repository>
     <!-- OpenDayLight Snapshot artifact -->
     <snapshotRepository>
       <id>opendaylight-snapshot</id>
     </repository>
     <!-- OpenDayLight Snapshot artifact -->
     <snapshotRepository>
       <id>opendaylight-snapshot</id>

-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+      <url>${nexusproxy}/repositories/${nexus.repository.snapshot}/</url>

     </snapshotRepository>
     <!-- Site deployment -->
     <site>
     </snapshotRepository>
     <!-- Site deployment -->
     <site>