Bump VID version to 3.2.3 03/82703/2
authorIttay Stern <ittay.stern@att.com>
Tue, 19 Mar 2019 18:14:53 +0000 (20:14 +0200)
committerIttay Stern <ittay.stern@att.com>
Wed, 20 Mar 2019 04:15:10 +0000 (06:15 +0200)
Planned as part of Casablanca maintenance release (3.0.2).

Issue-ID: VID-446
Change-Id: I96f3cd9e59eddc43a249d102c70b558f4fad54e6
Signed-off-by: Ittay Stern <ittay.stern@att.com>
docs/installation.rst
docs/release-notes.rst
epsdk-app-onap/pom.xml
epsdk-app-onap/version.properties
pom.xml
version.properties
vid-app-common/pom.xml
vid-app-common/version.properties

index f9d12e8..75b1c70 100644 (file)
@@ -17,7 +17,7 @@ Please follow the instructions given below, for installing VID using a Docker im
 
   docker pull mariadb:10
   docker login -u docker -p docker nexus3.onap.org:10001
-  docker pull nexus3.onap.org:10001/onap/vid:3.2.1
+  docker pull nexus3.onap.org:10001/onap/vid:3.2.3
 
 2. Install by running following command (Use the path for the lf_config folder under the VID git repository as CONFIG_PATH)
 
@@ -27,7 +27,7 @@ Please follow the instructions given below, for installing VID using a Docker im
    docker run --name vid-mariadb -e MYSQL_DATABASE=vid_openecomp_epsdk -e MYSQL_USER=vidadmin -e MYSQL_PASSWORD=YOUR_PASSWORD -e MYSQL_ROOT_PASSWORD=ROOT_PASSWORD -v CONFIG_PATH/vid-my.cnf:/etc/mysql/my.cnf -v /var/lib/mysql -d mariadb:10
    
    #start VID server
-   docker run -e VID_MYSQL_DBNAME=vid_openecomp_epsdk -e VID_MYSQL_PASS=YOUR_PASSWORD --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d nexus3.onap.org:10001/onap/vid:3.2.1
+   docker run -e VID_MYSQL_DBNAME=vid_openecomp_epsdk -e VID_MYSQL_PASS=YOUR_PASSWORD --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d nexus3.onap.org:10001/onap/vid:3.2.3
 
 Or use docker-compose:
 
index 962fe1b..ce682cd 100644 (file)
@@ -3,6 +3,15 @@
 VID Release Notes
 =================
 
+Version: 3.2.3
+--------------
+
+:Release Date: 2019-03-28
+
+**Notes**
+It's v3.2.2, but repackaged with a new certificate valid until March 12, 2020.
+
+
 Version: 3.2.2
 --------------
 
