From ffff34adfb3495151d11bd1410f2eebf9eca8494 Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
Date: Thu, 27 Feb 2020 11:02:51 -0500
Subject: Upgrading logging-analytics to 1.6.5

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
---
 odlparent/binding-parent/pom.xml                    | 8 +++++++-
 odlparent/bundle-parent/pom.xml                     | 8 +++++++-
 odlparent/feature-repo-parent/pom.xml               | 8 +++++++-
 odlparent/karaf4-parent/pom.xml                     | 8 +++++++-
 odlparent/mdsal-it-parent/pom.xml                   | 8 +++++++-
 odlparent/odlparent-lite/pom.xml                    | 8 +++++++-
 odlparent/odlparent/pom.xml                         | 8 +++++++-
 odlparent/setup/src/main/resources/pom-template.xml | 8 +++++++-
 odlparent/single-feature-parent/pom.xml             | 8 +++++++-
 9 files changed, 63 insertions(+), 9 deletions(-)

(limited to 'odlparent')

diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 65ef9297..16bb11b2 100644
--- 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 b7c329f7..4ae75c79 100644
--- 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 45b51ea4..1b8dc79c 100644
--- 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 8fe5453b..04193fa1 100644
--- 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 e00c463b..030f6dc2 100644
--- 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 995e7d02..fff41013 100644
--- 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 20274f5b..49fd86d4 100644
--- 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 63b873d0..2c94b12b 100755
--- 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 967446ba..beaab1f7 100644
--- 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>
 
-- 
cgit 1.2.3-korg