From 0190b382e4b37854c4461bfcfce594c20f5dd8a8 Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Tue, 2 Mar 2021 20:00:49 -0500 Subject: Refactoring pom's name tag Indenting pom's and running mvn tidy:pom to rearrange items Issue-ID: CCSDK-3198 Signed-off-by: Singal, Kapil (ks220y) Change-Id: Ic9c7cfd76bd98e6a101ec7788841d96316508735 --- plugins/artifacts/pom.xml | 198 +++++----- plugins/features/ccsdk-gr-toolkit/pom.xml | 2 +- plugins/features/ccsdk-properties-node/pom.xml | 3 +- plugins/features/ccsdk-restapi-call-node/pom.xml | 54 +-- plugins/features/ccsdk-restconf-client/pom.xml | 59 ++- plugins/features/ccsdk-sli-plugins-all/pom.xml | 114 +++--- plugins/features/ccsdk-sshapi-call-node/pom.xml | 4 +- plugins/features/ccsdk-template-node/pom.xml | 40 +- plugins/features/installer/pom.xml | 401 ++++++++++----------- plugins/features/pom.xml | 38 +- plugins/grToolkit/installer/pom.xml | 2 +- plugins/grToolkit/model/pom.xml | 3 +- plugins/grToolkit/pom.xml | 2 +- plugins/grToolkit/provider/pom.xml | 26 +- plugins/pom.xml | 2 +- plugins/properties-node/installer/pom.xml | 2 +- plugins/properties-node/pom.xml | 5 +- plugins/properties-node/provider/pom.xml | 20 +- .../ccsdk/sli/plugins/prop/TestPropertiesNode.java | 4 +- .../provider/src/test/resources/test-invalid.xml | 8 +- .../provider/src/test/resources/test.xml | 8 +- plugins/restapi-call-node/installer/pom.xml | 226 ++++++------ plugins/restapi-call-node/pom.xml | 2 +- plugins/restapi-call-node/provider/pom.xml | 44 +-- .../provider/src/test/resources/test.xml | 8 +- plugins/restconf-client/installer/pom.xml | 2 +- plugins/restconf-client/pom.xml | 2 +- plugins/restconf-client/provider/pom.xml | 4 +- plugins/sshapi-call-node/installer/pom.xml | 226 ++++++------ plugins/sshapi-call-node/pom.xml | 2 +- plugins/sshapi-call-node/provider/pom.xml | 21 +- .../provider/src/test/resources/test.xml | 8 +- plugins/template-node/installer/pom.xml | 228 ++++++------ plugins/template-node/pom.xml | 2 + plugins/template-node/provider/pom.xml | 82 ++--- 35 files changed, 925 insertions(+), 927 deletions(-) (limited to 'plugins') diff --git a/plugins/artifacts/pom.xml b/plugins/artifacts/pom.xml index 0826fb50e..6063beb4b 100755 --- a/plugins/artifacts/pom.xml +++ b/plugins/artifacts/pom.xml @@ -1,106 +1,106 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.1.1 - - + + org.onap.ccsdk.parent + odlparent-lite + 2.1.1 + + - org.onap.ccsdk.sli.plugins - sli-plugins-artifacts - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.plugins + sli-plugins-artifacts + 1.2.1-SNAPSHOT + pom - ccsdk-sli-plugins :: sli-plugins-artifacts - CCSDK plugins components Bill of Materials (BOM) - https://wiki.onap.org - - ONAP - + ccsdk-sli-plugins :: ${project.artifactId} + CCSDK plugins components Bill of Materials (BOM) + https://wiki.onap.org + + ONAP + - - - - org.onap.ccsdk.sli.plugins - ccsdk-properties-node - ${project.version} - xml - feature - - - org.onap.ccsdk.sli.plugins - ccsdk-restapi-call-node - ${project.version} - xml - feature - - - org.onap.ccsdk.sli.plugins - ccsdk-restconf-client - ${project.version} - xml - feature - - - org.onap.ccsdk.sli.plugins - ccsdk-template-node - ${project.version} - xml - feature - - - org.onap.ccsdk.sli.plugins - fabric-discovery-plugin-provider - ${project.version} - - - org.onap.ccsdk.sli.plugins - fabric-discovery-plugin-installer - ${project.version} - - - org.onap.ccsdk.sli.plugins - properties-node-provider - ${project.version} - - - org.onap.ccsdk.sli.plugins - properties-node-installer - ${project.version} - - - org.onap.ccsdk.sli.plugins - restapi-call-node-provider - ${project.version} - - - org.onap.ccsdk.sli.plugins - restapi-call-node-installer - ${project.version} - - - org.onap.ccsdk.sli.plugins - restconf-client-provider - ${project.version} - - - org.onap.ccsdk.sli.plugins - restconf-client-installer - ${project.version} - - - org.onap.ccsdk.sli.plugins - template-node-provider - ${project.version} - - - org.onap.ccsdk.sli.plugins - template-node-installer - ${project.version} - - - + + + + org.onap.ccsdk.sli.plugins + ccsdk-properties-node + ${project.version} + xml + feature + + + org.onap.ccsdk.sli.plugins + ccsdk-restapi-call-node + ${project.version} + xml + feature + + + org.onap.ccsdk.sli.plugins + ccsdk-restconf-client + ${project.version} + xml + feature + + + org.onap.ccsdk.sli.plugins + ccsdk-template-node + ${project.version} + xml + feature + + + org.onap.ccsdk.sli.plugins + fabric-discovery-plugin-provider + ${project.version} + + + org.onap.ccsdk.sli.plugins + fabric-discovery-plugin-installer + ${project.version} + + + org.onap.ccsdk.sli.plugins + properties-node-provider + ${project.version} + + + org.onap.ccsdk.sli.plugins + properties-node-installer + ${project.version} + + + org.onap.ccsdk.sli.plugins + restapi-call-node-provider + ${project.version} + + + org.onap.ccsdk.sli.plugins + restapi-call-node-installer + ${project.version} + + + org.onap.ccsdk.sli.plugins + restconf-client-provider + ${project.version} + + + org.onap.ccsdk.sli.plugins + restconf-client-installer + ${project.version} + + + org.onap.ccsdk.sli.plugins + template-node-provider + ${project.version} + + + org.onap.ccsdk.sli.plugins + template-node-installer + ${project.version} + + + diff --git a/plugins/features/ccsdk-gr-toolkit/pom.xml b/plugins/features/ccsdk-gr-toolkit/pom.xml index 072755d4b..c6afe244a 100644 --- a/plugins/features/ccsdk-gr-toolkit/pom.xml +++ b/plugins/features/ccsdk-gr-toolkit/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId} + ccsdk-sli-plugins :: features :: ${project.artifactId} diff --git a/plugins/features/ccsdk-properties-node/pom.xml b/plugins/features/ccsdk-properties-node/pom.xml index db737aca7..c11500f57 100644 --- a/plugins/features/ccsdk-properties-node/pom.xml +++ b/plugins/features/ccsdk-properties-node/pom.xml @@ -14,11 +14,10 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-plugins :: properties-node :: ${project.artifactId} + ccsdk-sli-plugins :: features :: ${project.artifactId} - ${project.groupId} properties-node-provider diff --git a/plugins/features/ccsdk-restapi-call-node/pom.xml b/plugins/features/ccsdk-restapi-call-node/pom.xml index af44fb223..2b8898a74 100644 --- a/plugins/features/ccsdk-restapi-call-node/pom.xml +++ b/plugins/features/ccsdk-restapi-call-node/pom.xml @@ -1,38 +1,38 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 2.1.1 - - + + org.onap.ccsdk.parent + single-feature-parent + 2.1.1 + + - org.onap.ccsdk.sli.plugins - ccsdk-restapi-call-node - 1.2.1-SNAPSHOT - feature + org.onap.ccsdk.sli.plugins + ccsdk-restapi-call-node + 1.2.1-SNAPSHOT + feature - ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId} + ccsdk-sli-plugins :: features :: ${project.artifactId} - + javax.ws.rs javax.ws.rs-api - - - ${project.groupId} - restapi-call-node-provider - ${project.version} - - - - org.onap.logging-analytics - logging-filter-base - - - - + + + ${project.groupId} + restapi-call-node-provider + ${project.version} + + + + org.onap.logging-analytics + logging-filter-base + + + + diff --git a/plugins/features/ccsdk-restconf-client/pom.xml b/plugins/features/ccsdk-restconf-client/pom.xml index edea3ee5d..30b2e503b 100644 --- a/plugins/features/ccsdk-restconf-client/pom.xml +++ b/plugins/features/ccsdk-restconf-client/pom.xml @@ -1,39 +1,38 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 2.1.1 - - + + org.onap.ccsdk.parent + single-feature-parent + 2.1.1 + + - org.onap.ccsdk.sli.plugins - ccsdk-restconf-client - 1.2.1-SNAPSHOT - feature + org.onap.ccsdk.sli.plugins + ccsdk-restconf-client + 1.2.1-SNAPSHOT + feature - ccsdk-sli-plugins :: restconf-client :: ${project.artifactId} + ccsdk-sli-plugins :: features :: ${project.artifactId} - - true - + + true + - + - - - ${project.groupId} - restconf-client-provider - ${project.version} - - - - org.onap.logging-analytics - logging-filter-base - - - - + + ${project.groupId} + restconf-client-provider + ${project.version} + + + + org.onap.logging-analytics + logging-filter-base + + + + diff --git a/plugins/features/ccsdk-sli-plugins-all/pom.xml b/plugins/features/ccsdk-sli-plugins-all/pom.xml index 0ac957f0e..17d66c34a 100644 --- a/plugins/features/ccsdk-sli-plugins-all/pom.xml +++ b/plugins/features/ccsdk-sli-plugins-all/pom.xml @@ -1,60 +1,60 @@ - 4.0.0 - - - org.onap.ccsdk.parent - single-feature-parent - 2.1.1 - - - - org.onap.ccsdk.sli.plugins - ccsdk-sli-plugins-all - 1.2.1-SNAPSHOT - feature - - ccsdk-sli-plugins :: features :: ${project.artifactId} - - - - ${project.groupId} - ccsdk-properties-node - ${project.version} - xml - features - - - - ${project.groupId} - ccsdk-restapi-call-node - ${project.version} - xml - features - - - - ${project.groupId} - ccsdk-restconf-client - ${project.version} - xml - features - - - - ${project.groupId} - ccsdk-template-node - ${project.version} - xml - features - - - - ${project.groupId} - ccsdk-sshapi-call-node - ${project.version} - xml - features - - + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 2.1.1 + + + + org.onap.ccsdk.sli.plugins + ccsdk-sli-plugins-all + 1.2.1-SNAPSHOT + feature + + ccsdk-sli-plugins :: features :: ${project.artifactId} + + + + ${project.groupId} + ccsdk-properties-node + ${project.version} + xml + features + + + + ${project.groupId} + ccsdk-restapi-call-node + ${project.version} + xml + features + + + + ${project.groupId} + ccsdk-restconf-client + ${project.version} + xml + features + + + + ${project.groupId} + ccsdk-template-node + ${project.version} + xml + features + + + + ${project.groupId} + ccsdk-sshapi-call-node + ${project.version} + xml + features + + diff --git a/plugins/features/ccsdk-sshapi-call-node/pom.xml b/plugins/features/ccsdk-sshapi-call-node/pom.xml index c9a1d213b..79b2e286e 100644 --- a/plugins/features/ccsdk-sshapi-call-node/pom.xml +++ b/plugins/features/ccsdk-sshapi-call-node/pom.xml @@ -14,9 +14,9 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId} - + 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.sli.plugins - 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/plugins/features/pom.xml b/plugins/features/pom.xml index 4c26161e2..1b8b15af1 100755 --- a/plugins/features/pom.xml +++ b/plugins/features/pom.xml @@ -1,28 +1,28 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.1.1 - - + + org.onap.ccsdk.parent + odlparent-lite + 2.1.1 + + - org.onap.ccsdk.sli.plugins - sliplugins-feature-aggregator - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.plugins + sliplugins-feature-aggregator + 1.2.1-SNAPSHOT + pom - ccsdk-sli-plugins :: features + ccsdk-sli-plugins :: features - - ccsdk-gr-toolkit - ccsdk-properties-node - ccsdk-restapi-call-node - ccsdk-restconf-client - ccsdk-sshapi-call-node - ccsdk-template-node + + ccsdk-gr-toolkit + ccsdk-properties-node + ccsdk-restapi-call-node + ccsdk-restconf-client + ccsdk-sshapi-call-node + ccsdk-template-node ccsdk-sli-plugins-all features-sli-plugins installer diff --git a/plugins/grToolkit/installer/pom.xml b/plugins/grToolkit/installer/pom.xml index c9c6d378a..dbd5ece1c 100755 --- a/plugins/grToolkit/installer/pom.xml +++ b/plugins/grToolkit/installer/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} ccsdk-gr-toolkit diff --git a/plugins/grToolkit/model/pom.xml b/plugins/grToolkit/model/pom.xml index b9a7e41a0..f4fe6af06 100755 --- a/plugins/grToolkit/model/pom.xml +++ b/plugins/grToolkit/model/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} @@ -22,6 +22,5 @@ rfc6991 - diff --git a/plugins/grToolkit/pom.xml b/plugins/grToolkit/pom.xml index 8808d54ca..476007f38 100755 --- a/plugins/grToolkit/pom.xml +++ b/plugins/grToolkit/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-plugins :: gr-toolkit + ccsdk-sli-plugins :: ${project.artifactId} ODL bundle used to judge health of SDN-C application. diff --git a/plugins/grToolkit/provider/pom.xml b/plugins/grToolkit/provider/pom.xml index acb42b17b..6e6604721 100755 --- a/plugins/grToolkit/provider/pom.xml +++ b/plugins/grToolkit/provider/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} @@ -53,18 +53,18 @@ mdsal-binding-test-model test - - - - - - - - - - - - + + + + + + + + + + + + junit junit diff --git a/plugins/pom.xml b/plugins/pom.xml index c5c4ad39f..3c1baea16 100755 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -13,7 +13,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-plugins + ${project.artifactId} CCSDK Java Plugins https://wiki.onap.org diff --git a/plugins/properties-node/installer/pom.xml b/plugins/properties-node/installer/pom.xml index fe36ad381..3d6ee7cf2 100755 --- a/plugins/properties-node/installer/pom.xml +++ b/plugins/properties-node/installer/pom.xml @@ -13,7 +13,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-plugins :: properties-node :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} ccsdk-properties-node diff --git a/plugins/properties-node/pom.xml b/plugins/properties-node/pom.xml index 5be15e5af..70dcbf11f 100755 --- a/plugins/properties-node/pom.xml +++ b/plugins/properties-node/pom.xml @@ -13,9 +13,10 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-plugins :: properties-node + ccsdk-sli-plugins :: ${project.artifactId} This is an implementation of DG Execute Node that reads property file and - puts the properties in the DG context + puts the properties in the DG context + provider diff --git a/plugins/properties-node/provider/pom.xml b/plugins/properties-node/provider/pom.xml index d3571f197..d112ff604 100755 --- a/plugins/properties-node/provider/pom.xml +++ b/plugins/properties-node/provider/pom.xml @@ -13,18 +13,18 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-plugins :: properties-node :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${project.version} - pom - import - - + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${project.version} + pom + import + + diff --git a/plugins/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java b/plugins/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java index a858c49b3..34ac4685f 100644 --- a/plugins/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java +++ b/plugins/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java @@ -20,7 +20,7 @@ public class TestPropertiesNode { private static final Logger log = LoggerFactory.getLogger(TestPropertiesNode.class); @Rule public EnvironmentVariables environmentVariables = new EnvironmentVariables(); - + @Test public void testJSONFileParsing() throws SvcLogicException { SvcLogicContext ctx = new SvcLogicContext(); @@ -535,7 +535,7 @@ public class TestPropertiesNode { PropertiesNode rcn = new PropertiesNode(); rcn.readProperties(p, ctx); - assertEquals(ctx.getAttribute("NotFileBased.RESTAPI"),"Call Node - Provider"); + assertEquals(ctx.getAttribute("NotFileBased.ccsdk-sli-plugins"),": properties-node-provider :: test.xml"); assertEquals(ctx.getAttribute("NotFileBased."); diff --git a/plugins/properties-node/provider/src/test/resources/test-invalid.xml b/plugins/properties-node/provider/src/test/resources/test-invalid.xml index 50bd0fff2..3e4bd3b2d 100644 --- a/plugins/properties-node/provider/src/test/resources/test-invalid.xml +++ b/plugins/properties-node/provider/src/test/resources/test-invalid.xml @@ -9,9 +9,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,11 +25,11 @@ org.onap.ccsdk.sli.plugins restapi-call-node - 6.0.0-SNAPSHOT + 0.0.0-SNAPSHOT restapi-call-node-provider bundle - RESTAPI Call Node - Provider + ccsdk-sli-plugins :: properties-node-provider :: test-invalid.xml http://maven.apache.org UTF-8 diff --git a/plugins/properties-node/provider/src/test/resources/test.xml b/plugins/properties-node/provider/src/test/resources/test.xml index 19e3b7139..b3e1164e4 100644 --- a/plugins/properties-node/provider/src/test/resources/test.xml +++ b/plugins/properties-node/provider/src/test/resources/test.xml @@ -9,9 +9,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,11 +25,11 @@ org.onap.ccsdk.sli.plugins restapi-call-node - 6.0.0-SNAPSHOT + 0.0.0-SNAPSHOT restapi-call-node-provider bundle - RESTAPI Call Node - Provider + ccsdk-sli-plugins :: properties-node-provider :: test.xml http://maven.apache.org UTF-8 diff --git a/plugins/restapi-call-node/installer/pom.xml b/plugins/restapi-call-node/installer/pom.xml index 2f98ff6ca..eb50cf81e 100755 --- a/plugins/restapi-call-node/installer/pom.xml +++ b/plugins/restapi-call-node/installer/pom.xml @@ -1,125 +1,125 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.1.1 - + + org.onap.ccsdk.parent + odlparent-lite + 2.1.1 + - org.onap.ccsdk.sli.plugins - restapi-call-node-installer - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.plugins + restapi-call-node-installer + 1.2.1-SNAPSHOT + pom - ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} - - ccsdk-restapi-call-node - ${application.name} + + ccsdk-restapi-call-node + ${application.name} mvn:org.onap.ccsdk.sli.plugins/${features.boot}/${project.version}/xml/features - false - + false + - - - org.onap.ccsdk.sli.plugins - restapi-call-node-provider - ${project.version} - - + + + org.onap.ccsdk.sli.plugins + restapi-call-node-provider + ${project.version} + + - - - - maven-assembly-plugin - 2.6 - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - 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.sli.plugins - provided - - - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ${basedir}/target/stage - - - src/main/resources/scripts - - install-feature.sh - - true - - - - + + + + maven-assembly-plugin + 2.6 + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + 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.sli.plugins + 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/plugins/restapi-call-node/pom.xml b/plugins/restapi-call-node/pom.xml index 613cf8583..0db05c2b9 100755 --- a/plugins/restapi-call-node/pom.xml +++ b/plugins/restapi-call-node/pom.xml @@ -13,7 +13,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-plugins :: restapi-call-node + ccsdk-sli-plugins :: ${project.artifactId} This is an implementation of DG Execute Node that makes a call to an external REST API diff --git a/plugins/restapi-call-node/provider/pom.xml b/plugins/restapi-call-node/provider/pom.xml index 026a619f7..c0cf257ed 100755 --- a/plugins/restapi-call-node/provider/pom.xml +++ b/plugins/restapi-call-node/provider/pom.xml @@ -13,25 +13,25 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${project.version} - pom - import - - - org.glassfish.jersey - jersey-bom - 2.27 - import - pom - - + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${project.version} + pom + import + + + org.glassfish.jersey + jersey-bom + 2.27 + pom + import + + @@ -74,7 +74,7 @@ org.onap.logging-analytics logging-filter-base - + junit @@ -82,10 +82,10 @@ test - com.github.stefanbirkner - system-rules - 1.19.0 - test + com.github.stefanbirkner + system-rules + 1.19.0 + test org.glassfish.jersey.containers diff --git a/plugins/restapi-call-node/provider/src/test/resources/test.xml b/plugins/restapi-call-node/provider/src/test/resources/test.xml index 1974f688e..1f42886e9 100644 --- a/plugins/restapi-call-node/provider/src/test/resources/test.xml +++ b/plugins/restapi-call-node/provider/src/test/resources/test.xml @@ -9,9 +9,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,11 +25,11 @@ org.onap.ccsdk.sli.plugins restapi-call-node - 6.0.0-SNAPSHOT + 0.0.0-SNAPSHOT restapi-call-node-provider bundle - RESTAPI Call Node - Provider + ccsdk-sli-plugins :: restapi-call-node-provider :: test.xml http://maven.apache.org UTF-8 diff --git a/plugins/restconf-client/installer/pom.xml b/plugins/restconf-client/installer/pom.xml index 5378fae70..6e92da538 100755 --- a/plugins/restconf-client/installer/pom.xml +++ b/plugins/restconf-client/installer/pom.xml @@ -13,7 +13,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-plugins :: restconf-client :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} ccsdk-restconf-client diff --git a/plugins/restconf-client/pom.xml b/plugins/restconf-client/pom.xml index fc233ece2..801c0ed93 100755 --- a/plugins/restconf-client/pom.xml +++ b/plugins/restconf-client/pom.xml @@ -13,7 +13,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-plugins :: restconf-client + ccsdk-sli-plugins :: ${project.artifactId} This is an implementation of DG Execute Node that makes a call to an external RESTCONF API diff --git a/plugins/restconf-client/provider/pom.xml b/plugins/restconf-client/provider/pom.xml index 1a3301075..3640d6cfd 100755 --- a/plugins/restconf-client/provider/pom.xml +++ b/plugins/restconf-client/provider/pom.xml @@ -13,7 +13,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-plugins :: restconf-client :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} @@ -28,8 +28,8 @@ org.glassfish.jersey jersey-bom 2.27 - import pom + import diff --git a/plugins/sshapi-call-node/installer/pom.xml b/plugins/sshapi-call-node/installer/pom.xml index 5b40477fc..73bf80a11 100755 --- a/plugins/sshapi-call-node/installer/pom.xml +++ b/plugins/sshapi-call-node/installer/pom.xml @@ -1,126 +1,126 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.1.1 - + + org.onap.ccsdk.parent + odlparent-lite + 2.1.1 + - org.onap.ccsdk.sli.plugins - sshapi-call-node-installer - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.plugins + sshapi-call-node-installer + 1.2.1-SNAPSHOT + pom - ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} - - ccsdk-sshapi-call-node - ${application.name} + + ccsdk-sshapi-call-node + ${application.name} mvn:org.onap.ccsdk.sli.plugins/${features.boot}/${project.version}/xml/features - false - + false + - + - - org.onap.ccsdk.sli.plugins - sshapi-call-node-provider - ${project.version} - - + + org.onap.ccsdk.sli.plugins + sshapi-call-node-provider + ${project.version} + + - - - - maven-assembly-plugin - 2.6 - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - 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.sli.plugins - provided - - - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ${basedir}/target/stage - - - src/main/resources/scripts - - install-feature.sh - - true - - - - + + + + maven-assembly-plugin + 2.6 + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + 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.sli.plugins + 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/plugins/sshapi-call-node/pom.xml b/plugins/sshapi-call-node/pom.xml index 4bdd9a7fa..90bc7c92c 100755 --- a/plugins/sshapi-call-node/pom.xml +++ b/plugins/sshapi-call-node/pom.xml @@ -13,7 +13,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-plugins :: sshapi-call-node + ccsdk-sli-plugins :: ${project.artifactId} This is an implementation of DG Execute Node that makes a call to an external REST API diff --git a/plugins/sshapi-call-node/provider/pom.xml b/plugins/sshapi-call-node/provider/pom.xml index e933e05b8..7410211f0 100755 --- a/plugins/sshapi-call-node/provider/pom.xml +++ b/plugins/sshapi-call-node/provider/pom.xml @@ -13,19 +13,18 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId} - + ccsdk-sli-plugins :: ${project.artifactId} - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${project.version} - pom - import - - + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${project.version} + pom + import + + diff --git a/plugins/sshapi-call-node/provider/src/test/resources/test.xml b/plugins/sshapi-call-node/provider/src/test/resources/test.xml index 7645f1992..b6977854a 100644 --- a/plugins/sshapi-call-node/provider/src/test/resources/test.xml +++ b/plugins/sshapi-call-node/provider/src/test/resources/test.xml @@ -11,9 +11,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -27,11 +27,11 @@ org.onap.ccsdk.sli.plugins sshapi-call-node - 6.0.0-SNAPSHOT + 0.0.0-SNAPSHOT sshapi-call-node-provider bundle - SSHAPI Call Node - Provider + ccsdk-sli-plugins :: sshapi-call-node-provider :: test.xml http://maven.apache.org UTF-8 diff --git a/plugins/template-node/installer/pom.xml b/plugins/template-node/installer/pom.xml index e0d24c416..3eb7a4b27 100644 --- a/plugins/template-node/installer/pom.xml +++ b/plugins/template-node/installer/pom.xml @@ -1,125 +1,125 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.1.1 - + + org.onap.ccsdk.parent + odlparent-lite + 2.1.1 + - org.onap.ccsdk.sli.plugins - template-node-installer - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.plugins + template-node-installer + 1.2.1-SNAPSHOT + pom - ccsdk-sli-plugins :: template-node :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} - - ccsdk-template-node - ${application.name} - mvn:org.onap.ccsdk.sli.plugins/${features.boot}/${project.version}/xml/features - false - + + ccsdk-template-node + ${application.name} + mvn:org.onap.ccsdk.sli.plugins/${features.boot}/${project.version}/xml/features + false + - - - org.onap.ccsdk.sli.plugins - template-node-provider - ${project.version} - - + + + org.onap.ccsdk.sli.plugins + template-node-provider + ${project.version} + + - - - - maven-assembly-plugin - 2.6 - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - 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.sli.plugins - provided - - - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ${basedir}/target/stage - - - src/main/resources/scripts - - install-feature.sh - - true - - - - + + + + maven-assembly-plugin + 2.6 + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + 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.sli.plugins + 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/plugins/template-node/pom.xml b/plugins/template-node/pom.xml index 847ce01fc..5f9997dab 100644 --- a/plugins/template-node/pom.xml +++ b/plugins/template-node/pom.xml @@ -13,6 +13,8 @@ 1.2.1-SNAPSHOT pom + ccsdk-sli-plugins :: ${project.artifactId} + provider installer diff --git a/plugins/template-node/provider/pom.xml b/plugins/template-node/provider/pom.xml index 0b6551a73..3058ae8a7 100644 --- a/plugins/template-node/provider/pom.xml +++ b/plugins/template-node/provider/pom.xml @@ -1,49 +1,49 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 2.1.1 - + + org.onap.ccsdk.parent + binding-parent + 2.1.1 + - org.onap.ccsdk.sli.plugins - template-node-provider - 1.2.1-SNAPSHOT - bundle + org.onap.ccsdk.sli.plugins + template-node-provider + 1.2.1-SNAPSHOT + bundle - ccsdk-sli-plugins :: template-node :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} - - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${project.version} - pom - import - - + + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${project.version} + pom + import + + - - - junit - junit - test - - - org.onap.ccsdk.sli.core - sli-common - provided - - - org.slf4j - slf4j-api - - - org.apache.velocity - velocity - - + + + junit + junit + test + + + org.onap.ccsdk.sli.core + sli-common + provided + + + org.slf4j + slf4j-api + + + org.apache.velocity + velocity + + -- cgit 1.2.3-korg