Merge changes from topic 'bugfix/update-ui-compo'

[clamp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 95be676..227a47a 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,7 +412,7 @@
                                                                                <artifactId>commons-io</artifactId>
                                                                </exclusion>
                                                                <exclusion>
-                                                                               <artifactId>grizzly-http</artifactId>
+                                                                               <artifactId>grizzly-http-server</artifactId>
                                                                                <groupId>org.glassfish.grizzly</groupId>
                                                                </exclusion>
                                                </exclusions>
@@ -534,16 +533,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 +549,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 +590,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>
@@ -651,7 +652,7 @@
                                </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>
@@ -671,8 +672,8 @@
                                                                </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>
@@ -707,7 +708,7 @@
                                                                </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>
@@ -828,7 +829,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>