From d89a50bbd9b1018024f02c3048f5c3d02a1a3ce9 Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Wed, 6 Sep 2023 09:07:24 -0500
Subject: [PATCH] Support JDK 21.

See #1425
---
 Jenkinsfile                                                 | 6 +++---
 .../Dockerfile                                              | 0
 pom.xml                                                     | 6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)
 rename ci/{openjdk20-8-cassandra-3.11 => openjdk21-8-cassandra-3.11}/Dockerfile (100%)

diff --git a/Jenkinsfile b/Jenkinsfile
index 39083677e..07d5cb424 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,10 +39,10 @@ pipeline {
 						}
 					}
 				}
-				stage('Publish JDK 20 + Cassandra 3.11') {
+				stage('Publish JDK 21 + Cassandra 3.11') {
 					when {
 						anyOf {
-							changeset "ci/openjdk20-8-cassandra-3.11/**"
+							changeset "ci/openjdk21-8-cassandra-3.11/**"
 							changeset "ci/pipeline.properties"
 						}
 					}
@@ -51,7 +51,7 @@ pipeline {
 
 					steps {
 						script {
-							def image = docker.build("springci/spring-data-with-cassandra-3.11:${p['java.next.tag']}", "--build-arg BASE=${p['docker.java.next.image']} --build-arg CASSANDRA=${p['docker.cassandra.3.version']} ci/openjdk20-8-cassandra-3.11/")
+							def image = docker.build("springci/spring-data-with-cassandra-3.11:${p['java.next.tag']}", "--build-arg BASE=${p['docker.java.next.image']} --build-arg CASSANDRA=${p['docker.cassandra.3.version']} ci/openjdk21-8-cassandra-3.11/")
 							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
 								image.push()
 							}
diff --git a/ci/openjdk20-8-cassandra-3.11/Dockerfile b/ci/openjdk21-8-cassandra-3.11/Dockerfile
similarity index 100%
rename from ci/openjdk20-8-cassandra-3.11/Dockerfile
rename to ci/openjdk21-8-cassandra-3.11/Dockerfile
diff --git a/pom.xml b/pom.xml
index a2e79b9e8..8797a8195 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,6 +152,12 @@
 				<artifactId>assertj-core</artifactId>
 				<version>${assertj}</version>
 				<scope>test</scope>
+				<exclusions>
+					<exclusion>
+						<groupId>net.bytebuddy</groupId>
+						<artifactId>byte-buddy</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 
 			<dependency>