From 92599831768c8b6857ad487270c7d716dc28d860 Mon Sep 17 00:00:00 2001
From: Zoe Wang <33073555+zoewangg@users.noreply.github.com>
Date: Wed, 9 Oct 2024 10:10:14 -0700
Subject: [PATCH 1/2] Bump dependency versions to build with Java 23

---
 pom.xml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index cc3d1ca1e807..3bf70ebcd60e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,7 @@
         <unitils.version>3.4.6</unitils.version>
         <xmlunit.version>1.3</xmlunit.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spotbugs.version>4.7.3.5</spotbugs.version>
+        <spotbugs.version>4.8.6.4</spotbugs.version>
         <javapoet.verion>1.13.0</javapoet.verion>
         <org.eclipse.jdt.version>3.10.0</org.eclipse.jdt.version>
         <org.eclipse.text.version>3.5.101</org.eclipse.text.version>
@@ -139,9 +139,9 @@
         <netty-open-ssl-version>2.0.65.Final</netty-open-ssl-version>
         <dynamodb-local.version>1.25.0</dynamodb-local.version>
         <sqllite.version>1.0.392</sqllite.version>
-        <blockhound.version>1.0.8.RELEASE</blockhound.version>
+        <blockhound.version>1.0.9.RELEASE</blockhound.version>
         <jetty.version>9.4.45.v20220203</jetty.version>
-        <bytebuddy.version>1.14.15</bytebuddy.version>
+        <bytebuddy.version>1.15.3</bytebuddy.version>
 
         <!-- build plugin dependencies-->
         <maven.surefire.version>3.1.2</maven.surefire.version>
@@ -806,6 +806,17 @@
             </properties>
         </profile>
 
+        <profile>
+            <id>jdk-23-plus</id>
+            <activation>
+                <jdk>[23,)</jdk>
+            </activation>
+            <properties>
+                <!-- Fixes this error "Java 23 (67) is not supported by the current version of Byte Buddy which officially supports Java 21 (65)"  -->
+                <argLine>-XX:+AllowRedefinitionToAddDeleteMethods -Dreactor.blockhound.shaded.net.bytebuddy.experimental=true</argLine>
+            </properties>
+        </profile>
+
         <profile>
             <id>quick</id>
             <properties>

From 55ebeac062483b98b50cbdd51db743f896cbcfa0 Mon Sep 17 00:00:00 2001
From: Zoe Wang <33073555+zoewangg@users.noreply.github.com>
Date: Wed, 9 Oct 2024 10:21:34 -0700
Subject: [PATCH 2/2] Fix checkstyle errors and bugs

---
 .../thirdparty/org/slf4j/impl/StaticLoggerBinder.java      | 7 ++++---
 .../thirdparty/org/slf4j/impl/StaticMarkerBinder.java      | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/bundle-logging-bridge/src/main/java/software/amazon/awssdk/thirdparty/org/slf4j/impl/StaticLoggerBinder.java b/bundle-logging-bridge/src/main/java/software/amazon/awssdk/thirdparty/org/slf4j/impl/StaticLoggerBinder.java
index ef56d49b8441..4c398b14f176 100644
--- a/bundle-logging-bridge/src/main/java/software/amazon/awssdk/thirdparty/org/slf4j/impl/StaticLoggerBinder.java
+++ b/bundle-logging-bridge/src/main/java/software/amazon/awssdk/thirdparty/org/slf4j/impl/StaticLoggerBinder.java
@@ -30,12 +30,15 @@
 @SdkInternalApi
 public class StaticLoggerBinder {
     private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
-
+    private static final StaticLoggerBinder INSTANCE = new StaticLoggerBinder();
     private static final String LOGGER_BINDER_NAME = "org.slf4j.impl.StaticLoggerBinder";
     private static final Class<?> BINDER_CLASS;
     private static final Object IMPL;
     private static final State STATE;
 
+    private StaticLoggerBinder() {
+    }
+
     private enum State {
         INIT_FAILURE,
         INIT_SUCCESS
@@ -64,8 +67,6 @@ private enum State {
         STATE = initState;
     }
 
-    private static final StaticLoggerBinder INSTANCE = new StaticLoggerBinder();
-
     // SLF4J API
     public static final StaticLoggerBinder getSingleton() {
         if (STATE != State.INIT_SUCCESS) {
diff --git a/bundle-logging-bridge/src/main/java/software/amazon/awssdk/thirdparty/org/slf4j/impl/StaticMarkerBinder.java b/bundle-logging-bridge/src/main/java/software/amazon/awssdk/thirdparty/org/slf4j/impl/StaticMarkerBinder.java
index a105b38d69ad..1ed54d0e990c 100644
--- a/bundle-logging-bridge/src/main/java/software/amazon/awssdk/thirdparty/org/slf4j/impl/StaticMarkerBinder.java
+++ b/bundle-logging-bridge/src/main/java/software/amazon/awssdk/thirdparty/org/slf4j/impl/StaticMarkerBinder.java
@@ -30,10 +30,14 @@ public class StaticMarkerBinder {
     private static final String LOGGER_BINDER_NAME = "org.slf4j.impl.StaticMarkerBinder";
     private static final AtomicReference<MethodHandle> GET_SINGLETON = new AtomicReference<>();
     private static final AtomicReference<MethodHandle> GET_MARKER_FACTORY = new AtomicReference<>();
+    private static final StaticMarkerBinder INSTANCE = new StaticMarkerBinder();
     private static final Class<?> BINDER_CLASS;
     private static final Object IMPL;
     private static final State STATE;
 
+    private StaticMarkerBinder() {
+    }
+
     private enum State {
         INIT_FAILURE,
         INIT_SUCCESS
@@ -69,8 +73,6 @@ private enum State {
         STATE = state;
     }
 
-    private static final StaticMarkerBinder INSTANCE = new StaticMarkerBinder();
-
     // SLF4J API
     public static StaticMarkerBinder getSingleton() {
         if (STATE != State.INIT_SUCCESS) {