Fix nexus iq issues

[clamp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 86461c5..6b08b0c 100644 (file)
--- 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"
@@ -42,7 +41,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 +56,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>
@@ -74,7 +73,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 +87,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>
@@ -306,7 +304,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 +330,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 +358,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 +389,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 +408,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 +427,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>
@@ -472,26 +474,6 @@
                                        <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
                                        <version>1.0.1.Final</version>
                                </dependency>
-                               <dependency>
-                                               <artifactId>jackson-databind</artifactId>
-                                               <groupId>com.fasterxml.jackson.core</groupId>
-                                               <version>2.9.4</version>
-                               </dependency>
-                               <dependency>
-                                               <groupId>com.fasterxml.jackson.core</groupId>
-                                               <artifactId>jackson-annotations</artifactId>
-                                               <version>2.9.4</version>
-                               </dependency>
-                               <dependency>
-                                               <groupId>com.fasterxml.jackson.core</groupId>
-                                               <artifactId>jackson-core</artifactId>
-                                               <version>2.9.4</version>
-                               </dependency>
-                               <dependency>
-                                               <groupId>com.fasterxml.jackson.dataformat</groupId>
-                                               <artifactId>jackson-dataformat-yaml</artifactId>
-                                               <version>2.9.4</version>
-                               </dependency>
                                <!-- Remove the MYSQL connector and replace it by Mariadb -->
                                <dependency>
                                                <groupId>org.mariadb.jdbc</groupId>
@@ -500,14 +482,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>
 
@@ -847,7 +829,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>