From 6aea408d97cee4257c2261f7a765396e0a0b9e3e Mon Sep 17 00:00:00 2001 From: "David K. Bainbridge" Date: Wed, 12 Mar 2014 13:16:43 -0700 Subject: [PATCH] update the pom files to enable the nexus repository path to be configured by properties such that if can be overriden via the command line to support deployment to alternative locations Change-Id: Ie96244a1a2a3f6b2f3760f366899017a44aa381d Signed-off-by: David K. Bainbridge --- opendaylight/archetypes/odl-model-project/pom.xml | 10 ++++++++-- .../src/main/resources/archetype-resources/pom.xml | 10 ++++++---- opendaylight/archetypes/pom.xml | 4 ++-- opendaylight/commons/checkstyle/pom.xml | 6 ++++-- opendaylight/commons/opendaylight/pom.xml | 8 ++++---- opendaylight/commons/parent/pom.xml | 8 +++++--- .../neutron/implementation/pom.xml | 5 ++--- opendaylight/networkconfiguration/neutron/pom.xml | 5 ++--- .../northbound/networkconfiguration/neutron/pom.xml | 5 ++--- third-party/commons/thirdparty/pom.xml | 8 +++++--- 10 files changed, 40 insertions(+), 29 deletions(-) diff --git a/opendaylight/archetypes/odl-model-project/pom.xml b/opendaylight/archetypes/odl-model-project/pom.xml index 63759c63dd..d2896027fb 100644 --- a/opendaylight/archetypes/odl-model-project/pom.xml +++ b/opendaylight/archetypes/odl-model-project/pom.xml @@ -7,6 +7,12 @@ 1.1-SNAPSHOT maven-archetype + + http://nexus.opendaylight.org/content + opendaylight.release + opendaylight.snapshot + + odl-model-project scm:git:ssh://git.opendaylight.org:29418/controller.git @@ -37,11 +43,11 @@ opendaylight-release - http://nexus.opendaylight.org/content/repositories/opendaylight.release/ + ${nexusproxy}/repositories/${nexus.repository.release}/ opendaylight-snapshot - http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + ${nexusproxy}/repositories/${nexus.repository.snapshot}/ website 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 ebb9302b78..016c30d787 100644 --- 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 @@ UTF-8 http://nexus.opendaylight.org/content + opendaylight.release + opendaylight.release 0.6.2-SNAPSHOT 0.6.2-SNAPSHOT 2.3.7 @@ -158,7 +160,7 @@ opendaylight-snapshot opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ + ${nexusproxy}/repositories/${nexus.repository.snapshot}/ true @@ -186,7 +188,7 @@ opendaylight-snapshot opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ + ${nexusproxy}/repositories/${nexus.repository.snapshot}/ true @@ -200,12 +202,12 @@ opendaylight-release - ${nexusproxy}/repositories/opendaylight.release/ + ${nexusproxy}/repositories/${nexus.repository.release}/ opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ + ${nexusproxy}/repositories/${nexus.repository.snapshot}/ diff --git a/opendaylight/archetypes/pom.xml b/opendaylight/archetypes/pom.xml index 7924ade625..36af861e84 100644 --- a/opendaylight/archetypes/pom.xml +++ b/opendaylight/archetypes/pom.xml @@ -24,12 +24,12 @@ opendaylight-release - ${nexusproxy}/repositories/opendaylight.release/ + ${nexusproxy}/repositories/${nexus.repository.release}/ opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ + ${nexusproxy}/repositories/${nexus.repository.snapshot}/ diff --git a/opendaylight/commons/checkstyle/pom.xml b/opendaylight/commons/checkstyle/pom.xml index 9f2bf9040e..55567af437 100644 --- a/opendaylight/commons/checkstyle/pom.xml +++ b/opendaylight/commons/checkstyle/pom.xml @@ -12,18 +12,20 @@ http://nexus.opendaylight.org/content + opendaylight.release + opendaylight.snapshot dav:http://nexus.opendaylight.org/content/sites/site opendaylight-release - ${nexusproxy}/repositories/opendaylight.release/ + ${nexusproxy}/repositories/${nexus.repository.release}/ opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ + ${nexusproxy}/repositories/${nexus.repository.snapshot}/ diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 77c807b0ed..3858f1a33e 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -1508,7 +1508,7 @@ opendaylight-snapshot opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ + ${nexusproxy}/repositories/${nexus.repository.snapshot}/ true @@ -1604,7 +1604,7 @@ opendaylight-snapshot opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ + ${nexusproxy}/repositories/${nexus.repository.snapshot}/ true @@ -1617,12 +1617,12 @@ opendaylight-release - ${nexusproxy}/repositories/opendaylight.release/ + ${nexusproxy}/repositories/${nexus.repository.release}/ opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ + ${nexusproxy}/repositories/${nexus.repository.snapshot}/ diff --git a/opendaylight/commons/parent/pom.xml b/opendaylight/commons/parent/pom.xml index 085096d206..c81dba75de 100644 --- a/opendaylight/commons/parent/pom.xml +++ b/opendaylight/commons/parent/pom.xml @@ -16,7 +16,9 @@ - http://nexus.opendaylight.org/content + http://nexus.opendaylight.org/content + opendaylight.release + opendaylight.snapshot dav:http://nexus.opendaylight.org/content/sites/site 2.3.2 @@ -33,12 +35,12 @@ opendaylight-release - ${nexusdeploy}/repositories/opendaylight.release/ + ${nexusproxy}/repositories/${nexus.repository.release}/ opendaylight-snapshot - ${nexusdeploy}/repositories/opendaylight.snapshot/ + ${nexusproxy}/repositories/${nexus.repository.snapshot}/ diff --git a/opendaylight/networkconfiguration/neutron/implementation/pom.xml b/opendaylight/networkconfiguration/neutron/implementation/pom.xml index 821ac92021..f539f1ca69 100644 --- a/opendaylight/networkconfiguration/neutron/implementation/pom.xml +++ b/opendaylight/networkconfiguration/neutron/implementation/pom.xml @@ -7,7 +7,6 @@ ../../../commons/opendaylight - http://nexus.opendaylight.org/content 1.26.2 @@ -21,12 +20,12 @@ opendaylight-release - ${nexusproxy}/repositories/opendaylight.release/ + ${nexusproxy}/repositories/${nexus.repository.release}/ opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ + ${nexusproxy}/repositories/${nexus.repository.snapshot}/ diff --git a/opendaylight/networkconfiguration/neutron/pom.xml b/opendaylight/networkconfiguration/neutron/pom.xml index 27588b8bee..b25e99e420 100644 --- a/opendaylight/networkconfiguration/neutron/pom.xml +++ b/opendaylight/networkconfiguration/neutron/pom.xml @@ -7,7 +7,6 @@ ../../commons/opendaylight - http://nexus.opendaylight.org/content 1.26.2 @@ -20,12 +19,12 @@ opendaylight-release - ${nexusproxy}/repositories/opendaylight.release/ + ${nexusproxy}/repositories/${nexus.repository.release}/ opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ + ${nexusproxy}/repositories/${nexus.repository.snapshot}/ diff --git a/opendaylight/northbound/networkconfiguration/neutron/pom.xml b/opendaylight/northbound/networkconfiguration/neutron/pom.xml index 7590a976b6..774a125479 100644 --- a/opendaylight/northbound/networkconfiguration/neutron/pom.xml +++ b/opendaylight/northbound/networkconfiguration/neutron/pom.xml @@ -7,7 +7,6 @@ ../../../commons/opendaylight - http://nexus.opendaylight.org/content 1.26.2 @@ -21,12 +20,12 @@ opendaylight-release - ${nexusproxy}/repositories/opendaylight.release/ + ${nexusproxy}/repositories/${nexus.repository.release}/ opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ + ${nexusproxy}/repositories/${nexus.repository.snapshot}/ diff --git a/third-party/commons/thirdparty/pom.xml b/third-party/commons/thirdparty/pom.xml index ccd07865a8..e388299262 100644 --- a/third-party/commons/thirdparty/pom.xml +++ b/third-party/commons/thirdparty/pom.xml @@ -18,6 +18,8 @@ https://sonar.opendaylight.org/ http://nexus.opendaylight.org/content + opendaylight.release + opendaylight.snapshot dav:http://nexus.opendaylight.org/content/sites/site 3.2 2.6 @@ -29,7 +31,7 @@ - + central2 central2 http://repo2.maven.org/maven2 @@ -205,12 +207,12 @@ opendaylight-release - ${nexusproxy}/repositories/opendaylight.release/ + ${nexusproxy}/repositories/${nexus.repository.release}/ opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ + ${nexusproxy}/repositories/${nexus.repository.snapshot}/ -- 2.36.6