diff options
36 files changed, 46 insertions, 46 deletions
diff --git a/adapters/mso-adapter-utils/pom.xml b/adapters/mso-adapter-utils/pom.xml index 90d1bbd680..176db7255b 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.0-SNAPSHOT</version> + <version>1.1.1-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 c8f3a8b01a..319f44dc28 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.0-SNAPSHOT</version> + <version>1.1.1-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 752d7f66fa..8c29815eb8 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.0-SNAPSHOT</version> + <version>1.1.1-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 6e0c9bf702..fe0b92262c 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.0-SNAPSHOT</version> + <version>1.1.1-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 94e5759ee3..8cbb7c68c3 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.0-SNAPSHOT</version> + <version>1.1.1-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 c3ed987cab..db7f1d46bb 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.0-SNAPSHOT</version> + <version>1.1.1-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 7c1ba1a47f..41d7d8bfa1 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.0-SNAPSHOT</version> + <version>1.1.1-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 3ceb853f27..58ca7b1a3a 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.0-SNAPSHOT</version> + <version>1.1.1-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 b5e3780cd9..1c14f12f7d 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.0-SNAPSHOT</version> + <version>1.1.1-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 c42c002dc1..344f981bc9 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.0-SNAPSHOT</version> + <version>1.1.1-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 9c5d74cb81..d5a31b3cbf 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.0-SNAPSHOT</version> + <version>1.1.1-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 82d23093b3..3124d7c545 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.0-SNAPSHOT</version> + <version>1.1.1-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 111db29137..75790aafe2 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.0-SNAPSHOT</version> + <version>1.1.1-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..3e5faca44e 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.0.1-SNAPSHOT</version> <dependencies> <dependency> diff --git a/aria/aria-rest-server/pom.xml b/aria/aria-rest-server/pom.xml index b93e49482e..28c373a585 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.0.2-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.0.1-SNAPSHOT</version> </parent> <pluginRepositories> @@ -61,7 +61,7 @@ <phase>initialize</phase> <configuration> <name>python_version</name> - <regex>-SNAPSHOT</regex> + <regex>-amsterdam</regex> <value>${project.version}</value> <replacement>\.dev0</replacement> <failIfNoMatch>false</failIfNoMatch> diff --git a/aria/multivim-plugin/pom.xml b/aria/multivim-plugin/pom.xml index d1ade4c88f..30b0c01ed4 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.0.2-SNAPSHOT</version> <description>ARIA MultiVIM plugin</description> <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.1-SNAPSHOT</version> </parent> <pluginRepositories> @@ -41,7 +41,7 @@ <phase>initialize</phase> <configuration> <name>python_version</name> - <regex>-SNAPSHOT</regex> + <regex>-amsterdam</regex> <value>${project.version}</value> <replacement>\.dev0</replacement> <failIfNoMatch>false</failIfNoMatch> diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml index 19bdb1a8b8..1a4727db17 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.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> </parent> <groupId>org.openecomp.so</groupId> diff --git a/bpmn/MSOCockpit/pom.xml b/bpmn/MSOCockpit/pom.xml index bb54fe66c7..3cc54a259b 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.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml index f0b7371a75..f589f03b83 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.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> </parent> <artifactId>MSOCommonBPMN</artifactId> <name>MSOCommonBPMN</name> diff --git a/bpmn/MSOCoreBPMN/pom.xml b/bpmn/MSOCoreBPMN/pom.xml index 33e5a96de5..326552fc83 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.0-SNAPSHOT</version> + <version>1.1.1-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 53888dd23e..bdef9c3b48 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.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MSOInfrastructureBPMN</artifactId>
@@ -434,7 +434,7 @@ <!-- <dependency>
<groupId>org.openecomp.so</groupId>
<artifactId>common</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/bpmn/MSORESTClient/pom.xml b/bpmn/MSORESTClient/pom.xml index 1bcb3b705d..246e472880 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.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.openecomp.so</groupId>
diff --git a/bpmn/pom.xml b/bpmn/pom.xml index a83e85f148..158e610315 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.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> </parent> <groupId>org.openecomp.so</groupId> diff --git a/common/pom.xml b/common/pom.xml index 5726ae926c..d810e328e5 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.0-SNAPSHOT</version> + <version>1.1.1-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 9159bb2a52..beef7fed66 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.0-SNAPSHOT</version> + <version>1.1.1-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 5a2c541225..a8927caa22 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.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> </parent> diff --git a/mso-api-handlers/mso-requests-db/pom.xml b/mso-api-handlers/mso-requests-db/pom.xml index ef69e8acb1..b39f6bad0c 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.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> </parent> <artifactId>mso-requests-db</artifactId> diff --git a/mso-api-handlers/pom.xml b/mso-api-handlers/pom.xml index aabb2b89ad..ae91ef4706 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.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> </parent> <groupId>org.openecomp.so</groupId> diff --git a/mso-catalog-db/pom.xml b/mso-catalog-db/pom.xml index 606c878c3e..c0499bfe89 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.0-SNAPSHOT</version> + <version>1.1.1-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 6a5e4a09e2..8434bd6f5f 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.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> </parent> <groupId>org.openecomp.so.packages</groupId> @@ -313,7 +313,7 @@ project.properties['docker.host']="unix:///var/run/docker.sock" } - if ( project.properties['mso.project.version'].endsWith("-SNAPSHOT") ) { + if ( project.properties['mso.project.version'].endsWith("-amsterdam") ) { project.properties['mso.version']="latest"; } else { project.properties['mso.version']=project.properties['mso.project.version']; diff --git a/packages/deliveries/pom.xml b/packages/deliveries/pom.xml index e083a28656..8e5bdb3e8c 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.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> </parent> <groupId>org.openecomp.so.packages</groupId> diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index c37d68a5ed..85b0638bcb 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.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> </parent> <packaging>pom</packaging> @@ -47,8 +47,8 @@ versionArray = project.properties['mso.project.version'].split('\\.'); } - if ( project.properties['mso.project.version'].endsWith("-SNAPSHOT") ) { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest"; + if ( project.properties['mso.project.version'].endsWith("-amsterdam") ) { + project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-amsterdam-latest"; } else { project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; } diff --git a/packages/pom.xml b/packages/pom.xml index 40a9b6efb6..f4feceb6f3 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.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.openecomp.so</groupId>
@@ -5,14 +5,14 @@ <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.1-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> <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. @@ -46,7 +46,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.1.1-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 4bf64ac657..ecb7cdd13a 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.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.openecomp.so</groupId>
diff --git a/version.properties b/version.properties index 04a32dea2d..31680664bc 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=1
minor=1
-patch=1
+patch=2
base_version=${major}.${minor}.${patch}
|