summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormukesh.paliwal1@huawei.com <mukesh.paliwal1@huawei.com>2020-07-22 17:51:38 +0530
committermukesh.paliwal1@huawei.com <mukesh.paliwal1@huawei.com>2020-07-24 15:29:47 +0530
commit82cc8ead6b2d25336f9b346d021e87983b2d9887 (patch)
tree0d810857f3ab16e81c062c7cf9d6d37f6699d2ea
parentdb410668b9e3eca991a55d5ed43981ade4978689 (diff)
RESTConf java upgrade
Issue-ID: DCAEGEN2-2281 Signed-off-by: mukesh.paliwal1@huawei.com <mukesh.paliwal1@huawei.com> Change-Id: I4c9f3cab5dc8f27b63b4245fa3a74dcbfaf8051f
-rw-r--r--pom.xml6
-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.properties2
4 files changed, 6 insertions, 6 deletions
diff --git a/pom.xml b/pom.xml
index ecc686f..2b6ecfc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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