Code Review / ccsdk / parent.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 1d5b9fd)
Changing spring.version property in all parent poms 85/87385/3
authorStan Bonev <sb5356@att.com>
Thu, 9 May 2019 18:52:16 +0000 (14:52 -0400)
committerTimoney, Dan (dt5972) <dtimoney@att.com>
Thu, 9 May 2019 19:54:20 +0000 (15:54 -0400)
Change-Id: I04ce4af7a243523887662be6525d73021f616be6
Issue-ID: CCSDK-442
Signed-off-by: Stan Bonev <sb5356@att.com>
odlparent/binding-parent/pom.xml patch | blob | history
odlparent/bundle-parent/pom.xml patch | blob | history
odlparent/feature-repo-parent/pom.xml patch | blob | history
odlparent/mdsal-it-parent/pom.xml patch | blob | history
odlparent/odlparent-lite/pom.xml patch | blob | history
odlparent/odlparent/pom.xml patch | blob | history
odlparent/setup/src/main/resources/pom-template.xml patch | blob | history
odlparent/single-feature-parent/pom.xml patch | blob | history

diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 464f48f..d9189c9 100644 (file)
--- 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 107f1d2..4c3f4c0 100644 (file)
--- 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 cea47d4..053fdb5 100644 (file)
--- 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 b5dfd2c..7a4fe7f 100644 (file)
--- 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 dd6881d..c3a2962 100644 (file)
--- 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 896aff1..3523752 100644 (file)
--- 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 71d43a9..6ed32b2 100755 (executable)
--- 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 4057aa1..1669133 100644 (file)
--- 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>
Parent POMs to be used by CCSDK clients