summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKanagaraj Manickam <kanagaraj.manickam@huawei.com>2020-09-23 02:35:34 +0000
committerGerrit Code Review <gerrit@onap.org>2020-09-23 02:35:34 +0000
commitbe21168e4e8197af4afb48a5154ed54aa9f3de27 (patch)
treeb7de05ca351e6dbeeb7b8d44cd0f428b50c772fb
parentbadda43ec2e53622d4bacdb75b37d0174f8e1153 (diff)
parentbad23522fec0e9dac2de8922395aba34122e7b3a (diff)
Merge "Update refrepo version"
-rw-r--r--Changelog.md11
-rw-r--r--pom.xml2
-rw-r--r--version.properties4
-rw-r--r--vnfmarket-be/deployment/docker/docker-refrepo/pom.xml4
-rw-r--r--vnfmarket-be/deployment/pom.xml2
-rw-r--r--vnfmarket-be/deployment/zip/pom.xml2
-rw-r--r--vnfmarket-be/pom.xml2
-rw-r--r--vnfmarket-be/vnf-sdk-marketplace/pom.xml2
8 files changed, 20 insertions, 9 deletions
diff --git a/Changelog.md b/Changelog.md
new file mode 100644
index 00000000..6cfb85bd
--- /dev/null
+++ b/Changelog.md
@@ -0,0 +1,11 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+
+## [1.6.0]
+
+### Added
+- Update java to 11 in the refrepo image
+ - https://jira.onap.org/browse/VNFSDK-646
+
+
diff --git a/pom.xml b/pom.xml
index c24e2d59..d9736708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vnfsdk.refrepo</groupId>
<artifactId>vnfmarket</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>vnfsdk-refrepo</name>
diff --git a/version.properties b/version.properties
index 81c5c8f5..0f0fb2bb 100644
--- a/version.properties
+++ b/version.properties
@@ -4,8 +4,8 @@
# because they are used in Jenkins, whose plug-in doesn't support
major=1
-minor=5
-patch=1
+minor=6
+patch=0
base_version=${major}.${minor}.${patch}
diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
index 745b6fa0..0a12798d 100644
--- a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
@@ -24,14 +24,14 @@
<parent>
<groupId>org.onap.vnfsdk.refrepo</groupId>
<artifactId>vnfmarket-deployment</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>vnfmarket-docker-refrepo</artifactId>
<name>vnfmarket/deployment/docker/refrepo</name>
<packaging>pom</packaging>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<properties>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
diff --git a/vnfmarket-be/deployment/pom.xml b/vnfmarket-be/deployment/pom.xml
index 3eedb3a4..16ef5cf2 100644
--- a/vnfmarket-be/deployment/pom.xml
+++ b/vnfmarket-be/deployment/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.vnfsdk.refrepo</groupId>
<artifactId>vnf-sdk-marketplace-core-parent</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>vnfmarket-deployment</artifactId>
diff --git a/vnfmarket-be/deployment/zip/pom.xml b/vnfmarket-be/deployment/zip/pom.xml
index 78a9709c..5b52744a 100644
--- a/vnfmarket-be/deployment/zip/pom.xml
+++ b/vnfmarket-be/deployment/zip/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.onap.vnfsdk.refrepo</groupId>
<artifactId>vnfmarket-deployment</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>vnf-sdk-marketplace-deployment</artifactId>
diff --git a/vnfmarket-be/pom.xml b/vnfmarket-be/pom.xml
index 47b1cb3a..bc5d328f 100644
--- a/vnfmarket-be/pom.xml
+++ b/vnfmarket-be/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.onap.vnfsdk.refrepo</groupId>
<artifactId>vnfmarket</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/vnfmarket-be/vnf-sdk-marketplace/pom.xml b/vnfmarket-be/vnf-sdk-marketplace/pom.xml
index a9885976..aaa72e9a 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/pom.xml
+++ b/vnfmarket-be/vnf-sdk-marketplace/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>org.onap.vnfsdk.refrepo</groupId>
<artifactId>vnf-sdk-marketplace-core-parent</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>