Merge "Fix bug due to wrong changes"

[clamp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 95be676..1ce86b5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -68,10 +68,9 @@
                                <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>
@@ -413,33 +412,30 @@
                                                                                <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>
                                                </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>
@@ -454,22 +450,6 @@
                                                                                <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>
@@ -534,16 +514,6 @@
                                                <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>
@@ -560,6 +530,11 @@
                                                <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>
@@ -596,6 +571,13 @@
                                                <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>
@@ -828,7 +810,9 @@
                                                <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>
@@ -882,6 +866,7 @@
                                                                                                </configuration>
                                                                                </execution>
                                                                </executions>
+
                                                </plugin>
                                                <plugin>
                                                                <groupId>io.fabric8</groupId>
@@ -946,7 +931,11 @@
                                                                                                <image>
                                                                                                                <name>onap/clamp</name>
                                                                                                                <alias>onap-clamp</alias>
+                                                                                                               <run>
+                                                                                                                       <skip>true</skip>
+                                                                                                               </run>
                                                                                                                <build>
+                                                                                                                               <imagePullPolicy>never</imagePullPolicy>
                                                                                                                                <cleanup>true</cleanup>
                                                                                                                                <tags>
                                                                                                                                                <tag>latest</tag>
@@ -964,6 +953,7 @@
                                                                                                </image>
                                                                                </images>
                                                                </configuration>
+
                                                                <executions>
                                                                                <execution>
                                                                                                <id>generate-images</id>