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: [PATCH] Changing spring.version property in all parent poms

Change-Id: I04ce4af7a243523887662be6525d73021f616be6
Issue-ID: CCSDK-442
Signed-off-by: Stan Bonev <sb5356@att.com>
---
 odlparent/binding-parent/pom.xml                    | 11 ++++++++---
 odlparent/bundle-parent/pom.xml                     | 11 ++++++++---
 odlparent/feature-repo-parent/pom.xml               | 11 ++++++++---
 odlparent/mdsal-it-parent/pom.xml                   | 11 ++++++++---
 odlparent/odlparent-lite/pom.xml                    | 11 ++++++++---
 odlparent/odlparent/pom.xml                         | 11 ++++++++---
 odlparent/setup/src/main/resources/pom-template.xml | 11 ++++++++---
 odlparent/single-feature-parent/pom.xml             | 11 ++++++++---
 8 files changed, 64 insertions(+), 24 deletions(-)

diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 464f48f9..d9189c94 100644
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.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>
diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 107f1d2b..4c3f4c06 100644
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.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>
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index cea47d45..053fdb57 100644
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.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>
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index b5dfd2c1..7a4fe7f2 100644
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.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>
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index dd6881d2..c3a2962a 100644
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.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>
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 896aff1b..35237526 100644
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.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>
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>
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 4057aa17..1669133d 100644
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.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>
-- 
2.16.6