<java.version>1.8</java.version>
<swagger.jaxrs2.version>2.0.0-rc4</swagger.jaxrs2.version>
- <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.12.RELEASE</springboot.version>
+ <springboot.version>1.5.14.RELEASE</springboot.version>
<sonar.language>java</sonar.language>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.projectVersion>${project.version}</sonar.projectVersion>
<docker.push.registry>localhost:5000</docker.push.registry>
+ <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
<docker.skip.build>true</docker.skip.build>
<docker.skip.push>true</docker.skip.push>
<docker.skip.tag>true</docker.skip.tag>
<tomcat.version>8.5.28</tomcat.version>
</properties>
+ <profiles>
+ <profile>
+ <id>without-test</id>
+ <activation>
+ <property>
+ <name>maven.test.skip</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <properties>
+ <docker.skip.run>true</docker.skip.run>
+ </properties>
+ </profile>
+ <profile>
+ <id>without-IT-only</id>
+ <activation>
+ <property>
+ <name>skipITs</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <properties>
+ <docker.skip.run>true</docker.skip.run>
+ </properties>
+ </profile>
+ <profile>
+ <id>without-IT-only2</id>
+ <activation>
+ <property>
+ <name>skipTests</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <properties>
+ <docker.skip.run>true</docker.skip.run>
+ </properties>
+ </profile>
+ <profile>
+ <id>docker</id>
+ <properties>
+ <skip.staging.artifacts>true</skip.staging.artifacts>
+ <docker.skip.build>false</docker.skip.build>
+ <docker.skip.tag>false</docker.skip.tag>
+ <docker.skip.push>false</docker.skip.push>
+ </properties>
+ </profile>
+ </profiles>
+
<distributionManagement>
<repository>
<id>ecomp-releases</id>
<dependency>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
<exclusion>
- <artifactId>grizzly-http</artifactId>
+ <artifactId>grizzly-http-server</artifactId>
<groupId>org.glassfish.grizzly</groupId>
</exclusion>
</exclusions>
<groupId>com.att.nsa</groupId>
<artifactId>dmaapClient</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<artifactId>commons-csv</artifactId>
<version>1.3</version>
</dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>2.1.7</version>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>2.1.7</version>
- </dependency>
<!-- Other dependencies to fix nexus IQ reported vulnerabilities -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
<version>1.0.1.Final</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>25.1-jre</version>
+ </dependency>
<!-- Remove the MYSQL connector and replace it by Mariadb -->
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<version>1.2.0</version>
<scope>test</scope>
</dependency>
+ <!-- TESTING -->
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>3.10.0</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<pluginRepositories>
<pluginRepository>
</resources>
<plugins>
- <!-- Scan Clamp code and generate the swagger.json file with all the
+ <!-- Scan Clamp code and generate the swagger.json file with all the
APIs -->
<plugin>
<groupId>com.sebastian-daschner</groupId>
</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
+ <!-- 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>
</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>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${springboot.version}</version>
+ <!-- Temporary fix -->
+ <version>1.5.13.RELEASE</version>
+ <!-- <version>${springboot.version}</version> -->
<executions>
<execution>
<goals>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.16</version>
+ <version>2.17</version>
<executions>
<execution>
<apiVersion>1.23</apiVersion>
<images>
<image>
- <name>mariadb:10.1.11</name>
+ <name>library/mariadb:10.1.11</name>
<alias>mariadb</alias>
<run>
<env>
</run>
</image>
<image>
- <name>python:2-slim</name>
+ <name>library/python:2-slim</name>
<alias>python</alias>
<run>
<hostname>python</hostname>
<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 by default -->
+ <!-- A relative path is looked up in ${project.basedir}/src/main/docker
+ by default -->
<dockerFile>Dockerfile</dockerFile>
<assembly>
<descriptor>assembly/clamp-files.xml</descriptor>
</build>
</image>
</images>
- <skip>${skipITs}</skip>
</configuration>
<executions>
<execution>
<goals>
<goal>build</goal>
</goals>
- <configuration>
- <images>
- <image>
- <alias>onap-clamp</alias>
- </image>
- </images>
- </configuration>
</execution>
<execution>
<id>push-images</id>
<goals>
<goal>push</goal>
</goals>
- <configuration>
- <images>
- <image>
- <alias>onap-clamp</alias>
- </image>
- </images>
- </configuration>
</execution>
<execution>
<id>docker-start-for-it</id>
<goals>
<goal>start</goal>
</goals>
- <configuration>
- <skip>${skipITs}</skip>
- <images>
- <image>
- <alias>mariadb</alias>
- </image>
- <image>
- <alias>python</alias>
- </image>
- </images>
- </configuration>
</execution>
<execution>
<id>docker-stop-for-it</id>
<goals>
<goal>stop</goal>
</goals>
- <configuration>
- <skip>${skipITs}</skip>
- <images>
- <image>
- <alias>mariadb</alias>
- </image>
- <image>
- <alias>python</alias>
- </image>
- </images>
- </configuration>
</execution>
</executions>
</plugin>
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>docker</id>
- <properties>
- <skip.staging.artifacts>true</skip.staging.artifacts>
- <docker.skip.build>false</docker.skip.build>
- <docker.skip.tag>false</docker.skip.tag>
- <docker.skip.push>false</docker.skip.push>
- </properties>
- </profile>
- </profiles>
</project>
Code Review / clamp.git / blobdiff