X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=pom.xml;h=7ec50328c7fe0f0dcaffff5a13e1f836b472b13b;hb=9daaecd1a2450fe2bae247ae320b4e7c6d7ceee5;hp=f5e862a496fbd1001983a7309fcbfef862ce34f3;hpb=88c6547f8db69a1a354988a6449c659af536c573;p=vid.git

diff --git a/pom.xml b/pom.xml
index f5e862a49..7ec50328c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <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.openecomp.vid</groupId>
+	<groupId>org.onap.vid</groupId>
 	<artifactId>vid-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>vid</name>
@@ -16,7 +16,10 @@
 			</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>
@@ -67,6 +70,7 @@
 			<id>docker</id>
 			<modules>
 				<module>vid-app-common</module>
+				<module>vid-webpack-master</module>
 				<module>epsdk-app-onap</module>
 				<module>deliveries</module>
 			</modules>
@@ -76,12 +80,12 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<build.version>1.1.0-SNAPSHOT</build.version>
+		<build.version>4.0.0-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/openecomp/vid/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath>
 	</properties>
 
 	<build>
@@ -115,12 +119,6 @@
 					</dependency>
 				</dependencies>
 			</plugin>
-			<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>
@@ -133,28 +131,6 @@
 				</configuration>
 			</plugin>
 
-			<!-- license plugin for open source -->
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>license-maven-plugin</artifactId>
-				<version>1.9</version>
-				<configuration>
-					<licenseName>apache_v2</licenseName>
-					<inceptionYear>2017</inceptionYear>
-					<organizationName>AT&amp;T</organizationName>
-					<projectName>VID</projectName>
-					<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
-					<processStartTag>========LICENSE_START===========</processStartTag>
-					<processEndTag>============LICENSE_END===========</processEndTag>
-					<roots>
-						<root>src/main/java</root>
-					</roots>
-					<excludes>
-						<exclude>*.png</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
@@ -194,6 +170,11 @@
 					</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>
@@ -259,6 +240,33 @@
 			<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>1.1.0-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 </project>