From 3c3e80c786c42381e75a5e72254729a92ab7722c Mon Sep 17 00:00:00 2001 From: Marcus G K Williams Date: Fri, 18 Aug 2017 13:42:02 -0700 Subject: Clean final ecomp references from sli-adaptors Issue-Id: CCSDK-19 Change-Id: I40c0287ebdaeb93fc17370a8692fbac5edf32d08 Signed-off-by: Marcus G K Williams --- .gitignore | 2 +- README.md | 2 +- aai-service/pom.xml | 82 ++++++++++----------- example-settings.xml | 163 ------------------------------------------ jenkins-settings.xml | 168 -------------------------------------------- mdsal-resource/pom.xml | 2 +- pom.xml | 29 ++++---- resource-assignment/pom.xml | 2 +- sql-resource/pom.xml | 2 +- 9 files changed, 61 insertions(+), 391 deletions(-) delete mode 100644 example-settings.xml delete mode 100644 jenkins-settings.xml diff --git a/.gitignore b/.gitignore index 2932cb92..f7a3d77c 100755 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,6 @@ provider/src/main/java/META-INF/ provider/src/main/java/inventory/ ## BlackDuck generated file -sdnc-adaptors_bdio.jsonld +ccsdk-adaptors_bdio.jsonld blackDuckHubProjectName.txt blackDuckHubProjectVersionName.txt diff --git a/README.md b/README.md index c1e7af92..c906c67d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ This source repository contains the code for the SDN Controller adaptors. To compile this code: -1. Make sure your local Maven settings file ($HOME/.m2/settings.xml) contains references to the OpenECOMP repositories and OpenDaylight repositories. See example-settings.xml for an example. +1. Make sure your local Maven settings file ($HOME/.m2/settings.xml) contains references to the ONAP repositories and OpenDaylight repositories. See example-settings.xml for an example. 2. To compile, run "mvn clean install". diff --git a/aai-service/pom.xml b/aai-service/pom.xml index 9c89a177..857ada4d 100755 --- a/aai-service/pom.xml +++ b/aai-service/pom.xml @@ -1,45 +1,45 @@ - - org.onap.ccsdk.sli.adaptors - sdnc-adaptors - 0.1.0-SNAPSHOT - - - 4.0.0 - pom - org.onap.ccsdk.sli.adaptors - aai-service - - - AAI Interface Service - The AAI Interface service exposes an interface to AAI as an OSGi service - - 0.1.0-SNAPSHOT - - - - - org.onap.ccsdk.sli.adaptors - aai-service-features - features - ${project.version} - xml - - - - org.onap.ccsdk.sli.adaptors - aai-service-provider - ${project.version} - - - - - - - provider - features - installer - + + org.onap.ccsdk.sli.adaptors + ccsdk-adaptors + 0.1.0-SNAPSHOT + + + 4.0.0 + pom + org.onap.ccsdk.sli.adaptors + aai-service + + + AAI Interface Service + The AAI Interface service exposes an interface to AAI as an OSGi service + + 0.1.0-SNAPSHOT + + + + + org.onap.ccsdk.sli.adaptors + aai-service-features + features + ${project.version} + xml + + + + org.onap.ccsdk.sli.adaptors + aai-service-provider + ${project.version} + + + + + + + provider + features + installer + diff --git a/example-settings.xml b/example-settings.xml deleted file mode 100644 index 2e7ce644..00000000 --- a/example-settings.xml +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - - openecomp-release - - - openecomp-release - openecomp-release - https://ecomp-nexus:8443/repository/maven-releases/ - - true - never - - - false - - - - - - openecomp-release - openecomp-release - https://ecomp-nexus:8443/repository/maven-releases/ - - true - never - - - false - - - - - - - openecomp-snapshots - - - openecomp-snapshot - openecomp-snapshot - https://ecomp-nexus:8443/repository/maven-snapshots/ - - false - - - true - - - - - - openecomp-snapshot - openecomp-snapshot - https://ecomp-nexus:8443/repository/maven-snapshots/ - - false - - - true - - - - - - opendaylight-release - - - opendaylight-mirror - opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ - - true - never - - - false - - - - - - opendaylight-mirror - opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ - - true - never - - - false - - - - - - - opendaylight-snapshots - - - opendaylight-snapshot - opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - false - - - true - - - - - - opendaylight-snapshot - opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - false - - - true - - - - - - - - openecomp-release - openecomp-snapshots - opendaylight-release - opendaylight-snapshots - - - - - nexus - USERNAME - PASSWORD - - - openecomp-release - USERNAME - PASSWORD - - - openecomp-snapshot - USERNAME - PASSWORD - - - diff --git a/jenkins-settings.xml b/jenkins-settings.xml deleted file mode 100644 index 344994f8..00000000 --- a/jenkins-settings.xml +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - openecomp-release - - - openecomp-release - openecomp-release - https://ecomp-nexus:8443/repository/maven-releases/ - - true - never - - - false - - - - - - openecomp-release - openecomp-release - https://ecomp-nexus:8443/repository/maven-releases/ - - true - never - - - false - - - - - - - openecomp-snapshots - - - openecomp-snapshot - openecomp-snapshot - https://ecomp-nexus:8443/repository/maven-snapshots/ - - false - - - true - - - - - - openecomp-snapshot - openecomp-snapshot - https://ecomp-nexus:8443/repository/maven-snapshots/ - - false - - - true - - - - - - opendaylight-release - - - opendaylight-mirror - opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ - - true - never - - - false - - - - - - opendaylight-mirror - opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ - - true - never - - - false - - - - - - - opendaylight-snapshots - - - opendaylight-snapshot - opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - false - - - true - - - - - - opendaylight-snapshot - opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - false - - - true - - - - - - - - openecomp-release - openecomp-snapshots - opendaylight-release - opendaylight-snapshots - - - - - nexus - ${ecomp.nexus.user} - ${ecomp.nexus.password} - - - openecomp-release - ${ecomp.nexus.user} - ${ecomp.nexus.password} - - - openecomp-snapshot - ${ecomp.nexus.user} - ${ecomp.nexus.password} - - - sdnc-javadoc - ${ecomp.nexus.user} - ${ecomp.nexus.password} - - - diff --git a/mdsal-resource/pom.xml b/mdsal-resource/pom.xml index eddff303..ba4b9442 100755 --- a/mdsal-resource/pom.xml +++ b/mdsal-resource/pom.xml @@ -2,7 +2,7 @@ org.onap.ccsdk.sli.adaptors - sdnc-adaptors + ccsdk-adaptors 0.1.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index f4e8fcb5..5544f1be 100755 --- a/pom.xml +++ b/pom.xml @@ -11,34 +11,35 @@ 4.0.0 pom org.onap.ccsdk.sli.adaptors - sdnc-adaptors + ccsdk-adaptors - SDN-C Adaptors - https://wiki.openecomp.org - The SDN-C core components contains the SLI, dblib and root pom + CCSDK SLI Adaptors + https://wiki.onap.org + The CCSDK core components contains the SLI, dblib and root pom JIRA - https://jira.openecomp.org/ + https://jira.onap.org/ - scm:git:ssh://git@${openecomp.git.host}/sdnc-adaptors.git - scm:git:ssh://${openecomp.git.host}:${openecomp.git.port}/${openecomp.git.project}/sdnc-adaptors.git - ${openecomp.git.protocol}://${openecomp.git.host}/projects/${openecomp.git.project}/repos/sdnc-adaptors/browse + scm:git:ssh://git@${onap.git.host}/ccsdk/sli/adaptors + scm:git:ssh://${onap.git.host}:${onap.git.port}/ccsdk/sli/adaptors + ${onap.git.protocol}://${onap.git.host}/ccsdk/sli/adaptors + ccsdk-adaptors-${project.version} Jenkins - https://jenkins.openecomp.org/ + https://jenkins.onap.org/ sdnc-javadoc - dav:https://${openecomp.nexus.host}/content/sites/site/org/onap/sdnc/adaptors/${project.artifactId}/${project.version} + dav:https://${onap.nexus.host}/content/sites/site/org/onap/sdnc/adaptors/${project.artifactId}/${project.version} @@ -96,9 +97,9 @@ 1.6.7 true - https://${openecomp.nexus.host} - ${openecomp.nexus.staging.profile-id} - ${openecomp.nexus.staging.server-id} + https://${onap.nexus.host} + ${onap.nexus.staging.profile-id} + ${onap.nexus.staging.server-id} @@ -111,7 +112,7 @@ sql-resource - OpenECOMP + ONAP 0.1.0-SNAPSHOT diff --git a/resource-assignment/pom.xml b/resource-assignment/pom.xml index 37889db0..17860829 100755 --- a/resource-assignment/pom.xml +++ b/resource-assignment/pom.xml @@ -2,7 +2,7 @@ org.onap.ccsdk.sli.adaptors - sdnc-adaptors + ccsdk-adaptors 0.1.0-SNAPSHOT diff --git a/sql-resource/pom.xml b/sql-resource/pom.xml index ffec0c42..a84e7e4e 100755 --- a/sql-resource/pom.xml +++ b/sql-resource/pom.xml @@ -2,7 +2,7 @@ org.onap.ccsdk.sli.adaptors - sdnc-adaptors + ccsdk-adaptors 0.1.0-SNAPSHOT -- cgit 1.2.3-korg