Merge branch 'refs/heads/9.4.x' into 10.0.x

# Conflicts: # embedded/logging-mixed/pom.xml # embedded/logging-slf4j/pom.xml
jetty · Apr 24, 2024 · 51d34c2 · 51d34c2
2 parents 544c675 + a5d5663
commit 51d34c2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/embedded/logging-slf4j-and-log4j2/pom.xml b/embedded/logging-slf4j-and-log4j2/pom.xml
@@ -33,7 +33,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>

diff --git a/embedded/uber-jar/pom.xml b/embedded/uber-jar/pom.xml
@@ -14,8 +14,8 @@
   <name>Jetty Examples :: Jetty 10.0.x :: Embedded :: Uber Jar</name>
 
   <properties>
-    <log4j.version>2.6.2</log4j.version>
-    <maven.shade.plugin.version>3.5.2</maven.shade.plugin.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
@@ -14,19 +14,22 @@
 
   <properties>
     <dependency.plugin.version>3.6.1</dependency.plugin.version>
+    <disruptor.version>3.6.1</disruptor.version>
+    <log4j.version>2.23.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.30</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.30</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>
 

diff --git 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 :: 10.0.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>