From f5da531e05c4294eb06003270a9083b63fb9e685 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Tue, 23 Oct 2018 09:21:16 -0400 Subject: Roll to initial Dublin snapshot Roll version to initial Dublin snapshot Change-Id: I50009b9cef542d4358bd0dbe5abebad8b1f1ad5b Issue-ID: CCSDK-617 Signed-off-by: Timoney, Dan (dt5972) --- .../adaptors/data-adaptor-provider/pom.xml | 14 +- blueprints-processor/adaptors/pom.xml | 40 ++-- .../adaptors/rest-adaptor-provider/pom.xml | 172 +++++++------- .../features/ccsdk-blueprints-processor/pom.xml | 147 ++++++------ .../features/features-blueprints-processor/pom.xml | 57 ++--- blueprints-processor/features/pom.xml | 37 +-- blueprints-processor/installer/pom.xml | 4 +- .../plugin/assignment-provider/pom.xml | 190 ++++++++-------- .../plugin/generator-provider/pom.xml | 194 ++++++++-------- blueprints-processor/plugin/model-provider/pom.xml | 226 +++++++++---------- blueprints-processor/plugin/pom.xml | 40 ++-- blueprints-processor/pom.xml | 6 +- features/ccsdk-features-all/pom.xml | 82 +++---- features/features-features/pom.xml | 47 ++-- features/installer/pom.xml | 251 +++++++++++---------- features/pom.xml | 39 ++-- pom.xml | 4 +- version.properties | 6 +- 18 files changed, 781 insertions(+), 775 deletions(-) diff --git a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml index c1e90e3ce..a8e4a287a 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml +++ b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml @@ -13,15 +13,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.1.1 - - + + org.onap.ccsdk.parent + binding-parent + 1.2.0-SNAPSHOT + + org.onap.ccsdk.features - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT blueprints-data-adaptor-provider bundle Blueprints Data Adaptor - Provider diff --git a/blueprints-processor/adaptors/pom.xml b/blueprints-processor/adaptors/pom.xml index fbe27f094..a7c3ccb22 100644 --- a/blueprints-processor/adaptors/pom.xml +++ b/blueprints-processor/adaptors/pom.xml @@ -17,26 +17,26 @@ --> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - org.onap.ccsdk.parent - odlparent-lite - 1.1.1 - - + + org.onap.ccsdk.parent + odlparent-lite + 1.2.0-SNAPSHOT + + - org.onap.ccsdk.features - 0.3.1-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 - + org.onap.ccsdk.features + 0.4.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 + diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml index 902cc9e45..525ee8f87 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml +++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml @@ -17,94 +17,94 @@ --> - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.1.1 - - + + org.onap.ccsdk.parent + binding-parent + 1.2.0-SNAPSHOT + + - org.onap.ccsdk.features - 0.3.1-SNAPSHOT - blueprints-rest-adaptor-provider - bundle - Blueprints Rest Adaptor - Provider - http://maven.apache.org + org.onap.ccsdk.features + 0.4.0-SNAPSHOT + blueprints-rest-adaptor-provider + bundle + Blueprints Rest Adaptor - Provider + http://maven.apache.org - - - org.apache.commons - commons-lang3 - ${commons.lang3.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - org.apache.httpcomponents - httpcore - ${apache.httpcomponents.core.version} - - - org.apache.httpcomponents - httpclient - ${apache.httpcomponents.client.version} - - - org.springframework - spring-web - ${spring.version} - - - com.att.eelf - eelf-core - ${eelf.version} - - - junit - junit - ${junit.version} - test - - + + + org.apache.commons + commons-lang3 + ${commons.lang3.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + org.apache.httpcomponents + httpcore + ${apache.httpcomponents.core.version} + + + org.apache.httpcomponents + httpclient + ${apache.httpcomponents.client.version} + + + org.springframework + spring-web + ${spring.version} + + + com.att.eelf + eelf-core + ${eelf.version} + + + junit + junit + ${junit.version} + test + + - - - - 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.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 + ${maven.bundle.version} + 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 09d805a83..619b08086 100644 --- a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml +++ b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml @@ -14,86 +14,87 @@ See the License for the specific language governing permissions and limitations under the License. --> - - 4.0.0 + + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 1.1.1 - - + + org.onap.ccsdk.parent + single-feature-parent + 1.2.0-SNAPSHOT + + - org.onap.ccsdk.features - ccsdk-blueprints-processor - 0.3.1-SNAPSHOT - feature + org.onap.ccsdk.features + ccsdk-blueprints-processor + 0.4.0-SNAPSHOT + feature - Blueprints Processor :: Features :: ${project.artifactId} + Blueprints Processor :: Features :: ${project.artifactId} - - - org.opendaylight.controller - odl-mdsal-broker - xml - features - + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + - - org.onap.ccsdk.sli.core - ccsdk-sli - xml - features - + + org.onap.ccsdk.sli.core + ccsdk-sli + xml + features + - - ${project.groupId} - blueprints-rest-adaptor-provider - ${project.version} - - - ${project.groupId} - blueprints-data-adaptor-provider - ${project.version} - - - ${project.groupId} - blueprints-model-provider - ${project.version} - - - ${project.groupId} - blueprints-generator-provider - ${project.version} - - - ${project.groupId} - blueprints-assignment-provider - ${project.version} - + + ${project.groupId} + blueprints-rest-adaptor-provider + ${project.version} + + + ${project.groupId} + blueprints-data-adaptor-provider + ${project.version} + + + ${project.groupId} + blueprints-model-provider + ${project.version} + + + ${project.groupId} + blueprints-generator-provider + ${project.version} + + + ${project.groupId} + blueprints-assignment-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} - - + + 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 1c01a0318..a8320adc5 100755 --- a/blueprints-processor/features/features-blueprints-processor/pom.xml +++ b/blueprints-processor/features/features-blueprints-processor/pom.xml @@ -14,32 +14,33 @@ See the License for the specific language governing permissions and limitations under the License. --> - - 4.0.0 - - - org.onap.ccsdk.parent - feature-repo-parent - 1.1.1 - - - - org.onap.ccsdk.features - features-blueprints-processor - 0.3.1-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.2.0-SNAPSHOT + + + + org.onap.ccsdk.features + features-blueprints-processor + 0.4.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 a4aa4ad2c..cbc47077f 100755 --- a/blueprints-processor/features/pom.xml +++ b/blueprints-processor/features/pom.xml @@ -14,26 +14,27 @@ See the License for the specific language governing permissions and limitations under the License. --> - - 4.0.0 + + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.1.1 - - + + org.onap.ccsdk.parent + odlparent-lite + 1.2.0-SNAPSHOT + + - org.onap.ccsdk.features - blueprints-processor-features - 0.3.1-SNAPSHOT - pom + org.onap.ccsdk.features + blueprints-processor-features + 0.4.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 56e545515..417ddbb35 100644 --- a/blueprints-processor/installer/pom.xml +++ b/blueprints-processor/installer/pom.xml @@ -23,13 +23,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT org.onap.ccsdk.features blueprints-processor-installer - 0.3.1-SNAPSHOT + 0.4.0-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 34d8e543e..776a10f5e 100644 --- a/blueprints-processor/plugin/assignment-provider/pom.xml +++ b/blueprints-processor/plugin/assignment-provider/pom.xml @@ -17,103 +17,103 @@ --> - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.1.1 - - + + org.onap.ccsdk.parent + binding-parent + 1.2.0-SNAPSHOT + + - org.onap.ccsdk.features - 0.3.1-SNAPSHOT - blueprints-assignment-provider - bundle - Blueprints Assignment - Provider - http://maven.apache.org + org.onap.ccsdk.features + 0.4.0-SNAPSHOT + blueprints-assignment-provider + bundle + 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 - ${junit.version} - test - - - org.apache.sling - org.apache.sling.testing.osgi-mock - 2.3.2 - test - - - org.powermock - powermock-api-mockito - 1.6.6 - test - - - org.powermock - powermock-module-junit4 - 1.6.6 - 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 + ${junit.version} + test + + + org.apache.sling + org.apache.sling.testing.osgi-mock + 2.3.2 + test + + + org.powermock + powermock-api-mockito + 1.6.6 + test + + + org.powermock + powermock-module-junit4 + 1.6.6 + test + + - - - - 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.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 + ${maven.bundle.version} + 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 7afd15f50..87203884c 100644 --- a/blueprints-processor/plugin/generator-provider/pom.xml +++ b/blueprints-processor/plugin/generator-provider/pom.xml @@ -17,105 +17,105 @@ --> - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.1.1 - - + + org.onap.ccsdk.parent + binding-parent + 1.2.0-SNAPSHOT + + - org.onap.ccsdk.features - 0.3.1-SNAPSHOT - blueprints-generator-provider - bundle - Blueprints Generator - Provider - http://maven.apache.org + org.onap.ccsdk.features + 0.4.0-SNAPSHOT + blueprints-generator-provider + bundle + 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 - ${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} - - - commons-io - commons-io - 2.5 - - - org.apache.velocity - velocity - 1.7 - - - org.powermock - powermock-api-mockito - 1.6.6 - test - - - org.powermock - powermock-module-junit4 - 1.6.6 - test - - - junit - junit - ${junit.version} - 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 + ${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} + + + commons-io + commons-io + 2.5 + + + org.apache.velocity + velocity + 1.7 + + + org.powermock + powermock-api-mockito + 1.6.6 + test + + + org.powermock + powermock-module-junit4 + 1.6.6 + test + + + junit + junit + ${junit.version} + test + + - - - - org.apache.felix - maven-bundle-plugin - ${maven.bundle.version} - 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 + ${maven.bundle.version} + 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 d61dea46c..0b9b4ded3 100644 --- a/blueprints-processor/plugin/model-provider/pom.xml +++ b/blueprints-processor/plugin/model-provider/pom.xml @@ -17,121 +17,121 @@ --> - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.1.1 - - + + org.onap.ccsdk.parent + binding-parent + 1.2.0-SNAPSHOT + + - org.onap.ccsdk.features - 0.3.1-SNAPSHOT - blueprints-model-provider - bundle - Blueprints Model - Provider - http://maven.apache.org + org.onap.ccsdk.features + 0.4.0-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-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 - - + + + 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.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 f52d15e30..2626c4281 100644 --- a/blueprints-processor/plugin/pom.xml +++ b/blueprints-processor/plugin/pom.xml @@ -16,27 +16,27 @@ --> - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.1.1 - - + + org.onap.ccsdk.parent + odlparent-lite + 1.2.0-SNAPSHOT + + - 0.3.1-SNAPSHOT - blueprints-processor-plugin - org.onap.ccsdk.features - pom - Blueprints Processor Plugins - POM - Blueprints Processor Plugins - POM - - model-provider - assignment-provider - generator-provider - + 0.4.0-SNAPSHOT + blueprints-processor-plugin + org.onap.ccsdk.features + pom + 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 fa2c09637..fabdc0254 100644 --- a/blueprints-processor/pom.xml +++ b/blueprints-processor/pom.xml @@ -24,13 +24,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 - + 1.2.0-SNAPSHOT + org.onap.ccsdk.features blueprints-processor - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT pom Blueprints Processor Module diff --git a/features/ccsdk-features-all/pom.xml b/features/ccsdk-features-all/pom.xml index 0c11f1346..849aaee39 100644 --- a/features/ccsdk-features-all/pom.xml +++ b/features/ccsdk-features-all/pom.xml @@ -15,52 +15,52 @@ limitations under the License. --> - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 1.1.1 - - + + org.onap.ccsdk.parent + single-feature-parent + 1.2.0-SNAPSHOT + + - org.onap.ccsdk.features - ccsdk-features-all - 0.3.1-SNAPSHOT - feature + org.onap.ccsdk.features + ccsdk-features-all + 0.4.0-SNAPSHOT + feature - ccsdk-features :: features :: ${project.artifactId} + 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.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 - ccsdk-blueprints-processor - ${project.version} - xml - features - + + + org.onap.ccsdk.features + ccsdk-blueprints-processor + ${project.version} + xml + features + - + diff --git a/features/features-features/pom.xml b/features/features-features/pom.xml index 2c37bde40..3d4a668ba 100644 --- a/features/features-features/pom.xml +++ b/features/features-features/pom.xml @@ -14,31 +14,32 @@ See the License for the specific language governing permissions and limitations under the License. --> - - 4.0.0 + + 4.0.0 - - org.onap.ccsdk.parent - feature-repo-parent - 1.1.1 - - + + org.onap.ccsdk.parent + feature-repo-parent + 1.2.0-SNAPSHOT + + - org.onap.ccsdk.features - features-features - 0.3.1-SNAPSHOT - feature + org.onap.ccsdk.features + features-features + 0.4.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 3c5863353..adb93a54e 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -14,140 +14,141 @@ See the License for the specific language governing permissions and limitations under the License. --> - - 4.0.0 + + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.1.1 - - + + org.onap.ccsdk.parent + odlparent-lite + 1.2.0-SNAPSHOT + + - org.onap.ccsdk.features - features-installer - 0.3.1-SNAPSHOT - pom + org.onap.ccsdk.features + features-installer + 0.4.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 bd58334d9..61c752d41 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -14,27 +14,28 @@ See the License for the specific language governing permissions and limitations under the License. --> - - 4.0.0 + + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.1.1 - - + + org.onap.ccsdk.parent + odlparent-lite + 1.2.0-SNAPSHOT + + - org.onap.ccsdk.features - ccsdk-feature-aggregator - 0.3.1-SNAPSHOT - pom + org.onap.ccsdk.features + ccsdk-feature-aggregator + 0.4.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 9cb1bb686..ac8f243d1 100755 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT org.onap.ccsdk.features ccsdk-features - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT pom ccsdk-features diff --git a/version.properties b/version.properties index e5ea9c747..aa6328e0e 100644 --- a/version.properties +++ b/version.properties @@ -5,11 +5,11 @@ release_name=0 -sprint_number=3 -feature_revision=1 +sprint_number=4 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} -release_version=${base_version} +release_version=${base_version}-STAGING snapshot_version=${base_version}-SNAPSHOT -- cgit 1.2.3-korg