X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=PyPDPServer%2Fpom.xml;h=8cae8cc77d91ddcb3651cd32db7b252a8d15a0be;hb=3234eb071e48263e4be760115f9aaf5ba2e49d33;hp=a5db099590a3338fab026957062a66d6e367ab48;hpb=6ab42b79dadfe735789526b19a1167381d16fdf4;p=policy%2Fengine.git

diff --git a/PyPDPServer/pom.xml b/PyPDPServer/pom.xml
index a5db09959..8cae8cc77 100644
--- a/PyPDPServer/pom.xml
+++ b/PyPDPServer/pom.xml
@@ -23,17 +23,15 @@
 	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>
 
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.3.RELEASE</version>
+		<groupId>org.openecomp.policy.engine</groupId>
+		<artifactId>PolicyEngineSuite</artifactId>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
@@ -49,6 +47,7 @@
 		<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>
@@ -74,6 +73,7 @@
 		</pluginRepository>
 	</pluginRepositories>
 
+<!-- 
 	<distributionManagement>
 		<repository>
 			<id>ecomp-releases</id>
@@ -86,6 +86,19 @@
 			<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>
@@ -114,6 +127,7 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
+             <version>${springboot.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.slf4j</groupId>
@@ -148,15 +162,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-tomcat</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
+			<version>4.2.5.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish</groupId>
@@ -196,6 +202,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
+			<version>4.2.5.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.mapstruct</groupId>
@@ -231,6 +238,7 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+	             <version>${springboot.version}</version>
 				<executions>
 					<execution>
 						<goals>
@@ -242,40 +250,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-war-plugin</artifactId>
-				<configuration>
-					<packagingExcludes>WEB-INF/lib/javax.websocket-api-1.1.jar</packagingExcludes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-<!-- 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
-				<extensions>true</extensions>
-				<configuration>
-					<nexusUrl>${nexusproxy}</nexusUrl>
-					<stagingProfileId>176c31dfe190a</stagingProfileId>
-					<serverId>ecomp-staging</serverId>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>repackage</goal>
-						</goals>
-						<phase>none</phase>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-war-plugin</artifactId>
+				<version>2.2</version>
 				<configuration>
 					<packagingExcludes>WEB-INF/lib/javax.websocket-api-1.1.jar</packagingExcludes>
 				</configuration>
@@ -289,28 +264,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>
@@ -318,5 +271,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	-->
 </project>