X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=c79fb908a814494ce20db09fcc519ed1e2fe7f9e;hb=8b4d54436b3283580d2776b0d48eab3c381d0419;hp=9591e7f9eb333932c1f1c36a5aa51ef218dca0b9;hpb=009f713c6c46cf3647f1a008e3a963522f988f92;p=clamp.git

diff --git a/pom.xml b/pom.xml
index 9591e7f9..c79fb908 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,6 @@
   limitations under the License.
   ============LICENSE_END============================================
   ===================================================================
-  ECOMP is a trademark and service mark of AT&T Intellectual Property.
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -33,7 +32,7 @@
 		<parent>
 				<groupId>org.onap.oparent</groupId>
 				<artifactId>oparent</artifactId>
-				<version>1.1.0-SNAPSHOT</version>
+				<version>1.1.0</version>
 		</parent>
 
 		<description>
@@ -42,22 +41,20 @@
            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
            "mvn clean install -Dspring.config.location=classpath:application-test.properties"
 
            The application.properties contains the location of the CLAMP parameters files:
-				- org.onap.clamp.config.files.cldsReference=classpath:/clds/clds-reference.properties
-				- org.onap.clamp.config.files.cldsPolicyConfig=classpath:/clds/clds-policy-config.properties
 				- org.onap.clamp.config.files.cldsUsers=classpath:/clds/clds-users.json
 				- org.onap.clamp.config.files.globalClds=classpath:/clds/globalClds.properties
 
 		</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,7 +63,7 @@
 				<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>
 
@@ -74,7 +71,7 @@
 				<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>
+				<springboot.version>1.5.12.RELEASE</springboot.version>
 
 				<sonar.language>java</sonar.language>
 				<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -88,8 +85,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>
@@ -199,6 +195,11 @@
 						<groupId>org.apache.camel</groupId>
 						<artifactId>camel-servlet-starter</artifactId>
 				</dependency>
+				<dependency>
+						<groupId>javax.xml.bind</groupId>
+						<artifactId>jaxb-api</artifactId>
+						<version>2.3.0</version>
+				</dependency> 
 				<!-- Spring famework -->
 				<dependency>
 						<groupId>org.springframework.boot</groupId>
@@ -283,14 +284,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>
@@ -314,7 +307,7 @@
 				<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>
@@ -332,10 +325,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>
@@ -344,12 +333,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>
@@ -368,7 +361,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>
@@ -399,7 +392,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>
@@ -418,7 +411,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>
@@ -437,7 +430,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>
@@ -453,14 +446,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>
@@ -500,9 +485,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>
 
@@ -514,6 +504,7 @@
 								<directory>src/test/resources</directory>
 								<excludes>
 										<exclude>**/*.jks</exclude>
+										<exclude>**/*.csar</exclude>
 								</excludes>
 								<filtering>true</filtering>
 						</testResource>
@@ -525,6 +516,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>
@@ -816,7 +815,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>
@@ -833,7 +832,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>