X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=4b19b808f03b28cb4b612a45755a530d9d9da716;hb=440d34023d8ad1864ebaecf6a7f70dd717710feb;hp=2f1a7d248a2066c56b6ac023f3300f4577f7443a;hpb=356fc5f8f9f0b075fba54da19df2de0fb9c0c69f;p=clamp.git

diff --git a/pom.xml b/pom.xml
index 2f1a7d24..4b19b808 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
 		<parent>
 				<groupId>org.onap.oparent</groupId>
 				<artifactId>oparent</artifactId>
-				<version>1.1.0-SNAPSHOT</version>
+				<version>1.1.0</version>
 		</parent>
 
 		<description>
@@ -42,7 +42,7 @@
            By Default "mvn clean install" command will execute also the unit tests
            and the integration tests. The integration tests require a docker engine running.
 
-           If you want to skip the intergation test you can by doing:
+           If you want to skip the integration test you can by doing:
            "mvn clean install -DskipITs=true"
 
            For Spring it's possible to specify the application.properties location
@@ -66,10 +66,12 @@
 				<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 				<docker.mariadb.port.host>3306</docker.mariadb.port.host>
-				<docker.http-cache.port.host>2080</docker.http-cache.port.host>
+				<docker.http-cache.port.host>8085</docker.http-cache.port.host>
 				<project.scm.id>git-server</project.scm.id>
 				<java.version>1.8</java.version>
 
+				<swagger.jaxrs2.version>2.0.0-rc4</swagger.jaxrs2.version>
+				<guava.version>20.0</guava.version>
 				<eelf.core.version>1.0.0</eelf.core.version>
 				<camel.version>2.20.1</camel.version>
 				<springboot.version>1.5.10.RELEASE</springboot.version>
@@ -168,6 +170,17 @@
 		</dependencyManagement>
 
 		<dependencies>
+				<!-- Swagger requires at least v20 and policy is bringing version 14 -->
+				<dependency>
+					<groupId>com.google.guava</groupId>
+					<artifactId>guava</artifactId>
+					<version>${guava.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>io.swagger.core.v3</groupId>
+					<artifactId>swagger-jaxrs2</artifactId>
+					<version>${swagger.jaxrs2.version}</version>
+				</dependency>
 				<dependency>
 						<groupId>com.att.eelf</groupId>
 						<artifactId>eelf-core</artifactId>
@@ -270,14 +283,6 @@
 						<groupId>junit</groupId>
 						<artifactId>junit</artifactId>
 				</dependency>
-				<dependency>
-						<groupId>com.fasterxml.jackson.core</groupId>
-						<artifactId>jackson-core</artifactId>
-				</dependency>
-				<dependency>
-						<groupId>com.fasterxml.jackson.core</groupId>
-						<artifactId>jackson-databind</artifactId>
-				</dependency>
 				<dependency>
 						<groupId>javax.transaction</groupId>
 						<artifactId>jta</artifactId>
@@ -303,6 +308,10 @@
 						<artifactId>PolicyEngineAPI</artifactId>
 						<version>1.1.0</version>
 						<exclusions>
+								<exclusion>
+										<groupId>com.google.guava</groupId>
+										<artifactId>guava</artifactId>
+								</exclusion>
 								<exclusion>
 										<artifactId>log4j</artifactId>
 										<groupId>log4j</groupId>
@@ -315,10 +324,6 @@
 										<artifactId>apache-log4j-extras</artifactId>
 										<groupId>log4j</groupId>
 								</exclusion>
-								<exclusion>
-										<artifactId>jackson-databind</artifactId>
-										<groupId>com.fasterxml.jackson.core</groupId>
-								</exclusion>
 								<exclusion>
 										<groupId>mysql</groupId>
 										<artifactId>mysql-connector-java</artifactId>
@@ -436,14 +441,6 @@
 								</exclusion>
 						</exclusions>
 				</dependency>
-				<dependency>
-						<groupId>com.fasterxml.jackson.core</groupId>
-						<artifactId>jackson-databind</artifactId>
-				</dependency>
-				<dependency>
-						<groupId>com.fasterxml.jackson.dataformat</groupId>
-						<artifactId>jackson-dataformat-yaml</artifactId>
-				</dependency>
 				<dependency>
 						<groupId>org.apache.commons</groupId>
 						<artifactId>commons-csv</artifactId>
@@ -485,7 +482,12 @@
 				<dependency>
 						<groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
 						<artifactId>sdc-distribution-client</artifactId>
-						<version>1.2.3</version>
+						<version>1.2.2</version>
+				</dependency>
+				<dependency>
+					<groupId>org.openecomp.sdc.sdc-tosca</groupId>
+					<artifactId>sdc-tosca</artifactId>
+					<version>1.2.2</version>
 				</dependency>
 		</dependencies>
 
@@ -497,6 +499,7 @@
 								<directory>src/test/resources</directory>
 								<excludes>
 										<exclude>**/*.jks</exclude>
+										<exclude>**/*.csar</exclude>
 								</excludes>
 								<filtering>true</filtering>
 						</testResource>
@@ -508,6 +511,14 @@
 								<filtering>false</filtering>
 								<targetPath>https</targetPath>
 						</testResource>
+					  <testResource>
+								<directory>src/test/resources/example/sdc</directory>
+								<includes>
+										<include>**.csar</include>
+								</includes>
+								<filtering>false</filtering>
+								<targetPath>example/sdc</targetPath>
+						</testResource>
 				</testResources>
 				<resources>
 						<resource>
@@ -799,7 +810,7 @@
 																<volumes>
 																		<bind>
 																				<volume>${project.basedir}/src/test/resources/http-cache/:/usr/src/http-cache-app</volume>
-																				<volume>${project.basedir}/src/test/resources/http-cache/sdc-example/:/usr/src/http-cache-app/data-cache</volume>
+																				<volume>${project.basedir}/src/test/resources/http-cache/example/:/usr/src/http-cache-app/data-cache</volume>
 																		</bind>
 																</volumes>
 																<wait>