From ef22506a94b612b97fce2640f1162f1c12af0966 Mon Sep 17 00:00:00 2001 From: Carter Kozak Date: Wed, 1 Nov 2023 15:34:19 -0400 Subject: [PATCH 1/2] Allow Atlasdb code to execute on JDK-21 to unblock testing Revert "[PDS-417767] Prevent Atlas from running in JDK 21 (#6749)" This reverts commit 48b3dd12daa7cf06a4ff40c665b5680559ece1aa. --- .../palantir/atlasdb/factory/TransactionManagers.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java index 8f4d1a58cc8..25e42a91ab4 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java @@ -155,15 +155,6 @@ @Value.Immutable @StagedBuilderStyle public abstract class TransactionManagers { - static { - int javaVersion = Runtime.version().feature(); - Preconditions.checkState( - javaVersion != 21, - "We are currently investigating an issue with AtlasDB running under Java 21 (PDS-417767)." - + " Please use a JDK version < 21", - SafeArg.of("javaVersion", javaVersion)); - } - private static final SafeLogger log = SafeLoggerFactory.get(TransactionManagers.class); public static final LockClient LOCK_CLIENT = LockClient.of("atlas instance"); From 8afb64124e08435963b76e3f5f1831f3dc920e7c Mon Sep 17 00:00:00 2001 From: svc-changelog Date: Wed, 1 Nov 2023 19:35:53 +0000 Subject: [PATCH 2/2] Add generated changelog entries --- changelog/@unreleased/pr-6805.v2.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/@unreleased/pr-6805.v2.yml diff --git a/changelog/@unreleased/pr-6805.v2.yml b/changelog/@unreleased/pr-6805.v2.yml new file mode 100644 index 00000000000..700e4be30e4 --- /dev/null +++ b/changelog/@unreleased/pr-6805.v2.yml @@ -0,0 +1,5 @@ +type: improvement +improvement: + description: Allow Atlasdb code to execute on JDK-21 to unblock testing + links: + - https://github.com/palantir/atlasdb/pull/6805