From e6a669cf9a2649aab72f071111ac0df2b37d774b Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Mon, 17 May 2021 13:23:11 -0400 Subject: [PATCH] Refactoring onap nexus url's and related section Issue-ID: CCSDK-3298 Signed-off-by: Singal, Kapil (ks220y) Change-Id: I8798f0cfa7b0042628f508ca851a42d76a5f7b21 --- dependencies-odl-bom/pom.xml | 2 +- odlparent/binding-parent/pom.xml | 5 +- odlparent/bundle-parent/pom.xml | 5 +- odlparent/feature-repo-parent/pom.xml | 5 +- odlparent/karaf4-parent/pom.xml | 5 +- odlparent/mdsal-it-parent/pom.xml | 5 +- odlparent/odlparent-lite/pom.xml | 5 +- odlparent/odlparent/pom.xml | 5 +- .../setup/src/main/resources/pom-template.xml | 5 +- odlparent/single-feature-parent/pom.xml | 5 +- oparent/pom.xml | 54 ++++++++++++++++++++-- .../src/main/resources/pom-template.xml | 4 +- springboot/springboot1/pom.xml | 4 +- springboot/springboot2/pom.xml | 4 +- 14 files changed, 77 insertions(+), 36 deletions(-) diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index 5824f1fe..a07e4edd 100644 --- a/dependencies-odl-bom/pom.xml +++ b/dependencies-odl-bom/pom.xml @@ -112,8 +112,8 @@ org.glassfish.jersey jersey-bom 2.27 - import pom + import commons-cli diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 7da4b8bf..5dc96956 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -55,7 +55,6 @@ UTF-8 UTF-8 - https://nexus.onap.org /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} @@ -66,6 +65,7 @@ + https://nexus.onap.org nexus.onap.org 443 https @@ -301,8 +301,8 @@ true - + onap-public @@ -363,7 +363,6 @@ JCenter Repository http://jcenter.bintray.com - Restlet Restlet Repository diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index 03843e3b..c7d693e0 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -55,7 +55,6 @@ UTF-8 UTF-8 - https://nexus.onap.org /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} @@ -66,6 +65,7 @@ + https://nexus.onap.org nexus.onap.org 443 https @@ -301,8 +301,8 @@ true - + onap-public @@ -363,7 +363,6 @@ JCenter Repository http://jcenter.bintray.com - Restlet Restlet Repository diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index f7cdca6d..6c1521f4 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -55,7 +55,6 @@ UTF-8 UTF-8 - https://nexus.onap.org /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} @@ -66,6 +65,7 @@ + https://nexus.onap.org nexus.onap.org 443 https @@ -301,8 +301,8 @@ true - + onap-public @@ -363,7 +363,6 @@ JCenter Repository http://jcenter.bintray.com - Restlet Restlet Repository diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index c0fa7f09..e0ad2643 100644 --- a/odlparent/karaf4-parent/pom.xml +++ b/odlparent/karaf4-parent/pom.xml @@ -55,7 +55,6 @@ UTF-8 UTF-8 - https://nexus.onap.org /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} @@ -66,6 +65,7 @@ + https://nexus.onap.org nexus.onap.org 443 https @@ -301,8 +301,8 @@ true - + onap-public @@ -363,7 +363,6 @@ JCenter Repository http://jcenter.bintray.com - Restlet Restlet Repository diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index 8d6e1a87..ed1f1790 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -55,7 +55,6 @@ UTF-8 UTF-8 - https://nexus.onap.org /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} @@ -66,6 +65,7 @@ + https://nexus.onap.org nexus.onap.org 443 https @@ -301,8 +301,8 @@ true - + onap-public @@ -363,7 +363,6 @@ JCenter Repository http://jcenter.bintray.com - Restlet Restlet Repository diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index c301aca1..45e3d268 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -55,7 +55,6 @@ UTF-8 UTF-8 - https://nexus.onap.org /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} @@ -66,6 +65,7 @@ + https://nexus.onap.org nexus.onap.org 443 https @@ -301,8 +301,8 @@ true - + onap-public @@ -363,7 +363,6 @@ JCenter Repository http://jcenter.bintray.com - Restlet Restlet Repository diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index d5602274..325e174b 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -55,7 +55,6 @@ UTF-8 UTF-8 - https://nexus.onap.org /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} @@ -66,6 +65,7 @@ + https://nexus.onap.org nexus.onap.org 443 https @@ -301,8 +301,8 @@ true - + onap-public @@ -363,7 +363,6 @@ JCenter Repository http://jcenter.bintray.com - Restlet Restlet Repository diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index c67c52e5..fef5c962 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -55,7 +55,6 @@ UTF-8 UTF-8 - https://nexus.onap.org /content/sites/site/\${project.groupId}/\${project.artifactId}/\${project.version} @@ -66,6 +65,7 @@ + https://nexus.onap.org nexus.onap.org 443 https @@ -301,8 +301,8 @@ true - + onap-public @@ -363,7 +363,6 @@ JCenter Repository http://jcenter.bintray.com - Restlet Restlet Repository diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index d00b4d49..a76c931a 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -55,7 +55,6 @@ UTF-8 UTF-8 - https://nexus.onap.org /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} @@ -66,6 +65,7 @@ + https://nexus.onap.org nexus.onap.org 443 https @@ -301,8 +301,8 @@ true - + onap-public @@ -363,7 +363,6 @@ JCenter Repository http://jcenter.bintray.com - Restlet Restlet Repository diff --git a/oparent/pom.xml b/oparent/pom.xml index 83d233ee..75f1fac0 100755 --- a/oparent/pom.xml +++ b/oparent/pom.xml @@ -75,6 +75,7 @@ 1.4.1 1.6.5 + 4.8-1 @@ -90,8 +91,8 @@ org.springframework.boot spring-boot-dependencies 2.3.8.RELEASE - import pom + import @@ -152,7 +153,7 @@ onap-public - https://nexus.onap.org/content/groups/public + \${onap.nexus.public-url} true never @@ -164,7 +165,7 @@ onap-staging - https://nexus.onap.org/content/groups/staging + \${onap.nexus.staging-url} true never @@ -177,7 +178,7 @@ ecomp-release onap-repository-releases - https://nexus.onap.org/content/repositories/releases + \${onap.nexus.release-url} true never @@ -189,7 +190,7 @@ ecomp-snapshot onap-repository-snapshots - https://nexus.onap.org/content/repositories/snapshots + \${onap.nexus.snapshot-url} false @@ -198,6 +199,49 @@ + + + onap-public + \${onap.nexus.public-url} + + true + + + true + + + + onap-staging + \${onap.nexus.staging-url} + + true + + + true + + + + onap-snapshot + \${onap.nexus.snapshot-url} + + false + + + true + + + + + JCenter + JCenter Repository + http://jcenter.bintray.com + + + Restlet + Restlet Repository + http://maven.restlet.com + + diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template.xml b/springboot/spring-boot-setup/src/main/resources/pom-template.xml index a0d89162..6bfaa9cf 100644 --- a/springboot/spring-boot-setup/src/main/resources/pom-template.xml +++ b/springboot/spring-boot-setup/src/main/resources/pom-template.xml @@ -28,6 +28,7 @@ JIRA https://jira.onap.org/ + ecomp-releases @@ -57,7 +58,6 @@ 1.8 UTF-8 UTF-8 - https://nexus.onap.org /content/sites/site/\${project.groupId}/\${project.artifactId}/\${project.version} @@ -68,6 +68,7 @@ + https://nexus.onap.org nexus.onap.org 443 https @@ -238,6 +239,7 @@ + onap-public diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index 93d85fb2..bf1dcbfe 100644 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -28,6 +28,7 @@ JIRA https://jira.onap.org/ + ecomp-releases @@ -57,7 +58,6 @@ 1.8 UTF-8 UTF-8 - https://nexus.onap.org /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} @@ -68,6 +68,7 @@ + https://nexus.onap.org nexus.onap.org 443 https @@ -238,6 +239,7 @@ + onap-public diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index 79d2e51d..9620486a 100644 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -28,6 +28,7 @@ JIRA https://jira.onap.org/ + ecomp-releases @@ -57,7 +58,6 @@ 1.8 UTF-8 UTF-8 - https://nexus.onap.org /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} @@ -68,6 +68,7 @@ + https://nexus.onap.org nexus.onap.org 443 https @@ -238,6 +239,7 @@ + onap-public -- 2.16.6