Fix security hotspots n Regex

[cps.git] / cps-application / pom.xml

diff --git a/cps-application/pom.xml b/cps-application/pom.xml
old mode 100644 (file)
new mode 100755 (executable)
index 8ea2db3..fa4b5ef
--- a/cps-application/pom.xml
+++ b/cps-application/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.cps</groupId>
         <artifactId>cps-parent</artifactId>
-        <version>0.0.2-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>../cps-parent/pom.xml</relativePath>
     </parent>
 
@@ -35,8 +35,9 @@
     <properties>
         <app>org.onap.cps.Application</app>
         <image.version>${project.version}</image.version>
-        <jib-maven-plugin.version>2.6.0</jib-maven-plugin.version>
-        <minimum-coverage>0.0</minimum-coverage>
+        <jib-maven-plugin.version>2.8.0</jib-maven-plugin.version>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+        <minimum-coverage>0.7</minimum-coverage>
         <nexus.repository>nexus3.onap.org:10003/onap/</nexus.repository>
     </properties>
 
@@ -51,6 +52,14 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jetty</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
@@ -59,6 +68,43 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-sleuth</artifactId>
         </dependency>
+        <!-- T E S T   D E P E N D E N C I E S -->
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.spockframework</groupId>
+            <artifactId>spock-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.spockframework</groupId>
+            <artifactId>spock-spring</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-nodep</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -77,7 +123,10 @@
                             <image>${base.image}</image>
                         </from>
                         <to>
-                            <image>${nexus.repository}${image.name}:${image.version}</image>
+                            <tags>
+                                <tag>latest</tag>
+                            </tags>
+                            <image>${nexus.repository}${image.name}:${image.version}-${maven.build.timestamp}</image>
                         </to>
                     </configuration>
                     <executions>
@@ -121,6 +170,10 @@
                     <groupId>${project.groupId}</groupId>
                     <artifactId>cps-rest</artifactId>
                 </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>cps-ri</artifactId>
+                </dependency>
             </dependencies>
             <build>
                 <plugins>
@@ -146,6 +199,10 @@
                     <groupId>${project.groupId}</groupId>
                     <artifactId>cps-nf-proxy-rest</artifactId>
                 </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>cps-ri</artifactId>
+                </dependency>
             </dependencies>
             <build>
                 <plugins>
@@ -175,6 +232,10 @@
                     <groupId>${project.groupId}</groupId>
                     <artifactId>cps-nf-proxy-rest</artifactId>
                 </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>cps-ri</artifactId>
+                </dependency>
             </dependencies>
             <build>
                 <plugins>