diff options
37 files changed, 59 insertions, 59 deletions
diff --git a/adapters/mso-adapter-utils/pom.xml b/adapters/mso-adapter-utils/pom.xml index 176db7255b..dd1159f6d1 100644 --- a/adapters/mso-adapter-utils/pom.xml +++ b/adapters/mso-adapter-utils/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>adapters</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-adapter-utils</artifactId> diff --git a/adapters/mso-adapters-rest-interface/pom.xml b/adapters/mso-adapters-rest-interface/pom.xml index 319f44dc28..f10500d2ca 100644 --- a/adapters/mso-adapters-rest-interface/pom.xml +++ b/adapters/mso-adapters-rest-interface/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>adapters</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-adapters-rest-interface</artifactId> diff --git a/adapters/mso-catalog-db-adapter/pom.xml b/adapters/mso-catalog-db-adapter/pom.xml index 8c29815eb8..c9590ee1a1 100644 --- a/adapters/mso-catalog-db-adapter/pom.xml +++ b/adapters/mso-catalog-db-adapter/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>adapters</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.so.adapters</groupId> diff --git a/adapters/mso-network-adapter-async-client/pom.xml b/adapters/mso-network-adapter-async-client/pom.xml index fe0b92262c..cc1ae6ea30 100644 --- a/adapters/mso-network-adapter-async-client/pom.xml +++ b/adapters/mso-network-adapter-async-client/pom.xml @@ -4,7 +4,7 @@ <parent>
<groupId>org.openecomp.so</groupId>
<artifactId>adapters</artifactId>
- <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent>
<groupId>org.openecomp.so.adapters</groupId>
<artifactId>mso-network-adapter-async-client</artifactId>
diff --git a/adapters/mso-network-adapter/pom.xml b/adapters/mso-network-adapter/pom.xml index 8cbb7c68c3..48b5b3ebd4 100644 --- a/adapters/mso-network-adapter/pom.xml +++ b/adapters/mso-network-adapter/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>adapters</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-network-adapter</artifactId> diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml index db7f1d46bb..ed8b2b3b88 100644 --- a/adapters/mso-requests-db-adapter/pom.xml +++ b/adapters/mso-requests-db-adapter/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>adapters</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.so.adapters</groupId> diff --git a/adapters/mso-sdnc-adapter/pom.xml b/adapters/mso-sdnc-adapter/pom.xml index 41d7d8bfa1..e7cb4d5318 100644 --- a/adapters/mso-sdnc-adapter/pom.xml +++ b/adapters/mso-sdnc-adapter/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>adapters</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-sdnc-adapter</artifactId> diff --git a/adapters/mso-tenant-adapter/pom.xml b/adapters/mso-tenant-adapter/pom.xml index 58ca7b1a3a..1479b2865e 100644 --- a/adapters/mso-tenant-adapter/pom.xml +++ b/adapters/mso-tenant-adapter/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>adapters</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-tenant-adapter</artifactId> diff --git a/adapters/mso-vfc-adapter/pom.xml b/adapters/mso-vfc-adapter/pom.xml index 1c14f12f7d..abd8ce4c29 100644 --- a/adapters/mso-vfc-adapter/pom.xml +++ b/adapters/mso-vfc-adapter/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>adapters</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-vfc-adapter</artifactId> diff --git a/adapters/mso-vnf-adapter-async-client/pom.xml b/adapters/mso-vnf-adapter-async-client/pom.xml index 344f981bc9..4a20257b4a 100644 --- a/adapters/mso-vnf-adapter-async-client/pom.xml +++ b/adapters/mso-vnf-adapter-async-client/pom.xml @@ -4,7 +4,7 @@ <parent>
<groupId>org.openecomp.so</groupId>
<artifactId>adapters</artifactId>
- <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent>
<groupId>org.openecomp.so.adapters</groupId>
<artifactId>mso-vnf-adapter-async-client</artifactId>
diff --git a/adapters/mso-vnf-adapter/pom.xml b/adapters/mso-vnf-adapter/pom.xml index d5a31b3cbf..9116e57a11 100644 --- a/adapters/mso-vnf-adapter/pom.xml +++ b/adapters/mso-vnf-adapter/pom.xml @@ -4,7 +4,7 @@ <parent>
<groupId>org.openecomp.so</groupId>
<artifactId>adapters</artifactId>
- <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent>
<groupId>org.openecomp.so.adapters</groupId>
<artifactId>mso-vnf-adapter</artifactId>
diff --git a/adapters/mso-workflow-message-adapter/pom.xml b/adapters/mso-workflow-message-adapter/pom.xml index 3124d7c545..3501dd5571 100644 --- a/adapters/mso-workflow-message-adapter/pom.xml +++ b/adapters/mso-workflow-message-adapter/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>adapters</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.so.adapters</groupId> <artifactId>mso-workflow-message-adapter</artifactId> diff --git a/adapters/pom.xml b/adapters/pom.xml index 75790aafe2..80244a62cc 100644 --- a/adapters/pom.xml +++ b/adapters/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>so</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.so</groupId> diff --git a/aria/aria-rest-java-client/pom.xml b/aria/aria-rest-java-client/pom.xml index 12019f0228..402d3c1268 100755 --- a/aria/aria-rest-java-client/pom.xml +++ b/aria/aria-rest-java-client/pom.xml @@ -25,7 +25,7 @@ <groupId>aria-client</groupId> <artifactId>aria-client</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <dependencies> <dependency> diff --git a/aria/aria-rest-server/pom.xml b/aria/aria-rest-server/pom.xml index b93e49482e..7af381c220 100644 --- a/aria/aria-rest-server/pom.xml +++ b/aria/aria-rest-server/pom.xml @@ -25,12 +25,12 @@ <groupId>org.onap.aria</groupId> <artifactId>ariarest</artifactId> <name>ariarest</name> - <version>0.0.1-SNAPSHOT</version> + <version>0.1.0-SNAPSHOT</version> <description>ARIA REST API wheel build</description> <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <pluginRepositories> diff --git a/aria/multivim-plugin/pom.xml b/aria/multivim-plugin/pom.xml index d1ade4c88f..8301a6a31c 100644 --- a/aria/multivim-plugin/pom.xml +++ b/aria/multivim-plugin/pom.xml @@ -5,12 +5,12 @@ <groupId>org.onap.so</groupId> <artifactId>multivim-plugin</artifactId> <name>multivim-plugin</name> - <version>0.0.1-SNAPSHOT</version> + <version>0.1.0-SNAPSHOT</version> <description>ARIA MultiVIM plugin</description> <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <pluginRepositories> diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml index 1a4727db17..5836e4cf7e 100644 --- a/asdc-controller/pom.xml +++ b/asdc-controller/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>so</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.so</groupId> diff --git a/bpmn/MSOCockpit/pom.xml b/bpmn/MSOCockpit/pom.xml index 3cc54a259b..7557f5e8ce 100644 --- a/bpmn/MSOCockpit/pom.xml +++ b/bpmn/MSOCockpit/pom.xml @@ -3,7 +3,7 @@ <parent>
<groupId>org.openecomp.so</groupId>
<artifactId>bpmn</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml index b60e6219e7..4a7cb5900a 100644 --- a/bpmn/MSOCommonBPMN/pom.xml +++ b/bpmn/MSOCommonBPMN/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>bpmn</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <artifactId>MSOCommonBPMN</artifactId> <name>MSOCommonBPMN</name> @@ -384,7 +384,7 @@ <artifactId>commons-httpclient</artifactId> <version>${httpclient.version}</version> </dependency> - <dependency> + <!--dependency> <groupId>org.openecomp.appc.client</groupId> <artifactId>client-kit</artifactId> <version>1.1.0</version> @@ -392,8 +392,8 @@ <dependency> <groupId>org.openecomp.appc.client</groupId> <artifactId>client-lib</artifactId> - <version>1.1.0</version> - </dependency> + <version>1.1.0</version > + </dependency--> <dependency> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-schema</artifactId> diff --git a/bpmn/MSOCoreBPMN/pom.xml b/bpmn/MSOCoreBPMN/pom.xml index 326552fc83..b3eddeda41 100644 --- a/bpmn/MSOCoreBPMN/pom.xml +++ b/bpmn/MSOCoreBPMN/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>bpmn</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.openecomp.so</groupId> diff --git a/bpmn/MSOInfrastructureBPMN/pom.xml b/bpmn/MSOInfrastructureBPMN/pom.xml index 36de61b516..908fcce276 100644 --- a/bpmn/MSOInfrastructureBPMN/pom.xml +++ b/bpmn/MSOInfrastructureBPMN/pom.xml @@ -3,7 +3,7 @@ <parent>
<groupId>org.openecomp.so</groupId>
<artifactId>bpmn</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MSOInfrastructureBPMN</artifactId>
@@ -422,7 +422,7 @@ <!-- <dependency>
<groupId>org.openecomp.so</groupId>
<artifactId>common</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy index dbefb6c346..9404364910 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy @@ -130,8 +130,8 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor { String serviceModelName = jsonUtil.getJsonValue(uuiRequest, "service.parameters.templateName") execution.setVariable("serviceModelName", serviceModelName) //aai serviceType and Role can be setted as fixed value now. - String aaiServiceType = "voLTE type" - String aaiServiceRole = "voLTE role" + String aaiServiceType = "E2E Service" + String aaiServiceRole = "E2E Service" execution.setVariable("modelInvariantUuid", modelInvariantUuid) execution.setVariable("modelUuid", modelUuid) diff --git a/bpmn/MSORESTClient/pom.xml b/bpmn/MSORESTClient/pom.xml index 246e472880..dead7d02d8 100644 --- a/bpmn/MSORESTClient/pom.xml +++ b/bpmn/MSORESTClient/pom.xml @@ -6,7 +6,7 @@ <parent>
<groupId>org.openecomp.so</groupId>
<artifactId>bpmn</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<groupId>org.openecomp.so</groupId>
diff --git a/bpmn/pom.xml b/bpmn/pom.xml index 158e610315..79acccb04d 100644 --- a/bpmn/pom.xml +++ b/bpmn/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>so</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.so</groupId> diff --git a/common/pom.xml b/common/pom.xml index d810e328e5..6a304c272c 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>so</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.so</groupId> diff --git a/mso-api-handlers/mso-api-handler-common/pom.xml b/mso-api-handlers/mso-api-handler-common/pom.xml index beef7fed66..eaab61c756 100644 --- a/mso-api-handlers/mso-api-handler-common/pom.xml +++ b/mso-api-handlers/mso-api-handler-common/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>mso-api-handlers</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml index a8927caa22..f152116421 100644 --- a/mso-api-handlers/mso-api-handler-infra/pom.xml +++ b/mso-api-handlers/mso-api-handler-infra/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>mso-api-handlers</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> diff --git a/mso-api-handlers/mso-requests-db/pom.xml b/mso-api-handlers/mso-requests-db/pom.xml index b39f6bad0c..6a4941e53e 100644 --- a/mso-api-handlers/mso-requests-db/pom.xml +++ b/mso-api-handlers/mso-requests-db/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>mso-api-handlers</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <artifactId>mso-requests-db</artifactId> diff --git a/mso-api-handlers/pom.xml b/mso-api-handlers/pom.xml index ae91ef4706..4399c75155 100644 --- a/mso-api-handlers/pom.xml +++ b/mso-api-handlers/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>so</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.so</groupId> diff --git a/mso-catalog-db/pom.xml b/mso-catalog-db/pom.xml index c0499bfe89..8b663c1394 100644 --- a/mso-catalog-db/pom.xml +++ b/mso-catalog-db/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>so</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.so</groupId> diff --git a/packages/arquillian-unit-tests/pom.xml b/packages/arquillian-unit-tests/pom.xml index 4279f8f0bd..0abe819253 100644 --- a/packages/arquillian-unit-tests/pom.xml +++ b/packages/arquillian-unit-tests/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>packages</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.so.packages</groupId> diff --git a/packages/deliveries/pom.xml b/packages/deliveries/pom.xml index 8e5bdb3e8c..9ce0ac8551 100644 --- a/packages/deliveries/pom.xml +++ b/packages/deliveries/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>packages</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.so.packages</groupId> diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index d102572a8e..41086eab04 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.openecomp.so</groupId> <artifactId>packages</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <packaging>pom</packaging> diff --git a/packages/pom.xml b/packages/pom.xml index f4feceb6f3..ff1be1fad0 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ <parent>
<groupId>org.openecomp.so</groupId>
<artifactId>so</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<groupId>org.openecomp.so</groupId>
@@ -5,15 +5,15 @@ <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <relativePath /> </parent> <groupId>org.openecomp.so</groupId> <artifactId>so</artifactId> <packaging>pom</packaging> - <!-- <version>1.1.0-SNAPSHOT</version> --> - <version>1.1.1-SNAPSHOT</version> + <!-- <version>1.2.0-SNAPSHOT</version> --> + <version>1.2.0-SNAPSHOT</version> <name>so</name> <description>This Maven project is responsible to build and package all child projects - contributions in the MSO project. This build can be configured to run Functional tests and to start/stop a jboss server + Mysql DB. @@ -47,7 +47,7 @@ <org.apache.maven.user-settings></org.apache.maven.user-settings> <!-- this is used for Chef mso-code cookbook --> <swm.version>2.19.3-1</swm.version> - <!-- <openstack.version>1.1.0-SNAPSHOT</openstack.version> --> + <!-- <openstack.version>1.2.0-SNAPSHOT</openstack.version> --> <openstack.version>1.1.0</openstack.version> <nexusproxy>https://nexus.onap.org</nexusproxy> <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format> diff --git a/status-control/pom.xml b/status-control/pom.xml index ecb7cdd13a..2339825be4 100644 --- a/status-control/pom.xml +++ b/status-control/pom.xml @@ -6,7 +6,7 @@ <parent>
<groupId>org.openecomp.so</groupId>
<artifactId>so</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<groupId>org.openecomp.so</groupId>
diff --git a/version.properties b/version.properties index 04a32dea2d..faf06bbba2 100644 --- a/version.properties +++ b/version.properties @@ -1,13 +1,13 @@ -# Versioning variables
-# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
-# because they are used in Jenkins, whose plug-in doesn't support
-
-major=1
-minor=1
-patch=1
-
-base_version=${major}.${minor}.${patch}
-
-# Release must be completed with git revision # in Jenkins
-release_version=${base_version}
-snapshot_version=${base_version}-SNAPSHOT
+# Versioning variables +# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) +# because they are used in Jenkins, whose plug-in doesn't support + +major=1 +minor=2 +patch=0 + +base_version=${major}.${minor}.${patch} + +# Release must be completed with git revision # in Jenkins +release_version=${base_version} +snapshot_version=${base_version}-SNAPSHOT |