diff options
author | rajendrajaiswal <rajendra.jaiswal@ericsson.com> | 2019-06-14 14:35:34 +0100 |
---|---|---|
committer | rajendrajaiswal <rajendra.jaiswal@ericsson.com> | 2019-06-17 10:39:42 +0100 |
commit | 686dc4ecb6adddc9299c93f20c0081918c532ee0 (patch) | |
tree | 0705417d4c1e30b173ce032614ca43d182fa41fa | |
parent | a9a19fd035c97cbac7300fff6feb529b15923883 (diff) |
JJB alignment across DCAE components - DCAE-CLI
Change-Id: I2215a01b7050d151907f0a8c71cb1786fbabc191
Issue-ID: DCAEGEN2-1578
Signed-off-by: rajendrajaiswal <rajendra.jaiswal@ericsson.com>
-rw-r--r-- | blueprint-generator/pom.xml | 56 | ||||
-rw-r--r-- | blueprint-generator/version.properties | 2 | ||||
-rw-r--r-- | component-json-schemas/pom.xml | 15 | ||||
-rw-r--r-- | dcae-cli/pom.xml | 15 | ||||
-rw-r--r-- | pom.xml | 18 | ||||
-rw-r--r-- | version.properties | 2 |
6 files changed, 40 insertions, 68 deletions
diff --git a/blueprint-generator/pom.xml b/blueprint-generator/pom.xml index 8009456..af67cbb 100644 --- a/blueprint-generator/pom.xml +++ b/blueprint-generator/pom.xml @@ -1,35 +1,35 @@ <!-- -============LICENSE_START======================================================= - org.onap.dcae - ================================================================================ - Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. - ================================================================================ - 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. - See the License for the specific language governing permissions and - limitations under the License. - ============LICENSE_END========================================================= +============LICENSE_START======================================================= + org.onap.dcae + ================================================================================ + Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. + ================================================================================ + 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. + See the License for the specific language governing permissions and + limitations under the License. + ============LICENSE_END========================================================= --> <project xmlns="http://maven.apache.org/POM/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"> <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.oparent</groupId> - <artifactId>oparent</artifactId> - <version>1.2.3</version> + <parent> + <groupId>org.onap.oparent</groupId> + <artifactId>oparent</artifactId> + <version>2.0.0</version> </parent> <groupId>org.onap.dcaegen2.platform.cli</groupId> <artifactId>blueprint-generator</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <properties> <maven.compiler.source>1.6</maven.compiler.source> <maven.compiler.target>1.6</maven.compiler.target> @@ -39,12 +39,12 @@ <sonar.java.coveragePlugin>cobertura</sonar.java.coveragePlugin> <sonar.junit.reportsPath>${project.basedir}/target/surefire-reports</sonar.junit.reportsPath> <sonar.surefire.reportsPath>${project.basedir}/target/surefire-reports</sonar.surefire.reportsPath> - <sonar.cobertura.reportPath>${project.basedir}/target/site/cobertura/coverage.xml</sonar.cobertura.reportPath> + <sonar.cobertura.reportPath>${project.basedir}/target/site/cobertura/coverage.xml</sonar.cobertura.reportPath> </properties> <build> - <plugins> + <plugins> <!-- the following plugins are invoked from oparent, we do not need them --> <plugin> <artifactId>maven-assembly-plugin</artifactId> @@ -56,10 +56,10 @@ </configuration> <executions> - <execution> + <execution> - <id>make-assembly</id> - <phase>package</phase> + <id>make-assembly</id> + <phase>package</phase> <goals> <goal>single</goal> </goals> @@ -67,7 +67,7 @@ </executions> - </plugin> + </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> diff --git a/blueprint-generator/version.properties b/blueprint-generator/version.properties index 2ddebb3..7b8b963 100644 --- a/blueprint-generator/version.properties +++ b/blueprint-generator/version.properties @@ -1,5 +1,5 @@ major=1 -minor=0 +minor=1 patch=0 base_version=${major}.${minor}.${patch} release_version=${base_version} diff --git a/component-json-schemas/pom.xml b/component-json-schemas/pom.xml index 0e53a11..9d22f01 100644 --- a/component-json-schemas/pom.xml +++ b/component-json-schemas/pom.xml @@ -23,7 +23,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <parent> <groupId>org.onap.dcaegen2.platform.cli</groupId> <artifactId>cli</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.dcaegen2.platform.cli</groupId> <artifactId>component-json-schemas</artifactId> @@ -52,15 +52,6 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <finalName>${project.artifactId}-${project.version}</finalName> <pluginManagement> <plugins> - <!-- the following plugins are invoked from oparent, we do not need them --> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <configuration> - <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> @@ -71,7 +62,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. </configuration> </plugin> <!-- first disable the default Java plugins at various stages --> - <!-- maven-resources-plugin is called during "*resource" phases by default behavior. it prepares + <!-- maven-resources-plugin is called during "*resource" phases by default behavior. it prepares the resources dir. we do not need it --> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -102,7 +93,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. </execution> </executions> </plugin> - <!-- maven-install-plugin is called during "install" phase by default behavior. it tries to copy stuff under + <!-- maven-install-plugin is called during "install" phase by default behavior. it tries to copy stuff under target dir to ~/.m2. we do not need it --> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/dcae-cli/pom.xml b/dcae-cli/pom.xml index b6db3e6..a45a3f3 100644 --- a/dcae-cli/pom.xml +++ b/dcae-cli/pom.xml @@ -23,7 +23,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <parent> <groupId>org.onap.dcaegen2.platform.cli</groupId> <artifactId>cli</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.dcaegen2.platform.cli</groupId> <artifactId>dcae-cli</artifactId> @@ -44,15 +44,6 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <finalName>${project.artifactId}-${project.version}</finalName> <pluginManagement> <plugins> - <!-- the following plugins are invoked from oparent, we do not need them --> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <configuration> - <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> @@ -63,7 +54,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. </configuration> </plugin> <!-- first disable the default Java plugins at various stages --> - <!-- maven-resources-plugin is called during "*resource" phases by default behavior. it prepares + <!-- maven-resources-plugin is called during "*resource" phases by default behavior. it prepares the resources dir. we do not need it --> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -94,7 +85,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. </execution> </executions> </plugin> - <!-- maven-install-plugin is called during "install" phase by default behavior. it tries to copy stuff under + <!-- maven-install-plugin is called during "install" phase by default behavior. it tries to copy stuff under target dir to ~/.m2. we do not need it --> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -33,7 +33,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <groupId>org.onap.dcaegen2.platform.cli</groupId> <artifactId>cli</artifactId> <name>dcaegen2-platform-cli</name> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <url>http://maven.apache.org</url> <packaging>pom</packaging> <modules> @@ -49,16 +49,6 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <finalName>${project.artifactId}-${project.version}</finalName> <pluginManagement> <plugins> - <!-- the following plugins are invoked from oparent, we do not need them --> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <configuration> - <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo> - <skip>false</skip> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> @@ -69,7 +59,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. </configuration> </plugin> <!-- first disable the default Java plugins at various stages --> - <!-- maven-resources-plugin is called during "*resource" phases by default behavior. it prepares + <!-- maven-resources-plugin is called during "*resource" phases by default behavior. it prepares the resources dir. we do not need it --> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -100,7 +90,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. </execution> </executions> </plugin> --> - <!-- maven-install-plugin is called during "install" phase by default behavior. it tries to copy stuff under + <!-- maven-install-plugin is called during "install" phase by default behavior. it tries to copy stuff under target dir to ~/.m2. we do not need it --> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -144,7 +134,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <MVN_PYPISERVER_SERVERID>${onap.nexus.pypiserver.serverid}</MVN_PYPISERVER_SERVERID> </environmentVariables> </configuration> - </plugin> + </plugin> </plugins> </pluginManagement> </build> diff --git a/version.properties b/version.properties index 73415a7..07578e5 100644 --- a/version.properties +++ b/version.properties @@ -1,5 +1,5 @@ major=1
-minor=1
+minor=2
patch=0
base_version=${major}.${minor}.${patch}
release_version=${base_version}
|