From 96c2a7f24a0d502944e66e8abbb326c59d341ce9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Apr 2024 08:22:02 +0000
Subject: [PATCH 1/7] Bump org.apache.logging.log4j:log4j-slf4j2-impl from
 2.22.1 to 2.23.1

Bumps org.apache.logging.log4j:log4j-slf4j2-impl from 2.22.1 to 2.23.1.

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-slf4j2-impl
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 embedded/logging-slf4j-and-log4j2/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/embedded/logging-slf4j-and-log4j2/pom.xml b/embedded/logging-slf4j-and-log4j2/pom.xml
index 58623b8..8d3806f 100644
--- a/embedded/logging-slf4j-and-log4j2/pom.xml
+++ b/embedded/logging-slf4j-and-log4j2/pom.xml
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j2-impl</artifactId>
-      <version>2.22.1</version>
+      <version>2.23.1</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>

From c1b61766001133d6d361294daebad8f84b796bd2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Apr 2024 08:22:37 +0000
Subject: [PATCH 2/7] Bump slf4j.version from 1.7.30 to 1.7.36

Bumps `slf4j.version` from 1.7.30 to 1.7.36.

Updates `org.slf4j:jcl-over-slf4j` from 1.7.30 to 1.7.36
- [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.30...v_1.7.36)

Updates `org.slf4j:log4j-over-slf4j` from 1.7.30 to 1.7.36
- [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.30...v_1.7.36)

Updates `org.slf4j:slf4j-jdk14` from 2.0.11 to 1.7.36
- [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.11...v_1.7.36)

---
updated-dependencies:
- dependency-name: org.slf4j:jcl-over-slf4j
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.slf4j:log4j-over-slf4j
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.slf4j:slf4j-jdk14
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 embedded/logging-mixed/pom.xml           | 2 +-
 embedded/logging-slf4j/pom.xml           | 2 +-
 webapps/logging-overlap/demobase/pom.xml | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/embedded/logging-mixed/pom.xml b/embedded/logging-mixed/pom.xml
index bdc689d..7a4890f 100644
--- a/embedded/logging-mixed/pom.xml
+++ b/embedded/logging-mixed/pom.xml
@@ -14,7 +14,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <slf4j.version>2.0.11</slf4j.version>
+    <slf4j.version>1.7.36</slf4j.version>
   </properties>
 
   <dependencies>
diff --git a/embedded/logging-slf4j/pom.xml b/embedded/logging-slf4j/pom.xml
index dc882f2..ae3fdbf 100644
--- a/embedded/logging-slf4j/pom.xml
+++ b/embedded/logging-slf4j/pom.xml
@@ -14,7 +14,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <slf4j.version>2.0.11</slf4j.version>
+    <slf4j.version>1.7.36</slf4j.version>
   </properties>
 
   <dependencies>
diff --git a/webapps/logging-overlap/demobase/pom.xml b/webapps/logging-overlap/demobase/pom.xml
index ae08cfa..bbd5882 100644
--- a/webapps/logging-overlap/demobase/pom.xml
+++ b/webapps/logging-overlap/demobase/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.7.30</version>
+      <version>1.7.36</version>
     </dependency>
     <!-- Capture Java Util Logging and route to SLF4J -->
     <dependency>
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>log4j-over-slf4j</artifactId>
-      <version>1.7.30</version>
+      <version>1.7.36</version>
     </dependency>
     <!-- The API for Slf4J -->
     <dependency>

From c43a78b693d8292a2c09748978576f1d1be2bb4f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Apr 2024 08:23:12 +0000
Subject: [PATCH 3/7] Bump org.apache.maven.plugins:maven-shade-plugin from
 3.5.2 to 3.5.3

