From: Pamela Dragosh <pdragosh@research.att.com>
Date: Tue, 21 Feb 2017 16:23:24 +0000 (-0500)
Subject: switching to spring boot dep
X-Git-Tag: v1.1.0~151
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5bb60833867c08f63a44d06f57d0537d8c49a0b2;hp=6ab42b79dadfe735789526b19a1167381d16fdf4;p=policy%2Fengine.git

switching to spring boot dep

Change-Id: Ieb1914f4fafff9bbb2a6d3a9dcc79a8f0ffd1d71
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---

diff --git a/PyPDPServer/pom.xml b/PyPDPServer/pom.xml
index a5db09959..5a64014b4 100644
--- a/PyPDPServer/pom.xml
+++ b/PyPDPServer/pom.xml
@@ -31,9 +31,9 @@
 	<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.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
@@ -88,6 +88,13 @@
 	</distributionManagement>
 
 	<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>
@@ -114,6 +121,7 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
+            <version>1.3.3.RELEASE</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.slf4j</groupId>
@@ -148,15 +156,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 +196,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
+			<version>4.2.5.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.mapstruct</groupId>
@@ -215,40 +216,6 @@
 		</dependency>
 	</dependencies>
 
-	<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>
-				<configuration>
-					<packagingExcludes>WEB-INF/lib/javax.websocket-api-1.1.jar</packagingExcludes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-<!-- 
 	<build>
 		<plugins>
 			<plugin>
@@ -318,5 +285,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	-->
 </project>