Fix casablanca build

Backporting changes on pom.xml from master

Issue-ID: CLAMP-331
Change-Id: I6a44188bb2e336c0148affa74b2afd8db89fb576
Signed-off-by: ChrisC <christophe.closset@intl.att.com>

diff --git a/pom.xml b/pom.xml
index e98ff5e..17d6665 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
                                <eelf.core.version>1.0.0</eelf.core.version>
                                <camel.version>2.22.0</camel.version>
                                <springboot.version>2.0.6.RELEASE</springboot.version>
-                               
+
                                <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
                                <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
                                <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
@@ -77,7 +77,7 @@
                                <sonar.projectVersion>${project.version}</sonar.projectVersion>
                                <!-- Enable language to disable javascript analysis -->
                                <sonar.language>java</sonar.language>
-                               <!-- Parameters for Javascript coverage 
+                               <!-- Parameters for Javascript coverage
                                        <sonar.sources>src/main,${project.build.directory}/clamp-ui/designer</sonar.sources>
                                        <sonar.javascript.lcov.reportPaths>${project.build.directory}/clamp-ui/coverage/lcov.info</sonar.javascript.lcov.reportPaths>
                                 -->
@@ -267,7 +267,7 @@
                                                <artifactId>camel-servlet-starter</artifactId>
                                </dependency>
                                <dependency>
-                                       <groupId>org.apache.camel</groupId> 
+                                       <groupId>org.apache.camel</groupId>
                                        <artifactId>camel-jackson-starter</artifactId>
                                </dependency>
                                <dependency>
@@ -644,7 +644,7 @@
                                                </testResource>
                                </testResources>
                                <resources>
-                                               <!--  For AAF folder maven should not try to filter Keystores/Truststores ... 
+                                               <!--  For AAF folder maven should not try to filter Keystores/Truststores ...
                                                          Otherwise they will be broken and unreadable
                                                -->
                                                <resource>
@@ -671,8 +671,8 @@
                                </resources>
 
                                <plugins>
-                                               <!-- Read the swagger.json file and the definition from SwaggerConfig.java; 
-                                                       generate a list of .adoc files containing the APIs info in more structured 
+                                               <!-- 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 -->
                                                <plugin>
                                                                <groupId>io.github.swagger2markup</groupId>
@@ -707,23 +707,18 @@
                                                                </executions>
                                                </plugin>
 
-                                               <!-- Run the generated asciidoc through Asciidoctor to generate other 
+                                               <!-- Run the generated asciidoc through Asciidoctor to generate other
                                                                documentation types, such as PDFs or HTML5 -->
                                                <plugin>
                                                                <groupId>org.asciidoctor</groupId>
                                                                <artifactId>asciidoctor-maven-plugin</artifactId>
-                                                               <version>1.5.6</version>
+                                                               <version>1.5.7.1</version>
                                                                <dependencies>
                                                                                <dependency>
                                                                                                <groupId>org.asciidoctor</groupId>
                                                                                                <artifactId>asciidoctorj-pdf</artifactId>
                                                                                                <version>1.5.0-alpha.10.1</version>
                                                                                </dependency>
-                                                                               <dependency>
-                                                                                               <groupId>org.jruby</groupId>
-                                                                                               <artifactId>jruby-complete</artifactId>
-                                                                                               <version>1.7.21</version>
-                                                                               </dependency>
                                                                </dependencies>
                                                                <configuration>
                                                                                <sourceDirectory>${project.basedir}/src/main/resources/asciidoc</sourceDirectory>
@@ -858,9 +853,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 +879,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 +890,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>
@@ -963,7 +967,7 @@
                                                                                                                                                <tag>${project.docker.latesttagtimestamp.version}</tag>
                                                                                                                                                <tag>${project.docker.latesttag.version}</tag>
                                                                                                                                </tags>
-                                                                                                                               <!-- A relative path is looked up in ${project.basedir}/src/main/docker 
+                                                                                                                               <!-- A relative path is looked up in ${project.basedir}/src/main/docker
                                                                                                                                                by default -->
                                                                                                                                <dockerFile>Dockerfile</dockerFile>
                                                                                                                                <assembly>
@@ -1045,10 +1049,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 +1062,7 @@
                                                                                                </goals>
                                                                                                <configuration>
                                                                                                                <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+                                                                                                               <propertyName>surefireArgLine</propertyName>
                                                                                                                <!-- <append>true</append> -->
                                                                                                </configuration>
                                                                                </execution>
@@ -1069,6 +1074,7 @@
                                                                                                </goals>
                                                                                                <configuration>
                                                                                                                <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
+                                                                                                               <propertyName>failsafeArgLine</propertyName>
                                                                                                                <!-- <append>true</append> -->
                                                                                                </configuration>
                                                                                </execution>