From 0f1a3db830b43cdf7e366b8a92609187c32370ac Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Fri, 9 Jul 2021 08:48:33 -0400 Subject: [PATCH] CLeaning up moved modules and running mvn tidy:pom Issue-ID: SDNC-1582 Signed-off-by: Singal, Kapil (ks220y) Change-Id: I0ba59010d54d2a379d794beeb7d21b601ac1abf4 --- asdcApi/.gitignore | 34 --- asdcApi/README.md | 3 - dataChange/.gitignore | 34 --- dataChange/.sonar/checkstyle.xml | 1 - dataChange/.sonar/pmd.xml | 67 ------ dataChange/README.md | 3 - dmaap-listener/.gitignore | 12 - dmaap-listener/.sonar/checkstyle.xml | 1 - dmaap-listener/.sonar/pmd.xml | 67 ------ dmaap-listener/README.md | 3 - features/features-sdnc-northbound/pom.xml | 1 - features/installer/pom.xml | 250 ++++++++++---------- features/pom.xml | 26 +- features/sdnc-northbound-all/pom.xml | 94 ++++---- generic-resource-api/client/pom.xml | 2 + .../features/features-generic-resource-api/pom.xml | 43 ++-- .../features/sdnc-generic-resource-api/pom.xml | 3 +- generic-resource-api/installer/pom.xml | 261 ++++++++++----------- generic-resource-api/model/pom.xml | 32 +-- generic-resource-api/model/swagger/pom.xml | 14 +- generic-resource-api/model/yang/pom.xml | 2 - generic-resource-api/pom.xml | 38 +-- generic-resource-api/provider/pom.xml | 17 +- .../features/features-optical-service/pom.xml | 1 - .../features/sdnc-optical-service/pom.xml | 4 +- optical-service/installer/pom.xml | 9 +- optical-service/model/pom.xml | 2 - optical-service/provider/pom.xml | 2 +- pom.xml | 183 +++++++-------- ueb-listener/.gitignore | 12 - ueb-listener/.sonar/checkstyle.xml | 1 - ueb-listener/.sonar/pmd.xml | 67 ------ ueb-listener/README.md | 3 - vnftools/features/features-vnftools/pom.xml | 43 ++-- vnftools/features/sdnc-vnftools/pom.xml | 3 +- vnftools/installer/pom.xml | 259 ++++++++++---------- vnftools/pom.xml | 88 ++++--- vnftools/provider/pom.xml | 4 +- 38 files changed, 675 insertions(+), 1014 deletions(-) delete mode 100755 asdcApi/.gitignore delete mode 100644 asdcApi/README.md delete mode 100755 dataChange/.gitignore delete mode 100755 dataChange/.sonar/checkstyle.xml delete mode 100755 dataChange/.sonar/pmd.xml delete mode 100644 dataChange/README.md delete mode 100755 dmaap-listener/.gitignore delete mode 100755 dmaap-listener/.sonar/checkstyle.xml delete mode 100755 dmaap-listener/.sonar/pmd.xml delete mode 100644 dmaap-listener/README.md delete mode 100755 ueb-listener/.gitignore delete mode 100755 ueb-listener/.sonar/checkstyle.xml delete mode 100755 ueb-listener/.sonar/pmd.xml delete mode 100644 ueb-listener/README.md diff --git a/asdcApi/.gitignore b/asdcApi/.gitignore deleted file mode 100755 index b73caf31..00000000 --- a/asdcApi/.gitignore +++ /dev/null @@ -1,34 +0,0 @@ -#####standard .git ignore entries##### - -## IDE Specific Files ## -org.eclipse.core.resources.prefs -.classpath -.project -.settings -.idea -.externalToolBuilders -maven-eclipse.xml -workspace - -## Compilation Files ## -*.class -**/target -target -target-ide -MANIFEST.MF - -## Misc Ignores (OS specific etc) ## -bin/ -dist -*~ -*.ipr -*.iml -*.iws -classes -out/ -.DS_STORE -.metadata - -## Folders which contain auto generated source code ## -yang-gen-config -yang-gen-sal diff --git a/asdcApi/README.md b/asdcApi/README.md deleted file mode 100644 index acef0674..00000000 --- a/asdcApi/README.md +++ /dev/null @@ -1,3 +0,0 @@ -ASDCAPI MOVED TO CCSDK! - -The code for asdcApi moved to the ccsdk/sli/northbound repository diff --git a/dataChange/.gitignore b/dataChange/.gitignore deleted file mode 100755 index b73caf31..00000000 --- a/dataChange/.gitignore +++ /dev/null @@ -1,34 +0,0 @@ -#####standard .git ignore entries##### - -## IDE Specific Files ## -org.eclipse.core.resources.prefs -.classpath -.project -.settings -.idea -.externalToolBuilders -maven-eclipse.xml -workspace - -## Compilation Files ## -*.class -**/target -target -target-ide -MANIFEST.MF - -## Misc Ignores (OS specific etc) ## -bin/ -dist -*~ -*.ipr -*.iml -*.iws -classes -out/ -.DS_STORE -.metadata - -## Folders which contain auto generated source code ## -yang-gen-config -yang-gen-sal diff --git a/dataChange/.sonar/checkstyle.xml b/dataChange/.sonar/checkstyle.xml deleted file mode 100755 index 3fa23153..00000000 --- a/dataChange/.sonar/checkstyle.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/dataChange/.sonar/pmd.xml b/dataChange/.sonar/pmd.xml deleted file mode 100755 index 80343b3b..00000000 --- a/dataChange/.sonar/pmd.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 2 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 5 - - - 2 - - - 3 - - - 3 - - - diff --git a/dataChange/README.md b/dataChange/README.md deleted file mode 100644 index c0a1dcb3..00000000 --- a/dataChange/README.md +++ /dev/null @@ -1,3 +0,0 @@ -DATACHANGE MOVED TO CCSDK! - -The code for dataChange moved to the ccsdk/sli/northbound repository diff --git a/dmaap-listener/.gitignore b/dmaap-listener/.gitignore deleted file mode 100755 index 1b8a6ba9..00000000 --- a/dmaap-listener/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -org.eclipse.core.resources.prefs -.classpath -.project -.settings -.idea -.externalToolBuilders -maven-eclipse.xml -*.class -target/ -MANIFEST.MF -.DS_STORE -.metadata diff --git a/dmaap-listener/.sonar/checkstyle.xml b/dmaap-listener/.sonar/checkstyle.xml deleted file mode 100755 index 3fa23153..00000000 --- a/dmaap-listener/.sonar/checkstyle.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/dmaap-listener/.sonar/pmd.xml b/dmaap-listener/.sonar/pmd.xml deleted file mode 100755 index 80343b3b..00000000 --- a/dmaap-listener/.sonar/pmd.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 2 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 5 - - - 2 - - - 3 - - - 3 - - - diff --git a/dmaap-listener/README.md b/dmaap-listener/README.md deleted file mode 100644 index ed067b1a..00000000 --- a/dmaap-listener/README.md +++ /dev/null @@ -1,3 +0,0 @@ -DMAAP-LISTENER MOVED TO CCSDK! - -The code for dmaap-listener moved to the ccsdk/sli/northbound repository diff --git a/features/features-sdnc-northbound/pom.xml b/features/features-sdnc-northbound/pom.xml index 2902c9b4..dfa33e6b 100644 --- a/features/features-sdnc-northbound/pom.xml +++ b/features/features-sdnc-northbound/pom.xml @@ -24,6 +24,5 @@ xml features - diff --git a/features/installer/pom.xml b/features/installer/pom.xml index 8a1bb46a..800ac8f7 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -1,136 +1,132 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.2.0-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 2.2.0-SNAPSHOT + + - org.onap.sdnc.northbound - sdnc-northbound-features-installer - 2.2.0-SNAPSHOT - pom + org.onap.sdnc.northbound + sdnc-northbound-features-installer + 2.2.0-SNAPSHOT + pom - sdnc-northbound :: features :: ${project.artifactId} + sdnc-northbound :: features :: ${project.artifactId} - - sdnc-northbound-all - ${application.name} - mvn:org.onap.sdnc.northbound/${features.boot}/${project.version}/xml/features - false - + + sdnc-northbound-all + ${application.name} + mvn:org.onap.sdnc.northbound/${features.boot}/${project.version}/xml/features + + false + - + + + org.onap.sdnc.northbound + ${application.name} + ${project.version} + xml + features + + + * + * + + + + - - org.onap.sdnc.northbound - ${application.name} - ${project.version} - xml - features - - - * - * - - - - - - - - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - installer-zip - - single - - package - - true - ${application.name}-${project.version}-installer - - src/assembly/assemble_installer_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/system - false - true - true - true - false - false - org.onap.sdnc.northbound - provided - - - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ${basedir}/target/stage - - - src/main/resources/scripts - - install-feature.sh - - true - - - - - - - - - - + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + installer-zip + + single + + package + + true + ${application.name}-${project.version}-installer + + src/assembly/assemble_installer_zip.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/assembly/system + false + true + true + true + false + false + org.onap.sdnc.northbound + provided + + + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ${basedir}/target/stage + + + src/main/resources/scripts + + install-feature.sh + + true + + + + + + + + diff --git a/features/pom.xml b/features/pom.xml index 4b79fd3e..aa9e6fe6 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -1,22 +1,22 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.2.0-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 2.2.0-SNAPSHOT + + - org.onap.sdnc.northbound - sdnc-northbound-feature-aggregator - 2.2.0-SNAPSHOT - pom + org.onap.sdnc.northbound + sdnc-northbound-feature-aggregator + 2.2.0-SNAPSHOT + pom - sdnc-northbound :: features + sdnc-northbound :: features - + sdnc-northbound-all features-sdnc-northbound installer diff --git a/features/sdnc-northbound-all/pom.xml b/features/sdnc-northbound-all/pom.xml index fb9411ba..39318423 100644 --- a/features/sdnc-northbound-all/pom.xml +++ b/features/sdnc-northbound-all/pom.xml @@ -1,55 +1,53 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 2.2.0-SNAPSHOT - - + + org.onap.ccsdk.parent + single-feature-parent + 2.2.0-SNAPSHOT + + - org.onap.sdnc.northbound - sdnc-northbound-all - 2.2.0-SNAPSHOT - feature + org.onap.sdnc.northbound + sdnc-northbound-all + 2.2.0-SNAPSHOT + feature - sdnc-northbound :: features :: ${project.artifactId} + sdnc-northbound :: features :: ${project.artifactId} - - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${ccsdk.sli.core.version} - pom - import - - - - - - ${project.groupId} - sdnc-generic-resource-api - ${project.version} - xml - features - - - ${project.groupId} - sdnc-optical-service - ${project.version} - xml - features - - - ${project.groupId} - sdnc-vnftools - ${project.version} - xml - features - - - - + + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${ccsdk.sli.version} + pom + import + + + + + + ${project.groupId} + sdnc-generic-resource-api + ${project.version} + xml + features + + + ${project.groupId} + sdnc-optical-service + ${project.version} + xml + features + + + ${project.groupId} + sdnc-vnftools + ${project.version} + xml + features + + diff --git a/generic-resource-api/client/pom.xml b/generic-resource-api/client/pom.xml index 35a400da..36cda5a5 100644 --- a/generic-resource-api/client/pom.xml +++ b/generic-resource-api/client/pom.xml @@ -20,6 +20,7 @@ generic-resource + javax.annotation @@ -27,6 +28,7 @@ 1.0 + diff --git a/generic-resource-api/features/features-generic-resource-api/pom.xml b/generic-resource-api/features/features-generic-resource-api/pom.xml index c8dcc505..bd846110 100644 --- a/generic-resource-api/features/features-generic-resource-api/pom.xml +++ b/generic-resource-api/features/features-generic-resource-api/pom.xml @@ -1,29 +1,28 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - feature-repo-parent - 2.2.0-SNAPSHOT - - + + org.onap.ccsdk.parent + feature-repo-parent + 2.2.0-SNAPSHOT + + - org.onap.sdnc.northbound - features-generic-resource-api - 2.2.0-SNAPSHOT - feature + org.onap.sdnc.northbound + features-generic-resource-api + 2.2.0-SNAPSHOT + feature - sdnc-northbound :: generic-resource-api :: ${project.artifactId} + sdnc-northbound :: generic-resource-api :: ${project.artifactId} - - - ${project.groupId} - sdnc-generic-resource-api - ${project.version} - xml - features - - - + + + ${project.groupId} + sdnc-generic-resource-api + ${project.version} + xml + features + + diff --git a/generic-resource-api/features/sdnc-generic-resource-api/pom.xml b/generic-resource-api/features/sdnc-generic-resource-api/pom.xml index 8acb44a8..57e69c72 100644 --- a/generic-resource-api/features/sdnc-generic-resource-api/pom.xml +++ b/generic-resource-api/features/sdnc-generic-resource-api/pom.xml @@ -26,7 +26,7 @@ org.onap.ccsdk.sli.core ccsdk-sli - ${ccsdk.sli.core.version} + ${ccsdk.sli.version} xml features @@ -40,6 +40,5 @@ generic-resource-api-provider ${project.version} - diff --git a/generic-resource-api/installer/pom.xml b/generic-resource-api/installer/pom.xml index 2f64fe25..60281ffe 100755 --- a/generic-resource-api/installer/pom.xml +++ b/generic-resource-api/installer/pom.xml @@ -1,142 +1,137 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.2.0-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 2.2.0-SNAPSHOT + + - org.onap.sdnc.northbound - generic-resource-api-installer - 2.2.0-SNAPSHOT - pom + org.onap.sdnc.northbound + generic-resource-api-installer + 2.2.0-SNAPSHOT + pom - sdnc-northbound :: generic-resource-api :: ${project.artifactId} + sdnc-northbound :: generic-resource-api :: ${project.artifactId} - - sdnc-generic-resource-api - ${application.name} - mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features - false - + + sdnc-generic-resource-api + ${application.name} + mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features + + false + - + + + org.onap.sdnc.northbound + ${application.name} + ${project.version} + xml + features + + + * + * + + + + + org.onap.sdnc.northbound + generic-resource-api-provider + ${project.version} + + - - org.onap.sdnc.northbound - ${application.name} - ${project.version} - xml - features - - - * - * - - - - - - org.onap.sdnc.northbound - generic-resource-api-provider - ${project.version} - - - - - - - - - maven-assembly-plugin - 2.6 - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - - - - installer-zip - - single - - package - - true - ${application.name}-${project.version}-installer - - src/assembly/assemble_installer_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/system - false - true - true - true - false - false - org.onap.sdnc.northbound - provided - - - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ${basedir}/target/stage - - - src/main/resources/scripts - - install-feature.sh - - true - - - - - - - - - - + + + + maven-assembly-plugin + 2.6 + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + + + + installer-zip + + single + + package + + true + ${application.name}-${project.version}-installer + + src/assembly/assemble_installer_zip.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/assembly/system + false + true + true + true + false + false + org.onap.sdnc.northbound + provided + + + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ${basedir}/target/stage + + + src/main/resources/scripts + + install-feature.sh + + true + + + + + + + + diff --git a/generic-resource-api/model/pom.xml b/generic-resource-api/model/pom.xml index 792fe04a..4d49bbb8 100644 --- a/generic-resource-api/model/pom.xml +++ b/generic-resource-api/model/pom.xml @@ -1,23 +1,23 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.2.0-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 2.2.0-SNAPSHOT + + - org.onap.sdnc.northbound - generic-resource-api-model - 2.2.0-SNAPSHOT - pom + org.onap.sdnc.northbound + generic-resource-api-model + 2.2.0-SNAPSHOT + pom - sdnc-northbound :: generic-resource-api :: ${project.artifactId} + sdnc-northbound :: generic-resource-api :: ${project.artifactId} - - yang - swagger - + + yang + swagger + diff --git a/generic-resource-api/model/swagger/pom.xml b/generic-resource-api/model/swagger/pom.xml index 871c7444..4b0ce29b 100644 --- a/generic-resource-api/model/swagger/pom.xml +++ b/generic-resource-api/model/swagger/pom.xml @@ -29,7 +29,7 @@ generic-resource-api-model-yang ${project.version} - + @@ -52,7 +52,9 @@ ${project.build.directory}/dependency **\/*.yang - org.opendaylight.mdsal.model,org.opendaylight.mdsal.binding.model.ietf,org.onap.sdnc.northbound + + org.opendaylight.mdsal.model,org.opendaylight.mdsal.binding.model.ietf,org.onap.sdnc.northbound + @@ -145,7 +147,8 @@ - com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator + com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator + ${project.basedir}/src/main/json ${project.build.directory}/yang @@ -169,7 +172,8 @@ - com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator + com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator + ${project.basedir}/src/main/yaml ${project.build.directory}/yang @@ -213,7 +217,7 @@ org.apache.maven.plugins maven-source-plugin - + org.codehaus.mojo build-helper-maven-plugin 1.10 diff --git a/generic-resource-api/model/yang/pom.xml b/generic-resource-api/model/yang/pom.xml index 7dbf48be..8ac6c405 100644 --- a/generic-resource-api/model/yang/pom.xml +++ b/generic-resource-api/model/yang/pom.xml @@ -21,8 +21,6 @@ org.opendaylight.mdsal.binding.model.ietf rfc6991 - - diff --git a/generic-resource-api/pom.xml b/generic-resource-api/pom.xml index 61c65498..a84a8272 100644 --- a/generic-resource-api/pom.xml +++ b/generic-resource-api/pom.xml @@ -1,26 +1,26 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.2.0-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 2.2.0-SNAPSHOT + + - org.onap.sdnc.northbound - generic-resource-api - 2.2.0-SNAPSHOT - pom + org.onap.sdnc.northbound + generic-resource-api + 2.2.0-SNAPSHOT + pom - sdnc-northbound :: generic-resource-api + sdnc-northbound :: generic-resource-api - - model - provider - features - client - installer - + + model + provider + features + client + installer + diff --git a/generic-resource-api/provider/pom.xml b/generic-resource-api/provider/pom.xml index 2dd8d69e..45ed0aee 100644 --- a/generic-resource-api/provider/pom.xml +++ b/generic-resource-api/provider/pom.xml @@ -17,16 +17,16 @@ sdnc-northbound :: generic-resource-api :: ${project.artifactId} - - + + org.onap.ccsdk.sli.core sli-core-artifacts - ${ccsdk.sli.core.version} + ${ccsdk.sli.version} pom import - - - + + + org.onap.sdnc.northbound @@ -76,14 +76,15 @@ test + maven-compiler-plugin - true + true - + diff --git a/optical-service/features/features-optical-service/pom.xml b/optical-service/features/features-optical-service/pom.xml index eba8f316..5a4ae5c4 100644 --- a/optical-service/features/features-optical-service/pom.xml +++ b/optical-service/features/features-optical-service/pom.xml @@ -28,6 +28,5 @@ xml features - diff --git a/optical-service/features/sdnc-optical-service/pom.xml b/optical-service/features/sdnc-optical-service/pom.xml index 1cbc7678..edafbc57 100644 --- a/optical-service/features/sdnc-optical-service/pom.xml +++ b/optical-service/features/sdnc-optical-service/pom.xml @@ -17,11 +17,10 @@ sdnc-northbound :: optical-service :: ${project.artifactId} - org.onap.ccsdk.sli.core ccsdk-sli - ${ccsdk.sli.core.version} + ${ccsdk.sli.version} xml features @@ -35,6 +34,5 @@ optical-service-provider ${project.version} - diff --git a/optical-service/installer/pom.xml b/optical-service/installer/pom.xml index b2db80a0..82bdb2ae 100644 --- a/optical-service/installer/pom.xml +++ b/optical-service/installer/pom.xml @@ -19,12 +19,12 @@ sdnc-optical-service ${application.name} - mvn:org.onap.sdnc.northbound/${features.boot}/${project.version}/xml/features + mvn:org.onap.sdnc.northbound/${features.boot}/${project.version}/xml/features + false - org.onap.sdnc.northbound ${application.name} @@ -43,14 +43,11 @@ optical-service-model ${project.version} - org.onap.sdnc.northbound optical-service-provider ${project.version} - - @@ -139,10 +136,8 @@ - - diff --git a/optical-service/model/pom.xml b/optical-service/model/pom.xml index 346bc1ff..444e92bf 100644 --- a/optical-service/model/pom.xml +++ b/optical-service/model/pom.xml @@ -25,7 +25,5 @@ org.opendaylight.mdsal.binding.model.ietf rfc6991 - - diff --git a/optical-service/provider/pom.xml b/optical-service/provider/pom.xml index 756737c0..dda0e8cf 100644 --- a/optical-service/provider/pom.xml +++ b/optical-service/provider/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.sli.core sli-core-artifacts - ${ccsdk.sli.core.version} + ${ccsdk.sli.version} pom import diff --git a/pom.xml b/pom.xml index cc55ba2a..c9f29aaa 100644 --- a/pom.xml +++ b/pom.xml @@ -1,102 +1,101 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.2.0-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 2.2.0-SNAPSHOT + + - org.onap.sdnc.northbound - sdnc-northbound - 2.2.0-SNAPSHOT - pom + org.onap.sdnc.northbound + sdnc-northbound + 2.2.0-SNAPSHOT + pom - sdnc-northbound - The SDN-C Northbound APIs repo contains code for northbound API adaptors, typically MD-SAL applications - https://wiki.onap.org - - ONAP - + sdnc-northbound + The SDN-C Northbound APIs repo contains code for northbound API adaptors, typically MD-SAL + applications + + https://wiki.onap.org + + ONAP + - - generic-resource-api - optical-service - vnftools - features - + + generic-resource-api + optical-service + vnftools + features + - - scm:git:ssh://git@${onap.git.host}/sdnc-northbound.git + + scm:git:ssh://git@${onap.git.host}/sdnc-northbound.git + scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-northbound.git + ${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-northbound/browse + + + JIRA + https://jira.onap.org/ + + + Jenkins + https://jenkins.onap.org/ + + + + sdnc-javadoc + + dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version} + + + - scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-northbound.git - ${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-northbound/browse - - - JIRA - https://jira.onap.org/ - - - Jenkins - https://jenkins.onap.org/ - - - - sdnc-javadoc - dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version} - - + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.17 + + false + + + + - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.17 - - false - - - - - - - - blackduck - - - blackduck-scan - - - - - - com.blackducksoftware.integration - hub-maven-plugin - 1.4.0 - false - - ${project.name} - ${project.basedir} - - - - create-bdio-file - package - - createHubOutput - - - - - - - - - - - - + + + blackduck + + + blackduck-scan + + + + + + com.blackducksoftware.integration + hub-maven-plugin + 1.4.0 + false + + ${project.name} + ${project.basedir} + + + + create-bdio-file + package + + createHubOutput + + + + + + + + diff --git a/ueb-listener/.gitignore b/ueb-listener/.gitignore deleted file mode 100755 index 1b8a6ba9..00000000 --- a/ueb-listener/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -org.eclipse.core.resources.prefs -.classpath -.project -.settings -.idea -.externalToolBuilders -maven-eclipse.xml -*.class -target/ -MANIFEST.MF -.DS_STORE -.metadata diff --git a/ueb-listener/.sonar/checkstyle.xml b/ueb-listener/.sonar/checkstyle.xml deleted file mode 100755 index 3fa23153..00000000 --- a/ueb-listener/.sonar/checkstyle.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ueb-listener/.sonar/pmd.xml b/ueb-listener/.sonar/pmd.xml deleted file mode 100755 index 80343b3b..00000000 --- a/ueb-listener/.sonar/pmd.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 2 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - 5 - - - 2 - - - 3 - - - 3 - - - diff --git a/ueb-listener/README.md b/ueb-listener/README.md deleted file mode 100644 index 842ddb16..00000000 --- a/ueb-listener/README.md +++ /dev/null @@ -1,3 +0,0 @@ -UEB-LISTENER MOVED TO CCSDK! - -The code for ueb-listener moved to the ccsdk/sli/northbound repository diff --git a/vnftools/features/features-vnftools/pom.xml b/vnftools/features/features-vnftools/pom.xml index b996abac..6a400167 100644 --- a/vnftools/features/features-vnftools/pom.xml +++ b/vnftools/features/features-vnftools/pom.xml @@ -1,29 +1,28 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - feature-repo-parent - 2.2.0-SNAPSHOT - - + + org.onap.ccsdk.parent + feature-repo-parent + 2.2.0-SNAPSHOT + + - org.onap.sdnc.northbound - features-vnftools - 2.2.0-SNAPSHOT - feature + org.onap.sdnc.northbound + features-vnftools + 2.2.0-SNAPSHOT + feature - sdnc-northbound :: vnftools :: ${project.artifactId} + sdnc-northbound :: vnftools :: ${project.artifactId} - - - ${project.groupId} - sdnc-vnftools - ${project.version} - xml - features - - - + + + ${project.groupId} + sdnc-vnftools + ${project.version} + xml + features + + diff --git a/vnftools/features/sdnc-vnftools/pom.xml b/vnftools/features/sdnc-vnftools/pom.xml index e70447a1..1dca0508 100644 --- a/vnftools/features/sdnc-vnftools/pom.xml +++ b/vnftools/features/sdnc-vnftools/pom.xml @@ -26,7 +26,7 @@ org.onap.ccsdk.sli.core ccsdk-sli - ${ccsdk.sli.core.version} + ${ccsdk.sli.version} xml features @@ -35,6 +35,5 @@ vnftools-provider ${project.version} - diff --git a/vnftools/installer/pom.xml b/vnftools/installer/pom.xml index c29bb4e6..a4ea19fb 100755 --- a/vnftools/installer/pom.xml +++ b/vnftools/installer/pom.xml @@ -1,141 +1,136 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.2.0-SNAPSHOT - + + org.onap.ccsdk.parent + odlparent-lite + 2.2.0-SNAPSHOT + - org.onap.sdnc.northbound - vnftools-installer - 2.2.0-SNAPSHOT - pom + org.onap.sdnc.northbound + vnftools-installer + 2.2.0-SNAPSHOT + pom - sdnc-northbound :: vnftools :: ${project.artifactId} + sdnc-northbound :: vnftools :: ${project.artifactId} - - sdnc-vnftools - ${application.name} - mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features - false - + + sdnc-vnftools + ${application.name} + mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features + + false + - + + + ${project.groupId} + ${application.name} + ${project.version} + xml + features + + + * + * + + + + + org.onap.sdnc.northbound + vnftools-provider + ${project.version} + + - - ${project.groupId} - ${application.name} - ${project.version} - xml - features - - - * - * - - - - - - org.onap.sdnc.northbound - vnftools-provider - ${project.version} - - - - - - - - - maven-assembly-plugin - 2.6 - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - - - - installer-zip - - single - - package - - true - ${application.name}-${project.version}-installer - - src/assembly/assemble_installer_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/system - false - true - true - true - false - false - org.onap.sdnc.northbound - provided - - - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ${basedir}/target/stage - - - src/main/resources/scripts - - install-feature.sh - - true - - - - - - - - - - + + + + maven-assembly-plugin + 2.6 + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + + + + installer-zip + + single + + package + + true + ${application.name}-${project.version}-installer + + src/assembly/assemble_installer_zip.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/assembly/system + false + true + true + true + false + false + org.onap.sdnc.northbound + provided + + + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ${basedir}/target/stage + + + src/main/resources/scripts + + install-feature.sh + + true + + + + + + + + diff --git a/vnftools/pom.xml b/vnftools/pom.xml index 6b39c131..59eb09a7 100644 --- a/vnftools/pom.xml +++ b/vnftools/pom.xml @@ -1,49 +1,45 @@ - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 2.2.0-SNAPSHOT - - - org.onap.sdnc.northbound - vnftools - 2.2.0-SNAPSHOT - pom - - VNF Tools Plugin - Provides execute nodes to Directed Graphs that use the VNF Module. - - - provider - features - installer - - - - vnftools - - - - - - - org.onap.sdnc.northbound - vnftools-features - ${project.version} - xml - features - - - - org.onap.sdnc.northbound - vnftools-provider - ${project.version} - - - - - + 4.0.0 + + + org.onap.ccsdk.parent + odlparent-lite + 2.2.0-SNAPSHOT + + + org.onap.sdnc.northbound + vnftools + 2.2.0-SNAPSHOT + pom + + VNF Tools Plugin + Provides execute nodes to Directed Graphs that use the VNF Module. + + + provider + features + installer + + + + vnftools + + + + + + org.onap.sdnc.northbound + vnftools-features + ${project.version} + xml + features + + + org.onap.sdnc.northbound + vnftools-provider + ${project.version} + + + diff --git a/vnftools/provider/pom.xml b/vnftools/provider/pom.xml index 0e8f04fc..ee271d58 100644 --- a/vnftools/provider/pom.xml +++ b/vnftools/provider/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.sli.core sli-core-artifacts - ${ccsdk.sli.core.version} + ${ccsdk.sli.version} pom import @@ -57,7 +57,7 @@ org.onap.ccsdk.sli.core sliPluginUtils-provider - ${ccsdk.sli.core.version} + ${ccsdk.sli.version} -- 2.16.6