Merge "Fix docker build"
[clamp.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 091c57b..be85a0a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,6 @@
                                <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.14.RELEASE</springboot.version>
@@ -82,6 +81,7 @@
                                <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>
+                                                       <docker.skip>true</docker.skip>
+                                               </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>
+                                                       <docker.skip>true</docker.skip>
+                                               </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>
+                                                       <docker.skip>true</docker.skip>
+                                               </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>
+                                                               <docker.skip>false</docker.skip>
+                                               </properties>
+                               </profile>
+               </profiles>
+
                <distributionManagement>
                                <repository>
                                                <id>ecomp-releases</id>
                                                <artifactId>persistence-api</artifactId>
                                                <version>1.0.2</version>
                                </dependency>
-                               <dependency>
-                                               <groupId>org.hibernate</groupId>
-                                               <artifactId>hibernate-annotations</artifactId>
-                                               <version>3.5.6-Final</version>
-                               </dependency>
-                               <dependency>
-                                               <groupId>dom4j</groupId>
-                                               <artifactId>dom4j</artifactId>
-                               </dependency>
-
                                <dependency>
                                                <groupId>org.onap.policy.engine</groupId>
                                                <artifactId>PolicyEngineAPI</artifactId>
                                                                                <artifactId>commons-io</artifactId>
                                                                </exclusion>
                                                                <exclusion>
-                                                                               <artifactId>grizzly-http</artifactId>
+                                                                               <artifactId>grizzly-http-server</artifactId>
                                                                                <groupId>org.glassfish.grizzly</groupId>
                                                                </exclusion>
-                                               </exclusions>
-                               </dependency>
-                               <dependency>
-                                               <groupId>org.onap.policy.common</groupId>
-                                               <artifactId>ONAP-Logging</artifactId>
-                                               <version>1.1.3</version>
-                                               <exclusions>
                                                                <exclusion>
-                                                                               <artifactId>log4j</artifactId>
-                                                                               <groupId>log4j</groupId>
+                                                                               <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
+                                                                               <artifactId>dmaapClient</artifactId>
                                                                </exclusion>
                                                                <exclusion>
-                                                                               <groupId>org.slf4j</groupId>
-                                                                               <artifactId>slf4j-log4j12</artifactId>
+                                                                               <groupId>org.onap.policy.common</groupId>
+                                                                               <artifactId>integrity-monitor</artifactId>
                                                                </exclusion>
                                                                <exclusion>
-                                                                               <artifactId>apache-log4j-extras</artifactId>
-                                                                               <groupId>log4j</groupId>
+                                                                               <groupId>org.onap.policy.common</groupId>
+                                                                               <artifactId>integrity-audit</artifactId>
+                                                               </exclusion>
+                                                               <exclusion>
+                                                                               <groupId>org.onap.aaf.cadi</groupId>
+                                                                               <artifactId>cadi-aaf</artifactId>
+                                                               </exclusion>
+                                                               <exclusion>
+                                                                               <groupId>javax.jms</groupId>
+                                                                               <artifactId>jms</artifactId>
                                                                </exclusion>
                                                </exclusions>
                                </dependency>
                                <dependency>
-                                               <groupId>org.onap.policy.engine</groupId>
-                                               <artifactId>PolicyEngineUtils</artifactId>
+                                               <groupId>org.onap.policy.common</groupId>
+                                               <artifactId>ONAP-Logging</artifactId>
                                                <version>1.1.3</version>
                                                <exclusions>
                                                                <exclusion>
                                                                                <artifactId>apache-log4j-extras</artifactId>
                                                                                <groupId>log4j</groupId>
                                                                </exclusion>
-                                                               <exclusion>
-                                                                               <groupId>mysql</groupId>
-                                                                               <artifactId>mysql-connector-java</artifactId>
-                                                               </exclusion>
-                                                               <exclusion>
-                                                                               <groupId>org.mariadb.jdbc</groupId>
-                                                                               <artifactId>mariadb-java-client</artifactId>
-                                                               </exclusion>
-                                                               <exclusion>
-                                                                               <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>
                                                <plugin>
                                                                <groupId>org.apache.maven.plugins</groupId>
                                                                <artifactId>maven-failsafe-plugin</artifactId>
-                                                               <version>2.16</version>
+                                                               <version>2.17</version>
 
                                                                <executions>
                                                                                <execution>
                                                                                                </configuration>
                                                                                </execution>
                                                                </executions>
+
                                                </plugin>
                                                <plugin>
                                                                <groupId>io.fabric8</groupId>
                                                                                <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>
                                                                                                <image>
                                                                                                                <name>onap/clamp</name>
                                                                                                                <alias>onap-clamp</alias>
+                                                                                                               <run>
+                                                                                                                       <skip>true</skip>
+                                                                                                               </run>
                                                                                                                <build>
                                                                                                                                <cleanup>true</cleanup>
                                                                                                                                <tags>
                                                                                                                                                <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>
                                                                                                <id>generate-images</id>
                                                                                                <goals>
                                                                                                                <goal>start</goal>
                                                                                                </goals>
-                                                                                               <configuration>
-                                                                                                               <skip>${skipITs}</skip>
-                                                                                               </configuration>
                                                                                </execution>
                                                                                <execution>
                                                                                                <id>docker-stop-for-it</id>
                                                                                                <goals>
                                                                                                                <goal>stop</goal>
                                                                                                </goals>
-                                                                                               <configuration>
-                                                                                                               <skip>${skipITs}</skip>
-                                                                                               </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>