X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=epsdk-app-onap%2Fpom.xml;h=646c017f3250172576857715d5cf5ce79c586948;hb=a3b6fb9972e3f114e5b6f6c23b0e67e07fb70d1e;hp=4a3da039760c8841e5711fb74bd9eb513a156401;hpb=3274b39fef63c43c6eeb202e98b71b01e0f714ff;p=vid.git

diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index 4a3da0397..646c017f3 100755
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -6,9 +6,9 @@
 	<!-- 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.openecomp.vid</groupId>
+	<groupId>org.onap.vid</groupId>
 	<artifactId>epsdk-app-onap</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.1-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>ECOMP SDK Webapp for OpenSource</name>
 	<description>ECOMP SDK Web Application for public release</description>
@@ -17,8 +17,8 @@
 		<encoding>UTF-8</encoding>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<epsdk.version>1.3.0-SNAPSHOT</epsdk.version>
-		<springframework.version>4.2.0.RELEASE</springframework.version>
+		<epsdk.version>2.1.0</epsdk.version>
+		<springframework.version>4.2.4.RELEASE</springframework.version>
 		<hibernate.version>4.3.11.Final</hibernate.version>
 		<!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->
 		<skipassembly>true</skipassembly>
@@ -28,7 +28,7 @@
 		<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>
 
 		<!-- SONAR -->
 		<sonar.language>java</sonar.language>
@@ -103,11 +103,6 @@
 	<build>
 		<finalName>vid</finalName>
 		<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>
@@ -168,11 +163,11 @@
 					</archive>
 					<overlays>
 						<overlay>
-							<groupId>org.openecomp.vid</groupId>
+							<groupId>org.onap.vid</groupId>
 							<artifactId>vid-app-common</artifactId>
 						</overlay>
 						<overlay>
-							<groupId>org.openecomp.ecompsdkos</groupId>
+							<groupId>org.onap.portal.sdk</groupId>
 							<artifactId>epsdk-app-overlay</artifactId>
 						</overlay>
 					</overlays>
@@ -219,7 +214,7 @@
 			<plugin>
 				<groupId>org.sonarsource.scanner.maven</groupId>
 				<artifactId>sonar-maven-plugin</artifactId>
-				<version>3.2</version>
+				<version>3.3.0.603</version>
 			</plugin>
 			<plugin>
 				<groupId>org.jacoco</groupId>
@@ -267,25 +262,25 @@
 	<dependencies>
 		<!-- SDK overlay war -->
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-app-overlay</artifactId>
 			<version>${epsdk.version}</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-app-common</artifactId>
 			<version>${epsdk.version}</version>
 			<type>jar</type>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.vid</groupId>
+			<groupId>org.onap.vid</groupId>
 			<artifactId>vid-app-common</artifactId>
 			<version>${project.version}</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.vid</groupId>
+			<groupId>org.onap.vid</groupId>
 			<artifactId>vid-app-common</artifactId>
 			<version>${project.version}</version>
 			<type>jar</type>
@@ -293,17 +288,17 @@
 		</dependency>
 		<!-- SDK components -->
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-core</artifactId>
 			<version>${epsdk.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-analytics</artifactId>
 			<version>${epsdk.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-workflow</artifactId>
 			<version>${epsdk.version}</version>
 		</dependency>
@@ -312,14 +307,18 @@
 			<artifactId>eelf-core</artifactId>
 			<version>1.0.0</version>
 		</dependency>
+		
+
+
+
 		<dependency>
-			<groupId>org.openecomp.vid</groupId>
+			<groupId>org.onap.vid</groupId>
 			<artifactId>vid-app-common</artifactId>
 			<version>${version}</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.vid</groupId>
+			<groupId>org.onap.vid</groupId>
 			<artifactId>vid-app-common</artifactId>
 			<version>${version}</version>
 			<type>jar</type>
@@ -334,12 +333,12 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
-			<version>2.6.3</version>
+			<version>2.8.6</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.6.3</version>
+			<version>2.6.7.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.mchange</groupId>
@@ -368,8 +367,11 @@
 			<version>4.12</version>
 		</dependency>
 		<!-- Elastic Search -->
-		<!-- <dependency> <groupId>org.elasticsearch</groupId> <artifactId>elasticsearch</artifactId> 
-			<version>2.2.0</version> </dependency> -->
+		<dependency>
+			<groupId>org.elasticsearch</groupId>
+			<artifactId>elasticsearch</artifactId>
+			<version>2.2.0</version>
+		</dependency>
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
@@ -409,6 +411,11 @@
 				</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>