diff options
author | Vijay Venkatesh Kumar <vv770d@att.com> | 2020-07-27 15:42:46 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-07-27 15:42:46 +0000 |
commit | 0ed9925b9598e0ac73c6d300a0c69896e2bc7aa3 (patch) | |
tree | 88ae4376dca56e13277ef8eaeb7af3f3a096fb25 | |
parent | cba445f21d9bc6637a4c4859b7646db6f4bae4f4 (diff) | |
parent | 82cc8ead6b2d25336f9b346d021e87983b2d9887 (diff) |
Merge "RESTConf java upgrade"
-rw-r--r-- | pom.xml | 6 | ||||
-rw-r--r-- | swagger_restconfcollector.json (renamed from swagger_restconfcollector_1.0.0.json) | 2 | ||||
-rw-r--r-- | swagger_restconfcollector.yaml (renamed from swagger_restconfcollector_1.0.0.yaml) | 2 | ||||
-rw-r--r-- | version.properties | 2 |
4 files changed, 6 insertions, 6 deletions
@@ -27,14 +27,14 @@ limitations under the License. </parent> <groupId>org.onap.dcaegen2.collectors.restconf</groupId> <artifactId>restconfcollector</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.2.2-SNAPSHOT</version> <name>dcaegen2-collectors-restconf</name> <description>RestConfCollector</description> <properties> <!-- PROJECT SETTINGS --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <java.version>8</java.version> + <java.version>11</java.version> <docker.image.name>onap/org.onap.dcaegen2.collectors.restconfcollector</docker.image.name> <docker.user.name>restconf</docker.user.name> <docker.user.dir>/opt/app/restconfcollector</docker.user.dir> @@ -203,7 +203,7 @@ limitations under the License. <imageTag>${project.version}</imageTag> <imageTag>latest</imageTag> </imageTags> - <baseImage>openjdk:8-jre-alpine</baseImage> + <baseImage>onap/integration-java11:7.0.0</baseImage> <env> <HOSTALIASES>/etc/host.aliases</HOSTALIASES> </env> diff --git a/swagger_restconfcollector_1.0.0.json b/swagger_restconfcollector.json index 79fbd42..964e8b4 100644 --- a/swagger_restconfcollector_1.0.0.json +++ b/swagger_restconfcollector.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "description": "Api Documentation", - "version": "1.0", + "version": "1.2.2", "title": "Api Documentation", "termsOfService": "urn:tos", "contact": {}, diff --git a/swagger_restconfcollector_1.0.0.yaml b/swagger_restconfcollector.yaml index 79fbd42..964e8b4 100644 --- a/swagger_restconfcollector_1.0.0.yaml +++ b/swagger_restconfcollector.yaml @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "description": "Api Documentation", - "version": "1.0", + "version": "1.2.2", "title": "Api Documentation", "termsOfService": "urn:tos", "contact": {}, diff --git a/version.properties b/version.properties index 755adf7..152260f 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=1 minor=2 -patch=1 +patch=2 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT |