Code Review / ccsdk / parent.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 400f2e4)
Upgrading logging-analytics to 1.6.5 16/102516/3
authorSingal, Kapil (ks220y) <ks220y@att.com>
Thu, 27 Feb 2020 16:02:51 +0000 (11:02 -0500)
committerKAPIL SINGAL <ks220y@att.com>
Thu, 27 Feb 2020 18:53:09 +0000 (18:53 +0000)
Overriding Junit dependency with version 4.12
Upgrading mockito-core version to 2.23.4 in dependency-odl-bom

Issue-ID: CCSDK-2125
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Ia5104f47728024361867102dd25adca454f53a73

13 files changed:
dependencies-odl-bom/pom.xml patch | blob | history
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/karaf4-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
springboot/spring-boot-setup/src/main/resources/pom-template.xml patch | blob | history
springboot/springboot1/pom.xml patch | blob | history
springboot/springboot2/pom.xml patch | blob | history

diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml
index 4879845..80f1b86 100644 (file)
--- a/dependencies-odl-bom/pom.xml
+++ b/dependencies-odl-bom/pom.xml
@@ -449,7 +449,7 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-                <version>2.2.11</version>
+                <version>2.23.4</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 65ef929..16bb11b 100644 (file)
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -93,7 +93,7 @@
         <checkstyle.skip>true</checkstyle.skip>
 
         <!-- logging-analytics versions -->
-        <logging-analytics.version>1.6.4</logging-analytics.version>
+        <logging-analytics.version>1.6.5</logging-analytics.version>
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>0.7.1-SNAPSHOT</ccsdk.cds.version>
@@ -205,6 +205,12 @@
                 <artifactId>logging-filter-base</artifactId>
                 <version>${logging-analytics.version}</version>
             </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index b7c329f..4ae75c7 100644 (file)
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -93,7 +93,7 @@
         <checkstyle.skip>true</checkstyle.skip>
 
         <!-- logging-analytics versions -->
-        <logging-analytics.version>1.6.4</logging-analytics.version>
+        <logging-analytics.version>1.6.5</logging-analytics.version>
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>0.7.1-SNAPSHOT</ccsdk.cds.version>
@@ -205,6 +205,12 @@
                 <artifactId>logging-filter-base</artifactId>
                 <version>${logging-analytics.version}</version>
             </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index 45b51ea..1b8dc79 100644 (file)
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -93,7 +93,7 @@
         <checkstyle.skip>true</checkstyle.skip>
 
         <!-- logging-analytics versions -->
-        <logging-analytics.version>1.6.4</logging-analytics.version>
+        <logging-analytics.version>1.6.5</logging-analytics.version>
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>0.7.1-SNAPSHOT</ccsdk.cds.version>
@@ -205,6 +205,12 @@
                 <artifactId>logging-filter-base</artifactId>
                 <version>${logging-analytics.version}</version>
             </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index 8fe5453..04193fa 100644 (file)
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -93,7 +93,7 @@
         <checkstyle.skip>true</checkstyle.skip>
 
         <!-- logging-analytics versions -->
-        <logging-analytics.version>1.6.4</logging-analytics.version>
+        <logging-analytics.version>1.6.5</logging-analytics.version>
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>0.7.1-SNAPSHOT</ccsdk.cds.version>
@@ -205,6 +205,12 @@
                 <artifactId>logging-filter-base</artifactId>
                 <version>${logging-analytics.version}</version>
             </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index e00c463..030f6dc 100644 (file)
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -93,7 +93,7 @@
         <checkstyle.skip>true</checkstyle.skip>
 
         <!-- logging-analytics versions -->
-        <logging-analytics.version>1.6.4</logging-analytics.version>
+        <logging-analytics.version>1.6.5</logging-analytics.version>
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>0.7.1-SNAPSHOT</ccsdk.cds.version>
@@ -205,6 +205,12 @@
                 <artifactId>logging-filter-base</artifactId>
                 <version>${logging-analytics.version}</version>
             </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 995e7d0..fff4101 100644 (file)
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -93,7 +93,7 @@
         <checkstyle.skip>true</checkstyle.skip>
 
         <!-- logging-analytics versions -->
-        <logging-analytics.version>1.6.4</logging-analytics.version>
+        <logging-analytics.version>1.6.5</logging-analytics.version>
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>0.7.1-SNAPSHOT</ccsdk.cds.version>
@@ -205,6 +205,12 @@
                 <artifactId>logging-filter-base</artifactId>
                 <version>${logging-analytics.version}</version>
             </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 20274f5..49fd86d 100644 (file)
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -93,7 +93,7 @@
         <checkstyle.skip>true</checkstyle.skip>
 
         <!-- logging-analytics versions -->
-        <logging-analytics.version>1.6.4</logging-analytics.version>
+        <logging-analytics.version>1.6.5</logging-analytics.version>
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>0.7.1-SNAPSHOT</ccsdk.cds.version>
@@ -205,6 +205,12 @@
                 <artifactId>logging-filter-base</artifactId>
                 <version>${logging-analytics.version}</version>
             </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index 63b873d..2c94b12 100755 (executable)
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -93,7 +93,7 @@
         <checkstyle.skip>true</checkstyle.skip>
 
         <!-- logging-analytics versions -->
-        <logging-analytics.version>1.6.4</logging-analytics.version>
+        <logging-analytics.version>1.6.5</logging-analytics.version>
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>0.7.1-SNAPSHOT</ccsdk.cds.version>
@@ -205,6 +205,12 @@
                 <artifactId>logging-filter-base</artifactId>
                 <version>\${logging-analytics.version}</version>
             </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>\${junit.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 967446b..beaab1f 100644 (file)
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -93,7 +93,7 @@
         <checkstyle.skip>true</checkstyle.skip>
 
         <!-- logging-analytics versions -->
-        <logging-analytics.version>1.6.4</logging-analytics.version>
+        <logging-analytics.version>1.6.5</logging-analytics.version>
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>0.7.1-SNAPSHOT</ccsdk.cds.version>
@@ -205,6 +205,12 @@
                 <artifactId>logging-filter-base</artifactId>
                 <version>${logging-analytics.version}</version>
             </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template.xml b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
index 7f75775..763e32b 100644 (file)
--- a/springboot/spring-boot-setup/src/main/resources/pom-template.xml
+++ b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
@@ -88,7 +88,7 @@
         <checkstyle.skip>true</checkstyle.skip>
 
         <!-- logging-analytics versions -->
-        <logging-analytics.version>1.6.4</logging-analytics.version>
+        <logging-analytics.version>1.6.5</logging-analytics.version>
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>0.7.1-SNAPSHOT</ccsdk.cds.version>
diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index 2e3e002..9cc72f8 100755 (executable)
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -88,7 +88,7 @@
         <checkstyle.skip>true</checkstyle.skip>
 
         <!-- logging-analytics versions -->
-        <logging-analytics.version>1.6.4</logging-analytics.version>
+        <logging-analytics.version>1.6.5</logging-analytics.version>
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>0.7.1-SNAPSHOT</ccsdk.cds.version>
diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index 312732f..f5ca330 100755 (executable)
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -88,7 +88,7 @@
         <checkstyle.skip>true</checkstyle.skip>
 
         <!-- logging-analytics versions -->
-        <logging-analytics.version>1.6.4</logging-analytics.version>
+        <logging-analytics.version>1.6.5</logging-analytics.version>
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>0.7.1-SNAPSHOT</ccsdk.cds.version>
Parent POMs to be used by CCSDK clients