X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=vid-ext-services-simulator%2Fpom.xml;h=73da5f0412df9329be69398f89431ef6cdc39183;hb=HEAD;hp=a470bcf5e079bfb94e780302c09ad5749a23ec2d;hpb=146eef0d6c07306b85c511bbcac0f60f4e3dae1a;p=vid.git

diff --git a/vid-ext-services-simulator/pom.xml b/vid-ext-services-simulator/pom.xml
index a470bcf5e..73da5f041 100644
--- a/vid-ext-services-simulator/pom.xml
+++ b/vid-ext-services-simulator/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openecomp.vid</groupId>
+    <groupId>org.onap.vid</groupId>
     <artifactId>vid-ext-services-simulator</artifactId>
     <version>1.0.0</version>
     <name>VID Simulator</name>
@@ -12,9 +12,11 @@
 
     <properties>
         <encoding>UTF-8</encoding>
-        <epsdk.version>1.3.0</epsdk.version>
-        <springframework.version>4.2.0.RELEASE</springframework.version>
-        <hibernate.version>4.3.11.Final</hibernate.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. -->
@@ -25,118 +27,31 @@
         <stagingNexusPath>content/repositories/staging/</stagingNexusPath>
         <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
         <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
-    </properties>
-
-
-    <repositories>
-        <repository>
-            <!-- Snapshots repository has ECOMP snapshot artifacts -->
-            <id>att-mavencentral-ecomp-snapshots-repo</id>
-            <name>ATT Maven Central - Snapshots</name>
-            <url>http://mavencentral.it.att.com:8084/nexus/content/repositories/att-repository-snapshots/</url>
-        </repository>
-        <repository>
-            <id>onap-staging</id>
-            <name>ONAP - Staging Repository</name>
-            <url>${nexusproxy}/${stagingNexusPath}</url>
-        </repository>
-        <repository>
-            <!-- Releases repository has ECOMP release artifacts -->
-            <id>att-mavencentral-ecomp-releases-repo</id>
-            <name>ATT Maven Central - Releases</name>
-            <url>http://mavencentral.it.att.com:8084/nexus/content/repositories/att-repository-releases/</url>
-        </repository>
-        <repository>
-            <!-- Third party repository has Oracle and other jars -->
-            <id>att-mavencentral-3rd-repo</id>
-            <name>ATT Maven Central - Third Party</name>
-            <url>http://mavencentral.it.att.com:8084/nexus/content/repositories/att-repository-3rd-party/</url>
-        </repository>
-        <repository>
-            <!-- Service Assurance group has UEB/Cambria jars -->
-            <id>att-mavencentral-sa-group</id>
-            <name>ATT Maven Central - Service Assurance Group</name>
-            <url>http://mavencentral.it.att.com:8084/nexus/content/groups/2020SAPC/</url>
-        </repository>
-        <repository>
-            <!-- SWM repository has EELF jars -->
-            <id>att-swm-repo</id>
-            <name>ATT SWM Repository</name>
-            <url>http://mavencentral.it.att.com:8084/nexus/content/repositories/swm-releases</url>
-        </repository>
-
-        <repository>
-            <!-- Public repository has ECOMP jars -->
-            <id>att-mavencentral-public</id>
-            <name>ATT Maven Central - Public Group</name>
-            <url>http://mavencentral.it.att.com:8084/nexus/content/groups/att-public-group</url>
-        </repository>
-        <repository>
-            <id>ecomp-releases</id>
-            <name>OpenECOMP - Release Repository</name>
-            <url>${nexusproxy}/${releaseNexusPath}</url>
-        </repository>
-        <repository>
-            <id>ecomp-snapshots</id>
-            <name>OpenECOMP - Snapshot Repository</name>
-            <url>${nexusproxy}/${snapshotNexusPath}</url>
-        </repository>
-        <!--repository>
-            <id>ecomp-public</id>
-            <name>ecomp onap public Repository</name>
-            <url>https://nexus.onap.org/content/groups/public</url>
-        </repository-->
-    </repositories>
-
-    <!--distributionManagement>
-        <repository>
-            <id>vid-releases</id>
-            <name>VID Release Repository</name>
-            <url>https://162.242.254.138:8443/repository/maven-releases</url>
-        </repository>
 
-        <snapshotRepository>
-            <id>vid-snapshots</id>
-            <name>VID Snapshot Repository</name>
-            <url>https://162.242.254.138:8443/repository/maven-snapshots</url>
-        </snapshotRepository>
-    </distributionManagement-->
+        <!-- "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>
-
         <profile>
             <id>onap</id>
-
             <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>
                 <repository>
