diff options
| -rw-r--r-- | BRMSGateway/pom.xml | 2 | ||||
| -rw-r--r-- | ONAP-SDK-APP/pom.xml | 4 | ||||
| -rw-r--r-- | POLICY-SDK-APP/pom.xml | 4 | ||||
| -rw-r--r-- | PolicyEngineUtils/pom.xml | 2 | ||||
| -rw-r--r-- | docker_build.sh | 4 | ||||
| -rw-r--r-- | docker_merge.sh | 4 | ||||
| -rw-r--r-- | docker_verify.sh | 2 | ||||
| -rw-r--r-- | pom.xml | 2 |
8 files changed, 16 insertions, 8 deletions
diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml index 18ed8f7b8..2f4612aba 100644 --- a/BRMSGateway/pom.xml +++ b/BRMSGateway/pom.xml @@ -48,7 +48,7 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>3.3.9</version> + <version>3.5.3</version> </dependency> <dependency> <groupId>org.apache.maven.shared</groupId> diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml index 9f383bf9a..b6e797947 100644 --- a/ONAP-SDK-APP/pom.xml +++ b/ONAP-SDK-APP/pom.xml @@ -260,6 +260,10 @@ <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </exclusion> + <exclusion> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml index 91e14d9f9..08bc3c23c 100644 --- a/POLICY-SDK-APP/pom.xml +++ b/POLICY-SDK-APP/pom.xml @@ -90,6 +90,10 @@ <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> </exclusion> + <exclusion> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + </exclusion> </exclusions> </dependency> <!-- Spring --> diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml index 73b6e0463..85b506a21 100644 --- a/PolicyEngineUtils/pom.xml +++ b/PolicyEngineUtils/pom.xml @@ -70,7 +70,7 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>3.3.9</version> + <version>3.5.3</version> </dependency> <!-- CLM security fix - force use of xstream diff --git a/docker_build.sh b/docker_build.sh index 55ee96457..aa0ac4776 100644 --- a/docker_build.sh +++ b/docker_build.sh @@ -58,7 +58,7 @@ TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_MAJMIN_VERSION}-lat # # This has the nexus repo prepended and major/minor/patch version with timestamp # -TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-STAGING-${TIMESTAMP}" +TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-STAGING-${TIMESTAMP}Z" echo $TAGS @@ -92,7 +92,7 @@ then exit 1 fi -docker push ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-STAGING-${TIMESTAMP} +docker push ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-STAGING-${TIMESTAMP}Z if [ $? -ne 0 ] then diff --git a/docker_merge.sh b/docker_merge.sh index 085a1ce0d..9312b480c 100644 --- a/docker_merge.sh +++ b/docker_merge.sh @@ -54,7 +54,7 @@ TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_MAJMIN_VERSION}-lat # # This has the nexus repo prepended and major/minor/patch version with timestamp # -TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-${TIMESTAMP}" +TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-${TIMESTAMP}Z" echo $TAGS @@ -81,7 +81,7 @@ then exit 1 fi -docker push ${DOCKER_REPOSITORY}/onap/$IMAGE:${MVN_VERSION}-${TIMESTAMP} +docker push ${DOCKER_REPOSITORY}/onap/$IMAGE:${MVN_VERSION}-${TIMESTAMP}Z if [ $? -ne 0 ] then diff --git a/docker_verify.sh b/docker_verify.sh index b5ac2aa82..b5acdd870 100644 --- a/docker_verify.sh +++ b/docker_verify.sh @@ -57,7 +57,7 @@ TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_MAJMIN_VERSION}-lat # # This has the nexus repo prepended and major/minor/patch version with timestamp # -TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-${TIMESTAMP}" +TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-${TIMESTAMP}Z" echo $TAGS @@ -61,7 +61,7 @@ <jetty.plugin.version>9.2.3.v20140905</jetty.plugin.version> <dmaap.version>1.1.3</dmaap.version> <httpclient.version>4.5.5</httpclient.version> - <jackson.version>2.9.4</jackson.version> + <jackson.version>2.9.5</jackson.version> <commons.fileupload.version>1.3.3</commons.fileupload.version> </properties> <modules> |