X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=PyPDPServer%2Fpom.xml;h=608bdea0df5f86033f748e1d3334af48207d88a8;hb=39fb0f30472777e4b60d6a7ac8aa4eb9773961ff;hp=5a64014b4cc2036321e81620839a926911240d52;hpb=5bb60833867c08f63a44d06f57d0537d8c49a0b2;p=policy%2Fengine.git

diff --git a/PyPDPServer/pom.xml b/PyPDPServer/pom.xml
index 5a64014b4..608bdea0d 100644
--- a/PyPDPServer/pom.xml
+++ b/PyPDPServer/pom.xml
@@ -23,9 +23,7 @@
 	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.policy.engine</groupId>
 	<artifactId>PyPDPServer</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 
 	<description>PyPDP Server</description>
@@ -33,7 +31,7 @@
 	<parent>
 		<groupId>org.openecomp.policy.engine</groupId>
 		<artifactId>PolicyEngineSuite</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
@@ -48,7 +46,7 @@
 		<sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
 		<sonar.jacoco.itReportPath>/opt/app/jacoco-it.exec</sonar.jacoco.itReportPath>
 		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
-		<nexusproxy>https://nexus.openecomp.org</nexusproxy>
+		<springboot.version>1.3.3.RELEASE</springboot.version>
 	</properties>
 
 	<repositories>
@@ -56,16 +54,6 @@
 			<id>spring-releases</id>
 			<url>https://repo.spring.io/libs-release</url>
 		</repository>
-		<repository>
-			<id>ecomp-releases</id>
-			<name>OpenECOMP Release Repository</name>
-			<url>${nexusproxy}/content/repositories/releases/</url>
-		</repository>
-		<repository>
-			<id>ecomp-staging</id>
-			<name>OpenECOMP Staging Repository</name>
-			<url>${nexusproxy}/content/repositories/staging/</url>
-		</repository>
 	</repositories>
 	<pluginRepositories>
 		<pluginRepository>
@@ -74,27 +62,19 @@
 		</pluginRepository>
 	</pluginRepositories>
 
-	<distributionManagement>
-		<repository>
-			<id>ecomp-releases</id>
-			<name>OpenECOMP Release Repository</name>
-			<url>${nexusproxy}/content/repositories/releases/</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<name>OpenECOMP Snapshot Repository</name>
-			<url>${nexusproxy}/content/repositories/snapshots/</url>
-		</snapshotRepository>
-	</distributionManagement>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+	             <groupId>org.springframework.boot</groupId>
+	             <artifactId>spring-boot-dependencies</artifactId>
+	             <version>${springboot.version}</version>
+	             <type>pom</type>
+	             <scope>import</scope>
+	         </dependency>
+		</dependencies>
+	</dependencyManagement>
 
 	<dependencies>
-		<dependency>
-             <groupId>org.springframework.boot</groupId>
-             <artifactId>spring-boot-dependencies</artifactId>
-             <version>1.3.3.RELEASE</version>
-             <type>pom</type>
-             <scope>import</scope>
-         </dependency>
 		<dependency>
 			<groupId>org.openecomp.policy.engine</groupId>
 			<artifactId>PolicyEngineAPI</artifactId>
@@ -121,7 +101,7 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
-            <version>1.3.3.RELEASE</version>
+             <version>${springboot.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.slf4j</groupId>
@@ -232,6 +212,7 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+	             <version>${springboot.version}</version>
 				<executions>
 					<execution>
 						<goals>
@@ -243,6 +224,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-war-plugin</artifactId>
+				<version>2.2</version>
 				<configuration>
 					<packagingExcludes>WEB-INF/lib/javax.websocket-api-1.1.jar</packagingExcludes>
 				</configuration>
@@ -256,28 +238,6 @@
 					<target>1.8</target>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.7.1.201405082137</version>
-				<configuration>
-					<dumpOnExit>true</dumpOnExit>
-					<includes>
-						<include>org.openecomp.policy.*</include>
-					</includes>
-				</configuration>
-				<executions>
-					<execution>
-						<id>jacoco-initialize-unit-tests</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-						<configuration>
-							<destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>com.fortify.ps.maven.plugin</groupId>
 				<artifactId>sca-maven-plugin</artifactId>