From 29e82cfb81e948500c99393fc09765af603730f8 Mon Sep 17 00:00:00 2001
From: Stan Bonev <sb5356@att.com>
Date: Thu, 9 May 2019 14:52:16 -0400
Subject: Changing spring.version property in all parent poms

Change-Id: I04ce4af7a243523887662be6525d73021f616be6
Issue-ID: CCSDK-442
Signed-off-by: Stan Bonev <sb5356@att.com>
---
 odlparent/setup/src/main/resources/pom-template.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'odlparent/setup/src/main/resources/pom-template.xml')

diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index 71d43a92..6ed32b2f 100755
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -157,7 +157,7 @@
 		<!-- Need to stick to JUnit 4.11 until https://github.com/jayway/powermock/issues/560 
 			is fixed (either in PowerMock or with a new JUnit release) -->
 		<!-- Used everywhere -->
-		<junit.version>4.11</junit.version>
+		<junit.version>4.12</junit.version>
 		<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
 		<logback.version>1.2.3</logback.version>
 		<!-- Used by nic, sfc, sxp, tsdr -->
@@ -169,7 +169,7 @@
 		<slf4j.version>1.7.25</slf4j.version>
 		<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, 
 			tsdr, ttp -->
-		<spring.version>3.2.17.RELEASE</spring.version>
+		<spring.version>4.3.18.RELEASE</spring.version>
 
 
 
@@ -582,7 +582,12 @@
 				<classifier>tests</classifier>
 				<scope>test</scope>
 			</dependency>
-
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>\${junit.version}</version>
+				<scope>test</scope>
+			</dependency>
 
 			<dependency>
 				<groupId>org.testng</groupId>
-- 
cgit 1.2.3-korg