Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump dependency versions to build with Java 23 #5653

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+22 −8
Open

Bump dependency versions to build with Java 23 #5653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9259983
Bump dependency versions to build with Java 23
zoewangg Oct 9, 2024
55ebeac
Fix checkstyle errors and bugs
zoewangg Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...ge/src/main/java/software/amazon/awssdk/thirdparty/org/slf4j/impl/StaticLoggerBinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) {
Expand Down
6 changes: 4 additions & 2 deletions ...ge/src/main/java/software/amazon/awssdk/thirdparty/org/slf4j/impl/StaticMarkerBinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) {
Expand Down
17 changes: 14 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Loading