From 59d34e4b2c6e1851b51412b5291425c1564f733c Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Mon, 25 Jul 2022 09:36:01 -0400
Subject: [PATCH] Update versions for Sulfur

Update versions to address issues in local Sulfur testing

Issue-ID: CCSDK-3691
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I886ec094c589cc2888a05e7e9d30f99748d27209
---
 dependencies-bom/pom.xml                                              | 4 ++--
 dependencies-odl-bom/pom.xml                                          | 4 ++--
 odlparent/binding-parent/pom.xml                                      | 2 +-
 odlparent/bundle-parent/pom.xml                                       | 2 +-
 odlparent/feature-repo-parent/pom.xml                                 | 2 +-
 odlparent/karaf4-parent/pom.xml                                       | 2 +-
 odlparent/mdsal-it-parent/pom.xml                                     | 2 +-
 odlparent/odlparent-lite/pom.xml                                      | 2 +-
 odlparent/odlparent/pom.xml                                           | 2 +-
 odlparent/setup/src/main/resources/pom-template.xml                   | 2 +-
 odlparent/single-feature-parent/pom.xml                               | 2 +-
 oparent/pom.xml                                                       | 3 ++-
 .../spring-boot-setup/src/main/properties/springboot1.properties      | 2 +-
 .../spring-boot-setup/src/main/properties/springboot23.properties     | 2 +-
 .../spring-boot-setup/src/main/properties/springboot25.properties     | 2 +-
 .../spring-boot-setup/src/main/properties/springboot26.properties     | 2 +-
 springboot/springboot1/pom.xml                                        | 2 +-
 springboot/springboot23/pom.xml                                       | 2 +-
 springboot/springboot25/pom.xml                                       | 2 +-
 springboot/springboot26/pom.xml                                       | 2 +-
 20 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
index 39a9e7bb..ead7d84e 100644
--- a/dependencies-bom/pom.xml
+++ b/dependencies-bom/pom.xml
@@ -23,12 +23,12 @@
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>1.2.5</version>
+                <version>1.2.11</version>
             </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-core</artifactId>
-                <version>1.2.5</version>
+                <version>1.2.11</version>
             </dependency>
             <dependency>
                 <groupId>ch.vorburger.mariaDB4j</groupId>
diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml
index 12a6b497..6b50559e 100644
--- a/dependencies-odl-bom/pom.xml
+++ b/dependencies-odl-bom/pom.xml
@@ -143,12 +143,12 @@
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>1.2.5</version>
+                <version>1.2.11</version>
             </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-core</artifactId>
-                <version>1.2.5</version>
+                <version>1.2.11</version>
             </dependency>
             <dependency>
                 <groupId>commons-cli</groupId>
diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index ba194c4c..a217d3b4 100644
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -155,7 +155,7 @@
         <!-- Used everywhere -->
         <junit.version>4.13.2</junit.version>
         <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
-        <logback.version>1.11.7</logback.version>
+        <logback.version>1.2.11</logback.version>
         <!-- Used by nic, sfc, sxp, tsdr -->
         <mockito.version>3.12.4</mockito.version>
         <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 4a3b115d..a4a67f61 100644
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -155,7 +155,7 @@
         <!-- Used everywhere -->
         <junit.version>4.13.2</junit.version>
         <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
-        <logback.version>1.11.7</logback.version>
+        <logback.version>1.2.11</logback.version>
         <!-- Used by nic, sfc, sxp, tsdr -->
         <mockito.version>3.12.4</mockito.version>
         <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index 8629a837..cc41fd71 100644
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -155,7 +155,7 @@
         <!-- Used everywhere -->
         <junit.version>4.13.2</junit.version>
         <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
-        <logback.version>1.11.7</logback.version>
+        <logback.version>1.2.11</logback.version>
         <!-- Used by nic, sfc, sxp, tsdr -->
         <mockito.version>3.12.4</mockito.version>
         <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index e2be76cf..fa818905 100644
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -155,7 +155,7 @@
         <!-- Used everywhere -->
         <junit.version>4.13.2</junit.version>
         <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