-                    <id>ecomp-releases</id>
-                    <name>VID Release Repository</name>
-                    <url>${nexusproxy}${releaseNexusPath}</url>
-                </repository>
-                <repository>
-                    <id>ecomp-snapshots</id>
-                    <name>VID Snapshot Repository</name>
-                    <url>${nexusproxy}${snapshotNexusPath}</url>
-                </repository>
-                <repository>
-                    <id>ecomp-staging</id>
-                    <name>VID Staging Repository</name>
-                    <url>${nexusproxy}${stagingNexusPath}</url>
-                </repository>
-                <repository>
-                    <!-- Snapshots repository has ECOMP snapshot artifacts -->
                     <id>oss-snapshots</id>
                     <name>oss Central - Snapshots</name>
                     <url>https://oss.sonatype.org/service/local/repositories/releases/content/</url>
@@ -145,9 +60,7 @@
         </profile>
 
         <profile>
-            <id>att-internal</id>
-
-
+            <id>default</id>
         </profile>
 
         <!-- disable doclint, a new feature in Java 8, when generating javadoc -->
@@ -171,191 +84,34 @@
         </profile>
 
         <profile>
-            <id>att-internal-jenkins</id>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>cobertura-maven-plugin</artifactId>
-                        <version>2.7</version>
-                        <configuration>
-                            <formats>
-                                <format>xml</format>
-                            </formats>
-                            <check>false</check>
-
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>cobertura</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <version>2.7</version>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-war-plugin</artifactId>
-                        <version>3.0.0</version>
-                        <configuration>
-                            <!-- Build a jar with all the Java classes -->
-                            <attachClasses>true</attachClasses>
-                            <!-- Do not put any jars in the war -->
-                            <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
-                        </configuration>
-                    </plugin>
-
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>att-internal-jenkins-noSwm</id>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>cobertura-maven-plugin</artifactId>
-                        <version>2.7</version>
-                        <configuration>
-                            <formats>
-                                <format>xml</format>
-                            </formats>
-                            <check>false</check>
-
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>cobertura</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <version>2.7</version>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
+            <id>cobertura</id>
+            <properties>
+                <coberturaBuildPhase>package</coberturaBuildPhase>
+            </properties>
         </profile>
 
         <profile>
-            <id>att-internal-general-build</id>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>cobertura-maven-plugin</artifactId>
-                        <version>2.7</version>
-                        <configuration>
-                            <formats>
-                                <format>xml</format>
-                            </formats>
-                            <check>false</check>
-
-                        </configuration>
-
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>cobertura</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <version>2.7</version>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
+            <id>no-docker</id>
+            <properties>
+                <skipDockerBuild>true</skipDockerBuild>
+                <dockerBuildPhase>none</dockerBuildPhase>
+                <dockerPushPhase>none</dockerPushPhase>
+            </properties>
         </profile>
 
         <profile>
-            <id>att-internal-install-only</id>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>cobertura-maven-plugin</artifactId>
-                        <version>2.7</version>
-                        <configuration>
-                            <formats>
-                                <format>xml</format>
-                            </formats>
-                            <check>false</check>
-
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>cobertura</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <version>2.7</version>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
+            <id>docker-proxy</id>
+            <!-- activate profile if environment variable `http_proxy` is set -->
+            <activation>
+                <property>
+                    <name>env.http_proxy</name>
+                </property>
+            </activation>
+            <properties>
+                <docker.buildArg.http_proxy>${env.http_proxy}</docker.buildArg.http_proxy>
+            </properties>
         </profile>
 
-        <profile>
-            <id>att-internal-no-swm</id>
-
-            <build>
-                <plugins>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <version>2.7</version>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 
     <dependencies>
@@ -365,21 +121,79 @@
             <artifactId>mockserver-netty</artifactId>
             <version>3.11</version>
         </dependency>
-         <dependency>
+        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>4.3.4.RELEASE</version>
+            <version>${springframework.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>4.3.4.RELEASE</version>
+            <version>${springframework.version}</version>
         </dependency>
-         <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>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>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <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>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>2.2.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hibernate.javax.persistence</groupId>
+            <artifactId>hibernate-jpa-2.1-api</artifactId>
+            <version>1.0.0.Final</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.0</version>
         </dependency>
+
     </dependencies>
 
     <build>
@@ -388,25 +202,56 @@
             <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>
                 </configuration>
             </plugin>
-        </plugins>
-    </build>
 
-   <!-- <build>
-        <finalName>vidSimulator</finalName>
-        <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>1.5.6.RELEASE</version>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.27.2</version>
+
+                <configuration>
+                    <skip>${skipDockerBuild}</skip>
+                    <images>
+                        <image>
+                            <name>onap/vid-simulator</name>
+                            <build>
+                                <cleanup>remove</cleanup>
+                                <dockerFileDir>${project.basedir}</dockerFileDir>
+                                <tags>
+                                    <tag>${project.version}</tag>
+                                    <tag>latest</tag>
+                                </tags>
+                            </build>
+                        </image>
+                    </images>
+                </configuration>
+
+                <executions>
+                    <execution>
+                        <id>generate-image</id>
+                        <phase>${dockerBuildPhase}</phase>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+
+                    <execution>
+                        <id>push-image</id>
+                        <phase>${dockerPushPhase}</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+
             </plugin>
+
         </plugins>
     </build>
--->
-
 </project>
\ No newline at end of file