Remove useless code

[clamp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index e98ff5e..297b0a1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
                <modelVersion>4.0.0</modelVersion>
                <groupId>org.onap.clamp</groupId>
                <artifactId>clds</artifactId>
-               <version>3.0.3-SNAPSHOT</version>
+               <version>4.0.0-SNAPSHOT</version>
                <name>clamp</name>
 
                <parent>
@@ -60,13 +60,11 @@
                                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-                               <docker.mariadb.port.host>3306</docker.mariadb.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>
 
                                <eelf.core.version>1.0.0</eelf.core.version>
-                               <camel.version>2.22.0</camel.version>
+                               <camel.version>2.22.1</camel.version>
                                <springboot.version>2.0.6.RELEASE</springboot.version>
                                
                                <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -397,7 +395,7 @@
                                <dependency>
                                                <groupId>org.onap.policy.engine</groupId>
                                                <artifactId>PolicyEngineAPI</artifactId>
-                                               <version>1.3.1</version>
+                                               <version>1.3.3</version>
                                                <exclusions>
                                                                <exclusion>
                                                                                <groupId>com.google.guava</groupId>
@@ -671,6 +669,38 @@
                                </resources>
 
                                <plugins>
+                                               <plugin>
+                                                       <groupId>org.sonatype.plugins</groupId>
+                                                       <artifactId>port-allocator-maven-plugin</artifactId>
+                                                       <version>1.2</version>
+                                                       <executions>
+                                                               <execution>
+                                                                       <phase>validate</phase>
+                                                                       <goals>
+                                                                               <goal>allocate-ports</goal>
+                                                                       </goals>
+                                                                       <configuration>
+                                                                               <ports>
+                                                                                       <port>
+                                                                                               <name>docker.mariadb.port.host</name>
+                                                                                       </port>
+                                                                                       <port>
+                                                                                               <name>docker.http-cache.port.host</name>
+                                                                                       </port>
+                                                                                       <port>
+                                                                                               <name>clamp.it.tests.http-redirected</name>
+                                                                                       </port>
+                                                                                       <port>
+                                                                                               <name>clamp.it.tests.https</name>
+                                                                                       </port>
+                                                                                       <port>
+                                                                                               <name>clamp.it.tests.http</name>
+                                                                                       </port>
+                                                                               </ports>
+                                                                       </configuration>
+                                                               </execution>
+                                                       </executions>
+                                               </plugin>
                                                <!-- Read the swagger.json file and the definition from SwaggerConfig.java; 
                                                        generate a list of .adoc files containing the APIs info in more structured 
                                                        way -->
@@ -858,9 +888,10 @@
                                                                <artifactId>maven-surefire-plugin</artifactId>
                                                                <version>2.22.1</version>
                                                                <configuration>
-                                                                               <forkCount>1</forkCount>
+                                                                               <forkCount>1C</forkCount>
                                                                                <reuseForks>true</reuseForks>
                                                                                <useSystemClassLoader>false</useSystemClassLoader>
+                                                                               <argLine>${surefireArgLine}</argLine>
                                                                </configuration>
                                                </plugin>
 
@@ -883,8 +914,9 @@
                                                                                                                                <include>**/*ItCase.java</include>
                                                                                                                </includes>
                                                                                                                <forkCount>1</forkCount>
-                                                                                                               <reuseForks>false</reuseForks>
+                                                                                                               <reuseForks>true</reuseForks>
                                                                                                                <useSystemClassLoader>false</useSystemClassLoader>
+                                                                                                               <argLine>${failsafeArgLine}</argLine>
                                                                                                </configuration>
                                                                                </execution>
                                                                </executions>
@@ -893,10 +925,17 @@
                                                <plugin>
                                                                <groupId>io.fabric8</groupId>
                                                                <artifactId>docker-maven-plugin</artifactId>
-                                                               <version>0.26.0</version>
+                                                               <version>0.27.2</version>
+                                                               <dependencies>
+                                                                       <dependency>
+                                                                               <groupId>org.apache.httpcomponents</groupId>
+                                                                               <artifactId>httpclient</artifactId>
+                                                                               <version>4.5.5</version>
+                                                                       </dependency>
+                                                               </dependencies>
                                                                <configuration>
                                                                                <verbose>true</verbose>
-                                                                               <apiVersion>1.23</apiVersion>
+                                                                               <apiVersion>1.35</apiVersion>
                                                                                <images>
                                                                                                <image>
                                                                                                                <name>library/mariadb:10.1.11</name>
@@ -1045,10 +1084,10 @@
                                                                <version>0.8.2</version>
                                                                <configuration>
                                                                                <dumpOnExit>true</dumpOnExit>
+                                                                               <append>true</append>
                                                                                <includes>
                                                                                                <include>org.onap.clamp.*</include>
                                                                                </includes>
-                                                                               <propertyName>surefireArgLine</propertyName>
                                                                </configuration>
                                                                <executions>
                                                                                <execution>
@@ -1058,6 +1097,7 @@
                                                                                                </goals>
                                                                                                <configuration>
                                                                                                                <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+                                                                                                               <propertyName>surefireArgLine</propertyName>
                                                                                                                <!-- <append>true</append> -->
                                                                                                </configuration>
                                                                                </execution>
@@ -1069,6 +1109,7 @@
                                                                                                </goals>
                                                                                                <configuration>
                                                                                                                <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
+                                                                                                               <propertyName>failsafeArgLine</propertyName>
                                                                                                                <!-- <append>true</append> -->
                                                                                                </configuration>
                                                                                </execution>