X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=c79fb908a814494ce20db09fcc519ed1e2fe7f9e;hb=c1a1b175f3bd831303a54d87f20ad046f42cb085;hp=4b19b808f03b28cb4b612a45755a530d9d9da716;hpb=c3472b1ec153c564fb99b37eb17c764db0d530fc;p=clamp.git

diff --git a/pom.xml b/pom.xml
index 4b19b808..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"
@@ -49,15 +48,13 @@
            "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>
@@ -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>
@@ -306,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,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>
@@ -356,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>
@@ -387,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>
@@ -406,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>
@@ -425,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>
@@ -480,14 +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.2</version>
+						<version>1.3.0</version>
 				</dependency>
 				<dependency>
-					<groupId>org.openecomp.sdc.sdc-tosca</groupId>
+					<groupId>org.onap.sdc.sdc-tosca</groupId>
 					<artifactId>sdc-tosca</artifactId>
-					<version>1.2.2</version>
+					<version>1.3.0</version>
 				</dependency>
 		</dependencies>
 
@@ -827,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>