-        <logback.version>1.11.7</logback.version>
+        <logback.version>1.2.11</logback.version>
         <!-- Used by nic, sfc, sxp, tsdr -->
         <mockito.version>3.12.4</mockito.version>
         <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index 71e56eeb..03ec9d35 100644
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -155,7 +155,7 @@
         <!-- Used everywhere -->
         <junit.version>4.13.2</junit.version>
         <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
-        <logback.version>1.11.7</logback.version>
+        <logback.version>1.2.11</logback.version>
         <!-- Used by nic, sfc, sxp, tsdr -->
         <mockito.version>3.12.4</mockito.version>
         <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index faacb747..eb4a0311 100644
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -155,7 +155,7 @@
         <!-- Used everywhere -->
         <junit.version>4.13.2</junit.version>
         <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
-        <logback.version>1.11.7</logback.version>
+        <logback.version>1.2.11</logback.version>
         <!-- Used by nic, sfc, sxp, tsdr -->
         <mockito.version>3.12.4</mockito.version>
         <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index f34eebea..83e3d57c 100644
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -155,7 +155,7 @@
         <!-- Used everywhere -->
         <junit.version>4.13.2</junit.version>
         <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
-        <logback.version>1.11.7</logback.version>
+        <logback.version>1.2.11</logback.version>
         <!-- Used by nic, sfc, sxp, tsdr -->
         <mockito.version>3.12.4</mockito.version>
         <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index be4fb43c..19b6b2d9 100755
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -155,7 +155,7 @@
         <!-- Used everywhere -->
         <junit.version>4.13.2</junit.version>
         <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
-        <logback.version>1.11.7</logback.version>
+        <logback.version>1.2.11</logback.version>
         <!-- Used by nic, sfc, sxp, tsdr -->
         <mockito.version>3.12.4</mockito.version>
         <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 7038bbab..6834e096 100644
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -155,7 +155,7 @@
         <!-- Used everywhere -->
         <junit.version>4.13.2</junit.version>
         <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
-        <logback.version>1.11.7</logback.version>
+        <logback.version>1.2.11</logback.version>
         <!-- Used by nic, sfc, sxp, tsdr -->
         <mockito.version>3.12.4</mockito.version>
         <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
diff --git a/oparent/pom.xml b/oparent/pom.xml
index 14b9e872..329573fb 100755
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>3.2.0</version>
+        <version>3.3.1</version>
         <relativePath/>
     </parent>
 
@@ -66,6 +66,7 @@
         <bundle.plugin.version>4.2.1</bundle.plugin.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <checkstyle.skip>true</checkstyle.skip>
+        <logback.version>1.2.11</logback.version>
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>(1.3.9999, 1.4.99999-SNAPSHOT]</ccsdk.cds.version>
diff --git a/springboot/spring-boot-setup/src/main/properties/springboot1.properties b/springboot/spring-boot-setup/src/main/properties/springboot1.properties
index e99c5a8c..99d6466e 100644
--- a/springboot/spring-boot-setup/src/main/properties/springboot1.properties
+++ b/springboot/spring-boot-setup/src/main/properties/springboot1.properties
@@ -6,7 +6,7 @@ spring.version=4.3.25.RELEASE
 springboot.httpcomponents.core.version=4.4.14
 springboot.httpcomponents.client.version=4.5.13
 springboot.jackson.version=2.11.4
-springboot.logback.version=1.2.3
+springboot.logback.version=1.2.11
 springboot.netty.ssl.version=2.0.39.Final
 springboot.jersey.version=2.30.1
 springboot.slf4j.version=1.7.25
diff --git a/springboot/spring-boot-setup/src/main/properties/springboot23.properties b/springboot/spring-boot-setup/src/main/properties/springboot23.properties
index 1389b933..e693fc54 100644
--- a/springboot/spring-boot-setup/src/main/properties/springboot23.properties
+++ b/springboot/spring-boot-setup/src/main/properties/springboot23.properties
@@ -6,7 +6,7 @@ spring.version=5.2.15.RELEASE
 springboot.httpcomponents.core.version=4.4.14
 springboot.httpcomponents.client.version=4.5.13
 springboot.jackson.version=2.11.4