index c5344fb..267e770 100755 (executable)
-<?xml version="1.0"?>\r
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
-       <modelVersion>4.0.0</modelVersion>\r
-\r
-       <!-- This is the Maven project object model (POM) file for the open-source \r
-               SDK web app. This is NOT the Portal - but it is developed and supported by \r
-               the Portal team. -->\r
-       <groupId>org.onap.vid</groupId>\r
-       <artifactId>epsdk-app-onap</artifactId>\r
-       <version>3.2.2-SNAPSHOT</version>\r
-       <packaging>war</packaging>\r
-       <name>ECOMP SDK Webapp for OpenSource</name>\r
-       <description>ECOMP SDK Web Application for public release</description>\r
-\r
-       <properties>\r
-               <encoding>UTF-8</encoding>\r
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
-               <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
-               <epsdk.version>2.4.0</epsdk.version>\r
-               <springframework.version>4.2.9.RELEASE</springframework.version>\r
-               <hibernate.version>4.3.11.Final</hibernate.version>\r
-               <!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->\r
-               <skipassembly>true</skipassembly>\r
-               <!-- Tests usually require some setup that maven cannot do, so skip. -->\r
-               <skiptests>false</skiptests>\r
-               <nexusproxy>https://nexus.onap.org</nexusproxy>\r
-               <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
-               <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
-               <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
-               <sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath>\r
-\r
-               <!-- SONAR -->\r
-               <sonar.language>java</sonar.language>\r
-               <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
-               <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
-               <sonar.projectVersion>${project.version}</sonar.projectVersion>\r
-       </properties>\r
-\r
-       <repositories>\r
-               <repository>\r
-                       <id>ecomp-releases</id>\r
-                       <name>VID Release Repository</name>\r
-                       <url>${nexusproxy}${releaseNexusPath}</url>\r
-               </repository>\r
-               <repository>\r
-                       <id>ecomp-snapshots</id>\r
-                       <name>VID Snapshot Repository</name>\r
-                       <url>${nexusproxy}${snapshotNexusPath}</url>\r
-               </repository>\r
-               <repository>\r
-                       <id>ecomp-staging</id>\r
-                       <name>VID Staging Repository</name>\r
-                       <url>${nexusproxy}${stagingNexusPath}</url>\r
-               </repository>\r
-               <repository>\r
-                       <!-- Snapshots repository has ECOMP snapshot artifacts -->\r
-                       <id>oss-snapshots</id>\r
-                       <name>oss Central - Snapshots</name>\r
-                       <url>https://oss.sonatype.org/service/local/repositories/releases/content/</url>\r
-               </repository>\r
-       </repositories>\r
-       <distributionManagement>\r
-               <repository>\r
-                       <id>ecomp-releases</id>\r
-                       <name>VID Release Repository</name>\r
-                       <url>${nexusproxy}/${releaseNexusPath}</url>\r
-               </repository>\r
-               <snapshotRepository>\r
-                       <id>ecomp-snapshots</id>\r
-                       <name>VID Snapshot Repository</name>\r
-                       <url>${nexusproxy}/${snapshotNexusPath}</url>\r
-               </snapshotRepository>\r
-               <!-- added for javadoc -->\r
-               <site>\r
-                       <id>ecomp-site</id>\r
-                       <url>dav:${nexusproxy}${sitePath}</url>\r
-               </site>\r
-       </distributionManagement>\r
-\r
-       <profiles>\r
-               <!-- disable doclint, a new feature in Java 8, when generating javadoc -->\r
-               <profile>\r
-                       <id>doclint-java8-disable</id>\r
-                       <activation>\r
-                               <jdk>[1.8,)</jdk>\r
-                       </activation>\r
-                       <build>\r
-                               <plugins>\r
-                                       <plugin>\r
-                                               <groupId>org.apache.maven.plugins</groupId>\r
-                                               <artifactId>maven-javadoc-plugin</artifactId>\r
-                                               <version>2.10.4</version>\r
-                                               <configuration>\r
-                                                       <additionalparam>-Xdoclint:none</additionalparam>\r
-                                               </configuration>\r
-                                       </plugin>\r
-                               </plugins>\r
-                       </build>\r
-               </profile>\r
-       </profiles>\r
-\r
-       <build>\r
-               <finalName>vid</finalName>\r
-               <plugins>\r
-                       <plugin>\r
-                               <groupId>org.sonatype.plugins</groupId>\r
-                               <artifactId>nexus-staging-maven-plugin</artifactId>\r
-                               <version>1.6.7</version>\r
-                               <extensions>true</extensions>\r
-                               <configuration>\r
-                                       <nexusUrl>${nexusproxy}</nexusUrl>\r
-                                       <stagingProfileId>176c31dfe190a</stagingProfileId>\r
-                                       <serverId>ecomp-staging</serverId>\r
-                               </configuration>\r
-                       </plugin>\r
-\r
-                       <!-- Compile to Java 1.8 class output format -->\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-compiler-plugin</artifactId>\r
-                               <version>3.1</version>\r
-                               <configuration>\r
-                                       <source>1.8</source>\r
-                                       <target>1.8</target>\r
-                               </configuration>\r
-                       </plugin>\r
-\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-surefire-plugin</artifactId>\r
-                               <version>2.19.1</version>\r
-                               <configuration>\r
-                                       <skipTests>${skiptests}</skipTests>\r
-                                       <includes>\r
-                                               <include>**/Test*.java</include>\r
-                                               <include>**/*Test.java</include>\r
-                                               <include>**/*TestCase.java</include>\r
-                                       </includes>\r
-                                       <additionalClasspathElements>\r
-                                               <additionalClasspathElement>${basedir}/war</additionalClasspathElement>\r
-                                       </additionalClasspathElements>\r
-                                       <systemPropertyVariables>\r
-                                               <container.classpath>classpath:</container.classpath>\r
-                                       </systemPropertyVariables>\r
-                               </configuration>\r
-                       </plugin>\r
-\r
-                       <!-- add version number to manifest -->\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-war-plugin</artifactId>\r
-                               <version>2.0.2</version>\r
-                               <configuration>\r
-                                       <archive>\r
-                                               <manifest>\r
-                                                       <addDefaultImplementationEntries>true</addDefaultImplementationEntries>\r
-                                               </manifest>\r
-                                               <manifestEntries>\r
-                                                       <Build-Number>${project.version}</Build-Number>\r
-                                                       <Build-Time>${maven.build.timestamp}</Build-Time>\r
-                                               </manifestEntries>\r
-                                       </archive>\r
-                                       <overlays>\r
-                                               <overlay>\r
-                                                       <groupId>org.onap.vid</groupId>\r
-                                                       <artifactId>vid-app-common</artifactId>\r
-                                               </overlay>\r
-                                               <overlay>\r
-                                                       <groupId>org.onap.portal.sdk</groupId>\r
-                                                       <artifactId>epsdk-app-overlay</artifactId>\r
-                                               </overlay>\r
-                                       </overlays>\r
-                               </configuration>\r
-                       </plugin>\r
-\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-assembly-plugin</artifactId>\r
-                               <version>3.0.0</version>\r
-                               <configuration>\r
-                                       <skipAssembly>${skipassembly}</skipAssembly>\r
-                                       <descriptors>\r
-                                               <descriptor>${basedir}/distribution.xml</descriptor>\r
-                                       </descriptors>\r
-                               </configuration>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>make-assembly</id>\r
-                                               <phase>package</phase>\r
-                                               <goals>\r
-                                                       <goal>single</goal>\r
-                                               </goals>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-site-plugin</artifactId>\r
-                               <version>3.6</version>\r
-                               <dependencies>\r
-                                       <dependency>\r
-                                               <groupId>org.apache.maven.wagon</groupId>\r
-                                               <artifactId>wagon-webdav-jackrabbit</artifactId>\r
-                                               <version>2.10</version>\r
-                                       </dependency>\r
-                               </dependencies>\r
-                       </plugin>\r
-\r
-                       <plugin>\r
-                               <artifactId>maven-surefire-plugin</artifactId>\r
-                               <version>2.17</version>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.sonarsource.scanner.maven</groupId>\r
-                               <artifactId>sonar-maven-plugin</artifactId>\r
-                               <version>3.3.0.603</version>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.jacoco</groupId>\r
-                               <artifactId>jacoco-maven-plugin</artifactId>\r
-                               <version>0.7.9</version>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>default-prepare-agent</id>\r
-                                               <goals>\r
-                                                       <goal>prepare-agent</goal>\r
-                                               </goals>\r
-                                       </execution>\r
-                                       <execution>\r
-                                               <id>default-report</id>\r
-                                               <goals>\r
-                                                       <goal>report</goal>\r
-                                               </goals>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-\r
-               </plugins>\r
-       </build>\r
-\r
-       <reporting>\r
-               <plugins>\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-javadoc-plugin</artifactId>\r
-                               <version>2.10.4</version>\r
-                               <configuration>\r
-                                       <failOnError>false</failOnError>\r
-                                       <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>\r
-                                       <docletArtifact>\r
-                                               <groupId>org.umlgraph</groupId>\r
-                                               <artifactId>umlgraph</artifactId>\r
-                                               <version>5.6</version>\r
-                                       </docletArtifact>\r
-                                       <additionalparam>-views</additionalparam>\r
-                                       <useStandardDocletOptions>true</useStandardDocletOptions>\r
-                               </configuration>\r
-                       </plugin>\r
-               </plugins>\r
-       </reporting>\r
-       <dependencies>\r
-               <!-- SDK overlay war -->\r
-               <dependency>\r
-                       <groupId>org.onap.portal.sdk</groupId>\r
-                       <artifactId>epsdk-app-overlay</artifactId>\r
-                       <version>${epsdk.version}</version>\r
-                       <type>war</type>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.portal.sdk</groupId>\r
-                       <artifactId>epsdk-app-common</artifactId>\r
-                       <version>${epsdk.version}</version>\r
-                       <type>jar</type>\r
-                       <exclusions>\r
-                               <exclusion>\r
-                                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                                       <artifactId>jackson-core</artifactId>\r
-                               </exclusion>\r
-                       </exclusions>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.vid</groupId>\r
-                       <artifactId>vid-app-common</artifactId>\r
-                       <version>${project.version}</version>\r
-                       <type>war</type>\r
-                       <exclusions>\r
-                               <exclusion>\r
-                                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                                       <artifactId>jackson-core</artifactId>\r
-                               </exclusion>\r
-                       </exclusions>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.vid</groupId>\r
-                       <artifactId>vid-app-common</artifactId>\r
-                       <version>${project.version}</version>\r
-                       <type>jar</type>\r
-                       <classifier>classes</classifier>\r
-               </dependency>\r
-               <!-- SDK components -->\r
-               <dependency>\r
-                       <groupId>org.onap.portal.sdk</groupId>\r
-                       <artifactId>epsdk-core</artifactId>\r
-                       <version>${epsdk.version}</version>\r
-                       <exclusions>\r
-                               <exclusion>\r
-                                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                                       <artifactId>jackson-core</artifactId>\r
-                               </exclusion>\r
-                       </exclusions>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.portal.sdk</groupId>\r
-                       <artifactId>epsdk-analytics</artifactId>\r
-                       <version>${epsdk.version}</version>\r
-                       <exclusions>\r
-                               <exclusion>\r
-                                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                                       <artifactId>jackson-core</artifactId>\r
-                               </exclusion>\r
-                               <exclusion>\r
-                                       <groupId>com.lowagie</groupId>\r
-                                       <artifactId>itext</artifactId>\r
-                               </exclusion>\r
-                       </exclusions>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.portal.sdk</groupId>\r
-                       <artifactId>epsdk-workflow</artifactId>\r
-                       <version>${epsdk.version}</version>\r
-                       <exclusions>\r
-                               <exclusion>\r
-                                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                                       <artifactId>jackson-core</artifactId>\r
-                               </exclusion>\r
-                       </exclusions>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.att.eelf</groupId>\r
-                       <artifactId>eelf-core</artifactId>\r
-                       <version>1.0.0</version>\r
-               </dependency>\r
-               \r
-\r
-\r
-\r
-               <dependency>\r
-                       <groupId>org.onap.vid</groupId>\r
-                       <artifactId>vid-app-common</artifactId>\r
-                       <version>${version}</version>\r
-                       <type>war</type>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.vid</groupId>\r
-                       <artifactId>vid-app-common</artifactId>\r
-                       <version>${version}</version>\r
-                       <type>jar</type>\r
-                       <classifier>classes</classifier>\r
-               </dependency>\r
-               <!-- Mapper -->\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                       <artifactId>jackson-annotations</artifactId>\r
-                       <version>2.6.3</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                       <artifactId>jackson-core</artifactId>\r
-                       <version>2.8.6</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                       <artifactId>jackson-databind</artifactId>\r
-                       <version>2.6.7.1</version>\r
-                       <exclusions>\r
-                               <exclusion>\r
-                                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                                       <artifactId>jackson-core</artifactId>\r
-                               </exclusion>\r
-                       </exclusions>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.mchange</groupId>\r
-                       <artifactId>c3p0</artifactId>\r
-                       <version>0.9.5.2</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>io.searchbox</groupId>\r
-                       <artifactId>jest</artifactId>\r
-                       <version>2.0.0</version>\r
-                       <exclusions>\r
-                               <exclusion>\r
-                                       <groupId>commons-logging</groupId>\r
-                                       <artifactId>commons-logging</artifactId>\r
-                               </exclusion>\r
-                       </exclusions>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>javax.servlet</groupId>\r
-                       <artifactId>javax.servlet-api</artifactId>\r
-                       <version>3.1.0</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>junit</groupId>\r
-                       <artifactId>junit</artifactId>\r
-                       <version>4.12</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.json</groupId>\r
-                       <artifactId>json</artifactId>\r
-                       <version>20160212</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.quartz-scheduler</groupId>\r
-                       <artifactId>quartz</artifactId>\r
-                       <version>2.2.1</version>\r
-                       <exclusions>\r
-                               <!-- exclude 0.9.1.1 to avoid dupe of com.mchange:c3p0:0.9.2.1 -->\r
-                               <exclusion>\r
-                                       <groupId>c3p0</groupId>\r
-                                       <artifactId>c3p0</artifactId>\r
-                               </exclusion>\r
-                       </exclusions>\r
-               </dependency>\r
-               <!-- bridge to implement commons-logging using slf4j -->\r
-               <dependency>\r
-                       <groupId>org.slf4j</groupId>\r
-                       <artifactId>jcl-over-slf4j</artifactId>\r
-                       <version>1.7.12</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-context-support</artifactId>\r
-                       <version>${springframework.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-core</artifactId>\r
-                       <version>${springframework.version}</version>\r
-                       <exclusions>\r
-                               <exclusion>\r
-                                       <groupId>commons-logging</groupId>\r
-                                       <artifactId>commons-logging</artifactId>\r
-                               </exclusion>\r
-                       </exclusions>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-aop</artifactId>\r
-                       <version>${springframework.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-test</artifactId>\r
-                       <version>${springframework.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-tx</artifactId>\r
-                       <version>${springframework.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-web</artifactId>\r
-                       <version>${springframework.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-webmvc</artifactId>\r
-                       <version>${springframework.version}</version>\r
-               </dependency>\r
-       </dependencies>\r
-</project>\r
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
+
+       <!-- This is the Maven project object model (POM) file for the open-source 
+               SDK web app. This is NOT the Portal - but it is developed and supported by 
+               the Portal team. -->
+       <groupId>org.onap.vid</groupId>
+       <artifactId>epsdk-app-onap</artifactId>
+       <version>3.2.3-SNAPSHOT</version>
+       <packaging>war</packaging>
+       <name>ECOMP SDK Webapp for OpenSource</name>
+       <description>ECOMP SDK Web Application for public release</description>
+
+       <properties>
+               <encoding>UTF-8</encoding>
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+               <epsdk.version>2.4.0</epsdk.version>
+               <springframework.version>4.2.9.RELEASE</springframework.version>
+               <hibernate.version>4.3.11.Final</hibernate.version>
+               <!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->
+               <skipassembly>true</skipassembly>
+               <!-- Tests usually require some setup that maven cannot do, so skip. -->
+               <skiptests>false</skiptests>
+               <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/onap/vid/${project.version}</sitePath>
+
+               <!-- SONAR -->
+               <sonar.language>java</sonar.language>
+               <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+               <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+               <sonar.projectVersion>${project.version}</sonar.projectVersion>
+       </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>
+               </repository>
+       </repositories>
+       <distributionManagement>
+               <repository>
+                       <id>ecomp-releases</id>
+                       <name>VID Release Repository</name>
+                       <url>${nexusproxy}/${releaseNexusPath}</url>
+               </repository>
+               <snapshotRepository>
+                       <id>ecomp-snapshots</id>
+                       <name>VID Snapshot Repository</name>
+                       <url>${nexusproxy}/${snapshotNexusPath}</url>
+               </snapshotRepository>
+               <!-- added for javadoc -->
+               <site>
+                       <id>ecomp-site</id>
+                       <url>dav:${nexusproxy}${sitePath}</url>
+               </site>
+       </distributionManagement>
+
+       <profiles>
+               <!-- disable doclint, a new feature in Java 8, when generating javadoc -->
+               <profile>
+                       <id>doclint-java8-disable</id>
+                       <activation>
+                               <jdk>[1.8,)</jdk>
+                       </activation>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.apache.maven.plugins</groupId>
+                                               <artifactId>maven-javadoc-plugin</artifactId>
+                                               <version>2.10.4</version>
+                                               <configuration>
+                                                       <additionalparam>-Xdoclint:none</additionalparam>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
+
+       <build>
+               <finalName>vid</finalName>
+               <plugins>
+                       <plugin>
+                               <groupId>org.sonatype.plugins</groupId>
+                               <artifactId>nexus-staging-maven-plugin</artifactId>
+                               <version>1.6.7</version>
+                               <extensions>true</extensions>
+                               <configuration>
+                                       <nexusUrl>${nexusproxy}</nexusUrl>
+                                       <stagingProfileId>176c31dfe190a</stagingProfileId>
+                                       <serverId>ecomp-staging</serverId>
+                               </configuration>
+                       </plugin>
+
+                       <!-- Compile to Java 1.8 class output format -->
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-compiler-plugin</artifactId>
+                               <version>3.1</version>
+                               <configuration>
+                                       <source>1.8</source>
+                                       <target>1.8</target>
+                               </configuration>
+                       </plugin>
+
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <version>2.19.1</version>
+                               <configuration>
+                                       <skipTests>${skiptests}</skipTests>
+                                       <includes>
+                                               <include>**/Test*.java</include>
+                                               <include>**/*Test.java</include>
+                                               <include>**/*TestCase.java</include>
+                                       </includes>
+                                       <additionalClasspathElements>
+                                               <additionalClasspathElement>${basedir}/war</additionalClasspathElement>
+                                       </additionalClasspathElements>
+                                       <systemPropertyVariables>
+                                               <container.classpath>classpath:</container.classpath>
+                                       </systemPropertyVariables>
+                               </configuration>
+                       </plugin>
+
+                       <!-- add version number to manifest -->
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-war-plugin</artifactId>
+                               <version>2.0.2</version>
+                               <configuration>
+                                       <archive>
+                                               <manifest>
+                                                       <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                                               </manifest>
+                                               <manifestEntries>
+                                                       <Build-Number>${project.version}</Build-Number>
+                                                       <Build-Time>${maven.build.timestamp}</Build-Time>
+                                               </manifestEntries>
+                                       </archive>
+                                       <overlays>
+                                               <overlay>
+                                                       <groupId>org.onap.vid</groupId>
+                                                       <artifactId>vid-app-common</artifactId>
+                                               </overlay>
+                                               <overlay>
+                                                       <groupId>org.onap.portal.sdk</groupId>
+                                                       <artifactId>epsdk-app-overlay</artifactId>
+                                               </overlay>
+                                       </overlays>
+                               </configuration>
+                       </plugin>
+
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <version>3.0.0</version>
+                               <configuration>
+                                       <skipAssembly>${skipassembly}</skipAssembly>
+                                       <descriptors>
+                                               <descriptor>${basedir}/distribution.xml</descriptor>
+                                       </descriptors>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <id>make-assembly</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>single</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-site-plugin</artifactId>
+                               <version>3.6</version>
+                               <dependencies>
+                                       <dependency>
+                                               <groupId>org.apache.maven.wagon</groupId>
+                                               <artifactId>wagon-webdav-jackrabbit</artifactId>
+                                               <version>2.10</version>
+                                       </dependency>
+                               </dependencies>
+                       </plugin>
+
+                       <plugin>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <version>2.17</version>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.sonarsource.scanner.maven</groupId>
+                               <artifactId>sonar-maven-plugin</artifactId>
+                               <version>3.3.0.603</version>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.jacoco</groupId>
+                               <artifactId>jacoco-maven-plugin</artifactId>
+                               <version>0.7.9</version>
+                               <executions>
+                                       <execution>
+                                               <id>default-prepare-agent</id>
+                                               <goals>
+                                                       <goal>prepare-agent</goal>
+                                               </goals>
+                                       </execution>
+                                       <execution>
+                                               <id>default-report</id>
+                                               <goals>
+                                                       <goal>report</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
+
+               </plugins>
+       </build>
+
+       <reporting>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-javadoc-plugin</artifactId>
+                               <version>2.10.4</version>
+                               <configuration>
+                                       <failOnError>false</failOnError>
+                                       <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+                                       <docletArtifact>
+                                               <groupId>org.umlgraph</groupId>
+                                               <artifactId>umlgraph</artifactId>
+                                               <version>5.6</version>
+                                       </docletArtifact>
+                                       <additionalparam>-views</additionalparam>
+                                       <useStandardDocletOptions>true</useStandardDocletOptions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </reporting>
+       <dependencies>
+               <!-- SDK overlay war -->
+               <dependency>
+                       <groupId>org.onap.portal.sdk</groupId>
+                       <artifactId>epsdk-app-overlay</artifactId>
+                       <version>${epsdk.version}</version>
+                       <type>war</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.portal.sdk</groupId>
+                       <artifactId>epsdk-app-common</artifactId>
+                       <version>${epsdk.version}</version>
+                       <type>jar</type>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>com.fasterxml.jackson.core</groupId>
+                                       <artifactId>jackson-core</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.vid</groupId>
+                       <artifactId>vid-app-common</artifactId>
+                       <version>${project.version}</version>
+                       <type>war</type>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>com.fasterxml.jackson.core</groupId>
+                                       <artifactId>jackson-core</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.vid</groupId>
+                       <artifactId>vid-app-common</artifactId>
+                       <version>${project.version}</version>
+                       <type>jar</type>
+                       <classifier>classes</classifier>
+               </dependency>
+               <!-- SDK components -->
+               <dependency>
+                       <groupId>org.onap.portal.sdk</groupId>
+                       <artifactId>epsdk-core</artifactId>
+                       <version>${epsdk.version}</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>com.fasterxml.jackson.core</groupId>
+                                       <artifactId>jackson-core</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.portal.sdk</groupId>
+                       <artifactId>epsdk-analytics</artifactId>
+                       <version>${epsdk.version}</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>com.fasterxml.jackson.core</groupId>
+                                       <artifactId>jackson-core</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>com.lowagie</groupId>
+                                       <artifactId>itext</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.portal.sdk</groupId>
+                       <artifactId>epsdk-workflow</artifactId>
+                       <version>${epsdk.version}</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>com.fasterxml.jackson.core</groupId>
+                                       <artifactId>jackson-core</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
+                       <groupId>com.att.eelf</groupId>
+                       <artifactId>eelf-core</artifactId>
+                       <version>1.0.0</version>
+               </dependency>
+               
+
+
+
+               <dependency>
+                       <groupId>org.onap.vid</groupId>
+                       <artifactId>vid-app-common</artifactId>
+                       <version>${version}</version>
+                       <type>war</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.vid</groupId>
+                       <artifactId>vid-app-common</artifactId>
+                       <version>${version}</version>
+                       <type>jar</type>
+                       <classifier>classes</classifier>
+               </dependency>
+               <!-- Mapper -->
+               <dependency>
+                       <groupId>com.fasterxml.jackson.core</groupId>
+                       <artifactId>jackson-annotations</artifactId>
+                       <version>2.6.3</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.fasterxml.jackson.core</groupId>
+                       <artifactId>jackson-core</artifactId>
+                       <version>2.8.6</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.fasterxml.jackson.core</groupId>
+                       <artifactId>jackson-databind</artifactId>
+                       <version>2.6.7.1</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>com.fasterxml.jackson.core</groupId>
+                                       <artifactId>jackson-core</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
+                       <groupId>com.mchange</groupId>
+                       <artifactId>c3p0</artifactId>
+                       <version>0.9.5.2</version>
+               </dependency>
+               <dependency>
+                       <groupId>io.searchbox</groupId>
+                       <artifactId>jest</artifactId>
+                       <version>2.0.0</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>commons-logging</groupId>
+                                       <artifactId>commons-logging</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
+                       <groupId>javax.servlet</groupId>
+                       <artifactId>javax.servlet-api</artifactId>
+                       <version>3.1.0</version>
+               </dependency>
+               <dependency>
+                       <groupId>junit</groupId>
+                       <artifactId>junit</artifactId>
+                       <version>4.12</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.json</groupId>
+                       <artifactId>json</artifactId>
+                       <version>20160212</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.quartz-scheduler</groupId>
+                       <artifactId>quartz</artifactId>
+                       <version>2.2.1</version>
+                       <exclusions>
+                               <!-- exclude 0.9.1.1 to avoid dupe of com.mchange:c3p0:0.9.2.1 -->
+                               <exclusion>
+                                       <groupId>c3p0</groupId>
+                                       <artifactId>c3p0</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <!-- bridge to implement commons-logging using slf4j -->
+               <dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>jcl-over-slf4j</artifactId>
+                       <version>1.7.12</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-context-support</artifactId>
+                       <version>${springframework.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-core</artifactId>
+                       <version>${springframework.version}</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>commons-logging</groupId>
+                                       <artifactId>commons-logging</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-aop</artifactId>
+                       <version>${springframework.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-test</artifactId>
+                       <version>${springframework.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-tx</artifactId>
+                       <version>${springframework.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-web</artifactId>
+                       <version>${springframework.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-webmvc</artifactId>
+                       <version>${springframework.version}</version>
+               </dependency>
+       </dependencies>
+</project>
index ef8c0e3..527c3ba 100644 (file)
@@ -1,13 +1,13 @@
-# Versioning variables\r
-# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )\r
-# because they are used in Jenkins, whose plug-in doesn't support\r
-\r
-major=3\r
-minor=2\r
-patch=2\r
-\r
-base_version=${major}.${minor}.${patch}\r
-\r
-# Release must be completed with git revision # in Jenkins\r
-release_version=${base_version}\r
-snapshot_version=${base_version}-SNAPSHOT\r
+# Versioning variables
+# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
+# because they are used in Jenkins, whose plug-in doesn't support
+
+major=3
+minor=2
+patch=3
+
+base_version=${major}.${minor}.${patch}
+
+# Release must be completed with git revision # in Jenkins
+release_version=${base_version}
+snapshot_version=${base_version}-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index 7a170f3..215bdd1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
-       <modelVersion>4.0.0</modelVersion>\r
-       <groupId>org.onap.vid</groupId>\r
-       <artifactId>vid-parent</artifactId>\r
-       <packaging>pom</packaging>\r
-       <name>vid</name>\r
-\r
-       <profiles>\r
-               <!-- DO NOT CHANGE THE *ORDER* IN WHICH THESE PROFILES ARE DEFINED! -->\r
-\r
-               <profile>\r
-                       <id>onap</id>\r
-                       <activation>\r
-                               <activeByDefault>true</activeByDefault>\r
-                       </activation>\r
-                       <modules>\r
-                               <module>vid-app-common</module>\r
-                               <module>vid-webpack-master</module>\r
-                               <module>epsdk-app-onap</module>\r
-                               <!--module>vid-automation</module-->\r
-                               <!--module>vid-ext-services-simulator</module-->\r
-                       </modules>\r
-\r
-                       <repositories>\r
-                               <repository>\r
-                                       <id>ecomp-releases</id>\r
-                                       <name>VID Release Repository</name>\r
-                                       <url>${nexusproxy}/${releaseNexusPath}</url>\r
-                               </repository>\r
-                               <repository>\r
-                                       <id>ecomp-snapshots</id>\r
-                                       <name>VID Snapshot Repository</name>\r
-                                       <url>${nexusproxy}/${snapshotNexusPath}</url>\r
-                               </repository>\r
-                               <repository>\r
-                                       <id>ecomp-staging</id>\r
-                                       <name>VID Staging Repository</name>\r
-                                       <url>${nexusproxy}/${stagingNexusPath}</url>\r
-                               </repository>\r
-                               <repository>\r
-                                       <!-- Snapshots repository has ECOMP snapshot artifacts -->\r
-                                       <id>oss-snapshots</id>\r
-                                       <name>oss Central - Snapshots</name>\r
-                                       <url>https://oss.sonatype.org/service/local/repositories/releases/content/</url>\r
-                               </repository>\r
-                       </repositories>\r
-\r
-                       <distributionManagement>\r
-                               <repository>\r
-                                       <id>ecomp-releases</id>\r
-                                       <name>VID Release Repository</name>\r
-                                       <url>${nexusproxy}/${releaseNexusPath}</url>\r
-                               </repository>\r
-                               <snapshotRepository>\r
-                                       <id>ecomp-snapshots</id>\r
-                                       <name>VID Snapshot Repository</name>\r
-                                       <url>${nexusproxy}/${snapshotNexusPath}</url>\r
-                               </snapshotRepository>\r
-                               <!-- added for javadoc -->\r
-                               <site>\r
-                                       <id>ecomp-site</id>\r
-                                       <url>dav:${nexusproxy}${sitePath}</url>\r
-                               </site>\r
-                       </distributionManagement>\r
-\r
-               </profile>\r
-\r
-               <profile>\r
-                       <id>docker</id>\r
-                       <modules>\r
-                               <module>vid-app-common</module>\r
-                               <module>vid-webpack-master</module>\r
-                               <module>epsdk-app-onap</module>\r
-                               <module>deliveries</module>\r
-                       </modules>\r
-               </profile>\r
-       </profiles>\r
-\r
-       <properties>\r
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
-               <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
-               <build.version>3.2.2-SNAPSHOT</build.version>\r
-               <nexusproxy>https://nexus.onap.org</nexusproxy>\r
-               <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
-               <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
-               <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
-               <sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath>\r
-       </properties>\r
-\r
-       <build>\r
-               <plugins>\r
-                       <plugin>\r
-                               <groupId>org.codehaus.mojo</groupId>\r
-                               <artifactId>versions-maven-plugin</artifactId>\r
-                               <version>1.3.1</version>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.sonatype.plugins</groupId>\r
-                               <artifactId>nexus-staging-maven-plugin</artifactId>\r
-                               <version>1.6.7</version>\r
-                               <extensions>true</extensions>\r
-                               <configuration>\r
-                                       <nexusUrl>${nexusproxy}</nexusUrl>\r
-                                       <stagingProfileId>176c31dfe190a</stagingProfileId>\r
-                                       <serverId>ecomp-staging</serverId>\r
-                               </configuration>\r
-                       </plugin>\r
-\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-site-plugin</artifactId>\r
-                               <version>3.6</version>\r
-                               <dependencies>\r
-                                       <dependency>\r
-                                               <groupId>org.apache.maven.wagon</groupId>\r
-                                               <artifactId>wagon-webdav-jackrabbit</artifactId>\r
-                                               <version>2.10</version>\r
-                                       </dependency>\r
-                               </dependencies>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.sonatype.plugins</groupId>\r
-                               <artifactId>nexus-staging-maven-plugin</artifactId>\r
-                               <version>1.6.7</version>\r
-                               <extensions>true</extensions>\r
-                               <configuration>\r
-                                       <nexusUrl>${nexusproxy}</nexusUrl>\r
-                                       <stagingProfileId>176c31dfe190a</stagingProfileId>\r
-                                       <serverId>ecomp-staging</serverId>\r
-                               </configuration>\r
-                       </plugin>\r
-\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-deploy-plugin</artifactId>\r
-                               <version>2.8</version>\r
-                       </plugin>\r
-\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-surefire-plugin</artifactId>\r
-                               <version>2.17</version>\r
-                       </plugin>\r
-\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-compiler-plugin</artifactId>\r
-                               <version>2.3.2</version>\r
-\r
-                               <configuration>\r
-                                       <debug>true</debug>\r
-                                       <compilerArgument>-Xlint</compilerArgument>\r
-                                       <verbose>true</verbose>\r
-                                       <showDeprecation>true</showDeprecation>\r
-                                       <showWarnings>true</showWarnings>\r
-                                       <source>1.8</source>\r
-                                       <target>1.8</target>\r
-                               </configuration>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-site-plugin</artifactId>\r
-                               <version>3.6</version>\r
-                               <dependencies>\r
-                                       <dependency>\r
-                                               <groupId>org.apache.maven.wagon</groupId>\r
-                                               <artifactId>wagon-webdav-jackrabbit</artifactId>\r
-                                               <version>2.10</version>\r
-                                       </dependency>\r
-                               </dependencies>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.sonarsource.scanner.maven</groupId>\r
-                               <artifactId>sonar-maven-plugin</artifactId>\r
-                               <version>3.3.0.603</version>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>com.blackducksoftware.integration</groupId>\r
-                               <artifactId>hub-maven-plugin</artifactId>\r
-                               <version>1.4.0</version>\r
-                               <inherited>false</inherited>\r
-                               <configuration>\r
-                                       <hubProjectName>${project.name}</hubProjectName>\r
-                                       <outputDirectory>${project.basedir}</outputDirectory>\r
-                               </configuration>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>create-bdio-file</id>\r
-                                               <phase>package</phase>\r
-                                               <goals>\r
-                                                       <goal>createHubOutput</goal>\r
-                                               </goals>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\r
-\r
-       <!-- added for javadoc -->\r
-       <pluginRepositories>\r
-               <!-- Black Duck plugin dependencies -->\r
-               <pluginRepository>\r
-                       <id>JCenter</id>\r
-                       <name>JCenter Repository</name>\r
-                       <url>http://jcenter.bintray.com</url>\r
-               </pluginRepository>\r
-\r
-               <pluginRepository>\r
-                       <id>Restlet</id>\r
-                       <name>Restlet Repository</name>\r
-                       <url>http://maven.restlet.com</url>\r
-               </pluginRepository>\r
-       </pluginRepositories>\r
-       <reporting>\r
-               <plugins>\r
-\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-javadoc-plugin</artifactId>\r
-                               <version>2.10.4</version>\r
-                               <configuration>\r
-                                       <failOnError>false</failOnError>\r
-                                       <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>\r
-                                       <docletArtifact>\r
-                                               <groupId>org.umlgraph</groupId>\r
-                                               <artifactId>umlgraph</artifactId>\r
-                                               <version>5.6</version>\r
-                                       </docletArtifact>\r
-                                       <additionalparam>-views</additionalparam>\r
-                                       <useStandardDocletOptions>true</useStandardDocletOptions>\r
-                               </configuration>\r
-                       </plugin>\r
-               </plugins>\r
-       </reporting>\r
-       <dependencies>\r
-               <dependency>\r
-                       <groupId>junit</groupId>\r
-                       <artifactId>junit</artifactId>\r
-                       <version>4.11</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               \r
-               <!--Overide versions for latest security fixes-->\r
-               <dependency>\r
-                       <groupId>ch.qos.logback</groupId>\r
-                       <artifactId>logback-core</artifactId>\r
-                       <version>1.2.3</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>ch.qos.logback</groupId>\r
-                       <artifactId>logback-classic</artifactId>\r
-                       <version>1.2.3</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>commons-collections</groupId>\r
-                       <artifactId>commons-collections</artifactId>\r
-                       <version>3.2.2</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.poi</groupId>\r
-                       <artifactId>poi</artifactId>\r
-                       <version>3.17</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.httpcomponents</groupId>\r
-                       <artifactId>httpclient</artifactId>\r
-                       <version>4.5.3</version>\r
-               </dependency>\r
-       </dependencies>\r
-       <version>3.2.2-SNAPSHOT</version>\r
-</project>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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.onap.vid</groupId>
+       <artifactId>vid-parent</artifactId>
+       <packaging>pom</packaging>
+       <name>vid</name>
+
+       <profiles>
+               <!-- DO NOT CHANGE THE *ORDER* IN WHICH THESE PROFILES ARE DEFINED! -->
+
+               <profile>
+                       <id>onap</id>
+                       <activation>
+                               <activeByDefault>true</activeByDefault>
+                       </activation>
+                       <modules>
+                               <module>vid-app-common</module>
+                               <module>vid-webpack-master</module>
+                               <module>epsdk-app-onap</module>
+                               <!--module>vid-automation</module-->
+                               <!--module>vid-ext-services-simulator</module-->
+                       </modules>
+
+                       <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>
+                               </repository>
+                       </repositories>
+
+                       <distributionManagement>
+                               <repository>
+                                       <id>ecomp-releases</id>
+                                       <name>VID Release Repository</name>
+                                       <url>${nexusproxy}/${releaseNexusPath}</url>
+                               </repository>
+                               <snapshotRepository>
+                                       <id>ecomp-snapshots</id>
+                                       <name>VID Snapshot Repository</name>
+                                       <url>${nexusproxy}/${snapshotNexusPath}</url>
+                               </snapshotRepository>
+                               <!-- added for javadoc -->
+                               <site>
+                                       <id>ecomp-site</id>
+                                       <url>dav:${nexusproxy}${sitePath}</url>
+                               </site>
+                       </distributionManagement>
+
+               </profile>
+
+               <profile>
+                       <id>docker</id>
+                       <modules>
+                               <module>vid-app-common</module>
+                               <module>vid-webpack-master</module>
+                               <module>epsdk-app-onap</module>
+                               <module>deliveries</module>
+                       </modules>
+               </profile>
+       </profiles>
+
+       <properties>
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+               <build.version>3.2.3-SNAPSHOT</build.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/onap/vid/${project.version}</sitePath>
+       </properties>
+
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>versions-maven-plugin</artifactId>
+                               <version>1.3.1</version>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.sonatype.plugins</groupId>
+                               <artifactId>nexus-staging-maven-plugin</artifactId>
+                               <version>1.6.7</version>
+                               <extensions>true</extensions>
+                               <configuration>
+                                       <nexusUrl>${nexusproxy}</nexusUrl>
+                                       <stagingProfileId>176c31dfe190a</stagingProfileId>
+                                       <serverId>ecomp-staging</serverId>
+                               </configuration>
+                       </plugin>
+
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-site-plugin</artifactId>
+                               <version>3.6</version>
+                               <dependencies>
+                                       <dependency>
+                                               <groupId>org.apache.maven.wagon</groupId>
+                                               <artifactId>wagon-webdav-jackrabbit</artifactId>
+                                               <version>2.10</version>
+                                       </dependency>
+                               </dependencies>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.sonatype.plugins</groupId>
+                               <artifactId>nexus-staging-maven-plugin</artifactId>
+                               <version>1.6.7</version>
+                               <extensions>true</extensions>
+                               <configuration>
+                                       <nexusUrl>${nexusproxy}</nexusUrl>
+                                       <stagingProfileId>176c31dfe190a</stagingProfileId>
+                                       <serverId>ecomp-staging</serverId>
+                               </configuration>
+                       </plugin>
+
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-deploy-plugin</artifactId>
+                               <version>2.8</version>
+                       </plugin>
+
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <version>2.17</version>
+                       </plugin>
+
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-compiler-plugin</artifactId>
+                               <version>2.3.2</version>
+
+                               <configuration>
+                                       <debug>true</debug>
+                                       <compilerArgument>-Xlint</compilerArgument>
+                                       <verbose>true</verbose>
+                                       <showDeprecation>true</showDeprecation>
+                                       <showWarnings>true</showWarnings>
+                                       <source>1.8</source>
+                                       <target>1.8</target>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-site-plugin</artifactId>
+                               <version>3.6</version>
+                               <dependencies>
+                                       <dependency>
+                                               <groupId>org.apache.maven.wagon</groupId>
+                                               <artifactId>wagon-webdav-jackrabbit</artifactId>
+                                               <version>2.10</version>
+                                       </dependency>
+                               </dependencies>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.sonarsource.scanner.maven</groupId>
+                               <artifactId>sonar-maven-plugin</artifactId>
+                               <version>3.3.0.603</version>
+                       </plugin>
+                       <plugin>
+                               <groupId>com.blackducksoftware.integration</groupId>
+                               <artifactId>hub-maven-plugin</artifactId>
+                               <version>1.4.0</version>
+                               <inherited>false</inherited>
+                               <configuration>
+                                       <hubProjectName>${project.name}</hubProjectName>
+                                       <outputDirectory>${project.basedir}</outputDirectory>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <id>create-bdio-file</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>createHubOutput</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>
+       </build>
+
+       <!-- added for javadoc -->
+       <pluginRepositories>
+               <!-- Black Duck plugin dependencies -->
+               <pluginRepository>
+                       <id>JCenter</id>
+                       <name>JCenter Repository</name>
+                       <url>http://jcenter.bintray.com</url>
+               </pluginRepository>
+
+               <pluginRepository>
+                       <id>Restlet</id>
+                       <name>Restlet Repository</name>
+                       <url>http://maven.restlet.com</url>
+               </pluginRepository>
+       </pluginRepositories>
+       <reporting>
+               <plugins>
+
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-javadoc-plugin</artifactId>
+                               <version>2.10.4</version>
+                               <configuration>
+                                       <failOnError>false</failOnError>
+                                       <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+                                       <docletArtifact>
+                                               <groupId>org.umlgraph</groupId>
+                                               <artifactId>umlgraph</artifactId>
+                                               <version>5.6</version>
+                                       </docletArtifact>
+                                       <additionalparam>-views</additionalparam>
+                                       <useStandardDocletOptions>true</useStandardDocletOptions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </reporting>
+       <dependencies>
+               <dependency>
+                       <groupId>junit</groupId>
+                       <artifactId>junit</artifactId>
+                       <version>4.11</version>
+                       <scope>test</scope>
+               </dependency>
+               
+               <!--Overide versions for latest security fixes-->
+               <dependency>
+                       <groupId>ch.qos.logback</groupId>
+                       <artifactId>logback-core</artifactId>
+                       <version>1.2.3</version>
+               </dependency>
+               <dependency>
+                       <groupId>ch.qos.logback</groupId>
+                       <artifactId>logback-classic</artifactId>
+                       <version>1.2.3</version>
+               </dependency>
+               <dependency>
+                       <groupId>commons-collections</groupId>
+                       <artifactId>commons-collections</artifactId>
+                       <version>3.2.2</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.poi</groupId>
+                       <artifactId>poi</artifactId>
+                       <version>3.17</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.httpcomponents</groupId>
+                       <artifactId>httpclient</artifactId>
+                       <version>4.5.3</version>
+               </dependency>
+       </dependencies>
+       <version>3.2.3-SNAPSHOT</version>
+</project>
index ef8c0e3..527c3ba 100644 (file)
@@ -1,13 +1,13 @@
-# Versioning variables\r
-# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )\r
-# because they are used in Jenkins, whose plug-in doesn't support\r
-\r
-major=3\r
-minor=2\r
-patch=2\r
-\r
-base_version=${major}.${minor}.${patch}\r
-\r
-# Release must be completed with git revision # in Jenkins\r
-release_version=${base_version}\r
-snapshot_version=${base_version}-SNAPSHOT\r
+# Versioning variables
+# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
+# because they are used in Jenkins, whose plug-in doesn't support
+
+major=3
+minor=2
+patch=3
+
+base_version=${major}.${minor}.${patch}
+
+# Release must be completed with git revision # in Jenkins
+release_version=${base_version}
+snapshot_version=${base_version}-SNAPSHOT
index f2a9690..ac4c4af 100755 (executable)
-<?xml version="1.0"?>\r
-<project\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"\r
-       xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
-       <modelVersion>4.0.0</modelVersion>\r
-\r
-       <!-- This is the Maven project object model (POM) file for VID web application \r
-               based on the ECOMP SDK distribution. This file stands alone; it does not \r
-               inherit from a parent maven module. -->\r
-       <groupId>org.onap.vid</groupId>\r
-       <artifactId>vid-app-common</artifactId>\r
-       <version>3.2.2-SNAPSHOT</version>\r
-       <packaging>war</packaging>\r
-       <name>VID Common</name>\r
-       <description>VID Common code for opensource version</description>\r
-\r
-       <properties>\r
-               <encoding>UTF-8</encoding>\r
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
-               <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
-               <epsdk.version>2.4.0</epsdk.version>\r
-               <springframework.version>4.2.9.RELEASE</springframework.version>\r
-               <hibernate.version>4.3.11.Final</hibernate.version>\r
-               <!-- Skip assembling the zip by default -->\r
-               <skipassembly>true</skipassembly>\r
-               <!-- Tests usually require some setup that maven cannot do, so skip. -->\r
-               <skiptests>false</skiptests>\r
-               <nexusproxy>https://nexus.onap.org</nexusproxy>\r
-               <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
-               <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
-               <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
-               <sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath>\r
-       </properties>\r
-\r
-\r
-       <!-- this should be commented for local debugging -->\r
-       <!-- <deployenv>local</deployenv> -->\r
-\r
-       <repositories>\r
-               <repository>\r
-                       <id>ecomp-releases</id>\r
-                       <name>VID Release Repository</name>\r
-                       <url>${nexusproxy}${releaseNexusPath}</url>\r
-               </repository>\r
-               <repository>\r
-                       <id>ecomp-snapshots</id>\r
-                       <name>VID Snapshot Repository</name>\r
-                       <url>${nexusproxy}${snapshotNexusPath}</url>\r
-               </repository>\r
-               <repository>\r
-                       <id>ecomp-staging</id>\r
-                       <name>VID Staging Repository</name>\r
-                       <url>${nexusproxy}${stagingNexusPath}</url>\r
-               </repository>\r
-               <repository>\r
-                       <!-- Snapshots repository has ECOMP snapshot artifacts -->\r
-                       <id>oss-snapshots</id>\r
-                       <name>oss Central - Snapshots</name>\r
-                       <url>https://oss.sonatype.org/service/local/repositories/releases/content/</url>\r
-               </repository>\r
-\r
-       </repositories>\r
-       <distributionManagement>\r
-               <repository>\r
-                       <id>ecomp-releases</id>\r
-                       <name>VID Release Repository</name>\r
-                       <url>${nexusproxy}/${releaseNexusPath}</url>\r
-               </repository>\r
-               <snapshotRepository>\r
-                       <id>ecomp-snapshots</id>\r
-                       <name>VID Snapshot Repository</name>\r
-                       <url>${nexusproxy}/${snapshotNexusPath}</url>\r
-               </snapshotRepository>\r
-               <!-- added for javadoc -->\r
-               <site>\r
-                       <id>ecomp-site</id>\r
-                       <url>dav:${nexusproxy}${sitePath}</url>\r
-               </site>\r
-       </distributionManagement>\r
-\r
-       <build>\r
-               <finalName>vid-common</finalName>\r
-\r
-               <plugins>\r
-                       <plugin>\r
-                               <groupId>org.sonatype.plugins</groupId>\r
-                               <artifactId>nexus-staging-maven-plugin</artifactId>\r
-                               <version>1.6.7</version>\r
-                               <extensions>true</extensions>\r
-                               <configuration>\r
-                                       <nexusUrl>${nexusproxy}</nexusUrl>\r
-                                       <stagingProfileId>176c31dfe190a</stagingProfileId>\r
-                                       <serverId>ecomp-staging</serverId>\r
-                               </configuration>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.jacoco</groupId>\r
-                               <artifactId>jacoco-maven-plugin</artifactId>\r
-                               <version>0.7.9</version>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>default-prepare-agent</id>\r
-                                               <goals>\r
-                                                       <goal>prepare-agent</goal>\r
-                                               </goals>\r
-                                       </execution>\r
-                                       <execution>\r
-                                               <id>default-report</id>\r
-                                               <goals>\r
-                                                       <goal>report</goal>\r
-                                               </goals>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.apache.tomcat.maven</groupId>\r
-                               <artifactId>tomcat6-maven-plugin</artifactId>\r
-                               <version>2.2</version>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.apache.tomcat.maven</groupId>\r
-                               <artifactId>tomcat7-maven-plugin</artifactId>\r
-                               <version>2.2</version>\r
-                       </plugin>\r
-\r
-                       <!-- Generate POJOs from MSO json schema -->\r
-                       <plugin>\r
-                               <groupId>org.jsonschema2pojo</groupId>\r
-                               <artifactId>jsonschema2pojo-maven-plugin</artifactId>\r
-                               <version>0.4.23</version>\r
-                               <configuration>\r
-                                       <sourceDirectory>${basedir}/src/main/resources/json/mso</sourceDirectory>\r
-                                       <targetPackage>org.onap.vid.domain.mso</targetPackage>\r
-                                       <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>\r
-                               </configuration>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <goals>\r
-                                                       <goal>generate</goal>\r
-                                               </goals>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-compiler-plugin</artifactId>\r
-                               <version>3.1</version>\r
-                               <configuration>\r
-                                       <source>1.8</source>\r
-                                       <target>1.8</target>\r
-                               </configuration>\r
-                       </plugin>\r
-\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-surefire-plugin</artifactId>\r
-                               <version>2.19.1</version>\r
-                               <configuration>\r
-                                       <skipTests>${skiptests}</skipTests>\r
-                                       <includes>\r
-                                               <include>**/Test*.java</include>\r
-                                               <include>**/*Test.java</include>\r
-                                               <include>**/*TestCase.java</include>\r
-                                       </includes>\r
-                                       <excludes>\r
-                                               <exclude>**/selenium/*.java</exclude>\r
-                                               <exclude>**/integrationTest/*.java</exclude>\r
-                                       </excludes>\r
-                                       <additionalClasspathElements>\r
-                                               <additionalClasspathElement>${basedir}/war</additionalClasspathElement>\r
-                                       </additionalClasspathElements>\r
-                                       <systemPropertyVariables>\r
-                                               <container.classpath>classpath:</container.classpath>\r
-                                       </systemPropertyVariables>\r
-                               </configuration>\r
-                       </plugin>\r
-\r
-                       <plugin>\r
-                               <artifactId>maven-assembly-plugin</artifactId>\r
-                               <configuration>\r
-                                       <skipAssembly>${skipassembly}</skipAssembly>\r
-                                       <descriptors>\r
-                                               <descriptor>${basedir}/distribution.xml</descriptor>\r
-                                       </descriptors>\r
-                               </configuration>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>make-assembly</id>\r
-                                               <phase>package</phase>\r
-                                               <goals>\r
-                                                       <goal>single</goal>\r
-                                               </goals>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-\r
-\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-war-plugin</artifactId>\r
-                               <version>3.0.0</version>\r
-                               <configuration>\r
-                                       <!-- Build a jar with all the Java classes -->\r
-                                       <attachClasses>true</attachClasses>\r
-                                       <!-- Do not put any jars in the war -->\r
-                                       <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>\r
-                               </configuration>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-site-plugin</artifactId>\r
-                               <version>3.6</version>\r
-                               <dependencies>\r
-                                       <dependency>\r
-                                               <groupId>org.apache.maven.wagon</groupId>\r
-                                               <artifactId>wagon-webdav-jackrabbit</artifactId>\r
-                                               <version>2.10</version>\r
-                                       </dependency>\r
-                               </dependencies>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>pl.project13.maven</groupId>\r
-                               <artifactId>git-commit-id-plugin</artifactId>\r
-                               <version>2.2.4</version>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>get-the-git-infos</id>\r
-                                               <goals>\r
-                                                       <goal>revision</goal>\r
-                                               </goals>\r
-                                       </execution>\r
-                               </executions>\r
-                               <configuration>\r
-                                       <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>\r
-                                       <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>\r
-                                       <dateFormatTimeZone>${user.timezone}</dateFormatTimeZone>\r
-                                       <generateGitPropertiesFile>true</generateGitPropertiesFile>\r
-                                       <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>\r
-                                       <includeOnlyProperties>\r
-                                                <includeOnlyProperty>^git.commit.id$</includeOnlyProperty>\r
-                                                <includeOnlyProperty>^git.commit.message.short$</includeOnlyProperty>\r
-                                                <includeOnlyProperty>^git.commit.time$</includeOnlyProperty>\r
-                                       </includeOnlyProperties>\r
-                               </configuration>\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\r
-\r
-       <reporting>\r
-               <plugins>\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-javadoc-plugin</artifactId>\r
-                               <version>2.10.4</version>\r
-                               <configuration>\r
-                                       <failOnError>false</failOnError>\r
-                                       <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>\r
-                                       <docletArtifact>\r
-                                               <groupId>org.umlgraph</groupId>\r
-                                               <artifactId>umlgraph</artifactId>\r
-                                               <version>5.6</version>\r
-                                       </docletArtifact>\r
-                                       <additionalparam>-views</additionalparam>\r
-                                       <useStandardDocletOptions>true</useStandardDocletOptions>\r
-                               </configuration>\r
-                       </plugin>\r
-               </plugins>\r
-       </reporting>\r
-\r
-       <dependencies>\r
-       \r
-               <dependency>\r
-                   <groupId>com.opencsv</groupId>\r
-                   <artifactId>opencsv</artifactId>\r
-                   <version>4.1</version>\r
-               </dependency>\r
-                       \r
-               <!-- HTTP client -->\r
-\r
-               <dependency>\r
-                       <groupId>io.joshworks.unirest</groupId>\r
-                       <artifactId>unirest-java</artifactId>\r
-                       <version>0.2.1</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.httpcomponents</groupId>\r
-                       <artifactId>httpclient</artifactId>\r
-                       <version>4.3.6</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.httpcomponents</groupId>\r
-                       <artifactId>httpasyncclient</artifactId>\r
-                       <version>4.0.2</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.httpcomponents</groupId>\r
-                       <artifactId>httpmime</artifactId>\r
-                       <version>4.3.6</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.xebialabs.restito</groupId>\r
-                       <artifactId>restito</artifactId>\r
-                       <version>0.9.3</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-\r
-               <!-- Helpers -->\r
-               <dependency>\r
-                       <groupId>org.projectlombok</groupId>\r
-                       <artifactId>lombok</artifactId>\r
-                       <version>1.18.2</version>\r
-                       <scope>provided</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>io.vavr</groupId>\r
-                       <artifactId>vavr</artifactId>\r
-                       <version>0.9.2</version>\r
-               </dependency>\r
-\r
-               <!-- SDK overlay war -->\r
-               <dependency>\r
-                       <groupId>org.onap.portal.sdk</groupId>\r
-                       <artifactId>epsdk-app-overlay</artifactId>\r
-                       <version>${epsdk.version}</version>\r
-                       <type>war</type>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.portal.sdk</groupId>\r
-                       <artifactId>epsdk-app-common</artifactId>\r
-                       <version>${epsdk.version}</version>\r
-                       <type>jar</type>\r
-               </dependency>\r
-\r
-               <dependency>\r
-                       <groupId>org.onap.portal.sdk</groupId>\r
-                       <artifactId>epsdk-core</artifactId>\r
-                       <version>${epsdk.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.portal.sdk</groupId>\r
-                       <artifactId>epsdk-analytics</artifactId>\r
-                       <version>${epsdk.version}</version>\r
-                       <exclusions>\r
-                               <exclusion>\r
-                                       <groupId>com.lowagie</groupId>\r
-                                       <artifactId>itext</artifactId>\r
-                               </exclusion>\r
-                       </exclusions>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.portal.sdk</groupId>\r
-                       <artifactId>epsdk-workflow</artifactId>\r
-                       <version>${epsdk.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.att.eelf</groupId>\r
-                       <artifactId>eelf-core</artifactId>\r
-                       <version>1.0.0</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>ch.qos.logback</groupId>\r
-                       <artifactId>logback-core</artifactId>\r
-                       <version>1.2.3</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>ch.qos.logback</groupId>\r
-                       <artifactId>logback-classic</artifactId>\r
-                       <version>1.2.3</version>\r
-               </dependency>\r
-\r
-               <!-- Mapper -->\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                       <artifactId>jackson-annotations</artifactId>\r
-                       <version>2.6.3</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                       <artifactId>jackson-core</artifactId>\r
-                       <version>2.8.6</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                       <artifactId>jackson-databind</artifactId>\r
-                       <version>2.6.7.1</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.codehaus.jackson</groupId>\r
-                       <artifactId>jackson-mapper-asl</artifactId>\r
-                       <version>1.9.13</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.mchange</groupId>\r
-                       <artifactId>c3p0</artifactId>\r
-                       <version>0.9.5.2</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>io.searchbox</groupId>\r
-                       <artifactId>jest</artifactId>\r
-                       <version>2.0.0</version>\r
-                       <exclusions>\r
-                               <exclusion>\r
-                                       <groupId>commons-logging</groupId>\r
-                                       <artifactId>commons-logging</artifactId>\r
-                               </exclusion>\r
-                       </exclusions>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>javax.servlet</groupId>\r
-                       <artifactId>javax.servlet-api</artifactId>\r
-                       <version>3.1.0</version>\r
-                       <scope>provided</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>junit</groupId>\r
-                       <artifactId>junit</artifactId>\r
-                       <version>4.12</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>commons-io</groupId>\r
-                       <artifactId>commons-io</artifactId>\r
-                       <version>2.4</version>\r
-                       <!--<scope>test</scope>-->\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.google.code.bean-matchers</groupId>\r
-                       <artifactId>bean-matchers</artifactId>\r
-                       <version>0.11</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.json</groupId>\r
-                       <artifactId>json</artifactId>\r
-                       <version>20160212</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.quartz-scheduler</groupId>\r
-                       <artifactId>quartz</artifactId>\r
-                       <version>2.2.1</version>\r
-                       <exclusions>\r
-                               <!-- exclude 0.9.1.1 to avoid dupe of com.mchange:c3p0:0.9.2.1 -->\r
-                               <exclusion>\r
-                                       <groupId>c3p0</groupId>\r
-                                       <artifactId>c3p0</artifactId>\r
-                               </exclusion>\r
-                       </exclusions>\r
-               </dependency>\r
-               <!-- bridge to implement commons-logging using slf4j -->\r
-               <dependency>\r
-                       <groupId>org.slf4j</groupId>\r
-                       <artifactId>jcl-over-slf4j</artifactId>\r
-                       <version>1.7.12</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-context-support</artifactId>\r
-                       <version>${springframework.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-core</artifactId>\r
-                       <version>${springframework.version}</version>\r
-                       <exclusions>\r
-                               <exclusion>\r
-                                       <groupId>commons-logging</groupId>\r
-                                       <artifactId>commons-logging</artifactId>\r
-                               </exclusion>\r
-                       </exclusions>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-test</artifactId>\r
-                       <version>${springframework.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-tx</artifactId>\r
-                       <version>${springframework.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-web</artifactId>\r
-                       <version>${springframework.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-webmvc</artifactId>\r
-                       <version>${springframework.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.glassfish.jersey.core</groupId>\r
-                       <artifactId>jersey-client</artifactId>\r
-                       <version>2.23.1</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.glassfish.jersey.connectors</groupId>\r
-                       <artifactId>jersey-jetty-connector</artifactId>\r
-                       <version>2.23.1</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.jaxrs</groupId>\r
-                       <artifactId>jackson-jaxrs-json-provider</artifactId>\r
-                       <version>2.6.3</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>commons-beanutils</groupId>\r
-                       <artifactId>commons-beanutils</artifactId>\r
-                       <version>1.9.3</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.googlecode.json-simple</groupId>\r
-                       <artifactId>json-simple</artifactId>\r
-                       <version>1.1.1</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.seleniumhq.selenium</groupId>\r
-                       <artifactId>selenium-java</artifactId>\r
-                       <version>2.53.1</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.seleniumhq.selenium</groupId>\r
-                       <artifactId>selenium-api</artifactId>\r
-                       <version>2.53.1</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.testng</groupId>\r
-                       <artifactId>testng</artifactId>\r
-                       <version>6.8</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.seleniumhq.selenium</groupId>\r
-                       <artifactId>selenium-firefox-driver</artifactId>\r
-                       <version>2.53.1</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>xml-apis</groupId>\r
-                       <artifactId>xml-apis</artifactId>\r
-                       <version>1.4.01</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.yaml</groupId>\r
-                       <artifactId>snakeyaml</artifactId>\r
-                       <version>1.16</version>\r
-               </dependency>\r
-               <dependency>\r
-                   <groupId>org.skyscreamer</groupId>\r
-                   <artifactId>jsonassert</artifactId>\r
-                   <version>1.5.0</version>\r
-               </dependency>\r
-               <dependency>\r
-                   <groupId>org.onap.sdc.sdc-tosca</groupId>\r
-                   <artifactId>sdc-tosca</artifactId>\r
-                   <version>1.4.1</version>\r
-                   <scope>compile</scope>\r
-               </dependency>\r
-               <dependency>\r
-                   <groupId>net.javacrumbs.json-unit</groupId>\r
-                   <artifactId>json-unit</artifactId>\r
-                   <version>1.23.0</version>\r
-                   <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                   <groupId>org.apache.commons</groupId>\r
-                   <artifactId>commons-text</artifactId>\r
-                   <version>1.1</version>\r
-               </dependency>\r
-               <dependency>\r
-                   <groupId>org.hamcrest</groupId>\r
-                   <artifactId>java-hamcrest</artifactId>\r
-                   <version>2.0.0.0</version>\r
-                   <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                   <groupId>org.togglz</groupId>\r
-                   <artifactId>togglz-spring-core</artifactId>\r
-                   <version>2.5.0.Final</version>\r
-               </dependency>\r
-                       <dependency>\r
-                               <groupId>org.assertj</groupId>\r
-                               <artifactId>assertj-core</artifactId>\r
-                               <version>3.10.0</version>\r
-                               <scope>compile</scope>\r
-                       </dependency>\r
-               </dependencies>\r
-</project>\r
+<?xml version="1.0"?>
+<project
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+       xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+       <modelVersion>4.0.0</modelVersion>
+
+       <!-- This is the Maven project object model (POM) file for VID web application 
+               based on the ECOMP SDK distribution. This file stands alone; it does not 
+               inherit from a parent maven module. -->
+       <groupId>org.onap.vid</groupId>
+       <artifactId>vid-app-common</artifactId>
+       <version>3.2.3-SNAPSHOT</version>
+       <packaging>war</packaging>
+       <name>VID Common</name>
+       <description>VID Common code for opensource version</description>
+
+       <properties>
+               <encoding>UTF-8</encoding>
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+               <epsdk.version>2.4.0</epsdk.version>
+               <springframework.version>4.2.9.RELEASE</springframework.version>
+               <hibernate.version>4.3.11.Final</hibernate.version>
+               <!-- Skip assembling the zip by default -->
+               <skipassembly>true</skipassembly>
+               <!-- Tests usually require some setup that maven cannot do, so skip. -->
+               <skiptests>false</skiptests>
+               <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/onap/vid/${project.version}</sitePath>
+       </properties>
+
+
+       <!-- this should be commented for local debugging -->
+       <!-- <deployenv>local</deployenv> -->
+
+       <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>
+               </repository>
+
+       </repositories>
+       <distributionManagement>
+               <repository>
+                       <id>ecomp-releases</id>
+                       <name>VID Release Repository</name>
+                       <url>${nexusproxy}/${releaseNexusPath}</url>
+               </repository>
+               <snapshotRepository>
+                       <id>ecomp-snapshots</id>
+                       <name>VID Snapshot Repository</name>
+                       <url>${nexusproxy}/${snapshotNexusPath}</url>
+               </snapshotRepository>
+               <!-- added for javadoc -->
+               <site>
+                       <id>ecomp-site</id>
+                       <url>dav:${nexusproxy}${sitePath}</url>
+               </site>
+       </distributionManagement>
+
+       <build>
+               <finalName>vid-common</finalName>
+
+               <plugins>
+                       <plugin>
+                               <groupId>org.sonatype.plugins</groupId>
+                               <artifactId>nexus-staging-maven-plugin</artifactId>
+                               <version>1.6.7</version>
+                               <extensions>true</extensions>
+                               <configuration>
+                                       <nexusUrl>${nexusproxy}</nexusUrl>
+                                       <stagingProfileId>176c31dfe190a</stagingProfileId>
+                                       <serverId>ecomp-staging</serverId>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.jacoco</groupId>
+                               <artifactId>jacoco-maven-plugin</artifactId>
+                               <version>0.7.9</version>
+                               <executions>
+                                       <execution>
+                                               <id>default-prepare-agent</id>
+                                               <goals>
+                                                       <goal>prepare-agent</goal>
+                                               </goals>
+                                       </execution>
+                                       <execution>
+                                               <id>default-report</id>
+                                               <goals>
+                                                       <goal>report</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.tomcat.maven</groupId>
+                               <artifactId>tomcat6-maven-plugin</artifactId>
+                               <version>2.2</version>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.tomcat.maven</groupId>
+                               <artifactId>tomcat7-maven-plugin</artifactId>
+                               <version>2.2</version>
+                       </plugin>
+
+                       <!-- Generate POJOs from MSO json schema -->
+                       <plugin>
+                               <groupId>org.jsonschema2pojo</groupId>
+                               <artifactId>jsonschema2pojo-maven-plugin</artifactId>
+                               <version>0.4.23</version>
+                               <configuration>
+                                       <sourceDirectory>${basedir}/src/main/resources/json/mso</sourceDirectory>
+                                       <targetPackage>org.onap.vid.domain.mso</targetPackage>
+                                       <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <goals>
+                                                       <goal>generate</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
+
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-compiler-plugin</artifactId>
+                               <version>3.1</version>
+                               <configuration>
+                                       <source>1.8</source>
+                                       <target>1.8</target>
+                               </configuration>
+                       </plugin>
+
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <version>2.19.1</version>
+                               <configuration>
+                                       <skipTests>${skiptests}</skipTests>
+                                       <includes>
+                                               <include>**/Test*.java</include>
+                                               <include>**/*Test.java</include>
+                                               <include>**/*TestCase.java</include>
+                                       </includes>
+                                       <excludes>
+                                               <exclude>**/selenium/*.java</exclude>
+                                               <exclude>**/integrationTest/*.java</exclude>
+                                       </excludes>
+                                       <additionalClasspathElements>
+                                               <additionalClasspathElement>${basedir}/war</additionalClasspathElement>
+                                       </additionalClasspathElements>
+                                       <systemPropertyVariables>
+                                               <container.classpath>classpath:</container.classpath>
+                                       </systemPropertyVariables>
+                               </configuration>
+                       </plugin>
+
+                       <plugin>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <configuration>
+                                       <skipAssembly>${skipassembly}</skipAssembly>
+                                       <descriptors>
+                                               <descriptor>${basedir}/distribution.xml</descriptor>
+                                       </descriptors>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <id>make-assembly</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>single</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </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>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-site-plugin</artifactId>
+                               <version>3.6</version>
+                               <dependencies>
+                                       <dependency>
+                                               <groupId>org.apache.maven.wagon</groupId>
+                                               <artifactId>wagon-webdav-jackrabbit</artifactId>
+                                               <version>2.10</version>
+                                       </dependency>
+                               </dependencies>
+                       </plugin>
+                       <plugin>
+                               <groupId>pl.project13.maven</groupId>
+                               <artifactId>git-commit-id-plugin</artifactId>
+                               <version>2.2.4</version>
+                               <executions>
+                                       <execution>
+                                               <id>get-the-git-infos</id>
+                                               <goals>
+                                                       <goal>revision</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                               <configuration>
+                                       <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
+                                       <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
+                                       <dateFormatTimeZone>${user.timezone}</dateFormatTimeZone>
+                                       <generateGitPropertiesFile>true</generateGitPropertiesFile>
+                                       <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+                                       <includeOnlyProperties>
+                                                <includeOnlyProperty>^git.commit.id$</includeOnlyProperty>
+                                                <includeOnlyProperty>^git.commit.message.short$</includeOnlyProperty>
+                                                <includeOnlyProperty>^git.commit.time$</includeOnlyProperty>
+                                       </includeOnlyProperties>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+
+       <reporting>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-javadoc-plugin</artifactId>
+                               <version>2.10.4</version>
+                               <configuration>
+                                       <failOnError>false</failOnError>
+                                       <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+                                       <docletArtifact>
+                                               <groupId>org.umlgraph</groupId>
+                                               <artifactId>umlgraph</artifactId>
+                                               <version>5.6</version>
+                                       </docletArtifact>
+                                       <additionalparam>-views</additionalparam>
+                                       <useStandardDocletOptions>true</useStandardDocletOptions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </reporting>
+
+       <dependencies>
+       
+               <dependency>
+                   <groupId>com.opencsv</groupId>
+                   <artifactId>opencsv</artifactId>
+                   <version>4.1</version>
+               </dependency>
+                       
+               <!-- HTTP client -->
+
+               <dependency>
+                       <groupId>io.joshworks.unirest</groupId>
+                       <artifactId>unirest-java</artifactId>
+                       <version>0.2.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.httpcomponents</groupId>
+                       <artifactId>httpclient</artifactId>
+                       <version>4.3.6</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.httpcomponents</groupId>
+                       <artifactId>httpasyncclient</artifactId>
+                       <version>4.0.2</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.httpcomponents</groupId>
+                       <artifactId>httpmime</artifactId>
+                       <version>4.3.6</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.xebialabs.restito</groupId>
+                       <artifactId>restito</artifactId>
+                       <version>0.9.3</version>
+                       <scope>test</scope>
+               </dependency>
+
+               <!-- Helpers -->
+               <dependency>
+                       <groupId>org.projectlombok</groupId>
+                       <artifactId>lombok</artifactId>
+                       <version>1.18.2</version>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>io.vavr</groupId>
+                       <artifactId>vavr</artifactId>
+                       <version>0.9.2</version>
+               </dependency>
+
+               <!-- SDK overlay war -->
+               <dependency>
+                       <groupId>org.onap.portal.sdk</groupId>
+                       <artifactId>epsdk-app-overlay</artifactId>
+                       <version>${epsdk.version}</version>
+                       <type>war</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.portal.sdk</groupId>
+                       <artifactId>epsdk-app-common</artifactId>
+                       <version>${epsdk.version}</version>
+                       <type>jar</type>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.onap.portal.sdk</groupId>
+                       <artifactId>epsdk-core</artifactId>
+                       <version>${epsdk.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.portal.sdk</groupId>
+                       <artifactId>epsdk-analytics</artifactId>
+                       <version>${epsdk.version}</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>com.lowagie</groupId>
+                                       <artifactId>itext</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.portal.sdk</groupId>
+                       <artifactId>epsdk-workflow</artifactId>
+                       <version>${epsdk.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.att.eelf</groupId>
+                       <artifactId>eelf-core</artifactId>
+                       <version>1.0.0</version>
+               </dependency>
+               <dependency>
+                       <groupId>ch.qos.logback</groupId>
+                       <artifactId>logback-core</artifactId>
+                       <version>1.2.3</version>
+               </dependency>
+               <dependency>
+                       <groupId>ch.qos.logback</groupId>
+                       <artifactId>logback-classic</artifactId>
+                       <version>1.2.3</version>
+               </dependency>
+
+               <!-- Mapper -->
+               <dependency>
+                       <groupId>com.fasterxml.jackson.core</groupId>
+                       <artifactId>jackson-annotations</artifactId>
+                       <version>2.6.3</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.fasterxml.jackson.core</groupId>
+                       <artifactId>jackson-core</artifactId>
+                       <version>2.8.6</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.fasterxml.jackson.core</groupId>
+                       <artifactId>jackson-databind</artifactId>
+                       <version>2.6.7.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.codehaus.jackson</groupId>
+                       <artifactId>jackson-mapper-asl</artifactId>
+                       <version>1.9.13</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.mchange</groupId>
+                       <artifactId>c3p0</artifactId>
+                       <version>0.9.5.2</version>
+               </dependency>
+               <dependency>
+                       <groupId>io.searchbox</groupId>
+                       <artifactId>jest</artifactId>
+                       <version>2.0.0</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>commons-logging</groupId>
+                                       <artifactId>commons-logging</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
+                       <groupId>javax.servlet</groupId>
+                       <artifactId>javax.servlet-api</artifactId>
+                       <version>3.1.0</version>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>junit</groupId>
+                       <artifactId>junit</artifactId>
+                       <version>4.12</version>
+               </dependency>
+               <dependency>
+                       <groupId>commons-io</groupId>
+                       <artifactId>commons-io</artifactId>
+                       <version>2.4</version>
+                       <!--<scope>test</scope>-->
+               </dependency>
+               <dependency>
+                       <groupId>com.google.code.bean-matchers</groupId>
+                       <artifactId>bean-matchers</artifactId>
+                       <version>0.11</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.json</groupId>
+                       <artifactId>json</artifactId>
+                       <version>20160212</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.quartz-scheduler</groupId>
+                       <artifactId>quartz</artifactId>
+                       <version>2.2.1</version>
+                       <exclusions>
+                               <!-- exclude 0.9.1.1 to avoid dupe of com.mchange:c3p0:0.9.2.1 -->
+                               <exclusion>
+                                       <groupId>c3p0</groupId>
+                                       <artifactId>c3p0</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <!-- bridge to implement commons-logging using slf4j -->
+               <dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>jcl-over-slf4j</artifactId>
+                       <version>1.7.12</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-context-support</artifactId>
+                       <version>${springframework.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-core</artifactId>
+                       <version>${springframework.version}</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>commons-logging</groupId>
+                                       <artifactId>commons-logging</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-test</artifactId>
+                       <version>${springframework.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-tx</artifactId>
+                       <version>${springframework.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-web</artifactId>
+                       <version>${springframework.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-webmvc</artifactId>
+                       <version>${springframework.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.glassfish.jersey.core</groupId>
+                       <artifactId>jersey-client</artifactId>
+                       <version>2.23.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.glassfish.jersey.connectors</groupId>
+                       <artifactId>jersey-jetty-connector</artifactId>
+                       <version>2.23.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.fasterxml.jackson.jaxrs</groupId>
+                       <artifactId>jackson-jaxrs-json-provider</artifactId>
+                       <version>2.6.3</version>
+               </dependency>
+               <dependency>
+                       <groupId>commons-beanutils</groupId>
+                       <artifactId>commons-beanutils</artifactId>
+                       <version>1.9.3</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.googlecode.json-simple</groupId>
+                       <artifactId>json-simple</artifactId>
+                       <version>1.1.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.seleniumhq.selenium</groupId>
+                       <artifactId>selenium-java</artifactId>
+                       <version>2.53.1</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.seleniumhq.selenium</groupId>
+                       <artifactId>selenium-api</artifactId>
+                       <version>2.53.1</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.testng</groupId>
+                       <artifactId>testng</artifactId>
+                       <version>6.8</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.seleniumhq.selenium</groupId>
+                       <artifactId>selenium-firefox-driver</artifactId>
+                       <version>2.53.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>xml-apis</groupId>
+                       <artifactId>xml-apis</artifactId>
+                       <version>1.4.01</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.yaml</groupId>
+                       <artifactId>snakeyaml</artifactId>
+                       <version>1.16</version>
+               </dependency>
+               <dependency>
+                   <groupId>org.skyscreamer</groupId>
+                   <artifactId>jsonassert</artifactId>
+                   <version>1.5.0</version>
+               </dependency>
+               <dependency>
+                   <groupId>org.onap.sdc.sdc-tosca</groupId>
+                   <artifactId>sdc-tosca</artifactId>
+                   <version>1.4.1</version>
+                   <scope>compile</scope>
+               </dependency>
+               <dependency>
+                   <groupId>net.javacrumbs.json-unit</groupId>
+                   <artifactId>json-unit</artifactId>
+                   <version>1.23.0</version>
+                   <scope>test</scope>
+               </dependency>
+               <dependency>
+                   <groupId>org.apache.commons</groupId>
+                   <artifactId>commons-text</artifactId>
+                   <version>1.1</version>
+               </dependency>
+               <dependency>
+                   <groupId>org.hamcrest</groupId>
+                   <artifactId>java-hamcrest</artifactId>
+                   <version>2.0.0.0</version>
+                   <scope>test</scope>
+               </dependency>
+               <dependency>
+                   <groupId>org.togglz</groupId>
+                   <artifactId>togglz-spring-core</artifactId>
+                   <version>2.5.0.Final</version>
+               </dependency>
+                       <dependency>
+                               <groupId>org.assertj</groupId>
+                               <artifactId>assertj-core</artifactId>
+                               <version>3.10.0</version>
+                               <scope>compile</scope>
+                       </dependency>
+               </dependencies>
+</project>
index ef8c0e3..527c3ba 100755 (executable)
@@ -1,13 +1,13 @@
-# Versioning variables\r
-# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )\r
-# because they are used in Jenkins, whose plug-in doesn't support\r
-\r
-major=3\r
-minor=2\r
-patch=2\r
-\r
-base_version=${major}.${minor}.${patch}\r
-\r
-# Release must be completed with git revision # in Jenkins\r
-release_version=${base_version}\r
-snapshot_version=${base_version}-SNAPSHOT\r
+# Versioning variables
+# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
+# because they are used in Jenkins, whose plug-in doesn't support
+
+major=3
+minor=2
+patch=3
+
+base_version=${major}.${minor}.${patch}
+
+# Release must be completed with git revision # in Jenkins
+release_version=${base_version}
+snapshot_version=${base_version}-SNAPSHOT