Merge "Portal Spring Boot Development"

[portal.git] / ecomp-portal-widget-ms / widget-ms / pom.xml

diff --git a/ecomp-portal-widget-ms/widget-ms/pom.xml b/ecomp-portal-widget-ms/widget-ms/pom.xml
index 5d8896c..d0849df 100644 (file)
--- a/ecomp-portal-widget-ms/widget-ms/pom.xml
+++ b/ecomp-portal-widget-ms/widget-ms/pom.xml
@@ -13,7 +13,7 @@
 
        <groupId>org.onap.portal</groupId>
        <artifactId>widget-ms</artifactId>
-       <version>2.2.0</version>
+       <version>2.6.0-SNAPSHOT</version>
        <packaging>jar</packaging>
        <name>widget-microservice</name>
 
@@ -23,7 +23,7 @@
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
                <java.version>1.8</java.version>
                <hibernate.version>4.3.11.Final</hibernate.version>
-               <skipTests>true</skipTests>
+               <skipTests>false</skipTests>
                <!-- Replicate this from OParent -->
                <jacocoVersion>0.7.6.201602180812</jacocoVersion>
        </properties>
@@ -44,16 +44,22 @@
                <dependency>
                        <groupId>org.springframework.boot</groupId>
                        <artifactId>spring-boot-starter-security</artifactId>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.springframework.security</groupId>
+                               <artifactId>spring-security-web</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
                <dependency>
                        <groupId>org.springframework.boot</groupId>
                        <artifactId>spring-boot-starter-thymeleaf</artifactId>
                </dependency>
-               <dependency>
+               <!-- <dependency>
                        <groupId>org.springframework.boot</groupId>
                        <artifactId>spring-boot-devtools</artifactId>
                        <optional>true</optional>
-               </dependency>
+               </dependency> -->
                <dependency>
                        <groupId>org.springframework.boot</groupId>
                        <artifactId>spring-boot-configuration-processor</artifactId>
@@ -92,6 +98,11 @@
                        <artifactId>jasypt-spring-boot-starter</artifactId>
                        <version>1.9</version>
                </dependency>
+               <dependency>
+                       <groupId>org.jsoup</groupId>
+                       <artifactId>jsoup</artifactId>
+                       <version>1.12.1</version>
+       </dependency>
                <!-- hibernate-core depends on dom4j, which has optional dependencies. 
                        On jenkins, contrary to doc, mvn 3.0.5 packages the optional dependencies 
                        in the war. Workaround: exclude them explicitly. -->
@@ -140,7 +151,7 @@
                <dependency>
                <groupId>org.apache.tomcat.embed</groupId>
                <artifactId>tomcat-embed-core</artifactId>
-               <version>8.5.13</version>
+               <version>8.5.28</version>
                </dependency>
                <dependency>
                        <groupId>ch.qos.logback</groupId>
@@ -167,6 +178,16 @@
                        <artifactId>jackson-databind</artifactId>
                        <version>2.8.10</version>
                </dependency>
+               <dependency>
+               <groupId>org.springframework.security</groupId>
+               <artifactId>spring-security-web</artifactId>
+               <version>4.1.4.RELEASE</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.projectlombok</groupId>
+                       <artifactId>lombok</artifactId>
+                       <version>1.18.4</version>
+               </dependency>
        </dependencies>
 
        <build>