From a2f171d1fa87c9a54356f4992c1a23611caa8ae8 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Fri, 4 Jan 2019 09:29:30 -0500 Subject: Changes for Fluorine Updated ccsdk/features to run in OpenDaylight Fluorine release. Change-Id: I62d13d52ea4a19fb0e0bb329eda9fc350013a051 Issue-ID: CCSDK-870 Signed-off-by: Timoney, Dan (dt5972) --- .../adaptors/data-adaptor-provider/pom.xml | 19 +- blueprints-processor/adaptors/pom.xml | 4 +- .../adaptors/rest-adaptor-provider/pom.xml | 4 +- .../features/ccsdk-blueprints-processor/pom.xml | 9 +- .../features/features-blueprints-processor/pom.xml | 4 +- blueprints-processor/features/pom.xml | 4 +- blueprints-processor/installer/pom.xml | 4 +- .../plugin/assignment-provider/pom.xml | 4 +- .../plugin/generator-provider/pom.xml | 4 +- blueprints-processor/plugin/model-provider/pom.xml | 225 +++++++++++---------- blueprints-processor/plugin/pom.xml | 4 +- blueprints-processor/pom.xml | 4 +- features/ccsdk-features-all/pom.xml | 23 +-- features/features-features/pom.xml | 4 +- features/installer/pom.xml | 4 +- features/pom.xml | 4 +- pom.xml | 4 +- sdnr/northbound/energysavings/features/pom.xml | 2 +- sdnr/northbound/energysavings/installer/pom.xml | 2 +- sdnr/northbound/energysavings/model/pom.xml | 2 +- sdnr/northbound/energysavings/pom.xml | 2 +- sdnr/northbound/energysavings/provider/pom.xml | 2 +- version.properties | 2 +- 23 files changed, 166 insertions(+), 174 deletions(-) diff --git a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml index 18996327a..3b7755326 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml +++ b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml @@ -13,33 +13,42 @@ org.onap.ccsdk.parent binding-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.features - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT blueprints-data-adaptor-provider bundle Blueprints Data Adaptor - Provider http://maven.apache.org + + + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${ccsdk.sli.core.version} + pom + import + + + org.apache.commons commons-lang3 - ${commons.lang3.version} org.onap.ccsdk.sli.core sli-provider - ${project.version} compile commons-io commons-io - 2.5 org.mariadb.jdbc diff --git a/blueprints-processor/adaptors/pom.xml b/blueprints-processor/adaptors/pom.xml index 9d5ddc4d1..8eed36d62 100644 --- a/blueprints-processor/adaptors/pom.xml +++ b/blueprints-processor/adaptors/pom.xml @@ -20,12 +20,12 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.features - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT 4.0.0 pom blueprints-processor-adaptors diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml index 8ecf61518..af272f6bb 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml +++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml @@ -21,12 +21,12 @@ org.onap.ccsdk.parent binding-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.features - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT blueprints-rest-adaptor-provider bundle Blueprints Rest Adaptor - Provider diff --git a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml index c59831990..eddda7c1a 100644 --- a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml +++ b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml @@ -20,13 +20,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.features ccsdk-blueprints-processor - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT feature Blueprints Processor :: Features :: ${project.artifactId} @@ -44,6 +44,7 @@ org.onap.ccsdk.sli.core ccsdk-sli + ${ccsdk.sli.core.version} xml features @@ -77,22 +78,18 @@ 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} diff --git a/blueprints-processor/features/features-blueprints-processor/pom.xml b/blueprints-processor/features/features-blueprints-processor/pom.xml index 52b716e59..c08a1bb02 100755 --- a/blueprints-processor/features/features-blueprints-processor/pom.xml +++ b/blueprints-processor/features/features-blueprints-processor/pom.xml @@ -20,13 +20,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.features features-blueprints-processor - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT feature Blueprints Processor :: CCSDK Features :: ${project.artifactId} diff --git a/blueprints-processor/features/pom.xml b/blueprints-processor/features/pom.xml index adbb04eca..9ed22efd9 100755 --- a/blueprints-processor/features/pom.xml +++ b/blueprints-processor/features/pom.xml @@ -20,13 +20,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.features blueprints-processor-features - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom Blueprints Processor :: Features aggregator :: ${project.artifactId} diff --git a/blueprints-processor/installer/pom.xml b/blueprints-processor/installer/pom.xml index 932f75764..46928b263 100644 --- a/blueprints-processor/installer/pom.xml +++ b/blueprints-processor/installer/pom.xml @@ -20,13 +20,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.features blueprints-processor-installer - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom Blueprints Processor :: ${project.artifactId} diff --git a/blueprints-processor/plugin/assignment-provider/pom.xml b/blueprints-processor/plugin/assignment-provider/pom.xml index 7fbce4507..953d640ef 100644 --- a/blueprints-processor/plugin/assignment-provider/pom.xml +++ b/blueprints-processor/plugin/assignment-provider/pom.xml @@ -21,12 +21,12 @@ org.onap.ccsdk.parent binding-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.features - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT blueprints-assignment-provider bundle Blueprints Assignment - Provider diff --git a/blueprints-processor/plugin/generator-provider/pom.xml b/blueprints-processor/plugin/generator-provider/pom.xml index 17daad8d3..7bcd820de 100644 --- a/blueprints-processor/plugin/generator-provider/pom.xml +++ b/blueprints-processor/plugin/generator-provider/pom.xml @@ -21,12 +21,12 @@ org.onap.ccsdk.parent binding-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.features - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT blueprints-generator-provider bundle Blueprints Generator - Provider diff --git a/blueprints-processor/plugin/model-provider/pom.xml b/blueprints-processor/plugin/model-provider/pom.xml index 2fbb0f074..b0f2a3ae4 100644 --- a/blueprints-processor/plugin/model-provider/pom.xml +++ b/blueprints-processor/plugin/model-provider/pom.xml @@ -16,119 +16,124 @@ limitations under the License. --> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.2.0 - - + + org.onap.ccsdk.parent + binding-parent + 1.2.1-SNAPSHOT + + - org.onap.ccsdk.features - 0.4.0-SNAPSHOT - blueprints-model-provider - bundle - Blueprints Model - Provider - http://maven.apache.org + org.onap.ccsdk.features + 0.4.1-SNAPSHOT + blueprints-model-provider + bundle + Blueprints Model - Provider + http://maven.apache.org - - - com.fasterxml.jackson.core - jackson-core - ${jackson.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} + + + com.jayway.jsonpath + json-path + 2.3.0 + + + org.onap.ccsdk.features + blueprints-rest-adaptor-provider + ${project.version} + + + org.onap.ccsdk.features + blueprints-data-adaptor-provider + ${project.version} + + + org.powermock + powermock-api-mockito + 1.6.6 + test + + + org.powermock + powermock-module-junit4 + 1.6.6 + test + + + org.apache.sling + org.apache.sling.testing.osgi-mock + 2.3.2 + test + + + junit + junit + ${junit.version} + test + + + commons-collections + commons-collections + 3.2.2 + + + org.osgi + org.osgi.core + provided - - 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} - - - com.jayway.jsonpath - json-path - 2.3.0 - - - org.onap.ccsdk.features - blueprints-rest-adaptor-provider - ${project.version} - - - org.onap.ccsdk.features - blueprints-data-adaptor-provider - ${project.version} - - - org.powermock - powermock-api-mockito - 1.6.6 - test - - - org.powermock - powermock-module-junit4 - 1.6.6 - test - - - org.apache.sling - org.apache.sling.testing.osgi-mock - 2.3.2 - test - - - junit - junit - ${junit.version} - test - - - commons-collections - commons-collections - 3.2.2 - - + - - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - - - org.apache.felix - maven-bundle-plugin - ${maven.bundle.version} - true - - - ${project.artifactId} - ${project.groupId}.${project.artifactId} - org.onap.ccsdk.features.model, - org.onap.ccsdk.features.model.data, - org.onap.ccsdk.features.model.data.api, - org.onap.ccsdk.features.model.data.dict, - org.onap.ccsdk.features.model.domain, - org.onap.ccsdk.features.model.service, - org.onap.ccsdk.features.model.utils, - org.onap.ccsdk.features.model.validator - - - - - - + + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.version} + true + + + ${project.artifactId} + ${project.groupId}.${project.artifactId} + org.onap.ccsdk.features.model, + org.onap.ccsdk.features.model.data, + org.onap.ccsdk.features.model.data.api, + org.onap.ccsdk.features.model.data.dict, + org.onap.ccsdk.features.model.domain, + org.onap.ccsdk.features.model.service, + org.onap.ccsdk.features.model.utils, + org.onap.ccsdk.features.model.validator + + + + + + diff --git a/blueprints-processor/plugin/pom.xml b/blueprints-processor/plugin/pom.xml index 58b3fe394..edfcbd0aa 100644 --- a/blueprints-processor/plugin/pom.xml +++ b/blueprints-processor/plugin/pom.xml @@ -21,11 +21,11 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT blueprints-processor-plugin org.onap.ccsdk.features pom diff --git a/blueprints-processor/pom.xml b/blueprints-processor/pom.xml index ea3fb2966..5db00f108 100644 --- a/blueprints-processor/pom.xml +++ b/blueprints-processor/pom.xml @@ -21,13 +21,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.features blueprints-processor - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom Blueprints Processor Module diff --git a/features/ccsdk-features-all/pom.xml b/features/ccsdk-features-all/pom.xml index 63c066dc6..9369ec6bf 100644 --- a/features/ccsdk-features-all/pom.xml +++ b/features/ccsdk-features-all/pom.xml @@ -20,37 +20,18 @@ org.onap.ccsdk.parent single-feature-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.features ccsdk-features-all - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT feature ccsdk-features :: 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 - - - - org.onap.ccsdk.features diff --git a/features/features-features/pom.xml b/features/features-features/pom.xml index ca2fb6916..72a26e91e 100644 --- a/features/features-features/pom.xml +++ b/features/features-features/pom.xml @@ -20,13 +20,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.features features-features - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT feature Blueprints Processor :: features :: ${project.artifactId} diff --git a/features/installer/pom.xml b/features/installer/pom.xml index 52e5faf81..4d1aaa128 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -20,13 +20,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.features features-installer - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom Blueprints Processor :: features :: ${project.artifactId} diff --git a/features/pom.xml b/features/pom.xml index a905586ec..b4bada827 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -20,13 +20,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.features ccsdk-feature-aggregator - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom Blueprints Processor :: features diff --git a/pom.xml b/pom.xml index e38d20f9a..b77cf3cfa 100755 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.features ccsdk-features - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom ccsdk-features diff --git a/sdnr/northbound/energysavings/features/pom.xml b/sdnr/northbound/energysavings/features/pom.xml index 4cbb4592f..368787b25 100644 --- a/sdnr/northbound/energysavings/features/pom.xml +++ b/sdnr/northbound/energysavings/features/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent feature-repo-parent - 1.2.0 + 1.2.1-SNAPSHOT diff --git a/sdnr/northbound/energysavings/installer/pom.xml b/sdnr/northbound/energysavings/installer/pom.xml index ad5708318..3a3524e52 100755 --- a/sdnr/northbound/energysavings/installer/pom.xml +++ b/sdnr/northbound/energysavings/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT diff --git a/sdnr/northbound/energysavings/model/pom.xml b/sdnr/northbound/energysavings/model/pom.xml index 78f9e5c03..e30bd9874 100644 --- a/sdnr/northbound/energysavings/model/pom.xml +++ b/sdnr/northbound/energysavings/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 1.2.0 + 1.2.1-SNAPSHOT diff --git a/sdnr/northbound/energysavings/pom.xml b/sdnr/northbound/energysavings/pom.xml index 3e049f37c..28b046d09 100644 --- a/sdnr/northbound/energysavings/pom.xml +++ b/sdnr/northbound/energysavings/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT diff --git a/sdnr/northbound/energysavings/provider/pom.xml b/sdnr/northbound/energysavings/provider/pom.xml index 52014662b..0794a3051 100644 --- a/sdnr/northbound/energysavings/provider/pom.xml +++ b/sdnr/northbound/energysavings/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 1.2.0 + 1.2.1-SNAPSHOT diff --git a/version.properties b/version.properties index ffee02fc4..b1967d0a1 100644 --- a/version.properties +++ b/version.properties @@ -6,7 +6,7 @@ release_name=0 sprint_number=4 -feature_revision=0 +feature_revision=1 base_version=${release_name}.${sprint_number}.${feature_revision} -- cgit 1.2.3-korg