From: Singal, Kapil (ks220y) Date: Thu, 12 Dec 2019 16:20:58 +0000 (-0500) Subject: Refactoring POM as per tidy:pom X-Git-Tag: 0.7.0~18 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=05e4277510b9947e3cdcbab8c7bb3846a4211af6;p=ccsdk%2Ffeatures.git Refactoring POM as per tidy:pom Removing sli version property declared as project.version, and it should inherit from parent pom Change-Id: I24dc1849e2183560f4c571319be0c490c772a95e Issue-ID: CCSDK-1993 Signed-off-by: Singal, Kapil (ks220y) --- diff --git a/.gitignore b/.gitignore index 9e3144e7d..f59381737 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,34 @@ -.idea -*.iml -.checkstyle -.classpath -.project -.fbExcludeFilterFile -.settings/ -target/ -target-ide/ -yang-gen-sal/ +# Target dir in all projects +**/target/* +**/target-ide/* + +# Logs dir in all projects +**/logs/* +**/debug-logs/* + +# Added for Intellij IDEA IDE +**/.idea/* + +# Generated models and features +**/bin/* + +# MANIFEST.MF is updated on every clean install +**/src/main/resources/META-INF/ +**/src/main/yang-gen-sal +**/src/main/yang-gen-config + + +**/pom.xml.versionsBackup +**/.fbExcludeFilterFile +**/.flattened-pom.xml +**/.pydevproject +**/.checkstyle +**/.classpath +**/.settings +**/.project + +**/*.class +**/*.prefs +**/*.iml + direct-dependencies.txt diff --git a/aafshiro/features/ccsdk-aafshiro/pom.xml b/aafshiro/features/ccsdk-aafshiro/pom.xml index de934c4ba..1be7d9ba7 100755 --- a/aafshiro/features/ccsdk-aafshiro/pom.xml +++ b/aafshiro/features/ccsdk-aafshiro/pom.xml @@ -15,32 +15,32 @@ limitations under the License. --> - 4.0.0 - - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.features - ccsdk-aafshiro - 0.7.0-SNAPSHOT - feature - - ccsdk-features :: aafshiro :: ${project.artifactId} - - - 2.1.13 - true - - - - - org.onap.aaf.cadi - aaf-shiro-aafrealm-osgi-bundle - ${aaf-shiro-bundle.version} - - + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + + + org.onap.ccsdk.features + ccsdk-aafshiro + 0.7.0-SNAPSHOT + feature + + ccsdk-features :: aafshiro :: ${project.artifactId} + + + 2.1.13 + true + + + + + org.onap.aaf.cadi + aaf-shiro-aafrealm-osgi-bundle + ${aaf-shiro-bundle.version} + + diff --git a/aafshiro/features/features-aafshiro/pom.xml b/aafshiro/features/features-aafshiro/pom.xml index d49f10b07..8dc9a0479 100755 --- a/aafshiro/features/features-aafshiro/pom.xml +++ b/aafshiro/features/features-aafshiro/pom.xml @@ -15,29 +15,29 @@ limitations under the License. --> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - feature-repo-parent - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + feature-repo-parent + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features - features-aafshiro - 0.7.0-SNAPSHOT - feature + org.onap.ccsdk.features + features-aafshiro + 0.7.0-SNAPSHOT + feature - ccsdk-features :: aafshiro :: ${project.artifactId} + ccsdk-features :: aafshiro :: ${project.artifactId} - - - ${project.groupId} - ccsdk-aafshiro - ${project.version} - xml - features - - + + + ${project.groupId} + ccsdk-aafshiro + ${project.version} + xml + features + + diff --git a/aafshiro/features/pom.xml b/aafshiro/features/pom.xml index 9dce268fe..4b7e2d252 100755 --- a/aafshiro/features/pom.xml +++ b/aafshiro/features/pom.xml @@ -15,24 +15,24 @@ limitations under the License. --> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features - aafshiro-features - 0.7.0-SNAPSHOT - pom + org.onap.ccsdk.features + aafshiro-features + 0.7.0-SNAPSHOT + pom - ccsdk-features :: aafshiro :: ${project.artifactId} + ccsdk-features :: aafshiro :: ${project.artifactId} - - ccsdk-aafshiro - features-aafshiro - + + ccsdk-aafshiro + features-aafshiro + diff --git a/aafshiro/installer/pom.xml b/aafshiro/installer/pom.xml index 026a76dab..3b079d68c 100755 --- a/aafshiro/installer/pom.xml +++ b/aafshiro/installer/pom.xml @@ -15,141 +15,141 @@ limitations under the License. --> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features - aafshiro-installer - 0.7.0-SNAPSHOT - pom + org.onap.ccsdk.features + aafshiro-installer + 0.7.0-SNAPSHOT + pom - ccsdk-features :: aafshiro :: ${project.artifactId} + ccsdk-features :: aafshiro :: ${project.artifactId} - - ccsdk-aafshiro - ${application.name} - mvn:org.onap.ccsdk.features/${features.boot}/${project.version}/xml/features - false - 2.1.13 - + + ccsdk-aafshiro + ${application.name} + mvn:org.onap.ccsdk.features/${features.boot}/${project.version}/xml/features + false + 2.1.13 + - + - - org.onap.ccsdk.features - ${application.name} - ${project.version} - xml - features - - - * - * - - - - - org.onap.aaf.cadi - aaf-shiro-aafrealm-osgi-bundle - ${aaf-shiro-bundle.version} - - + + org.onap.ccsdk.features + ${application.name} + ${project.version} + xml + features + + + * + * + + + + + org.onap.aaf.cadi + aaf-shiro-aafrealm-osgi-bundle + ${aaf-shiro-bundle.version} + + - - - - 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 - 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 + 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/aafshiro/pom.xml b/aafshiro/pom.xml index 11ac408e4..15848ca0e 100755 --- a/aafshiro/pom.xml +++ b/aafshiro/pom.xml @@ -15,25 +15,25 @@ limitations under the License. --> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features - aafshiro - 0.7.0-SNAPSHOT - pom + org.onap.ccsdk.features + aafshiro + 0.7.0-SNAPSHOT + pom - ccsdk-features :: aafshiro - AAF Shiro Bundle for UAC + ccsdk-features :: aafshiro + AAF Shiro Bundle for UAC - - features - installer - + + features + installer + diff --git a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml index e99ecc4cd..e4af0d14d 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml +++ b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml @@ -1,11 +1,11 @@ - 4.0.0 @@ -18,12 +18,13 @@ org.onap.ccsdk.features - 0.7.0-SNAPSHOT blueprints-data-adaptor-provider + 0.7.0-SNAPSHOT bundle + Blueprints Data Adaptor - Provider http://maven.apache.org - + ${project.version} @@ -39,7 +40,6 @@ - org.apache.commons diff --git a/blueprints-processor/adaptors/pom.xml b/blueprints-processor/adaptors/pom.xml index b8241297e..4c087a752 100644 --- a/blueprints-processor/adaptors/pom.xml +++ b/blueprints-processor/adaptors/pom.xml @@ -2,38 +2,39 @@ - + + 4.0.0 + + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + + + org.onap.ccsdk.features + blueprints-processor-adaptors + 0.7.0-SNAPSHOT + pom - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + Blueprints Processor Adaptors - POM + Blueprints Processor Adaptors - POM - org.onap.ccsdk.features - 0.7.0-SNAPSHOT - 4.0.0 - pom - blueprints-processor-adaptors - Blueprints Processor Adaptors - POM - http://wiki.sdn.labs.att.com - Blueprints Processor Adaptors - POM - - data-adaptor-provider - rest-adaptor-provider - + + data-adaptor-provider + rest-adaptor-provider + diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml index 7c23d697b..48a512854 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml +++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml @@ -2,13 +2,13 @@ - 4.0.0 + 4.0.0 + + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features + blueprints-rest-adaptor-provider + 0.7.0-SNAPSHOT + bundle - org.onap.ccsdk.features - 0.7.0-SNAPSHOT - blueprints-rest-adaptor-provider - bundle - Blueprints Rest Adaptor - Provider - http://maven.apache.org + Blueprints Rest Adaptor - Provider + http://maven.apache.org - - - org.apache.commons - commons-lang3 - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-core - - - org.apache.httpcomponents - httpcore - - - org.apache.httpcomponents - httpclient - - - org.springframework - spring-web - - - com.att.eelf - eelf-core - - - org.osgi - org.osgi.core - provided - - - junit - junit - test - - - org.powermock - powermock-api-mockito - 1.6.4 - test - - - org.javassist - javassist - 3.21.0-GA - test - - - org.mockito - mockito-core - 1.10.19 - test - - - org.powermock - powermock-module-junit4 - 1.6.4 - test - - - org.powermock - powermock-api-support - 1.6.4 - test - - - org.powermock - powermock-reflect - 1.6.4 - test - - - org.powermock - powermock-core - 1.6.4 - test - - + + + org.apache.commons + commons-lang3 + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-core + + + org.apache.httpcomponents + httpcore + + + org.apache.httpcomponents + httpclient + + + org.springframework + spring-web + + + com.att.eelf + eelf-core + + + org.osgi + org.osgi.core + provided + + + junit + junit + test + + + org.powermock + powermock-api-mockito + 1.6.4 + test + + + org.javassist + javassist + 3.21.0-GA + test + + + org.mockito + mockito-core + 1.10.19 + test + + + org.powermock + powermock-module-junit4 + 1.6.4 + test + + + org.powermock + powermock-api-support + 1.6.4 + test + + + org.powermock + powermock-reflect + 1.6.4 + test + + + org.powermock + powermock-core + 1.6.4 + test + + - - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - - - org.apache.felix - maven-bundle-plugin - true - - - ${project.artifactId} - ${project.groupId}.${project.artifactId} - org.onap.ccsdk.features.rest.adaptor, - org.onap.ccsdk.features.rest.adaptor.data, - org.onap.ccsdk.features.rest.adaptor.service, - org.onap.ccsdk.features.rest.adaptor.utils - - - - - - + + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + + + + org.apache.felix + maven-bundle-plugin + true + + + ${project.artifactId} + ${project.groupId}.${project.artifactId} + org.onap.ccsdk.features.rest.adaptor, + org.onap.ccsdk.features.rest.adaptor.data, + org.onap.ccsdk.features.rest.adaptor.service, + org.onap.ccsdk.features.rest.adaptor.utils + + + + + + diff --git a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml index f1df462c9..87de34e4f 100644 --- a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml +++ b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml @@ -31,7 +31,6 @@ Blueprints Processor :: Features :: ${project.artifactId} - ${project.version} diff --git a/blueprints-processor/features/features-blueprints-processor/pom.xml b/blueprints-processor/features/features-blueprints-processor/pom.xml index b7bbd61dd..a81262ea4 100755 --- a/blueprints-processor/features/features-blueprints-processor/pom.xml +++ b/blueprints-processor/features/features-blueprints-processor/pom.xml @@ -15,30 +15,30 @@ limitations under the License. --> - 4.0.0 - - - org.onap.ccsdk.parent - feature-repo-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.features - features-blueprints-processor - 0.7.0-SNAPSHOT - feature - - Blueprints Processor :: CCSDK Features :: ${project.artifactId} - - - - ${project.groupId} - ccsdk-blueprints-processor - ${project.version} - xml - features - - - + 4.0.0 + + + org.onap.ccsdk.parent + feature-repo-parent + 1.5.1-SNAPSHOT + + + + org.onap.ccsdk.features + features-blueprints-processor + 0.7.0-SNAPSHOT + feature + + Blueprints Processor :: CCSDK Features :: ${project.artifactId} + + + + ${project.groupId} + ccsdk-blueprints-processor + ${project.version} + xml + features + + + diff --git a/blueprints-processor/features/pom.xml b/blueprints-processor/features/pom.xml index ca78ca1af..c324b567d 100755 --- a/blueprints-processor/features/pom.xml +++ b/blueprints-processor/features/pom.xml @@ -15,24 +15,24 @@ limitations under the License. --> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features - blueprints-processor-features - 0.7.0-SNAPSHOT - pom + org.onap.ccsdk.features + blueprints-processor-features + 0.7.0-SNAPSHOT + pom - Blueprints Processor :: Features aggregator :: ${project.artifactId} + Blueprints Processor :: Features aggregator :: ${project.artifactId} - - ccsdk-blueprints-processor - features-blueprints-processor - + + ccsdk-blueprints-processor + features-blueprints-processor + diff --git a/blueprints-processor/installer/pom.xml b/blueprints-processor/installer/pom.xml index aa85086b3..ee82951b2 100644 --- a/blueprints-processor/installer/pom.xml +++ b/blueprints-processor/installer/pom.xml @@ -2,13 +2,13 @@ - 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + 4.0.0 + + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + + + org.onap.ccsdk.features + blueprints-processor-installer + 0.7.0-SNAPSHOT + pom - org.onap.ccsdk.features - blueprints-processor-installer - 0.7.0-SNAPSHOT - pom - Blueprints Processor :: ${project.artifactId} + Blueprints Processor :: ${project.artifactId} - - blueprints-processor - blueprints-processor-features - mvn:org.onap.ccsdk.features/ccsdk-features/blueprints-processor-features/${project.version}/xml/features - false - + + blueprints-processor + blueprints-processor-features + mvn:org.onap.ccsdk.features/ccsdk-features/blueprints-processor-features/${project.version}/xml/features + false + - - - org.onap.ccsdk.features - ccsdk-blueprints-processor - ${project.version} - features - xml - - - * - * - - - - - org.onap.ccsdk.features - blueprints-data-adaptor-provider - ${project.version} - - - org.onap.ccsdk.features - blueprints-rest-adaptor-provider - ${project.version} - - - org.onap.ccsdk.features - blueprints-assignment-provider - ${project.version} - - - org.onap.ccsdk.features - blueprints-generator-provider - ${project.version} - - - org.onap.ccsdk.features - blueprints-model-provider - ${project.version} - - + + + org.onap.ccsdk.features + ccsdk-blueprints-processor + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.features + blueprints-data-adaptor-provider + ${project.version} + + + org.onap.ccsdk.features + blueprints-rest-adaptor-provider + ${project.version} + + + org.onap.ccsdk.features + blueprints-assignment-provider + ${project.version} + + + org.onap.ccsdk.features + blueprints-generator-provider + ${project.version} + + + org.onap.ccsdk.features + blueprints-model-provider + ${project.version} + + - - - - 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.ccsdk.features - 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.ccsdk.features + 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/blueprints-processor/plugin/assignment-provider/pom.xml b/blueprints-processor/plugin/assignment-provider/pom.xml index 16b95bde4..45acb3e55 100644 --- a/blueprints-processor/plugin/assignment-provider/pom.xml +++ b/blueprints-processor/plugin/assignment-provider/pom.xml @@ -2,13 +2,13 @@ - 4.0.0 + 4.0.0 + + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features + blueprints-assignment-provider + 0.7.0-SNAPSHOT + bundle - org.onap.ccsdk.features - 0.7.0-SNAPSHOT - blueprints-assignment-provider - bundle - Blueprints Assignment - Provider - http://maven.apache.org + Blueprints Assignment - Provider + http://maven.apache.org - - - org.onap.ccsdk.features - blueprints-generator-provider - ${project.version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - com.fasterxml.jackson.module - jackson-module-jsonSchema - ${jackson.version} - - - junit - junit - test - - - org.apache.sling - org.apache.sling.testing.osgi-mock - test - - - org.powermock - powermock-api-mockito - 1.6.4 - test - - - org.javassist - javassist - 3.21.0-GA - test - - - org.mockito - mockito-core - 1.10.19 - test - - - org.powermock - powermock-module-junit4 - 1.6.4 - test - - - org.powermock - powermock-api-support - 1.6.4 - test - - - org.powermock - powermock-reflect - 1.6.4 - test - - - org.powermock - powermock-core - 1.6.4 - test - - + + + org.onap.ccsdk.features + blueprints-generator-provider + ${project.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.module + jackson-module-jsonSchema + ${jackson.version} + + + junit + junit + test + + + org.apache.sling + org.apache.sling.testing.osgi-mock + test + + + org.powermock + powermock-api-mockito + 1.6.4 + test + + + org.javassist + javassist + 3.21.0-GA + test + + + org.mockito + mockito-core + 1.10.19 + test + + + org.powermock + powermock-module-junit4 + 1.6.4 + test + + + org.powermock + powermock-api-support + 1.6.4 + test + + + org.powermock + powermock-reflect + 1.6.4 + test + + + org.powermock + powermock-core + 1.6.4 + test + + - - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - - - org.apache.felix - maven-bundle-plugin - true - - - ${project.artifactId} - ${project.groupId}.${project.artifactId} - org.onap.ccsdk.features.assignment, - org.onap.ccsdk.features.assignment.data, - org.onap.ccsdk.features.assignment.service, - org.onap.ccsdk.features.assignment.processor, - org.onap.ccsdk.features.assignment.processor.custom - - - - - - + + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + + + + org.apache.felix + maven-bundle-plugin + true + + + ${project.artifactId} + ${project.groupId}.${project.artifactId} + org.onap.ccsdk.features.assignment, + org.onap.ccsdk.features.assignment.data, + org.onap.ccsdk.features.assignment.service, + org.onap.ccsdk.features.assignment.processor, + org.onap.ccsdk.features.assignment.processor.custom + + + + + + diff --git a/blueprints-processor/plugin/generator-provider/pom.xml b/blueprints-processor/plugin/generator-provider/pom.xml index da78609f8..e1c8c8dac 100644 --- a/blueprints-processor/plugin/generator-provider/pom.xml +++ b/blueprints-processor/plugin/generator-provider/pom.xml @@ -2,13 +2,13 @@ - 4.0.0 + 4.0.0 + + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features + blueprints-generator-provider + 0.7.0-SNAPSHOT + bundle - org.onap.ccsdk.features - 0.7.0-SNAPSHOT - blueprints-generator-provider - bundle - Blueprints Generator - Provider - http://maven.apache.org + Blueprints Generator - Provider + http://maven.apache.org - - - org.onap.ccsdk.features - blueprints-model-provider - ${project.version} - - - org.onap.ccsdk.features - blueprints-data-adaptor-provider - ${project.version} - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.module - jackson-module-jsonSchema - - - commons-io - commons-io - - - org.apache.velocity - velocity - - - org.powermock - powermock-api-mockito - 1.6.4 - test - - - org.javassist - javassist - 3.21.0-GA - test - - - org.mockito - mockito-core - 1.10.19 - test - - - org.powermock - powermock-module-junit4 - 1.6.4 - test - - - org.powermock - powermock-api-support - 1.6.4 - test - - - org.powermock - powermock-reflect - 1.6.4 - test - - - org.powermock - powermock-core - 1.6.4 - test - - - junit - junit - test - - + + + org.onap.ccsdk.features + blueprints-model-provider + ${project.version} + + + org.onap.ccsdk.features + blueprints-data-adaptor-provider + ${project.version} + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.module + jackson-module-jsonSchema + + + commons-io + commons-io + + + org.apache.velocity + velocity + + + org.powermock + powermock-api-mockito + 1.6.4 + test + + + org.javassist + javassist + 3.21.0-GA + test + + + org.mockito + mockito-core + 1.10.19 + test + + + org.powermock + powermock-module-junit4 + 1.6.4 + test + + + org.powermock + powermock-api-support + 1.6.4 + test + + + org.powermock + powermock-reflect + 1.6.4 + test + + + org.powermock + powermock-core + 1.6.4 + test + + + junit + junit + test + + - - - - org.apache.felix - maven-bundle-plugin - true - - - ${project.artifactId} - ${project.groupId}.${project.artifactId} - - org.onap.ccsdk.features.generator, - org.onap.ccsdk.features.generator.data, - org.onap.ccsdk.features.generator.service, - org.onap.ccsdk.features.generator.tool - - - - - - + + + + org.apache.felix + maven-bundle-plugin + true + + + ${project.artifactId} + ${project.groupId}.${project.artifactId} + + org.onap.ccsdk.features.generator, + org.onap.ccsdk.features.generator.data, + org.onap.ccsdk.features.generator.service, + org.onap.ccsdk.features.generator.tool + + + + + + diff --git a/blueprints-processor/plugin/model-provider/pom.xml b/blueprints-processor/plugin/model-provider/pom.xml index 92810182c..903f499c8 100644 --- a/blueprints-processor/plugin/model-provider/pom.xml +++ b/blueprints-processor/plugin/model-provider/pom.xml @@ -2,13 +2,13 @@ - 4.0.0 + 4.0.0 + + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features + blueprints-processor-plugin + 0.7.0-SNAPSHOT + pom - 0.7.0-SNAPSHOT - blueprints-processor-plugin - org.onap.ccsdk.features - pom - Blueprints Processor Plugins - POM - Blueprints Processor Plugins - POM - - model-provider - assignment-provider - generator-provider - + Blueprints Processor Plugins - POM + Blueprints Processor Plugins - POM + + model-provider + assignment-provider + generator-provider + diff --git a/blueprints-processor/pom.xml b/blueprints-processor/pom.xml index f8be6c2c7..48603bac3 100644 --- a/blueprints-processor/pom.xml +++ b/blueprints-processor/pom.xml @@ -2,43 +2,41 @@ - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + 4.0.0 - org.onap.ccsdk.features - blueprints-processor - 0.7.0-SNAPSHOT - pom + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - Blueprints Processor Module - http://wiki.sdn.labs.att.com - Blueprints Processor Blueprints Processor + org.onap.ccsdk.features + blueprints-processor + 0.7.0-SNAPSHOT + pom - - adaptors - plugin - features - installer - + Blueprints Processor Module + Blueprints Processor Blueprints Processor + + adaptors + plugin + features + installer + diff --git a/features/ccsdk-features-all/pom.xml b/features/ccsdk-features-all/pom.xml index 8002806d1..b02a20e8e 100644 --- a/features/ccsdk-features-all/pom.xml +++ b/features/ccsdk-features-all/pom.xml @@ -15,38 +15,37 @@ limitations under the License. --> - 4.0.0 - - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.features - ccsdk-features-all - 0.7.0-SNAPSHOT - feature - - ccsdk-features :: features :: ${project.artifactId} - - - - - org.onap.ccsdk.features - ccsdk-blueprints-processor - ${project.version} - xml - features - - - org.onap.ccsdk.features - ccsdk-aafshiro - ${project.version} - xml - features - - - + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + + + org.onap.ccsdk.features + ccsdk-features-all + 0.7.0-SNAPSHOT + feature + + ccsdk-features :: features :: ${project.artifactId} + + + + org.onap.ccsdk.features + ccsdk-blueprints-processor + ${project.version} + xml + features + + + org.onap.ccsdk.features + ccsdk-aafshiro + ${project.version} + xml + features + + + diff --git a/features/features-features/pom.xml b/features/features-features/pom.xml index 17a611b98..b5ca8ba96 100644 --- a/features/features-features/pom.xml +++ b/features/features-features/pom.xml @@ -15,29 +15,29 @@ limitations under the License. --> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - feature-repo-parent - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + feature-repo-parent + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features - features-features - 0.7.0-SNAPSHOT - feature + org.onap.ccsdk.features + features-features + 0.7.0-SNAPSHOT + feature - Blueprints Processor :: features :: ${project.artifactId} + Blueprints Processor :: features :: ${project.artifactId} - - - ${project.groupId} - ccsdk-features-all - ${project.version} - xml - features - - + + + ${project.groupId} + ccsdk-features-all + ${project.version} + xml + features + + diff --git a/features/installer/pom.xml b/features/installer/pom.xml index 2a825d343..69cd96210 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -15,138 +15,137 @@ limitations under the License. --> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features - features-installer - 0.7.0-SNAPSHOT - pom + org.onap.ccsdk.features + features-installer + 0.7.0-SNAPSHOT + pom - Blueprints Processor :: features :: ${project.artifactId} + Blueprints Processor :: features :: ${project.artifactId} - - ccsdk-features-all - ${application.name} - mvn:org.onap.ccsdk.features/${features.boot}/${project.version}/xml/features - - false - + + ccsdk-features-all + ${application.name} + mvn:org.onap.ccsdk.features/${features.boot}/${project.version}/xml/features + + false + - + - - org.onap.ccsdk.features - ${application.name} - ${project.version} - xml - features - - - * - * - - - + + org.onap.ccsdk.features + ${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.ccsdk.features + 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.ccsdk.features - 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 f64036aec..c31b43728 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -15,25 +15,25 @@ limitations under the License. --> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features - ccsdk-feature-aggregator - 0.7.0-SNAPSHOT - pom + org.onap.ccsdk.features + ccsdk-feature-aggregator + 0.7.0-SNAPSHOT + pom - Blueprints Processor :: features + Blueprints Processor :: features - - ccsdk-features-all - features-features - installer - + + ccsdk-features-all + features-features + installer + diff --git a/pom.xml b/pom.xml index 1b21bcff7..c8ef632f7 100755 --- a/pom.xml +++ b/pom.xml @@ -1,114 +1,114 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features - ccsdk-features - 0.7.0-SNAPSHOT - pom + org.onap.ccsdk.features + ccsdk-features + 0.7.0-SNAPSHOT + pom - ccsdk-features - CCSDK applications - https://wiki.onap.org - - ONAP - + ccsdk-features + CCSDK applications + https://wiki.onap.org + + ONAP + - - features - sdnr/wt - sdnr/northbound - blueprints-processor - aafshiro - + + features + sdnr/wt + sdnr/northbound + blueprints-processor + aafshiro + - - scm:git:ssh://git@${onap.git.host}/features.git - scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/features.git - ${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/features/browse - + + scm:git:ssh://git@${onap.git.host}/features.git + scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/features.git + ${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/features/browse + - - - blackduck - - - blackduck-scan - - - - - - com.blackducksoftware.integration - hub-maven-plugin - 1.4.0 - false - - ${project.name} - ${project.basedir} - - - - create-bdio-file - package - - createHubOutput - - - - - - - - - dependency-list - - - - com.github.ferstl - depgraph-maven-plugin - - - validate - false - - aggregate - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - package - false - - attach-artifact - - - - - ${dependency-list.file} - txt - dependencies - - - - - - - - - - + + + blackduck + + + blackduck-scan + + + + + + com.blackducksoftware.integration + hub-maven-plugin + 1.4.0 + false + + ${project.name} + ${project.basedir} + + + + create-bdio-file + package + + createHubOutput + + + + + + + + + dependency-list + + + + com.github.ferstl + depgraph-maven-plugin + + + validate + false + + aggregate + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + package + false + + attach-artifact + + + + + ${dependency-list.file} + txt + dependencies + + + + + + + + + + diff --git a/sdnr/northbound/a1Adapter/feature/pom.xml b/sdnr/northbound/a1Adapter/feature/pom.xml index bc64dfffe..ef294b370 100644 --- a/sdnr/northbound/a1Adapter/feature/pom.xml +++ b/sdnr/northbound/a1Adapter/feature/pom.xml @@ -1,28 +1,28 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.northbound - sdnr-a1Adapter - 0.7.0-SNAPSHOT - feature + org.onap.ccsdk.features.sdnr.northbound + sdnr-a1Adapter + 0.7.0-SNAPSHOT + feature - ccsdk-features-sdnr-northbound :: a1Adapter :: ${project.artifactId} + ccsdk-features-sdnr-northbound :: a1Adapter :: ${project.artifactId} - + - - ${project.groupId} - a1Adapter-provider - ${project.version} - + + ${project.groupId} + a1Adapter-provider + ${project.version} + - + diff --git a/sdnr/northbound/a1Adapter/installer/pom.xml b/sdnr/northbound/a1Adapter/installer/pom.xml index cda3121e4..9cc63e7b7 100644 --- a/sdnr/northbound/a1Adapter/installer/pom.xml +++ b/sdnr/northbound/a1Adapter/installer/pom.xml @@ -1,97 +1,97 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.northbound - a1Adapter-installer - 0.7.0-SNAPSHOT - pom + org.onap.ccsdk.features.sdnr.northbound + a1Adapter-installer + 0.7.0-SNAPSHOT + pom - ccsdk-features-sdnr-northbound :: a1Adapter :: ${project.artifactId} + ccsdk-features-sdnr-northbound :: a1Adapter :: ${project.artifactId} - - sdnr-a1Adapter - false - + + sdnr-a1Adapter + false + - + - - org.onap.ccsdk.features.sdnr.northbound - ${application.name} - ${project.version} - xml - features - - - * - * - - - + + org.onap.ccsdk.features.sdnr.northbound + ${application.name} + ${project.version} + xml + features + + + * + * + + + - - ${project.groupId} - a1Adapter-provider - ${project.version} - + + ${project.groupId} + a1Adapter-provider + ${project.version} + - + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - 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 - a1Adapter-model,a1Adapter-provider,sdnr-a1Adapter - provided - - - - - - + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + 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 + a1Adapter-model,a1Adapter-provider,sdnr-a1Adapter + provided + + + + + + diff --git a/sdnr/northbound/a1Adapter/model/pom.xml b/sdnr/northbound/a1Adapter/model/pom.xml index e9c809773..a557d3c76 100644 --- a/sdnr/northbound/a1Adapter/model/pom.xml +++ b/sdnr/northbound/a1Adapter/model/pom.xml @@ -1,55 +1,54 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.northbound - a1Adapter-model - 0.7.0-SNAPSHOT - bundle + org.onap.ccsdk.features.sdnr.northbound + a1Adapter-model + 0.7.0-SNAPSHOT + bundle - - + + org.opendaylight.mdsal.binding.model.ietf rfc6991 + - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.codehaus.mojo - properties-maven-plugin - [1.0.0,) - - set-system-properties - - - - - - - - - - - - - + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.codehaus.mojo + properties-maven-plugin + [1.0.0,) + + set-system-properties + + + + + + + + + + + + + diff --git a/sdnr/northbound/a1Adapter/pom.xml b/sdnr/northbound/a1Adapter/pom.xml index 5ce3a88b0..bea1518ff 100644 --- a/sdnr/northbound/a1Adapter/pom.xml +++ b/sdnr/northbound/a1Adapter/pom.xml @@ -1,29 +1,29 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.northbound - a1Adapter - 0.7.0-SNAPSHOT - pom + org.onap.ccsdk.features.sdnr.northbound + a1Adapter + 0.7.0-SNAPSHOT + pom - ccsdk-features-sdnr-northbound :: a1Adapter + ccsdk-features-sdnr-northbound :: a1Adapter - - model - feature - provider - installer - + + model + feature + provider + installer + - - a1Adapter - + + a1Adapter + diff --git a/sdnr/northbound/a1Adapter/provider/pom.xml b/sdnr/northbound/a1Adapter/provider/pom.xml index a0ce6a1a2..41e639152 100644 --- a/sdnr/northbound/a1Adapter/provider/pom.xml +++ b/sdnr/northbound/a1Adapter/provider/pom.xml @@ -38,8 +38,6 @@ - - org.onap.ccsdk.features.sdnr.northbound @@ -95,7 +93,6 @@ - @@ -128,5 +125,4 @@ - diff --git a/sdnr/northbound/energysavings/features/pom.xml b/sdnr/northbound/energysavings/features/pom.xml index 5179518e5..c3b26cf1b 100644 --- a/sdnr/northbound/energysavings/features/pom.xml +++ b/sdnr/northbound/energysavings/features/pom.xml @@ -1,92 +1,91 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - feature-repo-parent - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + feature-repo-parent + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.northbound - energysavings-features - 0.2.4-SNAPSHOT - feature + org.onap.ccsdk.features.sdnr.northbound + energysavings-features + 0.2.4-SNAPSHOT + feature - - - - - org.opendaylight.controller - mdsal-artifacts - 1.6.1 - pom - import - - - + + + + org.opendaylight.controller + mdsal-artifacts + 1.6.1 + pom + import + + + - - - org.opendaylight.controller - odl-mdsal-broker - xml - features - - + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + - org.onap.ccsdk.features.sdnr.northbound - energysavings-model - ${project.version} - - - org.onap.ccsdk.features.sdnr.northbound - energysavings-provider - ${project.version} - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.codehaus.mojo - properties-maven-plugin - [1.0.0,) - - set-system-properties - - - - - - - - - org.apache.karaf.tooling - karaf-maven-plugin - [4.0.0,) - - features-generate-descriptor - - - - - - - - - - - - - + org.onap.ccsdk.features.sdnr.northbound + energysavings-model + ${project.version} + + + org.onap.ccsdk.features.sdnr.northbound + energysavings-provider + ${project.version} + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.codehaus.mojo + properties-maven-plugin + [1.0.0,) + + set-system-properties + + + + + + + + + org.apache.karaf.tooling + karaf-maven-plugin + [4.0.0,) + + features-generate-descriptor + + + + + + + + + + + + + diff --git a/sdnr/northbound/energysavings/installer/pom.xml b/sdnr/northbound/energysavings/installer/pom.xml index 316a6609f..b3eb3835a 100755 --- a/sdnr/northbound/energysavings/installer/pom.xml +++ b/sdnr/northbound/energysavings/installer/pom.xml @@ -1,134 +1,134 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.northbound - energysavings-installer - 0.2.4-SNAPSHOT - pom + org.onap.ccsdk.features.sdnr.northbound + energysavings-installer + 0.2.4-SNAPSHOT + pom - ccsdk-features-sdnr-northbound :: energysavings :: ${project.artifactId} + ccsdk-features-sdnr-northbound :: energysavings :: ${project.artifactId} - - ccsdk-energysavings - ${application.name} - mvn:org.onap.ccsdk.features.sdnr.northbound/${features.boot}/${project.version}/xml/features - false - + + ccsdk-energysavings + ${application.name} + mvn:org.onap.ccsdk.features.sdnr.northbound/${features.boot}/${project.version}/xml/features + false + - - - org.onap.ccsdk.features.sdnr.northbound - energysavings-model - ${project.version} - - - org.onap.ccsdk.features.sdnr.northbound - energysavings-provider - ${project.version} - - - org.onap.ccsdk.features.sdnr.northbound - energysavings-features - ${project.version} - xml - features - - + + + org.onap.ccsdk.features.sdnr.northbound + energysavings-model + ${project.version} + + + org.onap.ccsdk.features.sdnr.northbound + energysavings-provider + ${project.version} + + + org.onap.ccsdk.features.sdnr.northbound + energysavings-features + ${project.version} + xml + features + + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - false - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - false - - - - 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 - energysavings-model,energysavings-provider,energysavings-features - - - - - - 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 + + false + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + false + + + + 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 + energysavings-model,energysavings-provider,energysavings-features + + + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ${basedir}/target/stage + + + src/main/resources/scripts + + install-feature.sh + + true + + + + + + + + diff --git a/sdnr/northbound/energysavings/model/pom.xml b/sdnr/northbound/energysavings/model/pom.xml index 8f7e620d9..083f5163b 100644 --- a/sdnr/northbound/energysavings/model/pom.xml +++ b/sdnr/northbound/energysavings/model/pom.xml @@ -1,57 +1,57 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.northbound - energysavings-model - 0.2.4-SNAPSHOT - bundle + org.onap.ccsdk.features.sdnr.northbound + energysavings-model + 0.2.4-SNAPSHOT + bundle - - - org.opendaylight.mdsal.model - ietf-inet-types - - - org.opendaylight.mdsal.model - ietf-yang-types - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.codehaus.mojo - properties-maven-plugin - [1.0.0,) - - set-system-properties - - - - - - - - - - - - - + + + org.opendaylight.mdsal.model + ietf-inet-types + + + org.opendaylight.mdsal.model + ietf-yang-types + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.codehaus.mojo + properties-maven-plugin + [1.0.0,) + + set-system-properties + + + + + + + + + + + + + diff --git a/sdnr/northbound/energysavings/pom.xml b/sdnr/northbound/energysavings/pom.xml index 22d419b5d..bedc1f3a2 100644 --- a/sdnr/northbound/energysavings/pom.xml +++ b/sdnr/northbound/energysavings/pom.xml @@ -1,28 +1,28 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.northbound - energysavings - 0.2.4-SNAPSHOT - pom + org.onap.ccsdk.features.sdnr.northbound + energysavings + 0.2.4-SNAPSHOT + pom - - model - features - provider - installer - + + model + features + provider + installer + - - energysavings-features - + + energysavings-features + diff --git a/sdnr/northbound/energysavings/provider/pom.xml b/sdnr/northbound/energysavings/provider/pom.xml index 25c347811..9bf96e773 100644 --- a/sdnr/northbound/energysavings/provider/pom.xml +++ b/sdnr/northbound/energysavings/provider/pom.xml @@ -1,107 +1,107 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.northbound - energysavings-provider - 0.2.4-SNAPSHOT - bundle + org.onap.ccsdk.features.sdnr.northbound + energysavings-provider + 0.2.4-SNAPSHOT + bundle + + + + + org.opendaylight.controller + mdsal-artifacts + 1.6.1 + pom + import + + + - - - org.opendaylight.controller - mdsal-artifacts - 1.6.1 - pom - import - + + org.onap.ccsdk.features.sdnr.northbound + energysavings-model + ${project.version} + + + org.opendaylight.controller + sal-binding-config + + + org.opendaylight.controller + sal-binding-api + + + org.opendaylight.controller + sal-common-util + + + org.opendaylight.controller + sal-core-api + + + org.opendaylight.yangtools + yang-data-impl + + + junit + junit + + test + + + org.mockito + mockito-core + test + + + com.sun.jersey + jersey-client + + + com.sun.jersey + jersey-core + - - - - - org.onap.ccsdk.features.sdnr.northbound - energysavings-model - ${project.version} - - - org.opendaylight.controller - sal-binding-config - - - org.opendaylight.controller - sal-binding-api - - - org.opendaylight.controller - sal-common-util - - - org.opendaylight.controller - sal-core-api - - - org.opendaylight.yangtools - yang-data-impl - - - junit - junit - - test - - - org.mockito - mockito-core - test - - - com.sun.jersey - jersey-client - - - com.sun.jersey - jersey-core - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.codehaus.mojo - properties-maven-plugin - [1.0.0,) - - set-system-properties - - - - - - - - - - - - - + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.codehaus.mojo + properties-maven-plugin + [1.0.0,) + + set-system-properties + + + + + + + + + + + + + diff --git a/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml b/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml index 97aff536b..a16e0d19a 100644 --- a/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml +++ b/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml @@ -1,54 +1,55 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.northbound - sdnr-northbound-all - 0.7.0-SNAPSHOT - feature + org.onap.ccsdk.features.sdnr.northbound + sdnr-northbound-all + 0.7.0-SNAPSHOT + feature - ccsdk-features-sdnr-northbound :: features :: ${project.artifactId} - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - - - org.opendaylight.controller - mdsal-artifacts - ${odl.mdsal.version} - pom - import - + + ${project.groupId} + sdnr-oofpcipoc + ${project.version} + xml + features + + + ${project.groupId} + sdnr-a1Adapter + ${project.version} + xml + features + - ---> - - - ${project.groupId} - sdnr-oofpcipoc - ${project.version} - xml - features - - - ${project.groupId} - sdnr-a1Adapter - ${project.version} - xml - features - - diff --git a/sdnr/northbound/features/installer/pom.xml b/sdnr/northbound/features/installer/pom.xml index 753a447f9..f3b8361a7 100644 --- a/sdnr/northbound/features/installer/pom.xml +++ b/sdnr/northbound/features/installer/pom.xml @@ -1,89 +1,89 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.northbound - sdnr-northbound-features-installer - 0.7.0-SNAPSHOT - pom + org.onap.ccsdk.features.sdnr.northbound + sdnr-northbound-features-installer + 0.7.0-SNAPSHOT + pom - ccsdk-features-sdnr-northbound :: features :: ${project.artifactId} + ccsdk-features-sdnr-northbound :: features :: ${project.artifactId} - - sdnr-northbound-all - false - + + sdnr-northbound-all + false + - - - org.onap.ccsdk.features.sdnr.northbound - ${application.name} - ${project.version} - xml - features - - - * - * - - - - + + + org.onap.ccsdk.features.sdnr.northbound + ${application.name} + ${project.version} + xml + features + + + * + * + + + + - - - - 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.ccsdk.features.sdnr.northbound - provided - - - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - + + + + 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.ccsdk.features.sdnr.northbound + provided + + + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + diff --git a/sdnr/northbound/features/pom.xml b/sdnr/northbound/features/pom.xml index 2ca18829b..878dbaef3 100644 --- a/sdnr/northbound/features/pom.xml +++ b/sdnr/northbound/features/pom.xml @@ -1,24 +1,23 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.northbound - sdnr-northbound-feature-aggregator - 0.7.0-SNAPSHOT - pom + org.onap.ccsdk.features.sdnr.northbound + sdnr-northbound-feature-aggregator + 0.7.0-SNAPSHOT + pom - ccsdk-features-sdnr-northbound :: features - - - ccsdk-features-sdnr-northbound-all - installer - + ccsdk-features-sdnr-northbound :: features + + ccsdk-features-sdnr-northbound-all + installer + diff --git a/sdnr/northbound/oofpcipoc/consumer/pom.xml b/sdnr/northbound/oofpcipoc/consumer/pom.xml index 8a66c92f2..0448fdaac 100644 --- a/sdnr/northbound/oofpcipoc/consumer/pom.xml +++ b/sdnr/northbound/oofpcipoc/consumer/pom.xml @@ -38,9 +38,6 @@ - - - org.onap.ccsdk.features.sdnr.northbound @@ -159,5 +156,4 @@ - diff --git a/sdnr/northbound/oofpcipoc/feature/pom.xml b/sdnr/northbound/oofpcipoc/feature/pom.xml index 27ccec397..a7de972e2 100644 --- a/sdnr/northbound/oofpcipoc/feature/pom.xml +++ b/sdnr/northbound/oofpcipoc/feature/pom.xml @@ -1,49 +1,48 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.northbound - sdnr-oofpcipoc - 0.7.0-SNAPSHOT - feature + org.onap.ccsdk.features.sdnr.northbound + sdnr-oofpcipoc + 0.7.0-SNAPSHOT + feature - ccsdk-features-sdnr-northbound :: oofpcipoc :: ${project.artifactId} + ccsdk-features-sdnr-northbound :: oofpcipoc :: ${project.artifactId} - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - - - org.opendaylight.controller - mdsal-artifacts - ${odl.mdsal.version} - pom - import - - - ---> - - - - ${project.groupId} - oofpcipoc-provider - ${project.version} - + + ${project.groupId} + oofpcipoc-provider + ${project.version} + - + diff --git a/sdnr/northbound/oofpcipoc/installer/pom.xml b/sdnr/northbound/oofpcipoc/installer/pom.xml index 52d0fb1de..0d9ccad27 100644 --- a/sdnr/northbound/oofpcipoc/installer/pom.xml +++ b/sdnr/northbound/oofpcipoc/installer/pom.xml @@ -1,103 +1,103 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.northbound - oofpcipoc-installer - 0.7.0-SNAPSHOT - pom + org.onap.ccsdk.features.sdnr.northbound + oofpcipoc-installer + 0.7.0-SNAPSHOT + pom - ccsdk-features-sdnr-northbound :: oofpcipoc :: ${project.artifactId} + ccsdk-features-sdnr-northbound :: oofpcipoc :: ${project.artifactId} - - sdnr-oofpcipoc - false - + + sdnr-oofpcipoc + false + - + - - org.onap.ccsdk.features.sdnr.northbound - ${application.name} - ${project.version} - xml - features - - - * - * - - - + + org.onap.ccsdk.features.sdnr.northbound + ${application.name} + ${project.version} + xml + features + + + * + * + + + - - ${project.groupId} - oofpcipoc-provider - ${project.version} - + + ${project.groupId} + oofpcipoc-provider + ${project.version} + - - ${project.groupId} - oofpcipoc-consumer - ${project.version} - + + ${project.groupId} + oofpcipoc-consumer + ${project.version} + - + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - 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 - oofpcipoc-model,oofpcipoc-provider,oofpcipoc-consumer,sdnr-oofpcipoc - provided - - - - - - + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + 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 + oofpcipoc-model,oofpcipoc-provider,oofpcipoc-consumer,sdnr-oofpcipoc + provided + + + + + + diff --git a/sdnr/northbound/oofpcipoc/model/pom.xml b/sdnr/northbound/oofpcipoc/model/pom.xml index 345998d90..9a67c3e63 100644 --- a/sdnr/northbound/oofpcipoc/model/pom.xml +++ b/sdnr/northbound/oofpcipoc/model/pom.xml @@ -1,55 +1,55 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.northbound - oofpcipoc-model - 0.7.0-SNAPSHOT - bundle + org.onap.ccsdk.features.sdnr.northbound + oofpcipoc-model + 0.7.0-SNAPSHOT + bundle - - + + org.opendaylight.mdsal.binding.model.ietf rfc6991 - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.codehaus.mojo - properties-maven-plugin - [1.0.0,) - - set-system-properties - - - - - - - - - - - - - + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.codehaus.mojo + properties-maven-plugin + [1.0.0,) + + set-system-properties + + + + + + + + + + + + + diff --git a/sdnr/northbound/oofpcipoc/pom.xml b/sdnr/northbound/oofpcipoc/pom.xml index 0749215e7..86de80cbb 100644 --- a/sdnr/northbound/oofpcipoc/pom.xml +++ b/sdnr/northbound/oofpcipoc/pom.xml @@ -1,30 +1,30 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.northbound - oofpcipoc - 0.7.0-SNAPSHOT - pom + org.onap.ccsdk.features.sdnr.northbound + oofpcipoc + 0.7.0-SNAPSHOT + pom - ccsdk-features-sdnr-northbound :: oofpcipoc + ccsdk-features-sdnr-northbound :: oofpcipoc - - model - feature - provider - consumer - installer - + + model + feature + provider + consumer + installer + - - oofpcipoc - + + oofpcipoc + diff --git a/sdnr/northbound/oofpcipoc/provider/pom.xml b/sdnr/northbound/oofpcipoc/provider/pom.xml index eb11e0357..be42a39fe 100644 --- a/sdnr/northbound/oofpcipoc/provider/pom.xml +++ b/sdnr/northbound/oofpcipoc/provider/pom.xml @@ -14,12 +14,10 @@ 0.7.0-SNAPSHOT bundle - ${project.version} - @@ -29,7 +27,6 @@ pom import - org.onap.ccsdk.sli.core sli-core-artifacts @@ -37,11 +34,8 @@ pom import - - - org.onap.ccsdk.features.sdnr.northbound @@ -96,8 +90,6 @@ utils-provider - - @@ -130,5 +122,4 @@ - diff --git a/sdnr/northbound/pom.xml b/sdnr/northbound/pom.xml index 59d8a9cd4..0633dd33f 100644 --- a/sdnr/northbound/pom.xml +++ b/sdnr/northbound/pom.xml @@ -21,23 +21,24 @@ 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + org.onap.ccsdk.features.sdnr.northbound sdnr-northbound 0.7.0-SNAPSHOT pom + ccsdk-sdnr-northbound :: features - SDN-R RAN, OOF PCI ANR POC, A1 Adapter + SDN-R RAN, OOF PCI ANR POC, A1 Adapter - oofpcipoc - a1Adapter - features + oofpcipoc + a1Adapter + features diff --git a/sdnr/wt/apigateway/feature/pom.xml b/sdnr/wt/apigateway/feature/pom.xml index 8c0acfad2..88ccad411 100644 --- a/sdnr/wt/apigateway/feature/pom.xml +++ b/sdnr/wt/apigateway/feature/pom.xml @@ -22,41 +22,41 @@ --> - 4.0.0 - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-apigateway-feature - 0.7.0-SNAPSHOT - feature - ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature - - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - - - + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-apigateway-feature + 0.7.0-SNAPSHOT + feature + + ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature + + + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + - - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - - - - - - - ${project.groupId} - sdnr-wt-apigateway-provider - ${project.version} - + + ${project.groupId} + sdnr-wt-apigateway-provider + ${project.version} + - + diff --git a/sdnr/wt/apigateway/installer/pom.xml b/sdnr/wt/apigateway/installer/pom.xml index 96888e243..cee4f7d1c 100755 --- a/sdnr/wt/apigateway/installer/pom.xml +++ b/sdnr/wt/apigateway/installer/pom.xml @@ -1,115 +1,115 @@ - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-apigateway-installer - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-apigateway-installer + 0.7.0-SNAPSHOT + pom - - sdnr-wt-apigateway - false - + ccsdk-features-sdnr-wt :: ${project.artifactId} - + + sdnr-wt-apigateway + false + - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-feature - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-provider - ${project.version} - + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-feature + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-provider + ${project.version} + - + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - - - - - - - - - - - - - - - - - - - - copy-nested-dependencies - - copy-dependencies - - prepare-package - - true - ${project.build.directory}/assembly/system - false - true - true - true - false - false - - - - - - - - + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + + + + + + + + + + + + + + + + + + + copy-nested-dependencies + + copy-dependencies + + prepare-package + + true + ${project.build.directory}/assembly/system + false + true + true + true + false + false + + + + + + + + diff --git a/sdnr/wt/apigateway/pom.xml b/sdnr/wt/apigateway/pom.xml index 8189a2ce8..8efdbc0c0 100755 --- a/sdnr/wt/apigateway/pom.xml +++ b/sdnr/wt/apigateway/pom.xml @@ -24,12 +24,6 @@ 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-apigateway-top - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} - org.onap.ccsdk.parent odlparent-lite @@ -37,6 +31,13 @@ + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-apigateway-top + 0.7.0-SNAPSHOT + pom + + ccsdk-features-sdnr-wt :: ${project.artifactId} + feature provider diff --git a/sdnr/wt/apigateway/provider/pom.xml b/sdnr/wt/apigateway/provider/pom.xml index a989874f8..b4bbe1e56 100644 --- a/sdnr/wt/apigateway/provider/pom.xml +++ b/sdnr/wt/apigateway/provider/pom.xml @@ -11,24 +11,27 @@ OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END========================================================= --> - - + 4.0.0 + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + + org.onap.ccsdk.features.sdnr.wt sdnr-wt-apigateway-provider 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} bundle + + ccsdk-features-sdnr-wt :: ${project.artifactId} + true - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + javax.servlet @@ -49,6 +52,7 @@ + diff --git a/sdnr/wt/common/pom.xml b/sdnr/wt/common/pom.xml index 144cb6648..d77d2949f 100644 --- a/sdnr/wt/common/pom.xml +++ b/sdnr/wt/common/pom.xml @@ -16,147 +16,147 @@ ============LICENSE_END========================================================= --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-common - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - jar + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-common + 0.7.0-SNAPSHOT + jar - - true - true - yyyy-MM-dd HH:mm - ${maven.build.timestamp} UTC - 6.4.3 - 49400 - + ccsdk-features-sdnr-wt :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + + true + true + yyyy-MM-dd HH:mm + ${maven.build.timestamp} UTC + 6.4.3 + 49400 + - - - org.mockito - mockito-core - test - - - org.osgi - org.osgi.core - provided - - - org.json - json - - - org.elasticsearch.client - elasticsearch-rest-client - ${elasticsearch.version} - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-databind - + + + org.mockito + mockito-core + test + + + org.osgi + org.osgi.core + provided + + + org.json + json + + + org.elasticsearch.client + elasticsearch-rest-client + ${elasticsearch.version} + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-databind + + - - - - - org.jacoco - jacoco-maven-plugin - - - **/gen/** - **/generated-sources/** - **/yang-gen-sal/** - **/pax/** - - - - - org.codehaus.mojo - exec-maven-plugin - - - generateDTOs - generate-sources - - exec - - - ${basedir}/../data-provider/database/src/main/resources/es-init.sh - - initfile - -f - ${project.build.directory}/EsInit.script - - - - - - - com.github.alexcojocaru - elasticsearch-maven-plugin - 6.14 - - testCluster - 9500 - ${databaseport} - 6.4.3 - ${project.build.directory}/EsInit.script - - - - start-elasticsearch - process-test-classes - - runforked - - - - stop-elasticsearch - prepare-package - - stop - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - databaseport - ${databaseport} - - - - - - + + + + org.jacoco + jacoco-maven-plugin + + + **/gen/** + **/generated-sources/** + **/yang-gen-sal/** + **/pax/** + + + + + org.codehaus.mojo + exec-maven-plugin + + + generateDTOs + generate-sources + + exec + + + ${basedir}/../data-provider/database/src/main/resources/es-init.sh + + initfile + -f + ${project.build.directory}/EsInit.script + + + + + + + com.github.alexcojocaru + elasticsearch-maven-plugin + 6.14 + + testCluster + 9500 + ${databaseport} + 6.4.3 + ${project.build.directory}/EsInit.script + + + + start-elasticsearch + process-test-classes + + runforked + + + + stop-elasticsearch + prepare-package + + stop + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + databaseport + ${databaseport} + + + + + + diff --git a/sdnr/wt/devicemanager/feature/pom.xml b/sdnr/wt/devicemanager/feature/pom.xml index 84fd019f4..92d76cb76 100644 --- a/sdnr/wt/devicemanager/feature/pom.xml +++ b/sdnr/wt/devicemanager/feature/pom.xml @@ -22,48 +22,48 @@ --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-feature - 0.7.0-SNAPSHOT - feature - ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-feature + 0.7.0-SNAPSHOT + feature - + ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature + + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - + + ${project.groupId} + sdnr-wt-devicemodel-model + ${project.version} + + + ${project.groupId} + sdnr-wt-devicemanager-model + ${project.version} + + + ${project.groupId} + sdnr-wt-devicemanager-provider + ${project.version} + - - - - - ${project.groupId} - sdnr-wt-devicemodel-model - ${project.version} - - - ${project.groupId} - sdnr-wt-devicemanager-model - ${project.version} - - - ${project.groupId} - sdnr-wt-devicemanager-provider - ${project.version} - - diff --git a/sdnr/wt/devicemanager/installer/pom.xml b/sdnr/wt/devicemanager/installer/pom.xml index ad5cc1ae7..7bdca1f04 100755 --- a/sdnr/wt/devicemanager/installer/pom.xml +++ b/sdnr/wt/devicemanager/installer/pom.xml @@ -22,116 +22,118 @@ --> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-installer - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-installer + 0.7.0-SNAPSHOT + pom - - sdnr-wt-devicemanager - false - + ccsdk-features-sdnr-wt :: ${project.artifactId} - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-feature - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-provider - ${project.version} - - - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-nested-dependencies - - copy-dependencies - - prepare-package - - true - ${project.build.directory}/assembly/system - false - true - true - true - false - false - - - - - - maven-resources-plugin - 2.6 - - - copy-schemas - - copy-resources - - validate - - ${project.build.directory}/assembly/cache/schema - - - ${basedir}/../provider/src/main/resources/preload.cache.schema - - *.yang - - true - - - - - - - - + + sdnr-wt-devicemanager + false + + + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-feature + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-provider + ${project.version} + + + + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-nested-dependencies + + copy-dependencies + + prepare-package + + true + ${project.build.directory}/assembly/system + false + true + true + true + false + false + + + + + + maven-resources-plugin + 2.6 + + + copy-schemas + + copy-resources + + validate + + ${project.build.directory}/assembly/cache/schema + + + ${basedir}/../provider/src/main/resources/preload.cache.schema + + *.yang + + true + + + + + + + + diff --git a/sdnr/wt/devicemanager/model/pom.xml b/sdnr/wt/devicemanager/model/pom.xml index ef823d680..f6ba71245 100644 --- a/sdnr/wt/devicemanager/model/pom.xml +++ b/sdnr/wt/devicemanager/model/pom.xml @@ -22,47 +22,49 @@ --> - 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-model - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - - true - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-model + 0.7.0-SNAPSHOT + bundle - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + ccsdk-features-sdnr-wt :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - - - - - org.jacoco - jacoco-maven-plugin - - - **/gen/** - **/generated-sources/** - **/yang-gen-sal/** - **/pax/** - - - - - + + true + + + + + + + + + org.jacoco + jacoco-maven-plugin + + + **/gen/** + **/generated-sources/** + **/yang-gen-sal/** + **/pax/** + + + + + diff --git a/sdnr/wt/devicemanager/pom.xml b/sdnr/wt/devicemanager/pom.xml index 5a37d8521..febf74442 100755 --- a/sdnr/wt/devicemanager/pom.xml +++ b/sdnr/wt/devicemanager/pom.xml @@ -24,12 +24,6 @@ 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-top - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} - org.onap.ccsdk.parent odlparent-lite @@ -37,9 +31,12 @@ - - sdnr-wt-devicemanager - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-top + 0.7.0-SNAPSHOT + pom + + ccsdk-features-sdnr-wt :: ${project.artifactId} model @@ -48,4 +45,7 @@ installer + + sdnr-wt-devicemanager + diff --git a/sdnr/wt/devicemanager/provider/pom.xml b/sdnr/wt/devicemanager/provider/pom.xml index b08c5b51e..d9108966e 100644 --- a/sdnr/wt/devicemanager/provider/pom.xml +++ b/sdnr/wt/devicemanager/provider/pom.xml @@ -16,459 +16,462 @@ ============LICENSE_END========================================================= --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-provider - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-provider + 0.7.0-SNAPSHOT + bundle - - true - true - yyyy-MM-dd HH:mm - ${maven.build.timestamp} UTC - + ccsdk-features-sdnr-wt :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - - - - org.mockito - mockito-core - 2.23.0 - test - - - ${project.groupId} - sdnr-wt-devicemanager-model - ${project.version} - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-websocketmanager2-model - ${project.version} - - - ${project.groupId} - sdnr-wt-devicemodel-model - ${project.version} - - - org.osgi - org.osgi.core - provided - - - - - - - - - - - - - - - - - - - - - - - org.opendaylight.netconf - sal-netconf-connector - provided - - - org.opendaylight.mdsal.binding.model.ietf - rfc6991-ietf-yang-types - - - org.opendaylight.mdsal - yang-binding - - - org.opendaylight.mdsal - mdsal-singleton-common-api - provided - - - org.json - json - - - com.typesafe.akka - akka-actor_2.12 - - - com.typesafe.akka - akka-cluster_2.12 - - - org.osgi - org.osgi.compendium - + + true + true + yyyy-MM-dd HH:mm + ${maven.build.timestamp} UTC + + + + + org.mockito + mockito-core + 2.23.0 + test + + + ${project.groupId} + sdnr-wt-devicemanager-model + ${project.version} + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-websocketmanager2-model + ${project.version} + + + ${project.groupId} + sdnr-wt-devicemodel-model + ${project.version} + + + org.osgi + org.osgi.core + provided + + + + + + + + + + + + + + + + + + + + + + + org.opendaylight.netconf + sal-netconf-connector + provided + + + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-yang-types + + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.mdsal + mdsal-singleton-common-api + provided + + + org.json + json + + + com.typesafe.akka + akka-actor_2.12 + + + com.typesafe.akka + akka-cluster_2.12 + + + org.osgi + org.osgi.compendium + - - org.elasticsearch - elasticsearch - provided - - - com.spatial4j - spatial4j - provided - - - org.elasticsearch - securesm - provided - - - com.carrotsearch - hppc - provided - - - joda-time - joda-time - provided - - - org.joda - joda-convert - provided - - - com.fasterxml.jackson.core - jackson-core - 2.6.3 - provided - - - com.fasterxml.jackson.core - jackson-annotations - 2.6.3 - provided - - - com.fasterxml.jackson.core - jackson-databind - 2.6.3 - provided - - - com.fasterxml.jackson.dataformat - jackson-dataformat-smile - 2.6.3 - provided - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - 2.6.3 - provided - - - com.fasterxml.jackson.dataformat - jackson-dataformat-cbor - 2.6.3 - provided - - - org.yaml - snakeyaml - provided - - - - - - - - - com.ning - compress-lzf - provided - - - com.tdunning - t-digest - provided - - - org.hdrhistogram - HdrHistogram - provided - - - com.twitter - jsr166e - provided - - - org.apache.lucene - lucene-core - provided - - - org.apache.lucene - lucene-backward-codecs - provided - - - org.apache.lucene - lucene-analyzers-common - provided - - - org.apache.lucene - lucene-queries - provided - - - org.apache.lucene - lucene-memory - provided - - - org.apache.lucene - lucene-highlighter - provided - - - org.apache.lucene - lucene-queryparser - provided - - - org.apache.lucene - lucene-sandbox - provided - - - org.apache.lucene - lucene-suggest - provided - - - org.apache.lucene - lucene-misc - provided - - - org.apache.lucene - lucene-join - provided - - - org.apache.lucene - lucene-grouping - provided - - - org.apache.lucene - lucene-spatial - provided - - - org.apache.lucene - lucene-spatial3d - provided - - - jakarta-regexp - jakarta-regexp - provided - - - commons-collections - commons-collections - provided - - - commons-logging - commons-logging - provided - - - commons-cli - commons-cli - provided - - - org.apache.commons - commons-lang3 - 3.4 - provided - - - org.elasticsearch.plugin - delete-by-query - provided - + + org.elasticsearch + elasticsearch + provided + + + com.spatial4j + spatial4j + provided + + + org.elasticsearch + securesm + provided + + + com.carrotsearch + hppc + provided + + + joda-time + joda-time + provided + + + org.joda + joda-convert + provided + + + com.fasterxml.jackson.core + jackson-core + 2.6.3 + provided + + + com.fasterxml.jackson.core + jackson-annotations + 2.6.3 + provided + + + com.fasterxml.jackson.core + jackson-databind + 2.6.3 + provided + + + com.fasterxml.jackson.dataformat + jackson-dataformat-smile + 2.6.3 + provided + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + 2.6.3 + provided + + + com.fasterxml.jackson.dataformat + jackson-dataformat-cbor + 2.6.3 + provided + + + org.yaml + snakeyaml + provided + + + + + + + + + com.ning + compress-lzf + provided + + + com.tdunning + t-digest + provided + + + org.hdrhistogram + HdrHistogram + provided + + + com.twitter + jsr166e + provided + + + org.apache.lucene + lucene-core + provided + + + org.apache.lucene + lucene-backward-codecs + provided + + + org.apache.lucene + lucene-analyzers-common + provided + + + org.apache.lucene + lucene-queries + provided + + + org.apache.lucene + lucene-memory + provided + + + org.apache.lucene + lucene-highlighter + provided + + + org.apache.lucene + lucene-queryparser + provided + + + org.apache.lucene + lucene-sandbox + provided + + + org.apache.lucene + lucene-suggest + provided + + + org.apache.lucene + lucene-misc + provided + + + org.apache.lucene + lucene-join + provided + + + org.apache.lucene + lucene-grouping + provided + + + org.apache.lucene + lucene-spatial + provided + + + org.apache.lucene + lucene-spatial3d + provided + + + jakarta-regexp + jakarta-regexp + provided + + + commons-collections + commons-collections + provided + + + commons-logging + commons-logging + provided + + + commons-cli + commons-cli + provided + + + org.apache.commons + commons-lang3 + 3.4 + provided + + + org.elasticsearch.plugin + delete-by-query + provided + + + - - - - - src/main/resources - true - - - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - - org.w3c.dom, - org.opendaylight.controller.md.sal.binding.api;version="[1.6,2)", - org.opendaylight.controller.md.sal.common.api.data;version="[1.6,2)", - org.opendaylight.controller.sal.binding.api;version="[1.6,2)", - org.opendaylight.mdsal.singleton.common.api;version="[2.0,3.0.8]", - org.opendaylight.yangtools.concepts;version="[2.0,3)", - org.opendaylight.yangtools.yang.common;version="[2.0,3)", - org.opendaylight.yangtools.yang.binding;version="[1.0.8,2)", - org.osgi.framework, - org.osgi.service.blueprint.container, - org.slf4j;version="[1.7,2)", - org.slf4j.spi;version="[1.7,2)", - com.typesafe.config;version= "[1.3,2)", - org.json, - javax.annotation, - javax.net.ssl, - javax.xml.bind, - javax.xml.bind.annotation, - org.apache.commons.lang3.exception, + + + + src/main/resources + true + + + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + + org.w3c.dom, + org.opendaylight.controller.md.sal.binding.api;version="[1.6,2)", + org.opendaylight.controller.md.sal.common.api.data;version="[1.6,2)", + org.opendaylight.controller.sal.binding.api;version="[1.6,2)", + org.opendaylight.mdsal.singleton.common.api;version="[2.0,3.0.8]", + org.opendaylight.yangtools.concepts;version="[2.0,3)", + org.opendaylight.yangtools.yang.common;version="[2.0,3)", + org.opendaylight.yangtools.yang.binding;version="[1.0.8,2)", + org.osgi.framework, + org.osgi.service.blueprint.container, + org.slf4j;version="[1.7,2)", + org.slf4j.spi;version="[1.7,2)", + com.typesafe.config;version= "[1.3,2)", + org.json, + javax.annotation, + javax.net.ssl, + javax.xml.bind, + javax.xml.bind.annotation, + org.apache.commons.lang3.exception, - com.github.mustachejava;resolution:=optional, - com.sun.jna;resolution:=optional, - com.sun.jna.ptr;resolution:=optional, - com.sun.jna.win32;resolution:=optional, - com.vividsolutions.jts.algorithm;resolution:=optional, - com.vividsolutions.jts.geom;resolution:=optional, - com.vividsolutions.jts.geom.impl;resolution:=optional, - com.vividsolutions.jts.geom.prep;resolution:=optional, - com.vividsolutions.jts.io;resolution:=optional, - com.vividsolutions.jts.operation.union;resolution:=optional, - com.vividsolutions.jts.operation.valid;resolution:=optional, - com.vividsolutions.jts.util;resolution:=optional, - org.apache.log; - org.apache.log4j.helpers;resolution:=optional;version="[1.2,2)", - org.noggit;resolution:=optional, + com.github.mustachejava;resolution:=optional, + com.sun.jna;resolution:=optional, + com.sun.jna.ptr;resolution:=optional, + com.sun.jna.win32;resolution:=optional, + com.vividsolutions.jts.algorithm;resolution:=optional, + com.vividsolutions.jts.geom;resolution:=optional, + com.vividsolutions.jts.geom.impl;resolution:=optional, + com.vividsolutions.jts.geom.prep;resolution:=optional, + com.vividsolutions.jts.io;resolution:=optional, + com.vividsolutions.jts.operation.union;resolution:=optional, + com.vividsolutions.jts.operation.valid;resolution:=optional, + com.vividsolutions.jts.util;resolution:=optional, + org.apache.log; + org.apache.log4j.helpers;resolution:=optional;version="[1.2,2)", + org.noggit;resolution:=optional, - com.google.common.base;version="[23.6,26)", - com.google.common.cache;version="[23.6,26)", - com.google.common.collect;version="[23.6,26)", - com.google.common.hash;version="[23.6,26)", - com.google.common.io;version="[23.6,26)", - com.google.common.math;version="[23.6,26)", - com.google.common.net;version="[23.6,26)", - com.google.common.primitives;version="[23.6,26)", - com.google.common.util.concurrent;version="[23.6,26)", + com.google.common.base;version="[23.6,26)", + com.google.common.cache;version="[23.6,26)", + com.google.common.collect;version="[23.6,26)", + com.google.common.hash;version="[23.6,26)", + com.google.common.io;version="[23.6,26)", + com.google.common.math;version="[23.6,26)", + com.google.common.net;version="[23.6,26)", + com.google.common.primitives;version="[23.6,26)", + com.google.common.util.concurrent;version="[23.6,26)", - org.jboss.netty.bootstrap;version="[3.10,4)", - org.jboss.netty.buffer;version="[3.10,4)", - org.jboss.netty.channel;version="[3.10,4)", - org.jboss.netty.channel.socket.nio;version="[3.10,4)", - org.jboss.netty.channel.socket.oio;version="[3.10,4)", - org.jboss.netty.handler.codec.embedder;version="[3.10,4)", - org.jboss.netty.handler.codec.frame;version="[3.10,4)", - org.jboss.netty.handler.codec.http;version="[3.10,4)", - org.jboss.netty.handler.timeout;version="[3.10,4)", - org.jboss.netty.logging;version="[3.10,4)", - org.jboss.netty.util;version="[3.10,4)", + org.jboss.netty.bootstrap;version="[3.10,4)", + org.jboss.netty.buffer;version="[3.10,4)", + org.jboss.netty.channel;version="[3.10,4)", + org.jboss.netty.channel.socket.nio;version="[3.10,4)", + org.jboss.netty.channel.socket.oio;version="[3.10,4)", + org.jboss.netty.handler.codec.embedder;version="[3.10,4)", + org.jboss.netty.handler.codec.frame;version="[3.10,4)", + org.jboss.netty.handler.codec.http;version="[3.10,4)", + org.jboss.netty.handler.timeout;version="[3.10,4)", + org.jboss.netty.logging;version="[3.10,4)", + org.jboss.netty.util;version="[3.10,4)", - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.websocketmanager.rev150105, - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714;version="[1.4,2)", - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ptp.dataset.rev170208;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715;version="[1.2.8,2)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.equipment.g;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.extension.g;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.logical.termination.point.g;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.manufactured.thing.g;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.network.element;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.g._874._1.model.rev170320;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.air._interface.historical.performance.type.g;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.container.historical.performance.type.g;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.mw.air._interface.diversity.pac;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.mw.air._interface.pac;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.mw.ethernet.container.pac;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.mw.hybrid.mw.structure.pac;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.mw.pure.ethernet.structure.pac;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.mw.tdm.container.pac;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.air._interface.historical.performance.type.g;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.container.historical.performance.type.g;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.air._interface.diversity.pac;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.air._interface.pac;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.ethernet.container.pac;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.hybrid.mw.structure.pac;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.pure.ethernet.structure.pac;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.tdm.container.pac;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.air._interface.historical.performance.type.g;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.container.historical.performance.type.g;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.air._interface.diversity.pac;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.air._interface.pac;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.ethernet.container.pac;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.hybrid.mw.structure.pac;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.pure.ethernet.structure.pac;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.tdm.container.pac;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.onf.core.model.conditional.packages.rev170402;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.onf.core.model.conditional.packages.rev170402.equipment.pac;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.onf.core.model.conditional.packages.rev170402.network.element.current.problems.g;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.onf.core.model.conditional.packages.rev170402.network.element.pac;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114;version="[1.7,2)", - org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status;version="[1.7,2)", - org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.network.topology.topology.topology.types;version="[1.7,2)", - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.maintenance.mode.g;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.maintenance.mode.g.filter;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.show.required.network.element.output;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021;version="[2013.10,2014)", - org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology;version="[2013.10,2014)", - org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology;version="[2013.10,2014)" - - jackson*,ela*,delete-by-query,joda*,Hdr*,lucene*, - hppc,jsr166e,t-digest,snakeyaml,securesm,spatial4j,compress-lzf,commons-cli,jakarta-regexp, - commons-lang3,commons-collections,commons-logging,commons-beanutils - {maven-resources},{maven-dependencies},META-INF/git.properties=-target/classes/META-INF/git.properties - true - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.* - - - - - + org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.websocketmanager.rev150105, + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714;version="[1.4,2)", + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ptp.dataset.rev170208;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715;version="[1.2.8,2)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.equipment.g;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.extension.g;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.logical.termination.point.g;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.manufactured.thing.g;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.network.element;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.g._874._1.model.rev170320;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.air._interface.historical.performance.type.g;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.container.historical.performance.type.g;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.mw.air._interface.diversity.pac;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.mw.air._interface.pac;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.mw.ethernet.container.pac;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.mw.hybrid.mw.structure.pac;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.mw.pure.ethernet.structure.pac;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.mw.tdm.container.pac;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.air._interface.historical.performance.type.g;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.container.historical.performance.type.g;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.air._interface.diversity.pac;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.air._interface.pac;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.ethernet.container.pac;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.hybrid.mw.structure.pac;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.pure.ethernet.structure.pac;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.mw.tdm.container.pac;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.air._interface.historical.performance.type.g;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.container.historical.performance.type.g;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.air._interface.diversity.pac;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.air._interface.pac;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.ethernet.container.pac;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.hybrid.mw.structure.pac;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.pure.ethernet.structure.pac;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.mw.tdm.container.pac;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.onf.core.model.conditional.packages.rev170402;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.onf.core.model.conditional.packages.rev170402.equipment.pac;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.onf.core.model.conditional.packages.rev170402.network.element.current.problems.g;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.onf.core.model.conditional.packages.rev170402.network.element.pac;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114;version="[1.7,2)", + org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status;version="[1.7,2)", + org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.network.topology.topology.topology.types;version="[1.7,2)", + org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.maintenance.mode.g;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.maintenance.mode.g.filter;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.show.required.network.element.output;version="[0.3,1)", + org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021;version="[2013.10,2014)", + org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology;version="[2013.10,2014)", + org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology;version="[2013.10,2014)" + + jackson*,ela*,delete-by-query,joda*,Hdr*,lucene*, + hppc,jsr166e,t-digest,snakeyaml,securesm,spatial4j,compress-lzf,commons-cli,jakarta-regexp, + commons-lang3,commons-collections,commons-logging,commons-beanutils + + {maven-resources},{maven-dependencies},META-INF/git.properties=-target/classes/META-INF/git.properties + true + org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.* + + + + + diff --git a/sdnr/wt/devicemodel/feature/pom.xml b/sdnr/wt/devicemodel/feature/pom.xml index bd40e69be..164a90925 100644 --- a/sdnr/wt/devicemodel/feature/pom.xml +++ b/sdnr/wt/devicemodel/feature/pom.xml @@ -20,39 +20,39 @@ * ============LICENSE_END========================================================= --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemodel-feature - 0.7.0-SNAPSHOT - feature - ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemodel-feature + 0.7.0-SNAPSHOT + feature - + ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature + + + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + - - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - + + ${project.groupId} + sdnr-wt-devicemodel-model + ${project.version} + - - - - - ${project.groupId} - sdnr-wt-devicemodel-model - ${project.version} - - diff --git a/sdnr/wt/devicemodel/installer/pom.xml b/sdnr/wt/devicemodel/installer/pom.xml index f19c6b86d..24df6b4d3 100755 --- a/sdnr/wt/devicemodel/installer/pom.xml +++ b/sdnr/wt/devicemodel/installer/pom.xml @@ -22,91 +22,93 @@ --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemodel-installer - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemodel-installer + 0.7.0-SNAPSHOT + pom - - sdnr-wt-devicemodel - false - + ccsdk-features-sdnr-wt :: ${project.artifactId} - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-feature - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemodel-model - ${project.version} - - - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-nested-dependencies - - copy-dependencies - - prepare-package - - true - ${project.build.directory}/assembly/system - false - true - true - true - false - false - - - - - - + + sdnr-wt-devicemodel + false + + + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-feature + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemodel-model + ${project.version} + + + + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-nested-dependencies + + copy-dependencies + + prepare-package + + true + ${project.build.directory}/assembly/system + false + true + true + true + false + false + + + + + + diff --git a/sdnr/wt/devicemodel/model/pom.xml b/sdnr/wt/devicemodel/model/pom.xml index 3ee29cb4c..e95ff0635 100644 --- a/sdnr/wt/devicemodel/model/pom.xml +++ b/sdnr/wt/devicemodel/model/pom.xml @@ -22,52 +22,53 @@ --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemodel-model - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemodel-model + 0.7.0-SNAPSHOT + bundle - - true - + ccsdk-features-sdnr-wt :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + + true + - - - org.opendaylight.mdsal.model - ietf-topology - - - - - - org.jacoco - jacoco-maven-plugin - - - **/gen/** - **/generated-sources/** - **/yang-gen-sal/**/* - **/pax/** - - - - - + + + org.opendaylight.mdsal.model + ietf-topology + + + + + + + org.jacoco + jacoco-maven-plugin + + + **/gen/** + **/generated-sources/** + **/yang-gen-sal/**/* + **/pax/** + + + + + diff --git a/sdnr/wt/devicemodel/pom.xml b/sdnr/wt/devicemodel/pom.xml index e30c7e702..1d99b8c13 100755 --- a/sdnr/wt/devicemodel/pom.xml +++ b/sdnr/wt/devicemodel/pom.xml @@ -22,29 +22,29 @@ --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemodel-top - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemodel-top + 0.7.0-SNAPSHOT + pom - - sdnr-wt-devicemodel - + ccsdk-features-sdnr-wt :: ${project.artifactId} - - model - feature - installer - + + model + feature + installer + + + sdnr-wt-devicemodel + diff --git a/sdnr/wt/featureaggregator/feature/pom.xml b/sdnr/wt/featureaggregator/feature/pom.xml index 493b01d19..4c6b78a3c 100644 --- a/sdnr/wt/featureaggregator/feature/pom.xml +++ b/sdnr/wt/featureaggregator/feature/pom.xml @@ -20,76 +20,76 @@ * ============LICENSE_END========================================================= --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-feature-aggregator - 0.7.0-SNAPSHOT - feature - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-feature-aggregator + 0.7.0-SNAPSHOT + feature - + ccsdk-features-sdnr-wt :: ${project.artifactId} + + + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + - - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - + + ${project.groupId} + sdnr-wt-apigateway-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-helpserver-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-websocketmanager2-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-devicemanager-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-odlux-core-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-odlux-apps-feature + ${project.version} + xml + features + - - - - - ${project.groupId} - sdnr-wt-apigateway-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-helpserver-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-websocketmanager2-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-devicemanager-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-odlux-core-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-odlux-apps-feature - ${project.version} - xml - features - - diff --git a/sdnr/wt/featureaggregator/installer/pom.xml b/sdnr/wt/featureaggregator/installer/pom.xml index 6eae7c22a..026242019 100755 --- a/sdnr/wt/featureaggregator/installer/pom.xml +++ b/sdnr/wt/featureaggregator/installer/pom.xml @@ -20,129 +20,129 @@ * ============LICENSE_END========================================================= --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-feature-aggregator-installer - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-feature-aggregator-installer + 0.7.0-SNAPSHOT + pom - - sdnr-wt-feature-aggregator - true - ${project.version} - + ccsdk-features-sdnr-wt :: ${project.artifactId} - - - org.onap.ccsdk.features.sdnr.wt - ${application.name} - ${project.version} - xml - features - - - - - - - - + + sdnr-wt-feature-aggregator + true + ${project.version} + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - - - - - - - - - - - - - - - - - - - - copy-nested-dependencies - - copy-dependencies - - prepare-package - - true - ${project.build.directory}/assembly/system - false - true - true - true - false - false - - - - unpack-cache-schema - - unpack - - prepare-package - - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-provider - ${project.version} - jar - - - ${project.build.directory}/assembly - preload.cache.schema/** - false - true - - - - - - + + + org.onap.ccsdk.features.sdnr.wt + ${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 + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + + + + + + + + + + + + + + + + + + + copy-nested-dependencies + + copy-dependencies + + prepare-package + + true + ${project.build.directory}/assembly/system + false + true + true + true + false + false + + + + unpack-cache-schema + + unpack + + prepare-package + + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-provider + ${project.version} + jar + + + ${project.build.directory}/assembly + preload.cache.schema/** + false + true + + + + + + diff --git a/sdnr/wt/featureaggregator/pom.xml b/sdnr/wt/featureaggregator/pom.xml index e6e058774..f2051abcd 100755 --- a/sdnr/wt/featureaggregator/pom.xml +++ b/sdnr/wt/featureaggregator/pom.xml @@ -20,24 +20,24 @@ * ============LICENSE_END========================================================= --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-feature-aggregator-top - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-feature-aggregator-top + 0.7.0-SNAPSHOT + pom - - feature - installer - + ccsdk-features-sdnr-wt :: ${project.artifactId} + + feature + installer + diff --git a/sdnr/wt/helpserver/feature/pom.xml b/sdnr/wt/helpserver/feature/pom.xml index 88af2c785..f7e6271d9 100644 --- a/sdnr/wt/helpserver/feature/pom.xml +++ b/sdnr/wt/helpserver/feature/pom.xml @@ -22,29 +22,29 @@ --> - 4.0.0 - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-helpserver-feature - 0.7.0-SNAPSHOT - feature - ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature - - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - - - - - - - ${project.groupId} - sdnr-wt-helpserver-provider - ${project.version} - - - + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-helpserver-feature + 0.7.0-SNAPSHOT + feature + + ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature + + + + + ${project.groupId} + sdnr-wt-helpserver-provider + ${project.version} + + + diff --git a/sdnr/wt/helpserver/installer/pom.xml b/sdnr/wt/helpserver/installer/pom.xml index 368f495d7..01f6b3f6e 100755 --- a/sdnr/wt/helpserver/installer/pom.xml +++ b/sdnr/wt/helpserver/installer/pom.xml @@ -1,113 +1,114 @@ - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-helpserver-installer - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-helpserver-installer + 0.7.0-SNAPSHOT + pom - - sdnr-wt-helpserver - false - + ccsdk-features-sdnr-wt :: ${project.artifactId} - + + sdnr-wt-helpserver + false + - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-feature - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-provider - ${project.version} - - + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - - - - - - - - - - - - - - - - - - - - copy-nested-dependencies - - copy-dependencies - - prepare-package - - true - ${project.build.directory}/assembly/system - false - true - true - true - false - false - - - - - - - - + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-feature + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-provider + ${project.version} + + + + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + + + + + + + + + + + + + + + + + + + copy-nested-dependencies + + copy-dependencies + + prepare-package + + true + ${project.build.directory}/assembly/system + false + true + true + true + false + false + + + + + + + + diff --git a/sdnr/wt/helpserver/pom.xml b/sdnr/wt/helpserver/pom.xml index fd0a68cbb..4532c3465 100755 --- a/sdnr/wt/helpserver/pom.xml +++ b/sdnr/wt/helpserver/pom.xml @@ -22,29 +22,29 @@ --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-helpserver-top - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-helpserver-top + 0.7.0-SNAPSHOT + pom + ccsdk-features-sdnr-wt :: ${project.artifactId} - - feature - provider - installer - + + feature + provider + installer + - - sdnr-wt-helpserver - + + sdnr-wt-helpserver + diff --git a/sdnr/wt/helpserver/provider/pom.xml b/sdnr/wt/helpserver/provider/pom.xml index 80c27d318..0e237a61f 100644 --- a/sdnr/wt/helpserver/provider/pom.xml +++ b/sdnr/wt/helpserver/provider/pom.xml @@ -11,24 +11,27 @@ OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END========================================================= --> - - + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-helpserver-provider - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle - - true - org.onap.ccsdk.parent binding-parent 1.5.1-SNAPSHOT + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-helpserver-provider + 0.7.0-SNAPSHOT + bundle + + ccsdk-features-sdnr-wt :: ${project.artifactId} + + + true + + javax.servlet @@ -57,6 +60,7 @@ + diff --git a/sdnr/wt/odlux/apps/apiDemo/pom.xml b/sdnr/wt/odlux/apps/apiDemo/pom.xml index 012e279db..ea8f963c3 100644 --- a/sdnr/wt/odlux/apps/apiDemo/pom.xml +++ b/sdnr/wt/odlux/apps/apiDemo/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -7,11 +8,12 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-apiDemo 0.7.0-SNAPSHOT bundle + sdnr-wt-odlux-app-apiDemo @@ -19,6 +21,7 @@ http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -45,8 +48,32 @@ org.osgi.compendium + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -69,10 +96,10 @@ false - - bin - false - + + bin + false + @@ -138,27 +165,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - diff --git a/sdnr/wt/odlux/apps/app-feature/pom.xml b/sdnr/wt/odlux/apps/app-feature/pom.xml index 84b2611a7..adce6315b 100644 --- a/sdnr/wt/odlux/apps/app-feature/pom.xml +++ b/sdnr/wt/odlux/apps/app-feature/pom.xml @@ -14,18 +14,19 @@ 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-apps-feature - 0.7.0-SNAPSHOT - feature - ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature - org.onap.ccsdk.parent single-feature-parent 1.5.1-SNAPSHOT + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-apps-feature + 0.7.0-SNAPSHOT + feature + + ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature Apache License, Version 2.0 diff --git a/sdnr/wt/odlux/apps/app-installer/pom.xml b/sdnr/wt/odlux/apps/app-installer/pom.xml index 7437f7630..136bfc26f 100755 --- a/sdnr/wt/odlux/apps/app-installer/pom.xml +++ b/sdnr/wt/odlux/apps/app-installer/pom.xml @@ -2,12 +2,6 @@ 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-apps-installer - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} - org.onap.ccsdk.parent odlparent-lite @@ -15,10 +9,12 @@ - - sdnr-wt-odlux-apps - false - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-apps-installer + 0.7.0-SNAPSHOT + pom + + ccsdk-features-sdnr-wt :: ${project.artifactId} Apache License, Version 2.0 @@ -26,6 +22,11 @@ + + sdnr-wt-odlux-apps + false + + org.onap.ccsdk.features.sdnr.wt diff --git a/sdnr/wt/odlux/apps/configurationApp/pom.xml b/sdnr/wt/odlux/apps/configurationApp/pom.xml index 62742c05e..28d035b07 100644 --- a/sdnr/wt/odlux/apps/configurationApp/pom.xml +++ b/sdnr/wt/odlux/apps/configurationApp/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -7,11 +8,12 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-configurationApp 0.7.0-SNAPSHOT bundle + sdnr-wt-odlux-app-configurationApp @@ -19,6 +21,7 @@ http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -37,8 +40,32 @@ test + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -61,10 +88,10 @@ false - - bin - false - + + bin + false + @@ -130,27 +157,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - diff --git a/sdnr/wt/odlux/apps/connectApp/pom.xml b/sdnr/wt/odlux/apps/connectApp/pom.xml index 3da282c39..d85feb127 100644 --- a/sdnr/wt/odlux/apps/connectApp/pom.xml +++ b/sdnr/wt/odlux/apps/connectApp/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -7,11 +8,12 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-connectApp 0.7.0-SNAPSHOT bundle + sdnr-wt-odlux-app-connectApp @@ -19,6 +21,7 @@ http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -37,8 +40,32 @@ test + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -61,10 +88,10 @@ false - - bin - false - + + bin + false + @@ -130,27 +157,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - diff --git a/sdnr/wt/odlux/apps/demoApp/pom.xml b/sdnr/wt/odlux/apps/demoApp/pom.xml index 60016b7a1..32c8cc2c5 100644 --- a/sdnr/wt/odlux/apps/demoApp/pom.xml +++ b/sdnr/wt/odlux/apps/demoApp/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -7,11 +8,12 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-demoApp 0.7.0-SNAPSHOT bundle + sdnr-wt-odlux-app-demoApp @@ -19,6 +21,7 @@ http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -37,8 +40,32 @@ test + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -61,10 +88,10 @@ false - - bin - false - + + bin + false + @@ -130,27 +157,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - diff --git a/sdnr/wt/odlux/apps/faultApp/pom.xml b/sdnr/wt/odlux/apps/faultApp/pom.xml index b748b7d19..fc9e9762b 100644 --- a/sdnr/wt/odlux/apps/faultApp/pom.xml +++ b/sdnr/wt/odlux/apps/faultApp/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -8,11 +9,11 @@ - 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-faultApp 0.7.0-SNAPSHOT bundle + sdnr-wt-odlux-app-faultApp @@ -20,6 +21,7 @@ http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -38,8 +40,32 @@ test + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -62,10 +88,10 @@ false - - bin - false - + + bin + false + @@ -131,27 +157,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - diff --git a/sdnr/wt/odlux/apps/helpApp/pom.xml b/sdnr/wt/odlux/apps/helpApp/pom.xml index b88c233c3..a4d2ebdbc 100644 --- a/sdnr/wt/odlux/apps/helpApp/pom.xml +++ b/sdnr/wt/odlux/apps/helpApp/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -7,11 +8,12 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-helpApp 0.7.0-SNAPSHOT bundle + sdnr-wt-odlux-app-helpApp @@ -19,6 +21,7 @@ http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -37,8 +40,32 @@ test + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -61,10 +88,10 @@ false - - bin - false - + + bin + false + @@ -130,27 +157,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - diff --git a/sdnr/wt/odlux/apps/inventoryApp/pom.xml b/sdnr/wt/odlux/apps/inventoryApp/pom.xml index a958542e3..4fa2073a8 100644 --- a/sdnr/wt/odlux/apps/inventoryApp/pom.xml +++ b/sdnr/wt/odlux/apps/inventoryApp/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -7,11 +8,12 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-inventoryApp 0.7.0-SNAPSHOT bundle + sdnr-wt-odlux-app-inventoryApp @@ -19,6 +21,7 @@ http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -37,8 +40,32 @@ test + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -61,10 +88,10 @@ false - - bin - false - + + bin + false + @@ -130,27 +157,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - diff --git a/sdnr/wt/odlux/apps/maintenanceApp/pom.xml b/sdnr/wt/odlux/apps/maintenanceApp/pom.xml index aa574cf91..71a8aefaf 100644 --- a/sdnr/wt/odlux/apps/maintenanceApp/pom.xml +++ b/sdnr/wt/odlux/apps/maintenanceApp/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -7,11 +8,12 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-maintenanceApp 0.7.0-SNAPSHOT bundle + sdnr-wt-odlux-app-maintenanceApp @@ -19,6 +21,7 @@ http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -37,8 +40,32 @@ test + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -61,10 +88,10 @@ false - - bin - false - + + bin + false + @@ -130,27 +157,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - diff --git a/sdnr/wt/odlux/apps/mediatorApp/pom.xml b/sdnr/wt/odlux/apps/mediatorApp/pom.xml index e1ff2d5fc..81f1798ad 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/pom.xml +++ b/sdnr/wt/odlux/apps/mediatorApp/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -8,11 +9,11 @@ - 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-mediatorApp 0.7.0-SNAPSHOT bundle + sdnr-wt-odlux-app-mediatorApp @@ -20,6 +21,7 @@ http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -38,8 +40,32 @@ test + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -62,10 +88,10 @@ false - - bin - false - + + bin + false + @@ -131,27 +157,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - diff --git a/sdnr/wt/odlux/apps/minimumApp/pom.xml b/sdnr/wt/odlux/apps/minimumApp/pom.xml index bdc486ae3..529daa544 100644 --- a/sdnr/wt/odlux/apps/minimumApp/pom.xml +++ b/sdnr/wt/odlux/apps/minimumApp/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -7,11 +8,12 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-minimumApp 0.7.0-SNAPSHOT bundle + sdnr-wt-odlux-app-minimumApp @@ -19,6 +21,7 @@ http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -37,8 +40,32 @@ test + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -61,10 +88,10 @@ false - - bin - false - + + bin + false + @@ -130,27 +157,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml b/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml index 647b9efdb..2a172f7a0 100644 --- a/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml +++ b/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -7,11 +8,12 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-performanceHistoryApp 0.7.0-SNAPSHOT bundle + sdnr-wt-odlux-app-performanceHistoryApp @@ -19,6 +21,7 @@ http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -37,8 +40,32 @@ test + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -61,10 +88,10 @@ false - - bin - false - + + bin + false + @@ -130,27 +157,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - diff --git a/sdnr/wt/odlux/core/features/pom.xml b/sdnr/wt/odlux/core/features/pom.xml index 35655954a..39660b51a 100644 --- a/sdnr/wt/odlux/core/features/pom.xml +++ b/sdnr/wt/odlux/core/features/pom.xml @@ -14,18 +14,19 @@ 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-core-feature - 0.7.0-SNAPSHOT - feature - ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature - org.onap.ccsdk.parent single-feature-parent 1.5.1-SNAPSHOT + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-core-feature + 0.7.0-SNAPSHOT + feature + + ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature Apache License, Version 2.0 @@ -35,7 +36,7 @@ - + org.opendaylight.controller mdsal-artifacts @@ -45,7 +46,6 @@ - diff --git a/sdnr/wt/odlux/core/installer/pom.xml b/sdnr/wt/odlux/core/installer/pom.xml index 98a4fd50f..3ded887d8 100755 --- a/sdnr/wt/odlux/core/installer/pom.xml +++ b/sdnr/wt/odlux/core/installer/pom.xml @@ -1,99 +1,100 @@ - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-core-installer - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-core-installer + 0.7.0-SNAPSHOT + pom - - sdnr-wt-odlux-core - false - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + ccsdk-features-sdnr-wt :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-feature - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-provider - ${project.version} - - + + sdnr-wt-odlux-core + false + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-nested-dependencies - - copy-dependencies - - prepare-package - - true - ${project.build.directory}/assembly/system - false - true - true - true - false - false - - - - - - - - + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-feature + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-provider + ${project.version} + + + + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-nested-dependencies + + copy-dependencies + + prepare-package + + true + ${project.build.directory}/assembly/system + false + true + true + true + false + false + + + + + + + + diff --git a/sdnr/wt/odlux/core/model/pom.xml b/sdnr/wt/odlux/core/model/pom.xml index 1618e7aa1..e779d163b 100644 --- a/sdnr/wt/odlux/core/model/pom.xml +++ b/sdnr/wt/odlux/core/model/pom.xml @@ -2,18 +2,19 @@ 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-core-model - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle - org.onap.ccsdk.parent binding-parent 1.5.1-SNAPSHOT + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-core-model + 0.7.0-SNAPSHOT + bundle + + ccsdk-features-sdnr-wt :: ${project.artifactId} Apache License, Version 2.0 @@ -36,6 +37,7 @@ + diff --git a/sdnr/wt/odlux/core/pom.xml b/sdnr/wt/odlux/core/pom.xml index c41075a10..cfa0b348e 100644 --- a/sdnr/wt/odlux/core/pom.xml +++ b/sdnr/wt/odlux/core/pom.xml @@ -1,35 +1,35 @@ + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-core-top + 0.7.0-SNAPSHOT + pom - 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-core-top - 0.7.0-SNAPSHOT - pom - odlux-core + odlux-core + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - sdnr-wt-odlux-core - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + + model + provider + features + installer + - - model - provider - features - installer - + + sdnr-wt-odlux-core + diff --git a/sdnr/wt/odlux/core/provider/pom.xml b/sdnr/wt/odlux/core/provider/pom.xml index 84838a05f..bc18b2cea 100644 --- a/sdnr/wt/odlux/core/provider/pom.xml +++ b/sdnr/wt/odlux/core/provider/pom.xml @@ -1,108 +1,111 @@ - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-core-provider - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-core-model - ${project.version} - - - ${project.groupId} - sdnr-wt-odlux-framework - ${project.version} - - - org.eclipse.jetty - jetty-server - test - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-core-provider + 0.7.0-SNAPSHOT + bundle - - org.osgi - org.osgi.core - - - org.osgi - org.osgi.compendium - - - org.slf4j - slf4j-api - - - com.google.guava - guava - - - javax.servlet - javax.servlet-api - - - org.mockito - mockito-core - test - - - junit - junit - test - - - org.slf4j - slf4j-simple - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - maven-checkstyle-plugin - - true - - - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.ccsdk.features.sdnr.wt.odlux.*;resolution:=optional,*; - - sdnr-wt-odlux-framework;inline=true - true - ${project.groupId}.* - - - - - + ccsdk-features-sdnr-wt :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-core-model + ${project.version} + + + ${project.groupId} + sdnr-wt-odlux-framework + ${project.version} + + + org.eclipse.jetty + jetty-server + test + + + + org.osgi + org.osgi.core + + + org.osgi + org.osgi.compendium + + + org.slf4j + slf4j-api + + + com.google.guava + guava + + + javax.servlet + javax.servlet-api + + + org.mockito + mockito-core + test + + + junit + junit + test + + + org.slf4j + slf4j-simple + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + maven-checkstyle-plugin + + true + + + + org.apache.felix + maven-bundle-plugin + true + + + org.onap.ccsdk.features.sdnr.wt.odlux.*;resolution:=optional,*; + + sdnr-wt-odlux-framework;inline=true + true + ${project.groupId}.* + + + + + diff --git a/sdnr/wt/odlux/framework/pom.xml b/sdnr/wt/odlux/framework/pom.xml index abd0df0f5..7cc8a9b5d 100644 --- a/sdnr/wt/odlux/framework/pom.xml +++ b/sdnr/wt/odlux/framework/pom.xml @@ -1,160 +1,164 @@ + 4.0.0 - - org.onap.ccsdk.parent - odlparent - 1.5.1-SNAPSHOT - - - 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-framework - 0.7.0-SNAPSHOT - jar - sdnr-wt-odlux-framework - - ${maven.build.timestamp} - ONAP Dublin (Flourine-SR2) - 15.b8b89e4(19/08/12) - ONAP SDN-R | ONF Wireless for ${distversion} - Build: ${buildtime} ${buildno} ${project.version} - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + + org.onap.ccsdk.parent + odlparent + 1.5.1-SNAPSHOT + + - - - - maven-clean-plugin - - - - dist - false - - - node - false - - - node_modules - false - - - ../node_modules - false - - - - bin - false - - - - - - de.jacksitlab - frontend-maven-plugin - 1.7.1 - - - install node and yarn - - install-node-and-yarn - - - initialize - - v8.10.0 - v1.12.3 - - - - install lerna - - yarn - - initialize - - add lerna@3.13.1 -W --exact - ${project.basedir} - ${project.basedir}/../ - - - - exec lerna bootstrap - - lerna - - initialize - - false - bootstrap - ${project.basedir} - ${project.basedir}/../ - - - - yarn build - - yarn - - - run build - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - com.google.code.maven-replacer-plugin - replacer - 1.5.2 - - - replace version - prepare-package - - replace - - - - - ${project.build.directory}/classes/odlux - - app.js - - - - ##odlux.version## - ${odlux.version} - - - - - - - - dist - odlux - - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-framework + 0.7.0-SNAPSHOT + jar + + sdnr-wt-odlux-framework + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + + ${maven.build.timestamp} + ONAP Dublin (Flourine-SR2) + 15.b8b89e4(19/08/12) + ONAP SDN-R | ONF Wireless for ${distversion} - Build: ${buildtime} ${buildno} ${project.version} + + + + + highstreet repo + https://cloud-highstreet-technologies.com/mvn/ + + true + always + + + + + + + + dist + odlux + + + + + maven-clean-plugin + + + + dist + false + + + node + false + + + node_modules + false + + + ../node_modules + false + + + + bin + false + + + + + + de.jacksitlab + frontend-maven-plugin + 1.7.1 + + + install node and yarn + + install-node-and-yarn + + + initialize + + v8.10.0 + v1.12.3 + + + + install lerna + + yarn + + initialize + + add lerna@3.13.1 -W --exact + ${project.basedir} + ${project.basedir}/../ + + + + exec lerna bootstrap + + lerna + + initialize + + false + bootstrap + ${project.basedir} + ${project.basedir}/../ + + + + yarn build + + yarn + + + run build + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + com.google.code.maven-replacer-plugin + replacer + 1.5.2 + + + replace version + prepare-package + + replace + + + + + ${project.build.directory}/classes/odlux + + app.js + + + + ##odlux.version## + ${odlux.version} + + + + + + diff --git a/sdnr/wt/odlux/pom.xml b/sdnr/wt/odlux/pom.xml index 74455ddf3..d7b51724e 100644 --- a/sdnr/wt/odlux/pom.xml +++ b/sdnr/wt/odlux/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -8,12 +9,11 @@ - - 4.0.0 org.onap.ccsdk.features.sdnr.wt odlux-top 0.7.0-SNAPSHOT pom + odlux @@ -34,29 +34,28 @@ apps/app-installer - - - - exec-maven-plugin - org.codehaus.mojo - - - Clean node and node_modules - package - - exec - - - rm - - -r - node_modules - - - - - - - - + + + + org.codehaus.mojo + exec-maven-plugin + + + Clean node and node_modules + package + + exec + + + rm + + -r + node_modules + + + + + + + diff --git a/sdnr/wt/pom.xml b/sdnr/wt/pom.xml index 94fa46e75..b582dbe89 100644 --- a/sdnr/wt/pom.xml +++ b/sdnr/wt/pom.xml @@ -21,28 +21,29 @@ 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + org.onap.ccsdk.features.sdnr.wt sdnr-wt 0.7.0-SNAPSHOT pom + ccsdk-sdnr-wireless transport :: micro-services SDN-R wireless transport micro-services - common - apigateway - devicemodel - websocketmanager2 - helpserver - devicemanager - odlux - featureaggregator + common + apigateway + devicemodel + websocketmanager2 + helpserver + devicemanager + odlux + featureaggregator diff --git a/sdnr/wt/readthedocs/pom.xml b/sdnr/wt/readthedocs/pom.xml index 7e90d069d..428e72328 100644 --- a/sdnr/wt/readthedocs/pom.xml +++ b/sdnr/wt/readthedocs/pom.xml @@ -1,86 +1,88 @@ - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-readthedocs-installer - 0.5.1-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-readthedocs-installer + 0.5.1-SNAPSHOT + pom - - sdnr-wt-apigateway - false - - - - - exec-maven-plugin - org.codehaus.mojo - - - generate readthedocs files from helpserver markdowns - generate-resources - - exec - - - convert.sh - - - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - maven-resources-plugin - 3.1.0 - - - copy-resources - - - prepare-package - - copy-resources - - - ${project.build.directory}/assembly/docs/ - - - ../../../docs/ - true - - - - - - - - + ccsdk-features-sdnr-wt :: ${project.artifactId} + + + sdnr-wt-apigateway + false + + + + + + exec-maven-plugin + org.codehaus.mojo + + + generate readthedocs files from helpserver markdowns + generate-resources + + exec + + + convert.sh + + + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + maven-resources-plugin + 3.1.0 + + + copy-resources + + + prepare-package + + copy-resources + + + ${project.build.directory}/assembly/docs/ + + + ../../../docs/ + true + + + + + + + + diff --git a/sdnr/wt/websocketmanager2/feature/pom.xml b/sdnr/wt/websocketmanager2/feature/pom.xml index e86a46814..3ce6d3fb1 100644 --- a/sdnr/wt/websocketmanager2/feature/pom.xml +++ b/sdnr/wt/websocketmanager2/feature/pom.xml @@ -22,44 +22,44 @@ --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-websocketmanager2-feature - 0.7.0-SNAPSHOT - feature - ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-websocketmanager2-feature + 0.7.0-SNAPSHOT + feature - + ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature + + + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + - - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - + + ${project.groupId} + sdnr-wt-websocketmanager2-model + ${project.version} + + + ${project.groupId} + sdnr-wt-websocketmanager2-provider + ${project.version} + - - - - - ${project.groupId} - sdnr-wt-websocketmanager2-model - ${project.version} - - - ${project.groupId} - sdnr-wt-websocketmanager2-provider - ${project.version} - - diff --git a/sdnr/wt/websocketmanager2/installer/pom.xml b/sdnr/wt/websocketmanager2/installer/pom.xml index e363be323..dfedca560 100755 --- a/sdnr/wt/websocketmanager2/installer/pom.xml +++ b/sdnr/wt/websocketmanager2/installer/pom.xml @@ -22,111 +22,112 @@ --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-websocketmanager2-installer - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-websocketmanager2-installer + 0.7.0-SNAPSHOT + pom - - sdnr-wt-websocketmanager2 - false - + ccsdk-features-sdnr-wt :: ${project.artifactId} - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-feature - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-provider - ${project.version} - - + + sdnr-wt-websocketmanager2 + false + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - - - - - - - - - - - - - - - - - - - - copy-nested-dependencies - - copy-dependencies - - prepare-package - - true - ${project.build.directory}/assembly/system - false - true - true - true - false - false - - - - - - + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-feature + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-provider + ${project.version} + + + + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + + + + + + + + + + + + + + + + + + + copy-nested-dependencies + + copy-dependencies + + prepare-package + + true + ${project.build.directory}/assembly/system + false + true + true + true + false + false + + + + + + diff --git a/sdnr/wt/websocketmanager2/model/pom.xml b/sdnr/wt/websocketmanager2/model/pom.xml index fed8b2e54..fb8261858 100644 --- a/sdnr/wt/websocketmanager2/model/pom.xml +++ b/sdnr/wt/websocketmanager2/model/pom.xml @@ -22,16 +22,19 @@ --> - 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-websocketmanager2-model - 0.7.0-SNAPSHOT - bundle - ccsdk-features-sdnr-wt :: ${project.artifactId} - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + 4.0.0 + + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-websocketmanager2-model + 0.7.0-SNAPSHOT + bundle + + ccsdk-features-sdnr-wt :: ${project.artifactId} diff --git a/sdnr/wt/websocketmanager2/pom.xml b/sdnr/wt/websocketmanager2/pom.xml index f02ce1177..9c3798611 100755 --- a/sdnr/wt/websocketmanager2/pom.xml +++ b/sdnr/wt/websocketmanager2/pom.xml @@ -22,30 +22,30 @@ --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-websocketmanager2-top - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-websocketmanager2-top + 0.7.0-SNAPSHOT + pom - - sdnr-wt-websocketmanager2 - + ccsdk-features-sdnr-wt :: ${project.artifactId} - - model - provider - feature - installer - + + model + provider + feature + installer + + + sdnr-wt-websocketmanager2 + diff --git a/sdnr/wt/websocketmanager2/provider/pom.xml b/sdnr/wt/websocketmanager2/provider/pom.xml index 11d212f3f..20cf96445 100644 --- a/sdnr/wt/websocketmanager2/provider/pom.xml +++ b/sdnr/wt/websocketmanager2/provider/pom.xml @@ -11,116 +11,120 @@ OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-websocketmanager2-provider - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - - - true - true - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - - - - - - - - - - - - + 4.0.0 - - - ${project.groupId} - sdnr-wt-websocketmanager2-model - ${project.version} - - - javax.servlet - servlet-api - - - org.eclipse.jetty.websocket - websocket-api - - - org.eclipse.jetty.websocket - websocket-servlet - - - io.netty - netty-transport - - - io.netty - netty-all + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-websocketmanager2-provider + 0.7.0-SNAPSHOT + bundle + + ccsdk-features-sdnr-wt :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + + true + true + + + + + + + + + + + + + + + + ${project.groupId} + sdnr-wt-websocketmanager2-model + ${project.version} + + + javax.servlet + servlet-api + + + org.eclipse.jetty.websocket + websocket-api + + + org.eclipse.jetty.websocket + websocket-servlet + + + io.netty + netty-transport + + + io.netty + netty-all - - - org.json - json - - - com.typesafe.akka - akka-actor_2.12 - - - com.typesafe.akka - akka-cluster_2.12 - - - org.java-websocket - Java-WebSocket - - - org.mockito - mockito-core + + + org.json + json + + + com.typesafe.akka + akka-actor_2.12 + + + com.typesafe.akka + akka-cluster_2.12 + + + org.java-websocket + Java-WebSocket + + + org.mockito + mockito-core - test - - - org.opendaylight.controller - sal-binding-api - - - org.osgi - org.osgi.core - - - org.osgi - org.osgi.compendium - - - org.eclipse.jetty - jetty-server - test - - - org.eclipse.jetty - jetty-servlet - test - - - - - - + test + + + org.opendaylight.controller + sal-binding-api + + + org.osgi + org.osgi.core + + + org.osgi + org.osgi.compendium + + + org.eclipse.jetty + jetty-server + test + + + org.eclipse.jetty + jetty-servlet + test + + + + + + @@ -133,18 +137,18 @@ - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - + - + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + +