summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSingal, Kapil (ks220y) <ks220y@att.com>2020-02-27 11:02:51 -0500
committerKAPIL SINGAL <ks220y@att.com>2020-02-27 18:53:09 +0000
commitffff34adfb3495151d11bd1410f2eebf9eca8494 (patch)
tree98501b81a3504aa653d917935598008b4380af6f
parent400f2e4a5c352b9c4582f841d056fe3bba354ce3 (diff)
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
-rw-r--r--dependencies-odl-bom/pom.xml2
-rw-r--r--odlparent/binding-parent/pom.xml8
-rw-r--r--odlparent/bundle-parent/pom.xml8
-rw-r--r--odlparent/feature-repo-parent/pom.xml8
-rw-r--r--odlparent/karaf4-parent/pom.xml8
-rw-r--r--odlparent/mdsal-it-parent/pom.xml8
-rw-r--r--odlparent/odlparent-lite/pom.xml8
-rw-r--r--odlparent/odlparent/pom.xml8
-rwxr-xr-xodlparent/setup/src/main/resources/pom-template.xml8
-rw-r--r--odlparent/single-feature-parent/pom.xml8
-rw-r--r--springboot/spring-boot-setup/src/main/resources/pom-template.xml2
-rwxr-xr-xspringboot/springboot1/pom.xml2
-rwxr-xr-xspringboot/springboot2/pom.xml2
13 files changed, 67 insertions, 13 deletions
diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml
index 4879845c..80f1b862 100644
--- 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 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>
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 7f757751..763e32b0 100644
--- 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 2e3e002e..9cc72f8f 100755
--- 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 312732f8..f5ca3300 100755
--- 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>