<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.clamp</groupId>
<artifactId>clds</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<name>clamp</name>
<parent>
<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>
<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>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.att.research.xacml</groupId>
+ <artifactId>xacml</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
</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 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.19.1</version>
+ <version>2.22.1</version>
<configuration>
- <forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
+ <forkCount>1C</forkCount>
+ <reuseForks>true</reuseForks>
+ <useSystemClassLoader>false</useSystemClassLoader>
+ <argLine>${surefireArgLine}</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.17</version>
-
+ <version>2.22.1</version>
<executions>
<execution>
<id>integration-tests</id>
<goal>verify</goal>
</goals>
<configuration>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${project.build.directory}/classes</additionalClasspathElement>
+ </additionalClasspathElements>
<includes>
<include>**/*ItCase.java</include>
</includes>
<forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
+ <useSystemClassLoader>false</useSystemClassLoader>
+ <argLine>${failsafeArgLine}</argLine>
</configuration>
</execution>
</executions>
<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>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.7.7.201606060606</version>
+ <version>0.8.2</version>
<configuration>
<dumpOnExit>true</dumpOnExit>
+ <append>true</append>
<includes>
<include>org.onap.clamp.*</include>
</includes>
</goals>
<configuration>
<destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+ <propertyName>surefireArgLine</propertyName>
<!-- <append>true</append> -->
</configuration>
</execution>
</goals>
<configuration>
<destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
+ <propertyName>failsafeArgLine</propertyName>
<!-- <append>true</append> -->
</configuration>
</execution>