Fix for Penetration test _ Session and cookie management

[vid.git] / vid-ext-services-simulator / pom.xml

diff --git a/vid-ext-services-simulator/pom.xml b/vid-ext-services-simulator/pom.xml
index 8596b97..73da5f0 100644 (file)
--- a/vid-ext-services-simulator/pom.xml
+++ b/vid-ext-services-simulator/pom.xml
@@ -12,9 +12,11 @@
 
     <properties>
         <encoding>UTF-8</encoding>
-        <epsdk.version>1.3.0</epsdk.version>
-        <springframework.version>4.3.22.RELEASE</springframework.version>
+        <springframework.version>5.2.3.RELEASE</springframework.version>
         <hibernate.version>5.3.4.Final</hibernate.version>
+        <jaxb.version>2.3.2</jaxb.version>
+        <jackson.version>2.10.2</jackson.version>
+        <jackson.databind.version>2.10.2</jackson.databind.version>
         <!-- Skip assembling the zip by default -->
         <skipassembly>true</skipassembly>
         <!-- Tests usually require some setup that maven cannot do, so skip. -->
@@ -28,6 +30,11 @@
 
         <!-- "none" will skip cobertura by default; enable the profile "cobertura" to enable it -->
         <coberturaBuildPhase>none</coberturaBuildPhase>
+
+        <!-- will build docker-maven-plugin by default; enable the profile "no-docker" to disable it -->
+        <skipDockerBuild>false</skipDockerBuild>
+        <dockerBuildPhase>package</dockerBuildPhase>
+        <dockerPushPhase>deploy</dockerPushPhase>
     </properties>
 
     <profiles>
@@ -36,12 +43,11 @@
             <properties>
                 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-                <epsdk.version>1.1.0-SNAPSHOT</epsdk.version>
                 <nexusproxy>https://nexus.onap.org</nexusproxy>
-                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
-                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
-                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-                <sitePath>/content/sites/site/org/openecomp/vid/${project.version}</sitePath>
+                <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
+                <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
+                <stagingNexusPath>content/repositories/staging/</stagingNexusPath>
+                <sitePath>content/sites/site/org/openecomp/vid/${project.version}</sitePath>
             </properties>
 
             <repositories>
@@ -84,6 +90,15 @@
             </properties>
         </profile>
 
+        <profile>
+            <id>no-docker</id>
+            <properties>
+                <skipDockerBuild>true</skipDockerBuild>
+                <dockerBuildPhase>none</dockerBuildPhase>
+                <dockerPushPhase>none</dockerPushPhase>
+            </properties>
+        </profile>
+
         <profile>
             <id>docker-proxy</id>
             <!-- activate profile if environment variable `http_proxy` is set -->
@@ -116,15 +131,33 @@
             <artifactId>spring-webmvc</artifactId>
             <version>${springframework.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.8.7</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.2.11</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.databind.version}</version>
+        </dependency>
+        <!-- https://eclipse-ee4j.github.io/jaxb-ri/#maven-artifacts -->
+        <!-- API -->
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>${jaxb.version}</version>
+        </dependency>
+        <!-- Runtime -->
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>${jaxb.version}</version>
         </dependency>
 
         <dependency>
@@ -137,6 +170,11 @@
             <artifactId>hibernate-core</artifactId>
             <version>${hibernate.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-c3p0</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
@@ -164,7 +202,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.8.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -177,6 +215,7 @@
                 <version>0.27.2</version>
 
                 <configuration>
+                    <skip>${skipDockerBuild}</skip>
                     <images>
                         <image>
                             <name>onap/vid-simulator</name>
@@ -195,7 +234,7 @@
                 <executions>
                     <execution>
                         <id>generate-image</id>
-                        <phase>package</phase>
+                        <phase>${dockerBuildPhase}</phase>
                         <goals>
                             <goal>build</goal>
                         </goals>
@@ -203,7 +242,7 @@
 
                     <execution>
                         <id>push-image</id>
-                        <phase>deploy</phase>
+                        <phase>${dockerPushPhase}</phase>
                         <goals>
                             <goal>build</goal>
                             <goal>push</goal>