Bumps [org.apache.maven.plugins:maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.5.2 to 3.5.3.
- [Release notes](https://github.com/apache/maven-shade-plugin/releases)
- [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.5.2...maven-shade-plugin-3.5.3)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-shade-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 embedded/uber-jar/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/embedded/uber-jar/pom.xml b/embedded/uber-jar/pom.xml
index 82c5d2b..4ea9beb 100644
--- a/embedded/uber-jar/pom.xml
+++ b/embedded/uber-jar/pom.xml
@@ -15,7 +15,7 @@
 
   <properties>
     <log4j.version>2.6.2</log4j.version>
-    <maven.shade.plugin.version>3.5.2</maven.shade.plugin.version>
+    <maven.shade.plugin.version>3.5.3</maven.shade.plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 

From abcf5cacb3acd692232e9cce747219f7e3b01cc2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Apr 2024 08:23:24 +0000
Subject: [PATCH 4/7] Bump commons-logging:commons-logging from 1.2 to 1.3.1

Bumps commons-logging:commons-logging from 1.2 to 1.3.1.

---
updated-dependencies:
- dependency-name: commons-logging:commons-logging
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 webapps/logging-overlap/lib-using-commonslogging/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/logging-overlap/lib-using-commonslogging/pom.xml b/webapps/logging-overlap/lib-using-commonslogging/pom.xml
index 8f18215..884f6f9 100644
--- a/webapps/logging-overlap/lib-using-commonslogging/pom.xml
+++ b/webapps/logging-overlap/lib-using-commonslogging/pom.xml
@@ -13,7 +13,7 @@
   <name>Jetty Examples :: 9.4.x :: WebApp Logging Overlap :: Lib w/commons-logging</name>
 
   <properties>
-    <commonslogging.version>1.2</commonslogging.version>
+    <commonslogging.version>1.3.1</commonslogging.version>
   </properties>
 
   <dependencies>

From 4f3f90058a4d1cd68c6be269a203068fcede7fcc Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 24 Apr 2024 05:29:29 -0500
Subject: [PATCH 5/7] Fixing slf4j.version

---
 webapps/logging-overlap/demobase/pom.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/webapps/logging-overlap/demobase/pom.xml b/webapps/logging-overlap/demobase/pom.xml
index bbd5882..a049eac 100644
--- a/webapps/logging-overlap/demobase/pom.xml
+++ b/webapps/logging-overlap/demobase/pom.xml
@@ -14,19 +14,22 @@
 
   <properties>
     <dependency.plugin.version>3.6.1</dependency.plugin.version>
+    <disruptor.version>3.6.0</disruptor.version>
+    <log4j.version>2.21.1</log4j.version>
+    <slf4j.version>1.7.36</slf4j.version>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>com.weicoder</groupId>
       <artifactId>disruptor</artifactId>
-      <version>3.6.0</version>
+      <version>${disruptor.version}</version>
     </dependency>
     <!-- The (one and only) Slf4J Implementation -->
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>
-      <version>2.21.1</version>
+      <version>${log4j.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.examples.logging</groupId>
@@ -38,25 +41,25 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.7.36</version>
+      <version>${slf4j.version}</version>
     </dependency>
     <!-- Capture Java Util Logging and route to SLF4J -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jul-to-slf4j</artifactId>
-      <version>1.7.30</version>
+      <version>${slf4j.version}</version>
     </dependency>
     <!-- Capture Log4j 1.x and route to SLF4J -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>log4j-over-slf4j</artifactId>
-      <version>1.7.36</version>
+      <version>${slf4j.version}</version>
     </dependency>
     <!-- The API for Slf4J -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.30</version>
+      <version>${slf4j.version}</version>
     </dependency>
   </dependencies>
 

From 76877ad570170d0a907b1c6dab12d951f67edb11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Apr 2024 12:19:34 +0000
Subject: [PATCH 6/7] Bump com.weicoder:disruptor from 3.6.0 to 3.6.1

Bumps com.weicoder:disruptor from 3.6.0 to 3.6.1.

---
updated-dependencies:
- dependency-name: com.weicoder:disruptor
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 webapps/logging-overlap/demobase/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/logging-overlap/demobase/pom.xml b/webapps/logging-overlap/demobase/pom.xml
index a049eac..800f433 100644
--- a/webapps/logging-overlap/demobase/pom.xml
+++ b/webapps/logging-overlap/demobase/pom.xml
@@ -14,7 +14,7 @@
 
   <properties>
     <dependency.plugin.version>3.6.1</dependency.plugin.version>
-    <disruptor.version>3.6.0</disruptor.version>
+    <disruptor.version>3.6.1</disruptor.version>
     <log4j.version>2.21.1</log4j.version>
     <slf4j.version>1.7.36</slf4j.version>
   </properties>

From 39a2c52b937dc5f4931a7c46c7d19faf3b8aa79f Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 24 Apr 2024 07:45:08 -0500
Subject: [PATCH 7/7] Fixing log4j.version

---
 embedded/uber-jar/pom.xml                | 2 +-
 webapps/logging-overlap/demobase/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/embedded/uber-jar/pom.xml b/embedded/uber-jar/pom.xml
index 4ea9beb..5187032 100644
--- a/embedded/uber-jar/pom.xml
+++ b/embedded/uber-jar/pom.xml
@@ -14,7 +14,7 @@
   <name>Jetty Examples :: Jetty 9.4.x :: Embedded :: Uber Jar</name>
 
   <properties>
-    <log4j.version>2.6.2</log4j.version>
+    <log4j.version>2.23.1</log4j.version>
     <maven.shade.plugin.version>3.5.3</maven.shade.plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
diff --git a/webapps/logging-overlap/demobase/pom.xml b/webapps/logging-overlap/demobase/pom.xml
index 800f433..805b74f 100644
--- a/webapps/logging-overlap/demobase/pom.xml
+++ b/webapps/logging-overlap/demobase/pom.xml
@@ -15,7 +15,7 @@
   <properties>
     <dependency.plugin.version>3.6.1</dependency.plugin.version>
     <disruptor.version>3.6.1</disruptor.version>
-    <log4j.version>2.21.1</log4j.version>
+    <log4j.version>2.23.1</log4j.version>
     <slf4j.version>1.7.36</slf4j.version>
   </properties>