X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=d70d2163c2ed40b3379a61ed294c4a5fc58a714a;hb=acb239a605efcc83f788be62d145d88b5f43104c;hp=e8b4ba006a506c594499942bf8091344a7f0147b;hpb=59e4ac54b35e9821f9baf30ae1ac29d232900135;p=clamp.git

diff --git a/pom.xml b/pom.xml
index e8b4ba00..d70d2163 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,8 +76,8 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<eelf.core.version>1.0.0</eelf.core.version>
-		<camel.version>2.25.0</camel.version>
-		<springboot.version>2.2.6.RELEASE</springboot.version>
+		<camel.version>2.25.2</camel.version>
+		<springboot.version>2.2.9.RELEASE</springboot.version>
 
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
@@ -99,7 +99,7 @@
 		<docker.skip.tag>true</docker.skip.tag>
 		<skip.staging.artifacts>false</skip.staging.artifacts>
 		<python.http.proxy.param />
-		<tomcat.version>9.0.33</tomcat.version>
+		<tomcat.version>9.0.37</tomcat.version>
 		<ui.react.src>ui-react</ui.react.src>
 		<ui.react.lib.src>ui-react-lib</ui.react.lib.src>
 		<npm.publish.url>https://nexus3.onap.org/repository/npm.snapshot/</npm.publish.url>
@@ -327,10 +327,6 @@
 					<groupId>org.slf4j</groupId>
 					<artifactId>slf4j-ext</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.core</groupId>
-					<artifactId>jackson-databind</artifactId>
-				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -436,10 +432,6 @@
 			<artifactId>commons-vfs2</artifactId>
 			<version>2.2</version>
 		</dependency>
-		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
@@ -463,12 +455,12 @@
 			<artifactId>persistence-api</artifactId>
 			<version>1.0.2</version>
 		</dependency>
+		<!-- Other dependencies to fix nexus IQ reported vulnerabilities -->
 		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-csv</artifactId>
-			<version>1.3</version>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.14</version>
 		</dependency>
-		<!-- Other dependencies to fix nexus IQ reported vulnerabilities -->
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-web</artifactId>
@@ -489,11 +481,7 @@
 			<artifactId>guava</artifactId>
 			<version>27.0-jre</version>
 		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.13</version>
-		</dependency>
+
 		<!-- Remove the MYSQL connector and replace it by Mariadb -->
 		<dependency>
 			<groupId>org.mariadb.jdbc</groupId>
@@ -510,6 +498,12 @@
 			<groupId>org.onap.sdc.sdc-tosca</groupId>
 			<artifactId>sdc-tosca</artifactId>
 			<version>1.5.1</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.fasterxml.jackson.core</groupId>
+					<artifactId>jackson-databind</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.yaml</groupId>
@@ -547,6 +541,24 @@
 			<version>2.0.4</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.github.docker-java</groupId>
+			<artifactId>docker-java-core</artifactId>
+			<version>3.2.1</version>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>com.fasterxml.jackson.core</groupId>
+					<artifactId>jackson-databind</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>com.github.docker-java</groupId>
+			<artifactId>docker-java</artifactId>
+			<version>3.2.1</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -850,6 +862,7 @@
 								<portName>docker.mariadb.port.host</portName>
 								<portName>docker.http-cache.port.host</portName>
 								<portName>clamp.it.tests.http-redirected</portName>
+								<portName>clamp.it.tests.robotframework.http</portName>
 								<portName>clamp.it.tests.https</portName>
 								<portName>clamp.it.tests.http</portName>
 							</portNames>
@@ -901,7 +914,7 @@
 							<includes>
 								<include>**/*ItCase.java</include>
 							</includes>
-							<forkCount>1C</forkCount>
+							<forkCount>1</forkCount>
 							<reuseForks>true</reuseForks>
 							<useSystemClassLoader>false</useSystemClassLoader>
 							<argLine>${failsafeArgLine}</argLine>
@@ -925,7 +938,7 @@
 					<apiVersion>1.35</apiVersion>
 					<images>
 						<image>
-							<name>library/mariadb:10.3.12</name>
+							<name>docker.io/mariadb:10.5.4</name>
 							<alias>mariadb</alias>
 							<run>
 								<env>
@@ -939,8 +952,8 @@
 									</bind>
 								</volumes>
 								<wait>
-									<log>socket: '/var/run/mysqld/mysqld.sock'  port: 3306  mariadb.org binary distribution</log>
-									<time>600000</time>
+									<log>socket: '/run/mysqld/mysqld.sock'  port: 3306  mariadb.org binary distribution</log>
+									<time>300000</time>
 									<exec>
 										<preStop>/docker-entrypoint-initdb.d/dump/backup-data-only.sh</preStop>
 									</exec>
@@ -954,7 +967,7 @@
 							</run>
 						</image>
 						<image>
-							<name>library/python:2-slim</name>
+							<name>docker.io/python:2-slim</name>
 							<alias>python</alias>
 							<run>
 								<hostname>python</hostname>