X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=58c4de181c58a71625a57618be5fb7bb2d2bfe84;hb=e1d5007e4688bfbbb176f0fc6c119a73e9f19882;hp=9825d35b51fcc22245bc3a6662110f9e3412fb78;hpb=3bb0a519c63cc629f5d36b29d8eeced99109353f;p=clamp.git

diff --git a/pom.xml b/pom.xml
index 9825d35b..58c4de18 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.5-SNAPSHOT</version>
+	<version>5.1.4-SNAPSHOT</version>
 	<name>clamp</name>
 
 
@@ -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.5.RELEASE</springboot.version>
+		<camel.version>2.25.2</camel.version>
+		<springboot.version>2.2.10.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>
@@ -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>
@@ -360,27 +327,8 @@
 					<groupId>org.slf4j</groupId>
 					<artifactId>slf4j-ext</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.core</groupId>
-					<artifactId>jackson-databind</artifactId>
-				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>javax.xml.ws</groupId>
-			<artifactId>jaxws-api</artifactId>
-			<version>2.3.1</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
-			<version>2.3.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.core</groupId>
-			<artifactId>jersey-common</artifactId>
-			<version>2.27</version>
-		</dependency>
 		<!-- Spring famework -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -424,6 +372,12 @@
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
 		<!-- Others dependencies -->
+		<!-- Jaxws is required for AAF -->
+		<dependency>
+			<groupId>javax.xml.ws</groupId>
+			<artifactId>jaxws-api</artifactId>
+			<version>2.3.1</version>
+		</dependency>
 		<dependency>
 			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
@@ -449,11 +403,6 @@
 			<artifactId>logback-classic</artifactId>
 			<version>1.2.3</version>
 		</dependency>
-		<dependency>
-			<groupId>commons-dbcp</groupId>
-			<artifactId>commons-dbcp</artifactId>
-			<version>1.4</version>
-		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
@@ -469,23 +418,10 @@
 			<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>
 		</dependency>
-		<dependency>
-			<groupId>javax.ws.rs</groupId>
-			<artifactId>javax.ws.rs-api</artifactId>
-			<version>2.0</version>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>javax.transaction</groupId>
 			<artifactId>jta</artifactId>
@@ -496,12 +432,17 @@
 			<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>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-web</artifactId>
+			<version>5.2.3.RELEASE</version>
 		</dependency>
-		<!-- Other dependencies to fix nexus IQ reported vulnerabilities -->
 		<dependency>
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-utils</artifactId>
@@ -517,27 +458,29 @@
 			<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>
 			<artifactId>mariadb-java-client</artifactId>
-			<version>2.2.1</version>
+			<version>2.6.2</version>
 		</dependency>
 		<!-- For SDC Controller -->
 		<dependency>
 			<groupId>org.onap.sdc.sdc-distribution-client</groupId>
 			<artifactId>sdc-distribution-client</artifactId>
-			<version>1.3.0</version>
+			<version>1.4.1</version>
 		</dependency>
 		<dependency>
 			<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>
@@ -551,6 +494,11 @@
 		</dependency>
 
 		<!-- TESTING -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
@@ -575,6 +523,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>
@@ -878,6 +844,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>
@@ -953,7 +920,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>
@@ -967,8 +934,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>
@@ -982,7 +949,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 +1205,6 @@
 						</goals>
 						<phase>deploy</phase>
 						<configuration>
-							<skip>true</skip>
 							<workingDirectory>${project.build.directory}/${ui.react.lib.src}</workingDirectory>
 							<arguments>publish</arguments>
 						</configuration>
@@ -1259,6 +1225,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>