diff --git a/pom.xml b/pom.xml
index ced8889ad6..5308a3a9f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,6 +133,7 @@
     <fluidoVersion>${maven-fluido-skin.version}</fluidoVersion>
     <modelloNamespaceRuleVersion>2.1.0</modelloNamespaceRuleVersion>
     <modelloNamespaceReportVersion>2.0.0</modelloNamespaceReportVersion>
+    <byteBuddyVersion>1.14.11</byteBuddyVersion>
     <scmpublish.content>${project.build.directory}/staging/versions</scmpublish.content>
     <!-- mono-module doesn't require site:stage for scm-publish -->
     <project.build.outputTimestamp>2023-11-17T00:00:27Z</project.build.outputTimestamp>
@@ -328,6 +329,18 @@
         <artifactId>plexus-archiver</artifactId>
         <version>4.9.1</version>
       </dependency>
+
+      <!-- JDK 21 support -->
+      <dependency>
+        <groupId>net.bytebuddy</groupId>
+        <artifactId>byte-buddy</artifactId>
+        <version>${byteBuddyVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>net.bytebuddy</groupId>
+        <artifactId>byte-buddy-agent</artifactId>
+        <version>${byteBuddyVersion}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>