diff options
| -rw-r--r-- | Changelog.md | 9 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | version.properties | 2 | ||||
| -rw-r--r-- | vnfmarket-be/deployment/docker/docker-refrepo/pom.xml | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | vnfmarket-be/deployment/install/vtp_install.sh | 5 | ||||
| -rw-r--r-- | vnfmarket-be/deployment/pom.xml | 2 | ||||
| -rw-r--r-- | vnfmarket-be/deployment/zip/pom.xml | 2 | ||||
| -rw-r--r-- | vnfmarket-be/pom.xml | 2 | ||||
| -rw-r--r-- | vnfmarket-be/vnf-sdk-marketplace/pom.xml | 2 |
9 files changed, 20 insertions, 10 deletions
diff --git a/Changelog.md b/Changelog.md index 14147cc7..bf4aa318 100644 --- a/Changelog.md +++ b/Changelog.md @@ -15,3 +15,12 @@ All notable changes to this project will be documented in this file. ### Fix - Fix JSON parsing error returned from GET request - https://jira.onap.org/browse/VNFSDK-697 + +## [1.6.2] + +### Fix +- Fix OCLIP version used during docker image build, by setting it to 5.0.3 + - https://jira.onap.org/browse/VNFSDK-698 + +### Added +- Updated validation version to 1.2.14 @@ -29,7 +29,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.vnfsdk.refrepo</groupId> <artifactId>vnfmarket</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <packaging>pom</packaging> <name>vnfsdk-refrepo</name> diff --git a/version.properties b/version.properties index 9c539e8a..07c58854 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ major=1 minor=6 -patch=1 +patch=2 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 723d548b..9e90567a 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.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> <artifactId>vnfmarket-docker-refrepo</artifactId> <name>vnfmarket/deployment/docker/refrepo</name> <packaging>pom</packaging> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> <properties> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> diff --git a/vnfmarket-be/deployment/install/vtp_install.sh b/vnfmarket-be/deployment/install/vtp_install.sh index bef33750..7a5c40a0 100644..100755 --- a/vnfmarket-be/deployment/install/vtp_install.sh +++ b/vnfmarket-be/deployment/install/vtp_install.sh @@ -59,7 +59,7 @@ export VTP_STAGE_DIR=/opt/vtp_stage export OPEN_CLI_HOME=/opt/oclip export PATH=$OPEN_CLI_HOME/bin:$PATH export CATALINA_HOME=/opt/controller -export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ +export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/ #export ONAP_VVP_HOME=$VTP_STAGE_DIR/vvp-validation-scripts/ice_validator export VTP_TRACK_MARK=+++++++++++++++++++++++++++++++++++ @@ -119,7 +119,7 @@ function vtp_download() { if [ ! -d $JAVA_HOME ] then - apt-get install -y openjdk-8-jre + apt-get install -y openjdk-11-jre else echo $VTP_TRACK_MARK JAVA already installed fi @@ -164,6 +164,7 @@ function vtp_csar_validation_install() { cp $VTP_STAGE_DIR/CSAR-VALIDATE/validation-csar*.jar $OPEN_CLI_HOME/lib cp $VTP_STAGE_DIR/CSAR-VALIDATE/bcpkix-jdk15on-1.61.jar $OPEN_CLI_HOME/lib cp $VTP_STAGE_DIR/CSAR-VALIDATE/bcprov-jdk15on-1.61.jar $OPEN_CLI_HOME/lib + cp $VTP_STAGE_DIR/CSAR-VALIDATE/snakeyaml-1.26.jar $OPEN_CLI_HOME/lib else echo "CSAR Validation Test cases (TOSCA & HEAT) already installed" fi diff --git a/vnfmarket-be/deployment/pom.xml b/vnfmarket-be/deployment/pom.xml index 9ab173ba..5d7e6660 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.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> </parent> <artifactId>vnfmarket-deployment</artifactId> diff --git a/vnfmarket-be/deployment/zip/pom.xml b/vnfmarket-be/deployment/zip/pom.xml index 66ebb715..f134f4d5 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.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> </parent> <artifactId>vnf-sdk-marketplace-deployment</artifactId> diff --git a/vnfmarket-be/pom.xml b/vnfmarket-be/pom.xml index a8218c7b..d2b25d20 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.6.1-SNAPSHOT</version> + <version>1.6.2-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 1f980895..45b14500 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.6.1-SNAPSHOT</version> + <version>1.6.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> |