From 4a46dddefcfb5380db07b8b35e799ba7145801d0 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Tue, 8 Jan 2019 14:20:28 -0500 Subject: [PATCH] Prepare for release build Prepare for release of early ODL-Oxygen based CCSDK Dublin Change-Id: I322ccb15e1064a9acc7f2060c744623895766a87 Issue-ID: CCSDK-870 Signed-off-by: Timoney, Dan (dt5972) --- .../adaptors/data-adaptor-provider/pom.xml | 9 +- blueprints-processor/adaptors/pom.xml | 81 +++-- .../adaptors/rest-adaptor-provider/pom.xml | 197 ++++++------ .../features/ccsdk-blueprints-processor/pom.xml | 8 +- .../features/features-blueprints-processor/pom.xml | 8 +- blueprints-processor/features/pom.xml | 8 +- blueprints-processor/installer/pom.xml | 343 ++++++++++----------- .../plugin/assignment-provider/pom.xml | 183 ++++++----- .../plugin/generator-provider/pom.xml | 239 +++++++------- blueprints-processor/plugin/model-provider/pom.xml | 271 ++++++++-------- blueprints-processor/plugin/pom.xml | 82 +++-- blueprints-processor/pom.xml | 91 +++--- features/ccsdk-features-all/pom.xml | 8 +- features/features-features/pom.xml | 8 +- features/installer/pom.xml | 8 +- features/pom.xml | 8 +- pom.xml | 138 ++++----- sdnr/northbound/energysavings/features/pom.xml | 11 +- sdnr/northbound/energysavings/installer/pom.xml | 7 +- sdnr/northbound/energysavings/model/pom.xml | 9 +- sdnr/northbound/energysavings/pom.xml | 2 +- sdnr/northbound/energysavings/provider/pom.xml | 9 +- version.properties | 2 +- 23 files changed, 842 insertions(+), 888 deletions(-) diff --git a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml index a8e4a287a..18996327a 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml +++ b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml @@ -7,17 +7,14 @@ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - - + 4.0.0 org.onap.ccsdk.parent binding-parent - 1.2.0-SNAPSHOT - + 1.2.0 + org.onap.ccsdk.features diff --git a/blueprints-processor/adaptors/pom.xml b/blueprints-processor/adaptors/pom.xml index a7c3ccb22..9d5ddc4d1 100644 --- a/blueprints-processor/adaptors/pom.xml +++ b/blueprints-processor/adaptors/pom.xml @@ -1,42 +1,39 @@ - - - - - - - org.onap.ccsdk.parent - odlparent-lite - 1.2.0-SNAPSHOT - - - - 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 - - + + + + + + org.onap.ccsdk.parent + odlparent-lite + 1.2.0 + + + + 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 525ee8f87..8ecf61518 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml +++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml @@ -1,110 +1,107 @@ - - - - - 4.0.0 - - - org.onap.ccsdk.parent - binding-parent - 1.2.0-SNAPSHOT - - - - 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 + + + + 4.0.0 + + + org.onap.ccsdk.parent + binding-parent + 1.2.0 + + + + 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 + + + org.apache.httpcomponents httpclient ${apache.httpcomponents.client.version} - - - org.springframework - spring-web + + + 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 - - + + + 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.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 619b08086..c59831990 100644 --- a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml +++ b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml @@ -14,16 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.onap.ccsdk.parent single-feature-parent - 1.2.0-SNAPSHOT - + 1.2.0 + org.onap.ccsdk.features diff --git a/blueprints-processor/features/features-blueprints-processor/pom.xml b/blueprints-processor/features/features-blueprints-processor/pom.xml index a8320adc5..52b716e59 100755 --- a/blueprints-processor/features/features-blueprints-processor/pom.xml +++ b/blueprints-processor/features/features-blueprints-processor/pom.xml @@ -14,16 +14,14 @@ 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.2.0-SNAPSHOT - + 1.2.0 + org.onap.ccsdk.features diff --git a/blueprints-processor/features/pom.xml b/blueprints-processor/features/pom.xml index cbc47077f..adbb04eca 100755 --- a/blueprints-processor/features/pom.xml +++ b/blueprints-processor/features/pom.xml @@ -14,16 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.onap.ccsdk.parent odlparent-lite - 1.2.0-SNAPSHOT - + 1.2.0 + org.onap.ccsdk.features diff --git a/blueprints-processor/installer/pom.xml b/blueprints-processor/installer/pom.xml index 417ddbb35..932f75764 100644 --- a/blueprints-processor/installer/pom.xml +++ b/blueprints-processor/installer/pom.xml @@ -1,173 +1,170 @@ - - - - - 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.2.0-SNAPSHOT - - - - org.onap.ccsdk.features - blueprints-processor-installer - 0.4.0-SNAPSHOT - pom - Blueprints Processor :: ${project.artifactId} - - - 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} - - - - - - - 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 - - - - - - - - - + + + + 4.0.0 + + org.onap.ccsdk.parent + odlparent-lite + 1.2.0 + + + + org.onap.ccsdk.features + blueprints-processor-installer + 0.4.0-SNAPSHOT + pom + Blueprints Processor :: ${project.artifactId} + + + 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} + + + + + + + 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 776a10f5e..7fbce4507 100644 --- a/blueprints-processor/plugin/assignment-provider/pom.xml +++ b/blueprints-processor/plugin/assignment-provider/pom.xml @@ -1,47 +1,44 @@ - - - - - 4.0.0 - - - org.onap.ccsdk.parent - binding-parent - 1.2.0-SNAPSHOT - - - - 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} - - + + + + 4.0.0 + + + org.onap.ccsdk.parent + binding-parent + 1.2.0 + + + + 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} @@ -62,58 +59,58 @@ ${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 - - + 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.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 87203884c..17daad8d3 100644 --- a/blueprints-processor/plugin/generator-provider/pom.xml +++ b/blueprints-processor/plugin/generator-provider/pom.xml @@ -1,121 +1,118 @@ - - - - - 4.0.0 - - - org.onap.ccsdk.parent - binding-parent - 1.2.0-SNAPSHOT - - - - 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.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 - - - - - - - + + + + 4.0.0 + + + org.onap.ccsdk.parent + binding-parent + 1.2.0 + + + + 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.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 0b9b4ded3..2fbb0f074 100644 --- a/blueprints-processor/plugin/model-provider/pom.xml +++ b/blueprints-processor/plugin/model-provider/pom.xml @@ -1,137 +1,134 @@ - - - - - 4.0.0 - - - org.onap.ccsdk.parent - binding-parent - 1.2.0-SNAPSHOT - - - - 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 - - - - - - - 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 - - - - - - - + + + + 4.0.0 + + + org.onap.ccsdk.parent + binding-parent + 1.2.0 + + + + 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 + + + + + + + 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 2626c4281..58b3fe394 100644 --- a/blueprints-processor/plugin/pom.xml +++ b/blueprints-processor/plugin/pom.xml @@ -1,42 +1,40 @@ - - - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 1.2.0-SNAPSHOT - - - - 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 - - - + + + + 4.0.0 + + + org.onap.ccsdk.parent + odlparent-lite + 1.2.0 + + + + 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 fabdc0254..ea3fb2966 100644 --- a/blueprints-processor/pom.xml +++ b/blueprints-processor/pom.xml @@ -1,47 +1,44 @@ - - - - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 1.2.0-SNAPSHOT - - - - org.onap.ccsdk.features - blueprints-processor - 0.4.0-SNAPSHOT - pom - - Blueprints Processor Module - http://wiki.sdn.labs.att.com - Blueprints Processor Blueprints Processor - - - adaptors - plugin - features - installer - - - + + + + 4.0.0 + + + org.onap.ccsdk.parent + odlparent-lite + 1.2.0 + + + + org.onap.ccsdk.features + blueprints-processor + 0.4.0-SNAPSHOT + pom + + Blueprints Processor Module + http://wiki.sdn.labs.att.com + 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 849aaee39..63c066dc6 100644 --- a/features/ccsdk-features-all/pom.xml +++ b/features/ccsdk-features-all/pom.xml @@ -14,16 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.onap.ccsdk.parent single-feature-parent - 1.2.0-SNAPSHOT - + 1.2.0 + org.onap.ccsdk.features diff --git a/features/features-features/pom.xml b/features/features-features/pom.xml index 3d4a668ba..ca2fb6916 100644 --- a/features/features-features/pom.xml +++ b/features/features-features/pom.xml @@ -14,16 +14,14 @@ 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.2.0-SNAPSHOT - + 1.2.0 + org.onap.ccsdk.features diff --git a/features/installer/pom.xml b/features/installer/pom.xml index adb93a54e..52e5faf81 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -14,16 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.onap.ccsdk.parent odlparent-lite - 1.2.0-SNAPSHOT - + 1.2.0 + org.onap.ccsdk.features diff --git a/features/pom.xml b/features/pom.xml index 61c752d41..a905586ec 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -14,16 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.onap.ccsdk.parent odlparent-lite - 1.2.0-SNAPSHOT - + 1.2.0 + org.onap.ccsdk.features diff --git a/pom.xml b/pom.xml index ac8f243d1..e38d20f9a 100755 --- a/pom.xml +++ b/pom.xml @@ -1,70 +1,68 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 1.2.0-SNAPSHOT - - - - org.onap.ccsdk.features - ccsdk-features - 0.4.0-SNAPSHOT - pom - - ccsdk-features - CCSDK applications - https://wiki.onap.org - - ONAP - - - - features - blueprints-processor - - - - 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 - - - - - - - - - + + + 4.0.0 + + + org.onap.ccsdk.parent + odlparent-lite + 1.2.0 + + + + org.onap.ccsdk.features + ccsdk-features + 0.4.0-SNAPSHOT + pom + + ccsdk-features + CCSDK applications + https://wiki.onap.org + + ONAP + + + + features + blueprints-processor + + + + 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 + + + + + + + + + diff --git a/sdnr/northbound/energysavings/features/pom.xml b/sdnr/northbound/energysavings/features/pom.xml index df93ee52c..4cbb4592f 100644 --- a/sdnr/northbound/energysavings/features/pom.xml +++ b/sdnr/northbound/energysavings/features/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 org.onap.ccsdk.parent feature-repo-parent - 1.0.5-SNAPSHOT - + 1.2.0 + org.onap.ccsdk.features.sdnr.northbound @@ -73,7 +72,7 @@ - + @@ -86,7 +85,7 @@ - + diff --git a/sdnr/northbound/energysavings/installer/pom.xml b/sdnr/northbound/energysavings/installer/pom.xml index 93c23c51b..ad5708318 100755 --- a/sdnr/northbound/energysavings/installer/pom.xml +++ b/sdnr/northbound/energysavings/installer/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 org.onap.ccsdk.parent odlparent-lite - 1.0.5-SNAPSHOT - + 1.2.0 + org.onap.ccsdk.features.sdnr.northbound diff --git a/sdnr/northbound/energysavings/model/pom.xml b/sdnr/northbound/energysavings/model/pom.xml index d22fbfc34..78f9e5c03 100644 --- a/sdnr/northbound/energysavings/model/pom.xml +++ b/sdnr/northbound/energysavings/model/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 org.onap.ccsdk.parent binding-parent - 1.0.5-SNAPSHOT - + 1.2.0 + org.onap.ccsdk.features.sdnr.northbound @@ -45,7 +44,7 @@ - + diff --git a/sdnr/northbound/energysavings/pom.xml b/sdnr/northbound/energysavings/pom.xml index 395441a12..3e049f37c 100644 --- a/sdnr/northbound/energysavings/pom.xml +++ b/sdnr/northbound/energysavings/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.0.5-SNAPSHOT + 1.2.0 diff --git a/sdnr/northbound/energysavings/provider/pom.xml b/sdnr/northbound/energysavings/provider/pom.xml index 0314acccf..52014662b 100644 --- a/sdnr/northbound/energysavings/provider/pom.xml +++ b/sdnr/northbound/energysavings/provider/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 org.onap.ccsdk.parent binding-parent - 1.0.5-SNAPSHOT - + 1.2.0 + org.onap.ccsdk.features.sdnr.northbound @@ -94,7 +93,7 @@ - + diff --git a/version.properties b/version.properties index aa6328e0e..ffee02fc4 100644 --- a/version.properties +++ b/version.properties @@ -10,6 +10,6 @@ feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} -release_version=${base_version}-STAGING +release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT -- 2.16.6