-springboot.logback.version=1.2.3
+springboot.logback.version=1.2.11
 springboot.netty.ssl.version=2.0.39.Final
 springboot.jersey.version=2.30.1
 springboot.slf4j.version=1.7.25
diff --git a/springboot/spring-boot-setup/src/main/properties/springboot25.properties b/springboot/spring-boot-setup/src/main/properties/springboot25.properties
index 554a9422..c275a27f 100644
--- a/springboot/spring-boot-setup/src/main/properties/springboot25.properties
+++ b/springboot/spring-boot-setup/src/main/properties/springboot25.properties
@@ -6,7 +6,7 @@ spring.version=5.3.16
 springboot.httpcomponents.core.version=4.4.15
 springboot.httpcomponents.client.version=4.5.13
 springboot.jackson.version=2.12.6
-springboot.logback.version=1.2.10
+springboot.logback.version=1.2.11
 springboot.netty.ssl.version=2.0.50.Final
 springboot.jersey.version=2.33
 springboot.slf4j.version=1.7.36
diff --git a/springboot/spring-boot-setup/src/main/properties/springboot26.properties b/springboot/spring-boot-setup/src/main/properties/springboot26.properties
index 116c0f09..0289cf88 100644
--- a/springboot/spring-boot-setup/src/main/properties/springboot26.properties
+++ b/springboot/spring-boot-setup/src/main/properties/springboot26.properties
@@ -6,7 +6,7 @@ spring.version=5.3.20
 springboot.httpcomponents.core.version=4.4.15
 springboot.httpcomponents.client.version=4.5.13
 springboot.jackson.version=2.12.6
-springboot.logback.version=1.2.10
+springboot.logback.version=1.2.11
 springboot.netty.ssl.version=2.0.50.Final
 springboot.jersey.version=2.33
 springboot.slf4j.version=1.7.36
diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index 4b97943f..5598716d 100644
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -132,7 +132,7 @@
         <jettison.version>1.3.8</jettison.version>
         <log4j.version>2.17.1</log4j.version>
         <log4j2.version>2.17.1</log4j2.version>
-        <logback.version>1.2.3</logback.version>
+        <logback.version>1.2.11</logback.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <slf4j.version>1.7.25</slf4j.version>
diff --git a/springboot/springboot23/pom.xml b/springboot/springboot23/pom.xml
index 71a07795..d2425168 100644
--- a/springboot/springboot23/pom.xml
+++ b/springboot/springboot23/pom.xml
@@ -132,7 +132,7 @@
         <jettison.version>1.3.8</jettison.version>
         <log4j.version>2.17.1</log4j.version>
         <log4j2.version>2.17.1</log4j2.version>
-        <logback.version>1.2.3</logback.version>
+        <logback.version>1.2.11</logback.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <slf4j.version>1.7.25</slf4j.version>
diff --git a/springboot/springboot25/pom.xml b/springboot/springboot25/pom.xml
index 9a402ae8..7201b241 100644
--- a/springboot/springboot25/pom.xml
+++ b/springboot/springboot25/pom.xml
@@ -129,7 +129,7 @@
         <jettison.version>1.3.8</jettison.version>
         <log4j.version>2.17.1</log4j.version>
         <log4j2.version>2.17.1</log4j2.version>
-        <logback.version>1.2.10</logback.version>
+        <logback.version>1.2.11</logback.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <slf4j.version>1.7.36</slf4j.version>
diff --git a/springboot/springboot26/pom.xml b/springboot/springboot26/pom.xml
index 5914f959..4aa44396 100644
--- a/springboot/springboot26/pom.xml
+++ b/springboot/springboot26/pom.xml
@@ -129,7 +129,7 @@
         <jettison.version>1.3.8</jettison.version>
         <log4j.version>2.17.1</log4j.version>
         <log4j2.version>2.17.1</log4j2.version>
-        <logback.version>1.2.10</logback.version>
+        <logback.version>1.2.11</logback.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <slf4j.version>1.7.36</slf4j.version>
-- 
2.16.6