summaryrefslogtreecommitdiffstats
path: root/odlparent/setup/src
diff options
context:
space:
mode:
authorStan Bonev <sb5356@att.com>2019-05-09 14:52:16 -0400
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-05-09 15:54:20 -0400
commit29e82cfb81e948500c99393fc09765af603730f8 (patch)
treefb98dbd9f06ae07a4c5158669262ec14778d5d5c /odlparent/setup/src
parent1d5b9fd84b3bc4532e2635a872d1092a4f2b9e1d (diff)
Changing spring.version property in all parent poms
Change-Id: I04ce4af7a243523887662be6525d73021f616be6 Issue-ID: CCSDK-442 Signed-off-by: Stan Bonev <sb5356@att.com>
Diffstat (limited to 'odlparent/setup/src')
-rwxr-xr-xodlparent/setup/src/main/resources/pom-template.xml11
1 files changed, 8 insertions, 3 deletions
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>