X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fpom.xml;h=79968b3abfdb2e8645b7143bd6045228aa322276;hb=fc325ed92de8f32b1b59db484ddd3f30fc21f30a;hp=bff7ed2135485a82fa65f348151513c7cdbfb28c;hpb=627badaf69987c01811c477219fd943757a635f5;p=portal.git

diff --git a/ecomp-portal-BE-common/pom.xml b/ecomp-portal-BE-common/pom.xml
index bff7ed21..79968b3a 100644
--- a/ecomp-portal-BE-common/pom.xml
+++ b/ecomp-portal-BE-common/pom.xml
@@ -1,38 +1,42 @@
 <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.portal</groupId>
+	<groupId>org.onap.portal</groupId>
 	<artifactId>ecompportal-be-common</artifactId>
 	<packaging>war</packaging>
 	<!-- Version number is managed manually; no Jenkins build.number -->
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 
 	<properties>
 		<springframework.version>4.2.0.RELEASE</springframework.version>
 		<hibernate.version>4.3.11.Final</hibernate.version>
 		<eelf.version>1.0.0</eelf.version>
 		<fasterxml.version>2.7.4</fasterxml.version>
-		<epsdk.version>1.1.0-SNAPSHOT</epsdk.version>
+		<epsdk.version>1.3.0</epsdk.version>
 		<encoding>UTF-8</encoding>
 		<!-- Tests usually require some setup that maven cannot do, so skip. -->
 		<skipTests>true</skipTests>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
+		<stagingNexusPath>content/repositories/staging/</stagingNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 	</properties>
 
 	<repositories>
 		<repository>
-		        <!-- Releases repository has ECOMP release artifacts -->
-		        <id>ecomp-releases</id>
-		        <name>OpenECOMP - Release Repository</name>
-		        <url>${nexusproxy}/${releaseNexusPath}</url>
+			<id>onap-releases</id>
+			<name>ONAP - Release Repository</name>
+			<url>${nexusproxy}/${releaseNexusPath}</url>
 		</repository>
 		<repository>
-		        <!-- Snapshots repository has ECOMP snapshot artifacts -->
-		        <id>ecomp-snapshots</id>
-		        <name>OpenECOMP - Snapshot Repository</name>
-		        <url>${nexusproxy}/${snapshotNexusPath}</url>
+			<id>onap-staging</id>
+			<name>ONAP - Staging Repository</name>
+			<url>${nexusproxy}/${stagingNexusPath}</url>
+		</repository>
+		<repository>
+			<id>onap-snapshots</id>
+			<name>ONAP - Snapshot Repository</name>
+			<url>${nexusproxy}/${snapshotNexusPath}</url>
 		</repository>
 	</repositories>
 
@@ -115,49 +119,16 @@
 				</configuration>
 			</plugin>
 			
-			<!-- 	 
+			<!-- No deployment step for this project -->
 			<plugin>
-			    <groupId>org.codehaus.mojo</groupId>
-			    <artifactId>license-maven-plugin</artifactId>
-			    <version>1.10</version>
-			    <configuration>
-		              <encoding>UTF-8</encoding>
-			        <licenseName>my_license</licenseName>
-			        <licenseResolver>${project.baseUri}/license</licenseResolver>
-			        <inceptionYear>2017</inceptionYear>
-				<organizationName>AT&amp;T Intellectual Property</organizationName>
-				<projectName>ECOMP Portal</projectName> 
-				<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage> 
-     				<processStartTag>================================================================================</processStartTag>
-     				<sectionDelimiter>================================================================================</sectionDelimiter>
-     				<processEndTag>================================================================================</processEndTag> 
-			    	<roots>
-					<root>src/main</root>
-					<root>src/test</root>
-				</roots>
-				<excludes>
-					<exclude>*.png</exclude>
-					<exclude>*.drl</exclude>
-					<exclude>*.gif</exclude>
-					<exclude>*.jpeg</exclude>
-					<exclude>*.jpg</exclude>
-					<exclude>*.bmp</exclude>
-					<exclude>*.ico</exclude>
-					<exclude>*.svg</exclude>
-				</excludes>
-			    </configuration>
-			    <executions>
-			        <execution>
-			            <id>first</id>
-			            <goals>
-			                <goal>update-file-header</goal>
-			            </goals>
-			            <phase>process-sources</phase>
-			        </execution>
-			    </executions>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8</version>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
 			</plugin>
-			 -->
-	
+
 		</plugins>
 
 		<testResources>
@@ -367,13 +338,6 @@
 			<version>9.1-901-1.jdbc4</version>
 		</dependency>
 
-		<!-- Use Mariadb connector/j for failover -->
-		<dependency>
-			<groupId>org.mariadb.jdbc</groupId>
-			<artifactId>mariadb-java-client</artifactId>
-			<version>1.5.8</version>
-		</dependency>
-
 		<!-- Elastic Search -->
 		<dependency>
 			<groupId>org.elasticsearch</groupId>
@@ -424,11 +388,6 @@
 			<artifactId>commons-lang</artifactId>
 			<version>2.6</version>
 		</dependency>
-		<dependency>
-			<groupId>jfree</groupId>
-			<artifactId>jfreechart</artifactId>
-			<version>1.0.13</version>
-		</dependency>
 		<!-- for generating excel/csv/excelx -->
 		<dependency>
 			<groupId>org.apache.poi</groupId>
@@ -548,7 +507,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-fw</artifactId>
 			<version>${epsdk.version}</version>
 			<exclusions>
@@ -571,7 +530,7 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-core</artifactId>
 			<version>${epsdk.version}</version>
 			<exclusions>
@@ -582,12 +541,12 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-app-common</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>
@@ -595,7 +554,7 @@
 		<!-- Raptor required Libraries -->
 		<!-- for static charts -->
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-analytics</artifactId>
 			<version>${epsdk.version}</version>
 		</dependency>