aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogumil Zebek <bogumil.zebek@nokia.com>2020-12-11 13:56:55 +0100
committerZebek Bogumil <bogumil.zebek@nokia.com>2020-12-11 13:56:55 +0100
commitc18e8f2a5beb5e0acc1db8fc855976d9a38c7207 (patch)
tree5dc6c5a024242ca4c7cafdb3a47694d4f58a23ac
parent8c1b1674d7df0020ae79978378a238e736e7fd54 (diff)
Add cli to pmdictionary validation
- Extend pmdictionary validation library by cli Issue-ID: VNFSDK-715 Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com> Change-Id: I3efcb74a91fd9e083b19966af0e7ab4b382e5ce1
-rw-r--r--vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/install-vtp.sh3
-rwxr-xr-xvnfmarket-be/deployment/install/vtp_install.sh3
2 files changed, 4 insertions, 2 deletions
diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/install-vtp.sh b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/install-vtp.sh
index 82ecb3af..b77fe372 100644
--- a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/install-vtp.sh
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/install-vtp.sh
@@ -77,7 +77,8 @@ cp csarvalidator/commons-lang3*.jar $VTP_INSTALL_DIR/lib/
cp csarvalidator/bcpkix-jdk15on-1.61.jar $VTP_INSTALL_DIR/lib/
cp csarvalidator/bcprov-jdk15on-1.61.jar $VTP_INSTALL_DIR/lib/
cp csarvalidator/commons-collections*.jar $VTP_INSTALL_DIR/lib/
-cp csarvalidator/snakeyaml-1.26.jar $VTP_INSTALL_DIR/lib/
+cp csarvalidator/gson-*.jar $VTP_INSTALL_DIR/lib/
+cp csarvalidator/snakeyaml-*.jar $VTP_INSTALL_DIR/lib/
cp csarvalidator/validation-csar*.jar $VTP_INSTALL_DIR/lib/
cp csarvalidator/validation-pmdictionary*.jar $VTP_INSTALL_DIR/lib/
rm -rf csarvalidator $CSARVAL_ZIP $VTP_ZIP
diff --git a/vnfmarket-be/deployment/install/vtp_install.sh b/vnfmarket-be/deployment/install/vtp_install.sh
index e862e979..70d529b3 100755
--- a/vnfmarket-be/deployment/install/vtp_install.sh
+++ b/vnfmarket-be/deployment/install/vtp_install.sh
@@ -163,7 +163,8 @@ function vtp_csar_validation_install() {
cp $VTP_STAGE_DIR/CSAR-VALIDATE/commons-lang3*.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
+ cp $VTP_STAGE_DIR/CSAR-VALIDATE/gson-*.jar $VTP_INSTALL_DIR/lib/
+ cp $VTP_STAGE_DIR/CSAR-VALIDATE/snakeyaml-*.jar $OPEN_CLI_HOME/lib
cp $VTP_STAGE_DIR/CSAR-VALIDATE/validation-csar*.jar $OPEN_CLI_HOME/lib
cp $VTP_STAGE_DIR/CSAR-VALIDATE/validation-pmdictionary*.jar $OPEN_CLI_HOME/lib
else