X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=efd3a65d25c1d631e2f43921075ff09c4c13e9ed;hb=d400321cd3415ac2a0fa6a634e54be4fc0dc4aac;hp=5663d9882bfbd9d7f760eed9fbdb71af015e9c85;hpb=465bfe233d22c5366696028b50f47c3606806893;p=clamp.git

diff --git a/pom.xml b/pom.xml
index 5663d988..efd3a65d 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
@@ -57,7 +57,7 @@
 		</description>
 
 		<properties>
-				<maven.build.timestamp.format>yyyy.MM.dd'T'hh.mm.ss'Z'</maven.build.timestamp.format>
+				<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 				<clamp.project.version>${project.version}</clamp.project.version>
 				<clamp.build.timestamp>${maven.build.timestamp}</clamp.build.timestamp>
 				<maven.compiler.source>1.8</maven.compiler.source>
@@ -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>
@@ -86,8 +88,7 @@
 				<skip.docker.build>true</skip.docker.build>
 				<skip.docker.push>true</skip.docker.push>
 				<skip.staging.artifacts>false</skip.staging.artifacts>
-				<http.proxy></http.proxy>
-
+				<python.http.proxy.param></python.http.proxy.param>
 		</properties>
 
 		<distributionManagement>
@@ -168,6 +169,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>
@@ -251,7 +263,7 @@
 				<dependency>
 						<groupId>org.apache.commons</groupId>
 						<artifactId>commons-vfs2</artifactId>
-						<version>2.0</version>
+						<version>2.2</version>
 				</dependency>
 				<dependency>
 						<groupId>joda-time</groupId>
@@ -270,14 +282,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>
@@ -293,11 +297,6 @@
 						<artifactId>hibernate-annotations</artifactId>
 						<version>3.5.6-Final</version>
 				</dependency>
-				<!-- <dependency> -->
-				<!-- <groupId>org.apache.geronimo.specs</groupId> -->
-				<!-- <artifactId>geronimo-jpa_2.0_spec</artifactId> -->
-				<!-- <version>1.1</version> -->
-				<!-- </dependency> -->
 				<dependency>
 						<groupId>dom4j</groupId>
 						<artifactId>dom4j</artifactId>
@@ -306,8 +305,12 @@
 				<dependency>
 						<groupId>org.onap.policy.engine</groupId>
 						<artifactId>PolicyEngineAPI</artifactId>
-						<version>1.1.0</version>
+						<version>1.2.0</version>
 						<exclusions>
+								<exclusion>
+										<groupId>com.google.guava</groupId>
+										<artifactId>guava</artifactId>
+								</exclusion>
 								<exclusion>
 										<artifactId>log4j</artifactId>
 										<groupId>log4j</groupId>
@@ -320,10 +323,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>
@@ -332,12 +331,16 @@
 										<groupId>commons-io</groupId>
 										<artifactId>commons-io</artifactId>
 								</exclusion>
+								<exclusion>
+										<artifactId>grizzly-http</artifactId>
+										<groupId>org.glassfish.grizzly</groupId>
+								</exclusion>
 						</exclusions>
 				</dependency>
 				<dependency>
 						<groupId>org.onap.policy.common</groupId>
 						<artifactId>ONAP-Logging</artifactId>
-						<version>1.1.0</version>
+						<version>1.1.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -356,7 +359,7 @@
 				<dependency>
 						<groupId>org.onap.policy.engine</groupId>
 						<artifactId>PolicyEngineUtils</artifactId>
-						<version>1.1.0</version>
+						<version>1.1.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -387,7 +390,7 @@
 				<dependency>
 						<groupId>org.onap.policy.drools-applications</groupId>
 						<artifactId>policy-yaml</artifactId>
-						<version>1.1.0</version>
+						<version>1.1.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -406,7 +409,7 @@
 				<dependency>
 						<groupId>org.onap.policy.drools-applications</groupId>
 						<artifactId>sdc</artifactId>
-						<version>1.1.0</version>
+						<version>1.1.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -425,7 +428,7 @@
 				<dependency>
 						<groupId>org.onap.policy.drools-applications</groupId>
 						<artifactId>aai</artifactId>
-						<version>1.1.0</version>
+						<version>1.1.3</version>
 						<exclusions>
 								<exclusion>
 										<artifactId>log4j</artifactId>
@@ -441,14 +444,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>
@@ -464,6 +459,22 @@
 						<artifactId>jsf-impl</artifactId>
 						<version>2.1.7</version>
 				</dependency>
+				<!-- Other dependencies to fix nexus IQ reported vulnerabilities -->
+				<dependency>
+					<groupId>org.codehaus.plexus</groupId>
+					<artifactId>plexus-utils</artifactId>
+					<version>3.0.24</version>
+				</dependency>
+				<dependency>
+					<groupId>commons-fileupload</groupId>
+					<artifactId>commons-fileupload</artifactId>
+					<version>1.3.3</version>
+				</dependency>
+				<dependency>
+					<groupId>org.jboss.spec.javax.ws.rs</groupId>
+					<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
+					<version>1.0.1.Final</version>
+				</dependency>
 				<!-- Remove the MYSQL connector and replace it by Mariadb -->
 				<dependency>
 						<groupId>org.mariadb.jdbc</groupId>
@@ -472,9 +483,14 @@
 				</dependency>
 				<!-- For SDC Controller -->
 				<dependency>
-						<groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
+						<groupId>org.onap.sdc.sdc-distribution-client</groupId>
 						<artifactId>sdc-distribution-client</artifactId>
-						<version>1.2.3</version>
+						<version>1.3.0</version>
+				</dependency>
+				<dependency>
+					<groupId>org.onap.sdc.sdc-tosca</groupId>
+					<artifactId>sdc-tosca</artifactId>
+					<version>1.3.0</version>
 				</dependency>
 		</dependencies>
 
@@ -486,6 +502,7 @@
 								<directory>src/test/resources</directory>
 								<excludes>
 										<exclude>**/*.jks</exclude>
+										<exclude>**/*.csar</exclude>
 								</excludes>
 								<filtering>true</filtering>
 						</testResource>
@@ -497,6 +514,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>
@@ -788,7 +813,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>
@@ -805,7 +830,7 @@
 																</ports>
 																<workingDir>/usr/src/http-cache-app</workingDir>
 																<cmd>
-																		<shell>./start_http_cache.sh ${http.proxy}</shell>
+																		<shell>./start_http_cache.sh ${python.http.proxy.param} --python_proxyaddress=localhost:${docker.http-cache.port.host}</shell>
 																</cmd>
 														</run>
 												</image>