Merge "Change template properties for AAI"

[vid.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index f5e862a..93f4f77 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,8 +1,9 @@
 <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.openecomp.vid</groupId>\r
+       <groupId>org.onap.vid</groupId>\r
        <artifactId>vid-parent</artifactId>\r
+       <version>4.0.0-SNAPSHOT</version>\r
        <packaging>pom</packaging>\r
        <name>vid</name>\r
 \r
@@ -16,7 +17,10 @@
                        </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
@@ -67,6 +71,7 @@
                        <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
@@ -76,12 +81,12 @@
        <properties>\r
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
-               <build.version>1.1.0-SNAPSHOT</build.version>\r
+               <build.version>4.0.0-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/openecomp/vid/${project.version}</sitePath>\r
+               <sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath>\r
        </properties>\r
 \r
        <build>\r
@@ -115,12 +120,6 @@
                                        </dependency>\r
                                </dependencies>\r
                        </plugin>\r
-                       <plugin>\r
-\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
@@ -133,28 +132,6 @@
                                </configuration>\r
                        </plugin>\r
 \r
-                       <!-- license plugin for open source -->\r
-                       <plugin>\r
-                               <groupId>org.codehaus.mojo</groupId>\r
-                               <artifactId>license-maven-plugin</artifactId>\r
-                               <version>1.9</version>\r
-                               <configuration>\r
-                                       <licenseName>apache_v2</licenseName>\r
-                                       <inceptionYear>2017</inceptionYear>\r
-                                       <organizationName>AT&amp;T</organizationName>\r
-                                       <projectName>VID</projectName>\r
-                                       <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>\r
-                                       <processStartTag>========LICENSE_START===========</processStartTag>\r
-                                       <processEndTag>============LICENSE_END===========</processEndTag>\r
-                                       <roots>\r
-                                               <root>src/main/java</root>\r
-                                       </roots>\r
-                                       <excludes>\r
-                                               <exclude>*.png</exclude>\r
-                                       </excludes>\r
-                               </configuration>\r
-                       </plugin>\r
-\r
                        <plugin>\r
                                <groupId>org.apache.maven.plugins</groupId>\r
                                <artifactId>maven-deploy-plugin</artifactId>\r
@@ -194,6 +171,11 @@
                                        </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
@@ -259,6 +241,32 @@
                        <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>1.1.0-SNAPSHOT</version>\r
 </project>\r