From 71fb63595ff340651f1499705849a08d0eba954b Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 5 Mar 2020 11:53:23 -0500 Subject: [PATCH] Roll master to Guilin Roll versions of master for early Guilin development Change-Id: If777c42a3a6bf10589835b73b02f2fccdeca9490 Issue-ID: CCSDK-2152 Signed-off-by: Dan Timoney --- artifacts/pom.xml | 17 ++++++------ features/ccsdk-gr-toolkit/pom.xml | 4 +-- features/ccsdk-properties-node/pom.xml | 5 ++-- features/ccsdk-restapi-call-node/pom.xml | 5 ++-- features/ccsdk-restconf-client/pom.xml | 11 +++----- features/ccsdk-sli-plugins-all/pom.xml | 5 ++-- features/ccsdk-sshapi-call-node/pom.xml | 9 +++---- features/ccsdk-template-node/pom.xml | 4 +-- features/features-sli-plugins/pom.xml | 4 +-- features/installer/pom.xml | 4 +-- features/pom.xml | 4 +-- grToolkit/installer/pom.xml | 11 +++++--- grToolkit/model/pom.xml | 9 ++++--- grToolkit/pom.xml | 6 ++--- grToolkit/provider/pom.xml | 45 +++++++++++++++++--------------- pom.xml | 4 +-- properties-node/installer/pom.xml | 4 +-- properties-node/pom.xml | 4 +-- properties-node/provider/pom.xml | 5 ++-- restapi-call-node/installer/pom.xml | 4 +-- restapi-call-node/pom.xml | 4 +-- restapi-call-node/provider/pom.xml | 6 ++--- restconf-client/installer/pom.xml | 4 +-- restconf-client/pom.xml | 4 +-- restconf-client/provider/pom.xml | 5 ++-- sshapi-call-node/installer/pom.xml | 4 +-- sshapi-call-node/pom.xml | 4 +-- sshapi-call-node/provider/pom.xml | 15 +++++------ template-node/installer/pom.xml | 4 +-- template-node/pom.xml | 4 +-- template-node/provider/pom.xml | 21 +++++++-------- version.properties | 6 ++--- 32 files changed, 120 insertions(+), 125 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index a6f406df..12109ce5 100755 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -2,9 +2,15 @@ 4.0.0 + + org.onap.ccsdk.parent + parent + 2.0.0-SNAPSHOT + + org.onap.ccsdk.sli.plugins sli-plugins-artifacts - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-plugins :: sli-plugins-artifacts @@ -13,13 +19,7 @@ ONAP - - - org.onap.ccsdk.parent - parent - 1.5.2 - - + @@ -102,5 +102,4 @@ - diff --git a/features/ccsdk-gr-toolkit/pom.xml b/features/ccsdk-gr-toolkit/pom.xml index 30899041..ceac4105 100644 --- a/features/ccsdk-gr-toolkit/pom.xml +++ b/features/ccsdk-gr-toolkit/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.plugins ccsdk-gr-toolkit - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId} diff --git a/features/ccsdk-properties-node/pom.xml b/features/ccsdk-properties-node/pom.xml index 2c1ca974..c22b00ae 100644 --- a/features/ccsdk-properties-node/pom.xml +++ b/features/ccsdk-properties-node/pom.xml @@ -5,18 +5,17 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.plugins ccsdk-properties-node - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-plugins :: properties-node :: ${project.artifactId} - diff --git a/features/ccsdk-restapi-call-node/pom.xml b/features/ccsdk-restapi-call-node/pom.xml index 3bb1ce31..29111052 100644 --- a/features/ccsdk-restapi-call-node/pom.xml +++ b/features/ccsdk-restapi-call-node/pom.xml @@ -5,18 +5,17 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.plugins ccsdk-restapi-call-node - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId} - javax.ws.rs diff --git a/features/ccsdk-restconf-client/pom.xml b/features/ccsdk-restconf-client/pom.xml index ad001ed1..0fb75b43 100644 --- a/features/ccsdk-restconf-client/pom.xml +++ b/features/ccsdk-restconf-client/pom.xml @@ -5,24 +5,21 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.plugins ccsdk-restconf-client - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature + ccsdk-sli-plugins :: restconf-client :: ${project.artifactId} + true - ccsdk-sli-plugins :: restconf-client :: ${project.artifactId} - - - - diff --git a/features/ccsdk-sli-plugins-all/pom.xml b/features/ccsdk-sli-plugins-all/pom.xml index 96f1b007..132abd56 100644 --- a/features/ccsdk-sli-plugins-all/pom.xml +++ b/features/ccsdk-sli-plugins-all/pom.xml @@ -5,18 +5,17 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.plugins ccsdk-sli-plugins-all - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-plugins :: features :: ${project.artifactId} - ${project.groupId} diff --git a/features/ccsdk-sshapi-call-node/pom.xml b/features/ccsdk-sshapi-call-node/pom.xml index 5209d49b..5b600563 100644 --- a/features/ccsdk-sshapi-call-node/pom.xml +++ b/features/ccsdk-sshapi-call-node/pom.xml @@ -5,20 +5,17 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.plugins ccsdk-sshapi-call-node - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId} - - - -