moved maven property nexusproxy

now nexusproxy resides in pom where it is used
in commons.parent it was renamed to nexusdeploy to avoid misusage

Change-Id: I4485820797a0be6e91bae30b517950dc5bcef46b
Signed-off-by: Michal Rehak <mirehak@cisco.com>

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 525d685bee40056dd288d70439b4ffded732ea83..0356f4fd323e22753d0a2a93e082a9663078f098 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -23,10 +23,11 @@
   </scm>
 
   <properties>
   </scm>
 
   <properties>

-

     <!-- Java Versions -->
     <maven.compiler.source>1.7</maven.compiler.source>
     <maven.compiler.target>1.7</maven.compiler.target>
     <!-- Java Versions -->
     <maven.compiler.source>1.7</maven.compiler.source>
     <maven.compiler.target>1.7</maven.compiler.target>

+    <!-- ODL repository / plugin repository -->
+    <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>

 
     <propertymavenplugin.version>1.0-alpha-2</propertymavenplugin.version>
     <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
 
     <propertymavenplugin.version>1.0-alpha-2</propertymavenplugin.version>
     <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>

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

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

     <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 +33,12 @@
     <!-- OpenDayLight Released artifact -->
     <repository>
       <id>opendaylight-release</id>
     <!-- OpenDayLight Released artifact -->
     <repository>
       <id>opendaylight-release</id>

-      <url>${nexusproxy}/repositories/opendaylight.release/</url>
+      <url>${nexusdeploy}/repositories/opendaylight.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>${nexusdeploy}/repositories/opendaylight.snapshot/</url>

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