X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=6ab125b05a476bf7cf2758ebeffa5ed2d7da29d0;hb=refs%2Fheads%2Ftosca-poc;hp=7a696154a5a6b52201bd26ce3b90885686d4be35;hpb=94eb4305a9f99647ffd07a81ef57f62b71462858;p=clamp.git

diff --git a/pom.xml b/pom.xml
index 7a696154..6ab125b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,6 +6,8 @@
   Copyright (C) 2017-2019 AT&T Intellectual Property. All rights
                               reserved.
   ================================================================================
+  Modifications Copyright (c) 2020 Nordix
+  ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
@@ -26,7 +28,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.onap.clamp</groupId>
 	<artifactId>clds</artifactId>
-	<version>5.1.0-SNAPSHOT</version>
+	<version>5.1.1-SNAPSHOT</version>
 	<name>clamp</name>
 
 
@@ -78,6 +80,7 @@
 		<eelf.core.version>1.0.0</eelf.core.version>
 		<camel.version>2.25.2</camel.version>
 		<springboot.version>2.2.9.RELEASE</springboot.version>
+		<policy.models.version>2.3.2-SNAPSHOT</policy.models.version>
 
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
@@ -329,21 +332,6 @@
 				</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>
@@ -387,6 +375,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>
@@ -412,11 +406,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>
@@ -436,15 +425,6 @@
 			<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>
@@ -455,12 +435,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>
@@ -481,16 +461,12 @@
 			<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>
@@ -520,7 +496,24 @@
 			<version>2.1.3</version>
 		</dependency>
 
+		<!-- For TOSCA Controlloop  -->
+		<dependency>
+			<groupId>org.onap.policy.models</groupId>
+			<artifactId>policy-models-base</artifactId>
+			<version>${policy.models.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.policy.models</groupId>
+			<artifactId>policy-models-tosca</artifactId>
+			<version>${policy.models.version}</version>
+		</dependency>
+
 		<!-- TESTING -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
@@ -918,7 +911,7 @@
 							<includes>
 								<include>**/*ItCase.java</include>
 							</includes>
-							<forkCount>1</forkCount>
+							<forkCount>1C</forkCount>
 							<reuseForks>true</reuseForks>
 							<useSystemClassLoader>false</useSystemClassLoader>
 							<argLine>${failsafeArgLine}</argLine>