<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.clamp</groupId>
<artifactId>clds</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <version>3.0.3-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>
- <springboot.version>2.0.3.RELEASE</springboot.version>
-
+ <camel.version>2.22.1</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>
<sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
- <sonar.javascript.lcov.reportPaths>${project.build.directory}/clamp-ui/coverage/lcov.info</sonar.javascript.lcov.reportPaths>
<sonar.projectVersion>${project.version}</sonar.projectVersion>
- <sonar.sources>src/main,${project.build.directory}/clamp-ui/designer</sonar.sources>
+ <!-- Enable language to disable javascript analysis -->
+ <sonar.language>java</sonar.language>
+ <!-- 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>
+ -->
<sonar.exclusions>src/main/resources/**,**/clamp-ui/designer/lib/*</sonar.exclusions>
<docker.push.registry>localhost:5000</docker.push.registry>
<docker.skip.tag>true</docker.skip.tag>
<skip.staging.artifacts>false</skip.staging.artifacts>
<python.http.proxy.param/>
- <tomcat.version>8.5.32</tomcat.version>
+ <tomcat.version>8.5.34</tomcat.version>
</properties>
<profiles>
<distributionManagement>
<repository>
- <id>ecomp-releases</id>
+ <id>onap-releases</id>
<name>Clamp Release Repository</name>
<url>https://nexus.onap.org/content/repositories/releases/</url>
</repository>
<snapshotRepository>
- <id>ecomp-snapshots</id>
+ <id>onap-snapshots</id>
<name>Clamp Snapshot Repository</name>
<url>https://nexus.onap.org/content/repositories/snapshots/</url>
</snapshotRepository>
<site>
- <id>ecomp-site</id>
+ <id>onap-site</id>
<url>dav:https://nexus.onap.org/content/sites/site/org/onap/clamp/${project.version}</url>
</site>
</distributionManagement>
<url>http://repo2.maven.org/maven2/</url>
</repository>
<repository>
- <id>ecomp-releases</id>
+ <id>onap-releases</id>
<name>ONAP Release Repository</name>
<url>https://nexus.onap.org/content/repositories/releases/</url>
</repository>
<repository>
- <id>ecomp-staging</id>
+ <id>onap-staging</id>
<name>ONAP Staging Repository</name>
<url>https://nexus.onap.org/content/repositories/staging/</url>
</repository>
<repository>
- <id>ecomp-snapshots</id>
+ <id>onap-snapshots</id>
<name>ONAP Snapshot Repository</name>
<url>https://nexus.onap.org/content/repositories/snapshots/</url>
<snapshots>
<dependency>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineAPI</artifactId>
- <version>1.3.0</version>
+ <version>1.3.3</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<groupId>javax.jms</groupId>
<artifactId>jms</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.att.research.xacml</groupId>
+ <artifactId>xacml</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<artifactId>plexus-utils</artifactId>
<version>3.0.24</version>
</dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.3.3</version>
- </dependency>
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
</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.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>
</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>
</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>
<mode>direct</mode>
</tcp>
<time>120000</time>
+ <kill>5000</kill>
</wait>
<ports>
<port>${docker.http-cache.port.host}:8080</port>
<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>
<includes>
<include>org.onap.clamp.*</include>
</includes>
+ <propertyName>surefireArgLine</propertyName>
</configuration>
<executions>
<execution>