Merge "Fix the SDC controller"

[clamp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 2f1a7d2..0ea91c1 100644 (file)
--- 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>
@@ -87,7 +89,6 @@
                                <skip.docker.push>true</skip.docker.push>
                                <skip.staging.artifacts>false</skip.staging.artifacts>
                                <http.proxy></http.proxy>
-
                </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>
@@ -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>
@@ -303,6 +307,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 +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>
@@ -436,14 +440,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>
@@ -483,9 +479,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.3</version>
                                </dependency>
                </dependencies>
 
@@ -497,6 +498,7 @@
                                                                <directory>src/test/resources</directory>
                                                                <excludes>
                                                                                <exclude>**/*.jks</exclude>
+                                                                               <exclude>**/*.csar</exclude>
                                                                </excludes>
                                                                <filtering>true</filtering>
                                                </testResource>
@@ -508,6 +510,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 +809,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>
@@ -816,7 +826,7 @@
                                                                                                                                </ports>
                                                                                                                                <workingDir>/usr/src/http-cache-app</workingDir>
                                                                                                                                <cmd>
-                                                                                                                                               <shell>./start_http_cache.sh ${http.proxy}</shell>
+                                                                                                                                               <shell>./start_http_cache.sh ${http.proxy} --python_proxyaddress localhost:${docker.http-cache.port.host}</shell>
                                                                                                                                </cmd>
                                                                                                                </run>
                                                                                                </image>