From: Pamela Dragosh <pdragosh@research.att.com>
Date: Thu, 23 Feb 2017 22:51:00 +0000 (-0500)
Subject: move spring to dependencyManagement section
X-Git-Tag: v1.1.0~148
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=commitdiff_plain;h=828fb05f1efb4e022dd6dc6b9e5d3ac4136371e5

move spring to dependencyManagement section

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

diff --git a/PyPDPServer/pom.xml b/PyPDPServer/pom.xml
index e89f22da2..71e3999eb 100644
--- a/PyPDPServer/pom.xml
+++ b/PyPDPServer/pom.xml
@@ -47,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>
@@ -84,15 +85,20 @@
 			<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>
@@ -119,7 +125,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>
@@ -230,6 +236,7 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+	             <version>${springboot.version}</version>
 				<executions>
 					<execution>
 						<goals>
@@ -241,6 +248,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>
@@ -254,28 +262,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>
diff --git a/packages/base/pom.xml b/packages/base/pom.xml
index f5f13c0e2..01d7bbb5c 100755
--- a/packages/base/pom.xml
+++ b/packages/base/pom.xml
@@ -226,6 +226,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
+						<version>1.5.0</version>
 						<executions>
 							<execution>
 								<id>create-version-file</id>