X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=cf1068caee966b766d2cca275643df0f3659dbd6;hb=e673a058c995392b3ad6cbab91a9571bed29a57b;hp=bab08d1be5b46ff195d5d4023eb15a53a3acc246;hpb=3b01773127bc3c2a7c0f5eaf858b6a69fd10fc8f;p=clamp.git

diff --git a/pom.xml b/pom.xml
index bab08d1b..cf1068ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.onap.clamp</groupId>
 	<artifactId>clds</artifactId>
-	<version>5.0.4-SNAPSHOT</version>
+	<version>5.1.0-SNAPSHOT</version>
 	<name>clamp</name>
 
 
@@ -77,7 +77,7 @@
 
 		<eelf.core.version>1.0.0</eelf.core.version>
 		<camel.version>2.25.0</camel.version>
-		<springboot.version>2.2.5.RELEASE</springboot.version>
+		<springboot.version>2.2.6.RELEASE</springboot.version>
 
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
@@ -254,39 +254,6 @@
 	</dependencyManagement>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.apache.xmlgraphics</groupId>
-			<artifactId>batik-svggen</artifactId>
-			<version>1.11</version>
-			<exclusions>
-			<exclusion>
-				<groupId>xml-apis</groupId>
-				<artifactId>xml-apis</artifactId>
-			</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.xmlgraphics</groupId>
-			<artifactId>batik-svg-dom</artifactId>
-			<version>1.11</version>
-			<exclusions>
-				<exclusion>
-					<groupId>xml-apis</groupId>
-					<artifactId>xml-apis</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.xmlgraphics</groupId>
-			<artifactId>batik-transcoder</artifactId>
-			<version>1.11</version>
-			<exclusions>
-				<exclusion>
-					<groupId>xml-apis</groupId>
-					<artifactId>xml-apis</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 		<dependency>
 			<groupId>com.att.eelf</groupId>
 			<artifactId>eelf-core</artifactId>
@@ -502,6 +469,11 @@
 			<version>1.3</version>
 		</dependency>
 		<!-- Other dependencies to fix nexus IQ reported vulnerabilities -->
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-web</artifactId>
+			<version>5.2.3.RELEASE</version>
+		</dependency>
 		<dependency>
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-utils</artifactId>
@@ -575,6 +547,18 @@
 			<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>
+		</dependency>
+		<dependency>
+			<groupId>com.github.docker-java</groupId>
+			<artifactId>docker-java</artifactId>
+			<version>3.2.1</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -878,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>
@@ -929,7 +914,7 @@
 							<includes>
 								<include>**/*ItCase.java</include>
 							</includes>
-							<forkCount>1C</forkCount>
+							<forkCount>1</forkCount>
 							<reuseForks>true</reuseForks>
 							<useSystemClassLoader>false</useSystemClassLoader>
 							<argLine>${failsafeArgLine}</argLine>
@@ -953,7 +938,7 @@
 					<apiVersion>1.35</apiVersion>
 					<images>
 						<image>
-							<name>library/mariadb:10.3.12</name>
+							<name>docker.io/mariadb:10.3.12</name>
 							<alias>mariadb</alias>
 							<run>
 								<env>
@@ -982,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>
@@ -1238,7 +1223,6 @@
 						</goals>
 						<phase>deploy</phase>
 						<configuration>
-							<skip>true</skip>
 							<workingDirectory>${project.build.directory}/${ui.react.lib.src}</workingDirectory>
 							<arguments>publish</arguments>
 						</configuration>
@@ -1259,6 +1243,26 @@
 				<artifactId>sonar-maven-plugin</artifactId>
 				<version>3.7.0.1746</version>
 			</plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.3.2</version>             
+                <executions>  
+                    <execution>
+                        <id>libIndexCheck</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <executable>bash</executable>
+                    <arguments>
+                        <argument>${project.basedir}/src/main/script/checkLibIndex.sh</argument>
+                    </arguments>
+                </configuration>
+          </plugin>
 		</plugins>
 	</build>
 </project>