From 63c72ec15f800cab6a305cf2ec391df3f158c392 Mon Sep 17 00:00:00 2001
From: Rafael Winterhalter <rafael.wth@gmail.com>
Date: Wed, 25 Sep 2024 07:39:01 +0000
Subject: [PATCH 01/14] [maven-release-plugin] prepare for next development
 iteration

---
 byte-buddy-agent/pom.xml         | 2 +-
 byte-buddy-android-test/pom.xml  | 2 +-
 byte-buddy-android/pom.xml       | 2 +-
 byte-buddy-benchmark/pom.xml     | 2 +-
 byte-buddy-dep/pom.xml           | 2 +-
 byte-buddy-gradle-plugin/pom.xml | 2 +-
 byte-buddy-maven-plugin/pom.xml  | 2 +-
 byte-buddy/pom.xml               | 2 +-
 pom.xml                          | 6 +++---
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/byte-buddy-agent/pom.xml b/byte-buddy-agent/pom.xml
index 811d5f3a15..20eb6a3267 100644
--- a/byte-buddy-agent/pom.xml
+++ b/byte-buddy-agent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy-parent</artifactId>
-        <version>1.15.2</version>
+        <version>1.15.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>byte-buddy-agent</artifactId>
diff --git a/byte-buddy-android-test/pom.xml b/byte-buddy-android-test/pom.xml
index 57b2d63788..552f01432b 100644
--- a/byte-buddy-android-test/pom.xml
+++ b/byte-buddy-android-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy-parent</artifactId>
-        <version>1.15.2</version>
+        <version>1.15.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>byte-buddy-android-test</artifactId>
diff --git a/byte-buddy-android/pom.xml b/byte-buddy-android/pom.xml
index e0ff946b4e..c01d12fd9b 100644
--- a/byte-buddy-android/pom.xml
+++ b/byte-buddy-android/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy-parent</artifactId>
-        <version>1.15.2</version>
+        <version>1.15.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>byte-buddy-android</artifactId>
diff --git a/byte-buddy-benchmark/pom.xml b/byte-buddy-benchmark/pom.xml
index 0baac3e22c..747854dd23 100644
--- a/byte-buddy-benchmark/pom.xml
+++ b/byte-buddy-benchmark/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy-parent</artifactId>
-        <version>1.15.2</version>
+        <version>1.15.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>byte-buddy-benchmark</artifactId>
diff --git a/byte-buddy-dep/pom.xml b/byte-buddy-dep/pom.xml
index a9dce12e43..328504a199 100644
--- a/byte-buddy-dep/pom.xml
+++ b/byte-buddy-dep/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy-parent</artifactId>
-        <version>1.15.2</version>
+        <version>1.15.3-SNAPSHOT</version>
     </parent>
 
     <!--
diff --git a/byte-buddy-gradle-plugin/pom.xml b/byte-buddy-gradle-plugin/pom.xml
index 466362fc56..3258db00a2 100644
--- a/byte-buddy-gradle-plugin/pom.xml
+++ b/byte-buddy-gradle-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy-parent</artifactId>
-        <version>1.15.2</version>
+        <version>1.15.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>byte-buddy-gradle-plugin</artifactId>
diff --git a/byte-buddy-maven-plugin/pom.xml b/byte-buddy-maven-plugin/pom.xml
index 82589bf1f9..7d4cbe9085 100644
--- a/byte-buddy-maven-plugin/pom.xml
+++ b/byte-buddy-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy-parent</artifactId>
-        <version>1.15.2</version>
+        <version>1.15.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>byte-buddy-maven-plugin</artifactId>
diff --git a/byte-buddy/pom.xml b/byte-buddy/pom.xml
index 6f7da38dce..9cba48cda2 100644
--- a/byte-buddy/pom.xml
+++ b/byte-buddy/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy-parent</artifactId>
-        <version>1.15.2</version>
+        <version>1.15.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>byte-buddy</artifactId>
diff --git a/pom.xml b/pom.xml
index ece1803c0f..d105ecbeb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>net.bytebuddy</groupId>
     <artifactId>byte-buddy-parent</artifactId>
-    <version>1.15.2</version>
+    <version>1.15.3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <inceptionYear>2014</inceptionYear>
@@ -61,7 +61,7 @@
         <bytebuddy.integration>false</bytebuddy.integration>
         <bytebuddy.experimental>false</bytebuddy.experimental>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.build.outputTimestamp>1727249841</project.build.outputTimestamp>
+        <project.build.outputTimestamp>1727249941</project.build.outputTimestamp>
         <sourcecode.main.version>1.5</sourcecode.main.version>
         <sourcecode.test.version>1.6</sourcecode.test.version>
         <bytecode.main.version>1.5</bytecode.main.version>
@@ -154,7 +154,7 @@
         <connection>scm:git:${repository.url}</connection>
         <developerConnection>scm:git:${repository.url}</developerConnection>
         <url>${repository.url}</url>
-        <tag>byte-buddy-1.15.2</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <dependencies>

From 5cc5c73e23b099715b1d631ff9c860e8fc0beec3 Mon Sep 17 00:00:00 2001
From: Rafael Winterhalter <rafael.wth@gmail.com>
Date: Wed, 25 Sep 2024 18:39:23 +0200
Subject: [PATCH 02/14] Respect class file version also in Android plugins when
 resolving class files.

---
 .../gradle/android/ByteBuddyAndroidService.java      | 12 ++++++------
 .../LegacyByteBuddyLocalClassesEnhancerTask.java     |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/byte-buddy-gradle-plugin/android-plugin/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyAndroidService.java b/byte-buddy-gradle-plugin/android-plugin/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyAndroidService.java
index 275235da56..e1f1d98ea9 100644
--- a/byte-buddy-gradle-plugin/android-plugin/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyAndroidService.java
+++ b/byte-buddy-gradle-plugin/android-plugin/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyAndroidService.java
@@ -99,6 +99,10 @@ public void initialize(ByteBuddyInstrumentationParameters parameters) {
                 return;
             }
             try {
+                ClassFileVersion classFileVersion = ClassFileVersion.ofJavaVersionString(getParameters()
+                        .getJavaTargetCompatibilityVersion()
+                        .get()
+                        .toString());
                 List<ClassFileLocator> classFileLocators = new ArrayList<ClassFileLocator>();
                 classFileLocators.add(ClassFileLocator.ForClassLoader.of(ByteBuddy.class.getClassLoader()));
                 for (File artifact : parameters.getRuntimeClasspath()
@@ -106,13 +110,9 @@ public void initialize(ByteBuddyInstrumentationParameters parameters) {
                         .plus(parameters.getByteBuddyClasspath())
                         .getFiles()) {
                     classFileLocators.add(artifact.isFile()
-                            ? ClassFileLocator.ForJarFile.of(artifact)
-                            : new ClassFileLocator.ForFolder(artifact));
+                            ? ClassFileLocator.ForJarFile.of(artifact, classFileVersion)
+                            : ClassFileLocator.ForFolder.of(artifact, classFileVersion));
                 }
-                ClassFileVersion classFileVersion = ClassFileVersion.ofJavaVersionString(getParameters()
-                        .getJavaTargetCompatibilityVersion()
-                        .get()
-                        .toString());
                 ClassFileLocator classFileLocator = new ClassFileLocator.Compound(classFileLocators);
                 TypePool typePool = Plugin.Engine.PoolStrategy.Default.FAST.typePool(classFileLocator);
                 ClassLoader classLoader = new URLClassLoader(
diff --git a/byte-buddy-gradle-plugin/android-plugin/src/main/java/net/bytebuddy/build/gradle/android/LegacyByteBuddyLocalClassesEnhancerTask.java b/byte-buddy-gradle-plugin/android-plugin/src/main/java/net/bytebuddy/build/gradle/android/LegacyByteBuddyLocalClassesEnhancerTask.java
index 335edf5b57..9062a8a28e 100644
--- a/byte-buddy-gradle-plugin/android-plugin/src/main/java/net/bytebuddy/build/gradle/android/LegacyByteBuddyLocalClassesEnhancerTask.java
+++ b/byte-buddy-gradle-plugin/android-plugin/src/main/java/net/bytebuddy/build/gradle/android/LegacyByteBuddyLocalClassesEnhancerTask.java
@@ -130,8 +130,8 @@ public void execute() {
             List<ClassFileLocator> classFileLocators = new ArrayList<ClassFileLocator>();
             for (File file : getRuntimeClasspath().plus(getAndroidBootClasspath()).plus(getByteBuddyClasspath()).getFiles()) {
                 classFileLocators.add(file.isFile()
-                        ? ClassFileLocator.ForJarFile.of(file)
-                        : new ClassFileLocator.ForFolder(file));
+                        ? ClassFileLocator.ForJarFile.of(file, classFileVersion)
+                        : ClassFileLocator.ForFolder.of(file, classFileVersion));
             }
             classFileLocators.add(ClassFileLocator.ForClassLoader.of(ByteBuddy.class.getClassLoader()));
             ClassFileLocator classFileLocator = new ClassFileLocator.Compound(classFileLocators);
@@ -173,6 +173,7 @@ public void execute() {
                                     classFileVersion,
                                     MethodNameTransformer.Suffixing.withRandomSuffix())
                             .with(classFileLocator)
+                            .with(classFileVersion)
                             .apply(new Plugin.Engine.Source.Compound(sources), new Plugin.Engine.Target.ForFolder(getOutputDir().get().getAsFile()), factories);
                     if (!summary.getFailed().isEmpty()) {
                         throw new IllegalStateException(summary.getFailed() + " local type transformations have failed");

From 4d4eb6ba6268f10037ea1e78cce492d92c760e5e Mon Sep 17 00:00:00 2001
From: Rafael Winterhalter <rafael.wth@gmail.com>
Date: Wed, 25 Sep 2024 18:59:32 +0200
Subject: [PATCH 03/14] Prepend actual class file.

---
 .../main/java/net/bytebuddy/build/Plugin.java | 76 +++++++++++++++++--
 1 file changed, 70 insertions(+), 6 deletions(-)

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java b/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
index 0f4ca42b68..a8e796329c 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
@@ -28,6 +28,7 @@
 import net.bytebuddy.pool.TypePool;
 import net.bytebuddy.utility.CompoundList;
 import net.bytebuddy.utility.FileSystem;
+import net.bytebuddy.utility.StreamDrainer;
 import net.bytebuddy.utility.nullability.AlwaysNull;
 import net.bytebuddy.utility.nullability.MaybeNull;
 
@@ -2959,7 +2960,7 @@ public static Source ofTypes(Collection<? extends Class<?>> types) {
                 /**
                  * Represents a collection of types as an in-memory source.
                  *
-                 * @param types The types to represent.
+                 * @param types          The types to represent.
                  * @param versionedTypes A versioned mapping of types to represent.
                  * @return A source representing the supplied types.
                  */
@@ -4884,16 +4885,20 @@ public Summary apply(Source source, Target target, List<? extends Plugin.Factory
                                     while (name.startsWith("/")) {
                                         name = name.substring(1);
                                     }
-                                    if (name.endsWith(ClassFileLocator.CLASS_FILE_EXTENSION) && !name.endsWith(PACKAGE_INFO) && !name.equals(MODULE_INFO)) {
+                                    if (name.endsWith(ClassFileLocator.CLASS_FILE_EXTENSION)
+                                            && (!name.startsWith("META-INF") && name.startsWith(ClassFileLocator.META_INF_VERSIONS))
+                                            && !name.endsWith(PACKAGE_INFO)
+                                            && !name.endsWith(MODULE_INFO)) {
                                         try {
+                                            String typeName = name.substring(name.startsWith(ClassFileLocator.META_INF_VERSIONS)
+                                                    ? name.indexOf('/', ClassFileLocator.META_INF_VERSIONS.length()) + 1
+                                                    : 0, name.length() - ClassFileLocator.CLASS_FILE_EXTENSION.length()).replace('/', '.');
                                             dispatcher.accept(new Preprocessor(element,
-                                                    name.substring(name.startsWith(ClassFileLocator.META_INF_VERSIONS)
-                                                            ? name.indexOf('/', ClassFileLocator.META_INF_VERSIONS.length()) + 1
-                                                            : 0, name.length() - ClassFileLocator.CLASS_FILE_EXTENSION.length()).replace('/', '.'),
+                                                    typeName,
                                                     name.startsWith(ClassFileLocator.META_INF_VERSIONS)
                                                             ? Integer.parseInt(name.substring(ClassFileLocator.META_INF_VERSIONS.length(), name.indexOf('/', ClassFileLocator.META_INF_VERSIONS.length())))
                                                             : 0,
-                                                    classFileLocator,
+                                                    new SourceEntryPrependingClassFileLocator(typeName, element, classFileLocator),
                                                     typePool,
                                                     listener,
                                                     plugins,
@@ -4946,6 +4951,65 @@ public Summary apply(Source source, Target target, List<? extends Plugin.Factory
                 }
             }
 
+            /**
+             * A class file locator that shadows a given {@link Source.Element}'s type with the explicit element.
+             * This avoids that caching yields the wrong class file in case of multi-release jars.
+             */
+            @HashCodeAndEqualsPlugin.Enhance
+            protected static class SourceEntryPrependingClassFileLocator implements ClassFileLocator {
+
+                /**
+                 * The name of the represented type.
+                 */
+                private final String name;
+
+                /**
+                 * The corresponding source element.
+                 */
+                private final Source.Element element;
+
+                /**
+                 * The actual class file locator to query for all other types.
+                 */
+                private final ClassFileLocator delegate;
+
+                /**
+                 * Creates a class file locator that prepends a {@link Source.Element}.
+                 *
+                 * @param name     The name of the represented type.
+                 * @param element  The corresponding source element.
+                 * @param delegate The actual class file locator to query for all other types.
+                 */
+                protected SourceEntryPrependingClassFileLocator(String name, Source.Element element, ClassFileLocator delegate) {
+                    this.name = name;
+                    this.element = element;
+                    this.delegate = delegate;
+                }
+
+                /**
+                 * {@inheritDoc}
+                 */
+                public Resolution locate(String name) throws IOException {
+                    if (name.endsWith(this.name)) {
+                        InputStream inputStream = element.getInputStream();
+                        try {
+                            return new Resolution.Explicit(StreamDrainer.DEFAULT.drain(inputStream));
+                        } finally {
+                            inputStream.close();
+                        }
+                    } else {
+                        return delegate.locate(name);
+                    }
+                }
+
+                /**
+                 * {@inheritDoc}
+                 */
+                public void close() throws IOException {
+                    delegate.close();
+                }
+            }
+
             /**
              * A preprocessor for a parallel plugin engine.
              */

From 550b84a705cf40b18437aa727e812c73b880a513 Mon Sep 17 00:00:00 2001
From: Rafael Winterhalter <rafael.wth@gmail.com>
Date: Wed, 25 Sep 2024 18:59:58 +0200
Subject: [PATCH 04/14] Fix boolen check.

---
 byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java b/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
index a8e796329c..c587e4e006 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
@@ -4886,7 +4886,7 @@ public Summary apply(Source source, Target target, List<? extends Plugin.Factory
                                         name = name.substring(1);
                                     }
                                     if (name.endsWith(ClassFileLocator.CLASS_FILE_EXTENSION)
-                                            && (!name.startsWith("META-INF") && name.startsWith(ClassFileLocator.META_INF_VERSIONS))
+                                            && (!name.startsWith("META-INF") || name.startsWith(ClassFileLocator.META_INF_VERSIONS))
                                             && !name.endsWith(PACKAGE_INFO)
                                             && !name.endsWith(MODULE_INFO)) {
                                         try {

From de561d05839ec50603813f4091b6a18f85db7150 Mon Sep 17 00:00:00 2001
From: Rafael Winterhalter <rafael.wth@gmail.com>
Date: Wed, 25 Sep 2024 23:31:47 +0200
Subject: [PATCH 05/14] Treat class files that are not supported by current VM
 as resources.

---
 .../main/java/net/bytebuddy/build/Plugin.java | 44 ++++++++++++-------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java b/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
index c587e4e006..2384b75083 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
@@ -3007,7 +3007,11 @@ public static Source ofTypes(
                     }
                     for (Map.Entry<ClassFileVersion, Map<TypeDescription, byte[]>> versioned : versionedBinaryRepresentations.entrySet()) {
                         for (Map.Entry<TypeDescription, byte[]> entry : versioned.getValue().entrySet()) {
-                            storage.put(ClassFileLocator.META_INF_VERSIONS + versioned.getKey().getJavaVersion() + "/" + entry.getKey().getInternalName() + ClassFileLocator.CLASS_FILE_EXTENSION, entry.getValue());
+                            storage.put(ClassFileLocator.META_INF_VERSIONS
+                                    + versioned.getKey().getJavaVersion()
+                                    + "/"
+                                    + entry.getKey().getInternalName()
+                                    + ClassFileLocator.CLASS_FILE_EXTENSION, entry.getValue());
                         }
                     }
                     return new InMemory(storage);
@@ -3339,7 +3343,8 @@ interface Sink extends Closeable {
                 /**
                  * Stores the supplied binary representation of types in this sink.
                  *
-                 * @param version               The version of the multi-release jar file.
+                 * @param version               The version of the multi-release jar file, which should at least be {@code 8} as previous
+                 *                              versions are not recognized by regular class loaders.
                  * @param binaryRepresentations The binary representations to store.
                  * @throws IOException If an I/O error occurs.
                  */
@@ -4890,19 +4895,28 @@ public Summary apply(Source source, Target target, List<? extends Plugin.Factory
                                             && !name.endsWith(PACKAGE_INFO)
                                             && !name.endsWith(MODULE_INFO)) {
                                         try {
-                                            String typeName = name.substring(name.startsWith(ClassFileLocator.META_INF_VERSIONS)
-                                                    ? name.indexOf('/', ClassFileLocator.META_INF_VERSIONS.length()) + 1
-                                                    : 0, name.length() - ClassFileLocator.CLASS_FILE_EXTENSION.length()).replace('/', '.');
-                                            dispatcher.accept(new Preprocessor(element,
-                                                    typeName,
-                                                    name.startsWith(ClassFileLocator.META_INF_VERSIONS)
-                                                            ? Integer.parseInt(name.substring(ClassFileLocator.META_INF_VERSIONS.length(), name.indexOf('/', ClassFileLocator.META_INF_VERSIONS.length())))
-                                                            : 0,
-                                                    new SourceEntryPrependingClassFileLocator(typeName, element, classFileLocator),
-                                                    typePool,
-                                                    listener,
-                                                    plugins,
-                                                    preprocessors), preprocessors.isEmpty());
+                                            int version = name.startsWith(ClassFileLocator.META_INF_VERSIONS)
+                                                    ? Math.max(7, Integer.parseInt(name.substring(ClassFileLocator.META_INF_VERSIONS.length(), name.indexOf('/', ClassFileLocator.META_INF_VERSIONS.length()))))
+                                                    : 0;
+                                            if (version == 0 || version > 7
+                                                    && classFileVersion != null
+                                                    && classFileVersion.isAtLeast(ClassFileVersion.JAVA_V9)
+                                                    && version <= classFileVersion.getJavaVersion()) {
+                                                String typeName = name.substring(name.startsWith(ClassFileLocator.META_INF_VERSIONS)
+                                                        ? name.indexOf('/', ClassFileLocator.META_INF_VERSIONS.length()) + 1
+                                                        : 0, name.length() - ClassFileLocator.CLASS_FILE_EXTENSION.length()).replace('/', '.');
+                                                dispatcher.accept(new Preprocessor(element,
+                                                        typeName,
+                                                        version,
+                                                        new SourceEntryPrependingClassFileLocator(typeName, element, classFileLocator),
+                                                        typePool,
+                                                        listener,
+                                                        plugins,
+                                                        preprocessors), preprocessors.isEmpty());
+                                            } else {
+                                                listener.onResource(name);
+                                                sink.retain(element);
+                                            }
                                         } catch (NumberFormatException ignored) {
                                             listener.onResource(name);
                                             sink.retain(element);

From d86040bbe463221b520dbf1056b1bf8ab9819c24 Mon Sep 17 00:00:00 2001
From: Rafael Winterhalter <rafael.wth@gmail.com>
Date: Thu, 26 Sep 2024 20:46:29 +0200
Subject: [PATCH 06/14] Add filter for multi-release jar files.

---
 .mvn/checksums.sha256                         |  8 ++
 byte-buddy-agent/pom.xml                      |  2 +-
 byte-buddy-dep/pom.xml                        | 12 +--
 .../main/java/net/bytebuddy/build/Plugin.java | 69 +++++++++++++++--
 .../PluginEngineSourceFilteringTest.java      | 19 +++++
 .../ByteBuddyLocalClassesEnhancerTask.java    |  2 +
 .../build/gradle/AbstractByteBuddyTask.java   | 74 +++++++++++++------
 .../AbstractByteBuddyTaskExtension.java       | 28 +++++++
 .../bytebuddy/build/maven/ByteBuddyMojo.java  | 16 +++-
 release-notes.md                              |  7 ++
 10 files changed, 199 insertions(+), 38 deletions(-)

diff --git a/.mvn/checksums.sha256 b/.mvn/checksums.sha256
index 92386a5847..1246b48480 100644
--- a/.mvn/checksums.sha256
+++ b/.mvn/checksums.sha256
@@ -647,6 +647,7 @@ net.bytebuddy:byte-buddy-agent:jar:1.14.8 f7c60fd229df2b0f4e390f50e0582a23ac1d89
 net.bytebuddy:byte-buddy-agent:jar:1.14.9 11ed107d4b78e55f8c3d34250494375081a29bc125a1f5c56db582ccdd48835f
 net.bytebuddy:byte-buddy-agent:jar:1.15.0 3399a0fdf7ba3f1386ebf831a706037428f1b1af81d653c25cf8a8fde2e4d2ea
 net.bytebuddy:byte-buddy-agent:jar:1.15.1 77a39846b42110eb50e49e4ff6137e3f0a92eb3bb6f59ce52dc4095c8b901005
+net.bytebuddy:byte-buddy-agent:jar:1.15.2 f8673a2dec2a4c2b0a910d92b4b332bb9622890332138e4c401364cba74eda77
 net.bytebuddy:byte-buddy-android:jar:1.12.19 bb73d3b9ace5a60a9a9aa1701761073b3df3baf79ff463aed6cd94b724fd3ba9
 net.bytebuddy:byte-buddy-android:jar:1.12.20 f43b8b7eb840f6140135066224f0e6b565b9becb05345fdc572a66bfb92df0aa
 net.bytebuddy:byte-buddy-android:jar:1.12.21 bf4ad1405c2fcaa8b179929f9a64c8ee66d04f34b0e3fe8a90b28c738f883fe9
@@ -675,6 +676,7 @@ net.bytebuddy:byte-buddy-android:jar:1.14.8 9c1ea03f4b06c85a30800b810b196806a480
 net.bytebuddy:byte-buddy-android:jar:1.14.9 3cdbdaaf439bce36b94dd27782b86fb1d92bbbedcd527dbf2ee14e0412f6b80e
 net.bytebuddy:byte-buddy-android:jar:1.15.0 3874728750cd8917f70190eb0d004ccef4c3e00652b42d89d97e5d890e97c5af
 net.bytebuddy:byte-buddy-android:jar:1.15.1 b8724a3372f76dbbe01ea3385baad0c325c583f637a87d32428b612be70b5b32
+net.bytebuddy:byte-buddy-android:jar:1.15.2 a19d628dee90c74e96a321e9814e2c5f3fe4e6404b05a7b25ec407e227e25e7e
 net.bytebuddy:byte-buddy-dep:jar:1.12.19 a85bb853ec6ec156b10ea0b5b0e38ac0f89c6c2bc89dd0358772a0dff2eb85c9
 net.bytebuddy:byte-buddy-dep:jar:1.12.20 d7e15d3ccc0508e78a146f1be420779eb3e2e9a537e3c8add3cd6d802c9a615e
 net.bytebuddy:byte-buddy-dep:jar:1.12.21 116b320c1f3f8539978ea67989d94e9bfed3e9422beb5a76749d967439ec8f9d
@@ -703,6 +705,7 @@ net.bytebuddy:byte-buddy-dep:jar:1.14.8 149957aaeb4c069864cad647c8f8680d8f939350
 net.bytebuddy:byte-buddy-dep:jar:1.14.9 e9affd66effe9857856b5948463893c02ad7a91e37cf3d8c07930e73cc8c282f
 net.bytebuddy:byte-buddy-dep:jar:1.15.0 5b4840406be9f761d39f314bc1b5d0574b55c163140fcfe7b6f670e82fb0738c
 net.bytebuddy:byte-buddy-dep:jar:1.15.1 ade2ebcc897db4ecc13ab61188d8251665314cbf8f3268e558e75f9728380fc6
+net.bytebuddy:byte-buddy-dep:jar:1.15.2 50f05dad8a626e588b2f89de7eefc9212515d45d6a03fb87870f946f0bab56f7
 net.bytebuddy:byte-buddy-maven-plugin:jar:1.12.19 3419e2afbfac4f21ef709ee3f8f08fc1d71001e07ba2524a0bb2a3c28f3e1087
 net.bytebuddy:byte-buddy-maven-plugin:jar:1.12.20 48a36e2e8c2dbe2b3673ef8bf6be22b021cfca35d6205a3d5e722f74db42d52b
 net.bytebuddy:byte-buddy-maven-plugin:jar:1.12.21 cb3332f89cc6502e3637dbe509c08c55cb5ad528c675131858dda89eabf7c9fc
@@ -728,6 +731,7 @@ net.bytebuddy:byte-buddy-maven-plugin:jar:1.14.6 d30844d8955cc7d9bba051bb5509166
 net.bytebuddy:byte-buddy-maven-plugin:jar:1.14.9 2bc8809f83aed11a531f093da593c52e3b572b7ee7359c1e3eff3796061db44e
 net.bytebuddy:byte-buddy-maven-plugin:jar:1.15.0 e14df4a925a628f3f7b937005eba803b1e9d320ee7a8172f734691dfa58bd432
 net.bytebuddy:byte-buddy-maven-plugin:jar:1.15.1 9cb4a37d5bb17cd55ea52e9f660a87b7b9fdae56bfe886f9588b09929207f7e3
+net.bytebuddy:byte-buddy-maven-plugin:jar:1.15.2 1cda61087db3b8159f77be5f74e04f816a24ea1d9cd54ba0b537c6573c6d118e
 net.bytebuddy:byte-buddy-maven-plugin:pom:1.12.19 c2051f8cbdf328692f36077627be07168334ee9167b72e5bf608eae624163b4f
 net.bytebuddy:byte-buddy-maven-plugin:pom:1.12.20 2d112ff342e7db7da484d038807749c1a87c81419b789a86b950a37bdd65b207
 net.bytebuddy:byte-buddy-maven-plugin:pom:1.12.21 13576ca6b9c44ab9789ada11ee400dcd3f4bcc22a7cab6f7052aeeb49a8c02e1
@@ -753,6 +757,7 @@ net.bytebuddy:byte-buddy-maven-plugin:pom:1.14.6 e301c83e77f6b8da2e2090c9eb6288f
 net.bytebuddy:byte-buddy-maven-plugin:pom:1.14.9 75c6d50a8cf6d528eb09b198e54035b6bbc10d0653655194ae697b971334fdd2
 net.bytebuddy:byte-buddy-maven-plugin:pom:1.15.0 cc233d43805a7e9756c8a94c4751a18cb938ac3ccf83f0691604206157130bd0
 net.bytebuddy:byte-buddy-maven-plugin:pom:1.15.1 d8f649ffa066009efc71e967a45cca915c6ffb1c4a4508b0718f4a51d4437197
+net.bytebuddy:byte-buddy-maven-plugin:pom:1.15.2 11d71812ac7ea9f397967f984750d4484dd9c027a4a64f5730d840bb3542aa15
 net.bytebuddy:byte-buddy-parent:pom:1.12.19 72ab6fef409e812921f4728b3c4b6ef4fa53bc25fabb0488fc2cae367368b54d
 net.bytebuddy:byte-buddy-parent:pom:1.12.20 ac59dd7bc0316c51ab29e7c44ae7941ba8c7bf84789edb1dc8fbef2f16535b99
 net.bytebuddy:byte-buddy-parent:pom:1.12.21 ff66d886607137e2095f20c90ee093f3c80329164eff091a0688bdce37e3e6b2
@@ -778,6 +783,7 @@ net.bytebuddy:byte-buddy-parent:pom:1.14.6 f889394b9e576a1e7a3ce13efd47b5cb2e62e
 net.bytebuddy:byte-buddy-parent:pom:1.14.9 66b8342251d35f2063e69316f63bafcb056342fe75e921c0f465c2d96593535e
 net.bytebuddy:byte-buddy-parent:pom:1.15.0 8ec247e077cdf76e72ad2b9919576cf2a477811935b56c8a27958e7297b4f18b
 net.bytebuddy:byte-buddy-parent:pom:1.15.1 7bb21259d04796865f0d83dd3344fcffdd34c94515c00a6525a8996acb1c413f
+net.bytebuddy:byte-buddy-parent:pom:1.15.2 3be68060e65990669555e02f4cf7826e10122462c14cb14c1b2db78447795bfd
 net.bytebuddy:byte-buddy:jar:1.12.19 030704139e46f32c38d27060edee9e0676b0a0fff8a8be53461515154ba8a7be
 net.bytebuddy:byte-buddy:jar:1.12.20 0a9b2795e0e2391117062f0fc7f6ae98fa3c2a7c927847ff1e01bb7cffcd9167
 net.bytebuddy:byte-buddy:jar:1.12.21 f6f45c2237a7f132c16745ad2a52c4cdde58028b11ee80b09f0d422f4930d685
@@ -803,6 +809,7 @@ net.bytebuddy:byte-buddy:jar:1.14.6 6eaf0190ee02731820e9925a544e7cfb48f6dfc3bf29
 net.bytebuddy:byte-buddy:jar:1.14.9 377352e253282bf86f731ac90ed88348e8f40a63ce033c00a85982de7e790e6f
 net.bytebuddy:byte-buddy:jar:1.15.0 c743cfb4db1e6c67af6297fbe32a3ad94710884cde4c7eecb1bad7d820d4f2ba
 net.bytebuddy:byte-buddy:jar:1.15.1 cc5f178f37ef83339b7ec93e8d0bed6b0730871cdb39c663527ddeae4a54a825
+net.bytebuddy:byte-buddy:jar:1.15.2 c754a34c3bf9cc7efbe9c229a2ad185504f017b1c255100a4d3023b38e1e14d5
 net.bytebuddy:byte-buddy:pom:1.12.19 435fb8664aa9b7e120c8dd6c707d4eafa642fa262dff6d5e3f71dc25c69e89eb
 net.bytebuddy:byte-buddy:pom:1.12.20 46353d5c52659c40f0f54d05c757665552e492be36087c19307598d1bf07bbfb
 net.bytebuddy:byte-buddy:pom:1.12.21 95eb42c89fd04f62187dd33b9cdf04d2df1b876b375c16ad32c0a5a1cc1a070b
@@ -828,6 +835,7 @@ net.bytebuddy:byte-buddy:pom:1.14.6 444380f496a38a2b0b7325a4d0f223e3b07f2a2347bc
 net.bytebuddy:byte-buddy:pom:1.14.9 2d6772910d16169bd4c9229e8a365cf54e192bc620cbcfa7f84271f5d115e815
 net.bytebuddy:byte-buddy:pom:1.15.0 ed4d27216401c5cb6e8f16c09fbfd460679b90c43a033d8d0e7b11e45cfb4e58
 net.bytebuddy:byte-buddy:pom:1.15.1 e358152bf7abff7b763a9670c79e798e14aed9a1b07f83476a909e3eaa222f21
+net.bytebuddy:byte-buddy:pom:1.15.2 2d72568104ae6c61368aede1864519a2a233ecf0a7aee3c52eed2d046fc4fb2f
 net.i2p.crypto:eddsa:jar:0.3.0 4dda1120db856640dbec04140ed23242215a075fe127bdefa0dcfa29fb31267d
 net.i2p.crypto:eddsa:pom:0.3.0 b6b13878e4bae8b768d7ea5732cb4d66ab2f5e9fe707c0a1a776cde9de52051b
 net.java.dev.jna:jna-platform:jar:5.12.1 8ce969116cac95bd61b07a8d5e07174b352e63301473caac72c395e3c08488d2
diff --git a/byte-buddy-agent/pom.xml b/byte-buddy-agent/pom.xml
index 20eb6a3267..714e49af68 100644
--- a/byte-buddy-agent/pom.xml
+++ b/byte-buddy-agent/pom.xml
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy</artifactId>
-            <version>1.15.1</version>
+            <version>1.15.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/byte-buddy-dep/pom.xml b/byte-buddy-dep/pom.xml
index 328504a199..c95595d8b2 100644
--- a/byte-buddy-dep/pom.xml
+++ b/byte-buddy-dep/pom.xml
@@ -127,7 +127,7 @@
             <plugin>
                 <groupId>net.bytebuddy</groupId>
                 <artifactId>byte-buddy-maven-plugin</artifactId>
-                <version>1.15.1</version>
+                <version>1.15.2</version>
                 <executions>
                     <execution>
                         <phase>compile</phase>
@@ -142,7 +142,7 @@
                                 <transformation>
                                     <groupId>net.bytebuddy</groupId>
                                     <artifactId>byte-buddy</artifactId>
-                                    <version>1.15.1</version>
+                                    <version>1.15.2</version>
                                     <plugin>net.bytebuddy.build.HashCodeAndEqualsPlugin$WithNonNullableFields</plugin>
                                     <arguments>
                                         <argument>
@@ -154,13 +154,13 @@
                                 <transformation>
                                     <groupId>net.bytebuddy</groupId>
                                     <artifactId>byte-buddy</artifactId>
-                                    <version>1.15.1</version>
+                                    <version>1.15.2</version>
                                     <plugin>net.bytebuddy.build.CachedReturnPlugin</plugin>
                                 </transformation>
                                 <transformation>
                                     <groupId>net.bytebuddy</groupId>
                                     <artifactId>byte-buddy</artifactId>
-                                    <version>1.15.1</version>
+                                    <version>1.15.2</version>
                                     <plugin>net.bytebuddy.build.AccessControllerPlugin</plugin>
                                     <arguments>
                                         <argument>
@@ -172,13 +172,13 @@
                                 <transformation>
                                     <groupId>net.bytebuddy</groupId>
                                     <artifactId>byte-buddy</artifactId>
-                                    <version>1.15.1</version>
+                                    <version>1.15.2</version>
                                     <plugin>net.bytebuddy.build.DispatcherAnnotationPlugin</plugin>
                                 </transformation>
                                 <transformation>
                                     <groupId>net.bytebuddy</groupId>
                                     <artifactId>byte-buddy</artifactId>
-                                    <version>1.15.1</version>
+                                    <version>1.15.2</version>
                                     <plugin>net.bytebuddy.build.RepeatedAnnotationPlugin</plugin>
                                 </transformation>
                             </transformations>
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java b/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
index 2384b75083..b796709c5c 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
@@ -809,10 +809,11 @@ interface Engine {
         /**
          * Uses the supplied {@link ClassFileVersion} as a base for resolving multi-release jars, or {@code null}
          * if multi-release jars should not be resolved but be treated as regular jar files. This property might
-         * not be applied if the underlying location mechanism does not supply manual resource resolution.
+         * not be applied if the underlying location mechanism does not supply manual resource resolution. Note that
+         * classes that are of newer class file versions than the specified version are not resolved and simply copied.
          *
-         * @param classFileVersion The class file version to use or {@code null}.
-         * @return A new plugin engine that is equal to this engine but with the supplied class file verion being used.
+         * @param classFileVersion The class file version to use or {@code null} if multi-release jars should be ignored.
+         * @return A new plugin engine that is equal to this engine but with the supplied class file version being used.
          */
         Engine with(@MaybeNull ClassFileVersion classFileVersion);
 
@@ -2421,15 +2422,15 @@ public ClassFileLocator toClassFileLocator(@MaybeNull ClassFileVersion classFile
                     /**
                      * {@inheritDoc}
                      */
-                    public void close() throws IOException {
-                        delegate.close();
+                    public Iterator<Element> iterator() {
+                        return new FilteringIterator(delegate.iterator(), matcher);
                     }
 
                     /**
                      * {@inheritDoc}
                      */
-                    public Iterator<Element> iterator() {
-                        return new FilteringIterator(delegate.iterator(), matcher);
+                    public void close() throws IOException {
+                        delegate.close();
                     }
 
                     /**
@@ -3304,12 +3305,66 @@ public Filtering(Source delegate, ElementMatcher<Element> matcher, boolean manif
                     this.manifest = manifest;
                 }
 
+                /**
+                 * Wraps a source to exclude elements that are above the specified Java version.
+                 *
+                 * @param delegate         The delegate source.
+                 * @param classFileVersion The latest multi-release Java version to retain from the source.
+                 * @return A source that applies an appropriate filter.
+                 */
+                public static Source dropMultiReleaseClassFilesAbove(Source delegate, ClassFileVersion classFileVersion) {
+                    return new Filtering(delegate, new MultiReleaseVersionMatcher(classFileVersion), true);
+                }
+
                 /**
                  * {@inheritDoc}
                  */
                 public Origin read() throws IOException {
                     return new Origin.Filtering(delegate.read(), matcher, manifest);
                 }
+
+                /**
+                 * An element matcher that filters multi-release files above a given version.
+                 */
+                @HashCodeAndEqualsPlugin.Enhance
+                protected static class MultiReleaseVersionMatcher implements ElementMatcher<Element> {
+
+                    /**
+                     * The latest version to consider.
+                     */
+                    private final ClassFileVersion classFileVersion;
+
+                    /**
+                     * Creates a multi-release version matcher.
+                     *
+                     * @param classFileVersion The latest class file version to consider.
+                     */
+                    protected MultiReleaseVersionMatcher(ClassFileVersion classFileVersion) {
+                        this.classFileVersion = classFileVersion;
+                    }
+
+                    /**
+                     * {@inheritDoc}
+                     */
+                    public boolean matches(Element target) {
+                        String name = target.getName();
+                        if (name.startsWith("/")) {
+                            name = name.substring(1);
+                        }
+                        if (name.startsWith(ClassFileLocator.META_INF_VERSIONS)) {
+                            int version;
+                            try {
+                                version = Integer.parseInt(name.substring(
+                                        ClassFileLocator.META_INF_VERSIONS.length(),
+                                        name.indexOf('/', ClassFileLocator.META_INF_VERSIONS.length())));
+                            } catch (NumberFormatException ignored) {
+                                return true;
+                            }
+                            return version <= classFileVersion.getJavaVersion();
+                        }
+                        return true;
+                    }
+                }
             }
         }
 
diff --git a/byte-buddy-dep/src/test/java/net/bytebuddy/build/PluginEngineSourceFilteringTest.java b/byte-buddy-dep/src/test/java/net/bytebuddy/build/PluginEngineSourceFilteringTest.java
index 37b6ea2ca1..c6aa6b2f59 100644
--- a/byte-buddy-dep/src/test/java/net/bytebuddy/build/PluginEngineSourceFilteringTest.java
+++ b/byte-buddy-dep/src/test/java/net/bytebuddy/build/PluginEngineSourceFilteringTest.java
@@ -1,5 +1,6 @@
 package net.bytebuddy.build;
 
+import net.bytebuddy.ClassFileVersion;
 import net.bytebuddy.dynamic.ClassFileLocator;
 import net.bytebuddy.matcher.ElementMatcher;
 import org.junit.Rule;
@@ -84,4 +85,22 @@ public void testClassFileLocator() throws Exception {
 
         assertThat(new Plugin.Engine.Source.Filtering(source, matcher).read().toClassFileLocator(null), is(classFileLocator));
     }
+
+    @Test
+    public void testMultiReleaseFilter() throws Exception {
+        when(source.read()).thenReturn(origin);
+        when(origin.iterator()).thenReturn(Arrays.asList(first, second, third).iterator());
+
+        when(first.getName()).thenReturn("foo/Bar.class");
+        when(second.getName()).thenReturn(ClassFileLocator.META_INF_VERSIONS + "17/foo/Bar.class");
+        when(third.getName()).thenReturn(ClassFileLocator.META_INF_VERSIONS + "11/foo/Bar.class");
+
+        Plugin.Engine.Source.Origin origin = Plugin.Engine.Source.Filtering.dropMultiReleaseClassFilesAbove(this.source, ClassFileVersion.JAVA_V11).read();
+        Iterator<Plugin.Engine.Source.Element> iterator = origin.iterator();
+        assertThat(iterator.hasNext(), is(true));
+        assertThat(iterator.next(), is(first));
+        assertThat(iterator.hasNext(), is(true));
+        assertThat(iterator.next(), is(third));
+        assertThat(iterator.hasNext(), is(false));
+    }
 }
diff --git a/byte-buddy-gradle-plugin/android-plugin/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyLocalClassesEnhancerTask.java b/byte-buddy-gradle-plugin/android-plugin/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyLocalClassesEnhancerTask.java
index 0edee42c4e..96ff3bd411 100644
--- a/byte-buddy-gradle-plugin/android-plugin/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyLocalClassesEnhancerTask.java
+++ b/byte-buddy-gradle-plugin/android-plugin/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyLocalClassesEnhancerTask.java
@@ -235,6 +235,7 @@ public void execute() throws IOException {
                 Iterable.class,
                 EntryPoint.class,
                 ClassFileVersion.class,
+                ClassFileVersion.class,
                 Plugin.Factory.UsingReflection.ArgumentResolver.class,
                 String.class,
                 int.class,
@@ -253,6 +254,7 @@ public void execute() throws IOException {
                     getDiscoverySet().getFiles(),
                     getEntryPoint().get(),
                     classFileVersion,
+                    classFileVersion,
                     Plugin.Factory.UsingReflection.ArgumentResolver.ForType.of(AndroidDescriptor.class, androidDescriptor),
                     getSuffix().get(),
                     getThreads().get(),
diff --git a/byte-buddy-gradle-plugin/src/main/java/net/bytebuddy/build/gradle/AbstractByteBuddyTask.java b/byte-buddy-gradle-plugin/src/main/java/net/bytebuddy/build/gradle/AbstractByteBuddyTask.java
index 6c7bfe9dc0..9ca194df3b 100644
--- a/byte-buddy-gradle-plugin/src/main/java/net/bytebuddy/build/gradle/AbstractByteBuddyTask.java
+++ b/byte-buddy-gradle-plugin/src/main/java/net/bytebuddy/build/gradle/AbstractByteBuddyTask.java
@@ -104,6 +104,13 @@ public abstract class AbstractByteBuddyTask extends DefaultTask {
     @MaybeNull
     private ClassFileVersion classFileVersion;
 
+    /**
+     * The class file version to use for resolving multi-release jar files or {@code null} if
+     * {@link #classFileVersion} or the implicit version should be used.
+     */
+    @MaybeNull
+    private ClassFileVersion multiReleaseClassFileVersion;
+
     /**
      * Creates a new abstract Byte Buddy task.
      */
@@ -322,6 +329,28 @@ public void setClassFileVersion(@MaybeNull ClassFileVersion classFileVersion) {
         this.classFileVersion = classFileVersion;
     }
 
+    /**
+     * Returns the class file version to use for resolving multi-release jar files or {@code null} if the
+     * explicit or implicit class file version of this task should be used.
+     *
+     * @return The class file version to use for resolving multi-release jar files.
+     */
+    @MaybeNull
+    @Input
+    @Optional
+    public ClassFileVersion getMultiReleaseClassFileVersion() {
+        return multiReleaseClassFileVersion;
+    }
+
+    /**
+     * Sets the class file version to use for resolving multi-release jar files.
+     *
+     * @param multiReleaseClassFileVersion The class file version to use for resolving multi-release jar files.
+     */
+    public void setMultiReleaseClassFileVersion(@MaybeNull ClassFileVersion multiReleaseClassFileVersion) {
+        this.multiReleaseClassFileVersion = multiReleaseClassFileVersion;
+    }
+
     /**
      * Returns the source file or folder.
      *
@@ -379,6 +408,7 @@ protected void doApply(Plugin.Engine.Source source, Plugin.Engine.Target target)
                 discoverySet(),
                 getEntryPoint(),
                 classFileVersion,
+                multiReleaseClassFileVersion == null ? classFileVersion : multiReleaseClassFileVersion,
                 Plugin.Factory.UsingReflection.ArgumentResolver.ForType.of(File.class, source()),
                 getSuffix(),
                 getThreads(),
@@ -393,24 +423,25 @@ protected void doApply(Plugin.Engine.Source source, Plugin.Engine.Target target)
     /**
      * Dispatches a Byte Buddy instrumentation Gradle task.
      *
-     * @param logger                The logger to use.
-     * @param rootLoader            The class loader that is used for searching types and applying plugins.
-     * @param transformations       The transformations to apply.
-     * @param discovery             The discovery for plugins to use.
-     * @param rootLocator           The root class file locator.
-     * @param artifacts             The artifacts to include.
-     * @param discoverySet          The source set to discover plugins from or {@code null} if no source set is used.
-     * @param entryPoint            The entry point to use.
-     * @param classFileVersion      The class file version to use.
-     * @param rootLocationResolver  An argument resolver for the root location of this build.
-     * @param suffix                The suffix to use for rebased methods or an empty string for using a random suffix.
-     * @param threads               The number of threads to use while instrumenting.
-     * @param extendedParsing       {@code true} if extended parsing should be used.
-     * @param failFast              {@code true} if the build should fail fast.
-     * @param failOnLiveInitializer {@code true} if the build should fail upon discovering a live initializer.
-     * @param warnOnEmptyTypeSet    {@code true} if a warning should be logged if no types are instrumented.
-     * @param source                The source to use for instrumenting.
-     * @param target                The target to use for instrumenting.
+     * @param logger                       The logger to use.
+     * @param rootLoader                   The class loader that is used for searching types and applying plugins.
+     * @param transformations              The transformations to apply.
+     * @param discovery                    The discovery for plugins to use.
+     * @param rootLocator                  The root class file locator.
+     * @param artifacts                    The artifacts to include.
+     * @param discoverySet                 The source set to discover plugins from or {@code null} if no source set is used.
+     * @param entryPoint                   The entry point to use.
+     * @param classFileVersion             The class file version to use.
+     * @param multiReleaseClassFileVersion The class file version to use for resolving multi-release jars.
+     * @param rootLocationResolver         An argument resolver for the root location of this build.
+     * @param suffix                       The suffix to use for rebased methods or an empty string for using a random suffix.
+     * @param threads                      The number of threads to use while instrumenting.
+     * @param extendedParsing              {@code true} if extended parsing should be used.
+     * @param failFast                     {@code true} if the build should fail fast.
+     * @param failOnLiveInitializer        {@code true} if the build should fail upon discovering a live initializer.
+     * @param warnOnEmptyTypeSet           {@code true} if a warning should be logged if no types are instrumented.
+     * @param source                       The source to use for instrumenting.
+     * @param target                       The target to use for instrumenting.
      * @throws IOException If an I/O error occurs.
      */
     public static void apply(Logger logger,
@@ -422,6 +453,7 @@ public static void apply(Logger logger,
                              @MaybeNull Iterable<File> discoverySet,
                              EntryPoint entryPoint,
                              ClassFileVersion classFileVersion,
+                             ClassFileVersion multiReleaseClassFileVersion,
                              Plugin.Factory.UsingReflection.ArgumentResolver rootLocationResolver,
                              String suffix,
                              int threads,
@@ -481,8 +513,8 @@ public static void apply(Logger logger,
             classFileLocators.add(rootLocator);
             for (File artifact : artifacts) {
                 classFileLocators.add(artifact.isFile()
-                        ? ClassFileLocator.ForJarFile.of(artifact, classFileVersion)
-                        : ClassFileLocator.ForFolder.of(artifact, classFileVersion));
+                        ? ClassFileLocator.ForJarFile.of(artifact, multiReleaseClassFileVersion)
+                        : ClassFileLocator.ForFolder.of(artifact, multiReleaseClassFileVersion));
             }
             ClassFileLocator classFileLocator = new ClassFileLocator.Compound(classFileLocators);
             try {
@@ -493,7 +525,7 @@ public static void apply(Logger logger,
                                 ? Plugin.Engine.PoolStrategy.Default.EXTENDED
                                 : Plugin.Engine.PoolStrategy.Default.FAST)
                         .with(classFileLocator)
-                        .with(classFileVersion)
+                        .with(multiReleaseClassFileVersion)
                         .with(new TransformationLogger(logger))
                         .withErrorHandlers(Plugin.Engine.ErrorHandler.Enforcing.ALL_TYPES_RESOLVED, failOnLiveInitializer
                                 ? Plugin.Engine.ErrorHandler.Enforcing.NO_LIVE_INITIALIZERS
diff --git a/byte-buddy-gradle-plugin/src/main/java/net/bytebuddy/build/gradle/AbstractByteBuddyTaskExtension.java b/byte-buddy-gradle-plugin/src/main/java/net/bytebuddy/build/gradle/AbstractByteBuddyTaskExtension.java
index ad2f837c16..d58358237c 100644
--- a/byte-buddy-gradle-plugin/src/main/java/net/bytebuddy/build/gradle/AbstractByteBuddyTaskExtension.java
+++ b/byte-buddy-gradle-plugin/src/main/java/net/bytebuddy/build/gradle/AbstractByteBuddyTaskExtension.java
@@ -118,6 +118,13 @@ public abstract class AbstractByteBuddyTaskExtension<T extends AbstractByteBuddy
     @MaybeNull
     private ClassFileVersion classFileVersion;
 
+    /**
+     * The class file version to use for resolving multi-release jar files or {@code null} if
+     * {@link #classFileVersion} or the implicit version should be used.
+     */
+    @MaybeNull
+    private ClassFileVersion multiReleaseClassFileVersion;
+
     /**
      * Creates a new abstract Byte Buddy task extension.
      *
@@ -410,6 +417,26 @@ public void setClassFileVersion(@MaybeNull ClassFileVersion classFileVersion) {
         this.classFileVersion = classFileVersion;
     }
 
+    /**
+     * Returns the class file version to use for resolving multi-release jar files or {@code null} if the
+     * explicit or implicit class file version of this task should be used.
+     *
+     * @return The class file version to use for resolving multi-release jar files.
+     */
+    @MaybeNull
+    public ClassFileVersion getMultiReleaseClassFileVersion() {
+        return multiReleaseClassFileVersion;
+    }
+
+    /**
+     * Sets the class file version to use for resolving multi-release jar files.
+     *
+     * @param multiReleaseClassFileVersion The class file version to use for resolving multi-release jar files.
+     */
+    public void setMultiReleaseClassFileVersion(@MaybeNull ClassFileVersion multiReleaseClassFileVersion) {
+        this.multiReleaseClassFileVersion = multiReleaseClassFileVersion;
+    }
+
     /**
      * Resolves default properties and considers the contextual Java version.
      *
@@ -451,6 +478,7 @@ protected void configure(T task) {
         task.setDiscovery(getDiscovery());
         task.setThreads(getThreads());
         task.setClassFileVersion(getClassFileVersion());
+        task.setMultiReleaseClassFileVersion(getMultiReleaseClassFileVersion());
         doConfigure(task);
     }
 
diff --git a/byte-buddy-maven-plugin/src/main/java/net/bytebuddy/build/maven/ByteBuddyMojo.java b/byte-buddy-maven-plugin/src/main/java/net/bytebuddy/build/maven/ByteBuddyMojo.java
index 1e7f847d50..2f7296eefe 100644
--- a/byte-buddy-maven-plugin/src/main/java/net/bytebuddy/build/maven/ByteBuddyMojo.java
+++ b/byte-buddy-maven-plugin/src/main/java/net/bytebuddy/build/maven/ByteBuddyMojo.java
@@ -230,6 +230,13 @@ public abstract class ByteBuddyMojo extends AbstractMojo {
     @Parameter(defaultValue = "0", required = true)
     public int staleMilliseconds;
 
+    /**
+     * Defines the version to use for resolving multi-release jar files. If not set, the Java compile version is used.
+     */
+    @MaybeNull
+    @Parameter
+    public Integer multiReleaseVersion;
+
     /**
      * {@inheritDoc}
      */
@@ -398,13 +405,16 @@ protected Plugin.Engine.Summary transform(List<? extends String> classPath,
                 classFileVersion = ClassFileVersion.ofJavaVersionString(javaVersionString);
                 getLog().debug("Java version detected: " + javaVersionString);
             }
+            ClassFileVersion multiReleaseClassFileVersion = multiReleaseVersion == null
+                    ? classFileVersion
+                    : ClassFileVersion.ofJavaVersion(multiReleaseVersion);
             List<ClassFileLocator> classFileLocators = new ArrayList<ClassFileLocator>(classPath.size());
             classFileLocators.add(ClassFileLocator.ForClassLoader.ofPlatformLoader());
             for (String element : classPath) {
                 File artifact = new File(element);
                 classFileLocators.add(artifact.isFile()
-                        ? ClassFileLocator.ForJarFile.of(artifact, classFileVersion)
-                        : ClassFileLocator.ForFolder.of(artifact, classFileVersion));
+                        ? ClassFileLocator.ForJarFile.of(artifact, multiReleaseClassFileVersion)
+                        : ClassFileLocator.ForFolder.of(artifact, multiReleaseClassFileVersion));
             }
             ClassFileLocator classFileLocator = new ClassFileLocator.Compound(classFileLocators);
             Plugin.Engine.Summary summary;
@@ -422,7 +432,7 @@ protected Plugin.Engine.Summary transform(List<? extends String> classPath,
                     summary = pluginEngine
                             .with(extendedParsing ? Plugin.Engine.PoolStrategy.Default.EXTENDED : Plugin.Engine.PoolStrategy.Default.FAST)
                             .with(classFileLocator)
-                            .with(classFileVersion)
+                            .with(multiReleaseClassFileVersion)
                             .with(new TransformationLogger(getLog()))
                             .withErrorHandlers(Plugin.Engine.ErrorHandler.Enforcing.ALL_TYPES_RESOLVED,
                                     failOnLiveInitializer ? Plugin.Engine.ErrorHandler.Enforcing.NO_LIVE_INITIALIZERS : Plugin.Engine.Listener.NoOp.INSTANCE,
diff --git a/release-notes.md b/release-notes.md
index 4d9357b1d7..d0d099211d 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,6 +1,13 @@
 Byte Buddy release notes
 ------------------------
 
+### 25. September 2024: version 1.15.2
+
+- Add support for multi-release JAR files in `ClassFileLocator`s and `Plugin.Engine.Default`.
+- Add Gradle task for transforming multiple jar files with `ByteBuddyJarsTask`.
+- Avoid validation of `JarFile` when extracting individual entries.
+- Rework discovery in `ByteBuddyMojo`.
+
 ### 29. August 2024: version 1.15.1
 
 - Revert default `EntryPoint` for Android Gradle plugin to use `DECORATE` unless explicitly specified due to many generic type errors in Kotlin classes. 

From 0bc0178b54c194d0ff6e32b4bc26e396ef70a092 Mon Sep 17 00:00:00 2001
From: Rafael Winterhalter <rafael.wth@gmail.com>
Date: Thu, 26 Sep 2024 20:50:47 +0200
Subject: [PATCH 07/14] Add missing annotation.

---
 byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java b/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
index b796709c5c..3ba2c159a5 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
@@ -31,6 +31,7 @@
 import net.bytebuddy.utility.StreamDrainer;
 import net.bytebuddy.utility.nullability.AlwaysNull;
 import net.bytebuddy.utility.nullability.MaybeNull;
+import net.bytebuddy.utility.nullability.UnknownNull;
 
 import java.io.*;
 import java.lang.annotation.*;
@@ -3346,7 +3347,7 @@ protected MultiReleaseVersionMatcher(ClassFileVersion classFileVersion) {
                     /**
                      * {@inheritDoc}
                      */
-                    public boolean matches(Element target) {
+                    public boolean matches(@UnknownNull Element target) {
                         String name = target.getName();
                         if (name.startsWith("/")) {
                             name = name.substring(1);

From 1e38dd0b12a3f1511f6f13b8fdf7eff5f4a33abc Mon Sep 17 00:00:00 2001
From: Rafael Winterhalter <rafael.wth@gmail.com>
Date: Thu, 26 Sep 2024 22:11:36 +0200
Subject: [PATCH 08/14] Adjust class file handling.

---
 .../main/java/net/bytebuddy/build/Plugin.java | 102 ++++++++++--------
 .../build/PluginEngineTargetInMemoryTest.java |   4 +-
 2 files changed, 59 insertions(+), 47 deletions(-)

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java b/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
index 3ba2c159a5..eda840224e 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
@@ -3399,12 +3399,12 @@ interface Sink extends Closeable {
                 /**
                  * Stores the supplied binary representation of types in this sink.
                  *
-                 * @param version               The version of the multi-release jar file, which should at least be {@code 8} as previous
+                 * @param classFileVersion      The version of the multi-release jar file, which should at least be {@code 8} as previous
                  *                              versions are not recognized by regular class loaders.
                  * @param binaryRepresentations The binary representations to store.
                  * @throws IOException If an I/O error occurs.
                  */
-                void store(int version, Map<TypeDescription, byte[]> binaryRepresentations) throws IOException;
+                void store(ClassFileVersion classFileVersion, Map<TypeDescription, byte[]> binaryRepresentations) throws IOException;
 
                 /**
                  * Retains the supplied element in its original form.
@@ -3447,9 +3447,13 @@ public void store(Map<TypeDescription, byte[]> binaryRepresentations) throws IOE
                     /**
                      * {@inheritDoc}
                      */
-                    public void store(int version, Map<TypeDescription, byte[]> binaryRepresentations) throws IOException {
+                    public void store(ClassFileVersion classFileVersion, Map<TypeDescription, byte[]> binaryRepresentations) throws IOException {
                         for (Map.Entry<TypeDescription, byte[]> entry : binaryRepresentations.entrySet()) {
-                            outputStream.putNextEntry(new JarEntry(ClassFileLocator.META_INF_VERSIONS + version + "/" + entry.getKey().getInternalName() + ClassFileLocator.CLASS_FILE_EXTENSION));
+                            outputStream.putNextEntry(new JarEntry(ClassFileLocator.META_INF_VERSIONS
+                                    + classFileVersion.getJavaVersion()
+                                    + "/"
+                                    + entry.getKey().getInternalName()
+                                    + ClassFileLocator.CLASS_FILE_EXTENSION));
                             outputStream.write(entry.getValue());
                             outputStream.closeEntry();
                         }
@@ -3512,7 +3516,7 @@ public void store(Map<TypeDescription, byte[]> binaryRepresentations) {
                 /**
                  * {@inheritDoc}
                  */
-                public void store(int version, Map<TypeDescription, byte[]> binaryRepresentations) throws IOException {
+                public void store(ClassFileVersion classFileVersion, Map<TypeDescription, byte[]> binaryRepresentations) throws IOException {
                     /* do nothing */
                 }
 
@@ -3585,9 +3589,13 @@ public void store(Map<TypeDescription, byte[]> binaryRepresentations) {
                 /**
                  * {@inheritDoc}
                  */
-                public void store(int version, Map<TypeDescription, byte[]> binaryRepresentations) throws IOException {
+                public void store(ClassFileVersion classFileVersion, Map<TypeDescription, byte[]> binaryRepresentations) throws IOException {
                     for (Map.Entry<TypeDescription, byte[]> entry : binaryRepresentations.entrySet()) {
-                        storage.put(ClassFileLocator.META_INF_VERSIONS + version + "/" + entry.getKey().getInternalName() + ClassFileLocator.CLASS_FILE_EXTENSION, entry.getValue());
+                        storage.put(ClassFileLocator.META_INF_VERSIONS
+                                + classFileVersion.getJavaVersion()
+                                + "/"
+                                + entry.getKey().getInternalName()
+                                + ClassFileLocator.CLASS_FILE_EXTENSION, entry.getValue());
                     }
                 }
 
@@ -3761,8 +3769,8 @@ public void store(Map<TypeDescription, byte[]> binaryRepresentations) throws IOE
                 /**
                  * {@inheritDoc}
                  */
-                public void store(int version, Map<TypeDescription, byte[]> binaryRepresentations) throws IOException {
-                    doStore(new File(folder, ClassFileLocator.META_INF_VERSIONS + version), binaryRepresentations);
+                public void store(ClassFileVersion classFileVersion, Map<TypeDescription, byte[]> binaryRepresentations) throws IOException {
+                    doStore(new File(folder, ClassFileLocator.META_INF_VERSIONS + classFileVersion.getJavaVersion()), binaryRepresentations);
                 }
 
                 /**
@@ -3877,7 +3885,7 @@ interface Materializable {
                 void materialize(Target.Sink sink,
                                  List<TypeDescription> transformed,
                                  Map<TypeDescription,
-                                         List<Throwable>> failed,
+                                 List<Throwable>> failed,
                                  List<String> unresolved) throws IOException;
 
                 /**
@@ -3886,9 +3894,10 @@ void materialize(Target.Sink sink,
                 class ForTransformedElement implements Materializable {
 
                     /**
-                     * The multi-release Java version number or {@code 0}.
+                     * The multi-release class file version number or {@code null} if a regular class.
                      */
-                    private final int version;
+                    @MaybeNull
+                    private final ClassFileVersion classFileVersion;
 
                     /**
                      * The type that has been transformed.
@@ -3898,11 +3907,11 @@ class ForTransformedElement implements Materializable {
                     /**
                      * Creates a new materializable for a successfully transformed type.
                      *
-                     * @param version     The multi-release Java version number or {@code 0}.
-                     * @param dynamicType The type that has been transformed.
+                     * @param classFileVersion The multi-release class file version number or {@code null} if a regular class.
+                     * @param dynamicType      The type that has been transformed.
                      */
-                    protected ForTransformedElement(int version, DynamicType dynamicType) {
-                        this.version = version;
+                    protected ForTransformedElement(@MaybeNull ClassFileVersion classFileVersion, DynamicType dynamicType) {
+                        this.classFileVersion = classFileVersion;
                         this.dynamicType = dynamicType;
                     }
 
@@ -3912,12 +3921,12 @@ protected ForTransformedElement(int version, DynamicType dynamicType) {
                     public void materialize(Target.Sink sink,
                                             List<TypeDescription> transformed,
                                             Map<TypeDescription,
-                                                    List<Throwable>> failed,
+                                            List<Throwable>> failed,
                                             List<String> unresolved) throws IOException {
-                        if (version == 0) {
+                        if (classFileVersion == null) {
                             sink.store(dynamicType.getAllTypes());
                         } else {
-                            sink.store(version, dynamicType.getAllTypes());
+                            sink.store(classFileVersion, dynamicType.getAllTypes());
                         }
                         transformed.add(dynamicType.getTypeDescription());
                     }
@@ -3948,7 +3957,7 @@ protected ForRetainedElement(Source.Element element) {
                     public void materialize(Target.Sink sink,
                                             List<TypeDescription> transformed,
                                             Map<TypeDescription,
-                                                    List<Throwable>> failed,
+                                            List<Throwable>> failed,
                                             List<String> unresolved) throws IOException {
                         sink.retain(element);
                     }
@@ -3993,7 +4002,7 @@ protected ForFailedElement(Source.Element element, TypeDescription typeDescripti
                     public void materialize(Target.Sink sink,
                                             List<TypeDescription> transformed,
                                             Map<TypeDescription,
-                                                    List<Throwable>> failed,
+                                            List<Throwable>> failed,
                                             List<String> unresolved) throws IOException {
                         sink.retain(element);
                         failed.put(typeDescription, errored);
@@ -4032,7 +4041,7 @@ protected ForUnresolvedElement(Source.Element element, String typeName) {
                     public void materialize(Target.Sink sink,
                                             List<TypeDescription> transformed,
                                             Map<TypeDescription,
-                                                    List<Throwable>> failed,
+                                            List<Throwable>> failed,
                                             List<String> unresolved) throws IOException {
                         sink.retain(element);
                         unresolved.add(typeName);
@@ -4951,20 +4960,20 @@ public Summary apply(Source source, Target target, List<? extends Plugin.Factory
                                             && !name.endsWith(PACKAGE_INFO)
                                             && !name.endsWith(MODULE_INFO)) {
                                         try {
-                                            int version = name.startsWith(ClassFileLocator.META_INF_VERSIONS)
-                                                    ? Math.max(7, Integer.parseInt(name.substring(ClassFileLocator.META_INF_VERSIONS.length(), name.indexOf('/', ClassFileLocator.META_INF_VERSIONS.length()))))
-                                                    : 0;
-                                            if (version == 0 || version > 7
-                                                    && classFileVersion != null
-                                                    && classFileVersion.isAtLeast(ClassFileVersion.JAVA_V9)
-                                                    && version <= classFileVersion.getJavaVersion()) {
+                                            ClassFileVersion classFileVersion = name.startsWith(ClassFileLocator.META_INF_VERSIONS)
+                                                    ? ClassFileVersion.ofJavaVersion(Integer.parseInt(name.substring(ClassFileLocator.META_INF_VERSIONS.length(), name.indexOf('/', ClassFileLocator.META_INF_VERSIONS.length()))))
+                                                    : null;
+                                            if (classFileVersion == null || classFileVersion.isAtLeast(ClassFileVersion.JAVA_V8)
+                                                    && this.classFileVersion != null
+                                                    && this.classFileVersion.isAtLeast(ClassFileVersion.JAVA_V9)
+                                                    && classFileVersion.isAtMost(this.classFileVersion)) {
                                                 String typeName = name.substring(name.startsWith(ClassFileLocator.META_INF_VERSIONS)
                                                         ? name.indexOf('/', ClassFileLocator.META_INF_VERSIONS.length()) + 1
                                                         : 0, name.length() - ClassFileLocator.CLASS_FILE_EXTENSION.length()).replace('/', '.');
                                                 dispatcher.accept(new Preprocessor(element,
                                                         typeName,
-                                                        version,
                                                         new SourceEntryPrependingClassFileLocator(typeName, element, classFileLocator),
+                                                        classFileVersion,
                                                         typePool,
                                                         listener,
                                                         plugins,
@@ -5096,14 +5105,16 @@ private class Preprocessor implements Callable<Callable<? extends Dispatcher.Mat
                 private final String typeName;
 
                 /**
-                 * The multi-release Java version number or {@code 0}.
+                 * The class file locator to use.
                  */
-                private final int version;
+                private final ClassFileLocator classFileLocator;
 
                 /**
-                 * The class file locator to use.
+                 * The multi-release class file version or {@code null} for a regular class.
                  */
-                private final ClassFileLocator classFileLocator;
+                @MaybeNull
+                @HashCodeAndEqualsPlugin.ValueHandling(HashCodeAndEqualsPlugin.ValueHandling.Sort.REVERSE_NULLABILITY)
+                private final ClassFileVersion classFileVersion;
 
                 /**
                  * The type pool to use.
@@ -5130,8 +5141,8 @@ private class Preprocessor implements Callable<Callable<? extends Dispatcher.Mat
                  *
                  * @param element          The processed element.
                  * @param typeName         The name of the processed type.
-                 * @param version          The multi-release Java version number or {@code 0}.
                  * @param classFileLocator The class file locator to use.
+                 * @param classFileVersion The multi-release class file version or {@code null} for a regular class.
                  * @param typePool         The type pool to use.
                  * @param listener         The listener to notify.
                  * @param plugins          The plugins to apply.
@@ -5139,16 +5150,16 @@ private class Preprocessor implements Callable<Callable<? extends Dispatcher.Mat
                  */
                 private Preprocessor(Source.Element element,
                                      String typeName,
-                                     int version,
                                      ClassFileLocator classFileLocator,
+                                     @MaybeNull ClassFileVersion classFileVersion,
                                      TypePool typePool,
                                      Listener listener,
                                      List<Plugin> plugins,
                                      List<WithPreprocessor> preprocessors) {
                     this.element = element;
                     this.typeName = typeName;
-                    this.version = version;
                     this.classFileLocator = classFileLocator;
+                    this.classFileVersion = classFileVersion;
                     this.typePool = typePool;
                     this.listener = listener;
                     this.plugins = plugins;
@@ -5168,7 +5179,7 @@ public Callable<Dispatcher.Materializable> call() throws Exception {
                                 for (WithPreprocessor preprocessor : preprocessors) {
                                     preprocessor.onPreprocess(typeDescription, classFileLocator);
                                 }
-                                return new Resolved(version, typeDescription);
+                                return new Resolved(classFileVersion, typeDescription);
                             } else {
                                 return new Ignored(typeDescription);
                             }
@@ -5193,9 +5204,10 @@ public Callable<Dispatcher.Materializable> call() throws Exception {
                 private class Resolved implements Callable<Dispatcher.Materializable> {
 
                     /**
-                     * The multi-release Java version number or {@code 0}.
+                     * The multi-release Java version number or {@code null} if a regular class.
                      */
-                    private final int version;
+                    @MaybeNull
+                    private final ClassFileVersion classFileVersion;
 
                     /**
                      * A description of the resolved type.
@@ -5205,11 +5217,11 @@ private class Resolved implements Callable<Dispatcher.Materializable> {
                     /**
                      * Creates a new resolved materializable.
                      *
-                     * @param version         The multi-release Java version number or {@code 0}.
-                     * @param typeDescription A description of the resolved type.
+                     * @param classFileVersion The multi-release Java version number or {@code null} if a regular class.
+                     * @param typeDescription  A description of the resolved type.
                      */
-                    private Resolved(int version, TypeDescription typeDescription) {
-                        this.version = version;
+                    private Resolved(@MaybeNull ClassFileVersion classFileVersion, TypeDescription typeDescription) {
+                        this.classFileVersion = classFileVersion;
                         this.typeDescription = typeDescription;
                     }
 
@@ -5248,7 +5260,7 @@ public Dispatcher.Materializable call() {
                                             listener.onLiveInitializer(typeDescription, entry.getKey());
                                         }
                                     }
-                                    return new Dispatcher.Materializable.ForTransformedElement(version, dynamicType);
+                                    return new Dispatcher.Materializable.ForTransformedElement(classFileVersion, dynamicType);
                                 } catch (Throwable throwable) {
                                     errored.add(throwable);
                                     listener.onError(typeDescription, errored);
diff --git a/byte-buddy-dep/src/test/java/net/bytebuddy/build/PluginEngineTargetInMemoryTest.java b/byte-buddy-dep/src/test/java/net/bytebuddy/build/PluginEngineTargetInMemoryTest.java
index 6cc33591f6..4c6f4aeca1 100644
--- a/byte-buddy-dep/src/test/java/net/bytebuddy/build/PluginEngineTargetInMemoryTest.java
+++ b/byte-buddy-dep/src/test/java/net/bytebuddy/build/PluginEngineTargetInMemoryTest.java
@@ -75,8 +75,8 @@ public void testMultiVersion() throws Exception {
         Plugin.Engine.Target.InMemory target = new Plugin.Engine.Target.InMemory();
         Plugin.Engine.Target.Sink sink = target.write(Plugin.Engine.Source.Origin.NO_MANIFEST);
         sink.store(Collections.singletonMap(TypeDescription.ForLoadedType.of(Object.class), new byte[]{1, 2, 3}));
-        sink.store(11, Collections.singletonMap(TypeDescription.ForLoadedType.of(Object.class), new byte[]{4, 5, 6}));
-        sink.store(17, Collections.singletonMap(TypeDescription.ForLoadedType.of(Object.class), new byte[]{7, 8, 9}));
+        sink.store(ClassFileVersion.JAVA_V11, Collections.singletonMap(TypeDescription.ForLoadedType.of(Object.class), new byte[]{4, 5, 6}));
+        sink.store(ClassFileVersion.JAVA_V17, Collections.singletonMap(TypeDescription.ForLoadedType.of(Object.class), new byte[]{7, 8, 9}));
         sink.close();
         assertThat(target.getStorage().size(), is(3));
         assertThat(target.getStorage().get(TypeDescription.ForLoadedType.of(Object.class).getInternalName() + ClassFileLocator.CLASS_FILE_EXTENSION), is(new byte[]{1, 2, 3}));

From b7b3b65ac66a584c21cc779cbe2263dbfda5d8bb Mon Sep 17 00:00:00 2001
From: Rafael Winterhalter <rafael.wth@gmail.com>
Date: Thu, 26 Sep 2024 22:28:52 +0200
Subject: [PATCH 09/14] Make class file version more efficient and avoid
 experimental API on it.

---
 .../java/net/bytebuddy/ClassFileVersion.java  | 179 +++++-------------
 .../bytebuddy/ClassFileVersionOtherTest.java  |  10 +
 .../net/bytebuddy/ClassFileVersionTest.java   |  30 +--
 3 files changed, 70 insertions(+), 149 deletions(-)

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java b/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java
index b72fed9249..bf025ffb9c 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java
@@ -20,7 +20,6 @@
 import net.bytebuddy.build.HashCodeAndEqualsPlugin;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.dynamic.ClassFileLocator;
-import net.bytebuddy.utility.OpenedClassReader;
 import net.bytebuddy.utility.nullability.MaybeNull;
 import org.objectweb.asm.Opcodes;
 
@@ -160,6 +159,33 @@ public class ClassFileVersion implements Comparable<ClassFileVersion>, Serializa
      */
     public static final ClassFileVersion JAVA_V23 = new ClassFileVersion(Opcodes.V23);
 
+    /**
+     * An array of class file versions in their sorting order.
+     */
+    private static final ClassFileVersion[] CLASS_FILE_VERSIONS = new ClassFileVersion[] {ClassFileVersion.JAVA_V1,
+            ClassFileVersion.JAVA_V2,
+            ClassFileVersion.JAVA_V3,
+            ClassFileVersion.JAVA_V4,
+            ClassFileVersion.JAVA_V5,
+            ClassFileVersion.JAVA_V6,
+            ClassFileVersion.JAVA_V7,
+            ClassFileVersion.JAVA_V8,
+            ClassFileVersion.JAVA_V9,
+            ClassFileVersion.JAVA_V10,
+            ClassFileVersion.JAVA_V11,
+            ClassFileVersion.JAVA_V12,
+            ClassFileVersion.JAVA_V13,
+            ClassFileVersion.JAVA_V14,
+            ClassFileVersion.JAVA_V15,
+            ClassFileVersion.JAVA_V16,
+            ClassFileVersion.JAVA_V17,
+            ClassFileVersion.JAVA_V18,
+            ClassFileVersion.JAVA_V19,
+            ClassFileVersion.JAVA_V20,
+            ClassFileVersion.JAVA_V21,
+            ClassFileVersion.JAVA_V22,
+            ClassFileVersion.JAVA_V23};
+
     /**
      * A version locator for the executing JVM.
      */
@@ -212,76 +238,20 @@ public static ClassFileVersion ofMinorMajor(int versionNumber) {
      * @return The appropriate class file version.
      */
     public static ClassFileVersion ofJavaVersionString(String javaVersionString) {
-        return ofJavaVersionString(javaVersionString, OpenedClassReader.EXPERIMENTAL);
-    }
-
-    /**
-     * Returns the Java class file by its representation by a version string in accordance to the formats known to <i>javac</i>.
-     *
-     * @param javaVersionString The Java version string.
-     * @param experimental      {@code true} if unknown version strings should be parsed as if they were known.
-     * @return The appropriate class file version.
-     */
-    public static ClassFileVersion ofJavaVersionString(String javaVersionString, boolean experimental) {
-        if (javaVersionString.equals("1.1")) {
-            return JAVA_V1;
-        } else if (javaVersionString.equals("1.2")) {
-            return JAVA_V2;
-        } else if (javaVersionString.equals("1.3")) {
-            return JAVA_V3;
-        } else if (javaVersionString.equals("1.4")) {
-            return JAVA_V4;
-        } else if (javaVersionString.equals("1.5") || javaVersionString.equals("5")) {
-            return JAVA_V5;
-        } else if (javaVersionString.equals("1.6") || javaVersionString.equals("6")) {
-            return JAVA_V6;
-        } else if (javaVersionString.equals("1.7") || javaVersionString.equals("7")) {
-            return JAVA_V7;
-        } else if (javaVersionString.equals("1.8") || javaVersionString.equals("8")) {
-            return JAVA_V8;
-        } else if (javaVersionString.equals("1.9") || javaVersionString.equals("9")) {
-            return JAVA_V9;
-        } else if (javaVersionString.equals("1.10") || javaVersionString.equals("10")) {
-            return JAVA_V10;
-        } else if (javaVersionString.equals("1.11") || javaVersionString.equals("11")) {
-            return JAVA_V11;
-        } else if (javaVersionString.equals("1.12") || javaVersionString.equals("12")) {
-            return JAVA_V12;
-        } else if (javaVersionString.equals("1.13") || javaVersionString.equals("13")) {
-            return JAVA_V13;
-        } else if (javaVersionString.equals("1.14") || javaVersionString.equals("14")) {
-            return JAVA_V14;
-        } else if (javaVersionString.equals("1.15") || javaVersionString.equals("15")) {
-            return JAVA_V15;
-        } else if (javaVersionString.equals("1.16") || javaVersionString.equals("16")) {
-            return JAVA_V16;
-        } else if (javaVersionString.equals("1.17") || javaVersionString.equals("17")) {
-            return JAVA_V17;
-        } else if (javaVersionString.equals("1.18") || javaVersionString.equals("18")) {
-            return JAVA_V18;
-        } else if (javaVersionString.equals("1.19") || javaVersionString.equals("19")) {
-            return JAVA_V19;
-        } else if (javaVersionString.equals("1.20") || javaVersionString.equals("20")) {
-            return JAVA_V20;
-        } else if (javaVersionString.equals("1.21") || javaVersionString.equals("21")) {
-            return JAVA_V21;
-        } else if (javaVersionString.equals("1.22") || javaVersionString.equals("22")) {
-            return JAVA_V22;
-        } else if (javaVersionString.equals("1.23") || javaVersionString.equals("23")) {
-            return JAVA_V23;
-        } else {
-            if (experimental) {
-                try {
-                    int version = Integer.parseInt(javaVersionString.startsWith("1.")
-                            ? javaVersionString.substring(2)
-                            : javaVersionString);
-                    if (version > 0) {
-                        return new ClassFileVersion(BASE_VERSION + version);
-                    }
-                } catch (NumberFormatException ignored) {
+        int index = javaVersionString.indexOf('.');
+        try {
+            int javaVersion;
+            if (index == -1) {
+                javaVersion = Integer.parseInt(javaVersionString);
+            } else {
+                javaVersion = Integer.parseInt(javaVersionString.substring(index + 1));
+                if (Integer.parseInt(javaVersionString.substring(0, index)) != 1 || javaVersion > 8) {
+                    throw new IllegalArgumentException("Java versions with minor version must be of format 1.[1-7]: " + javaVersionString);
                 }
             }
-            throw new IllegalArgumentException("Unknown Java version string: " + javaVersionString);
+            return ofJavaVersion(javaVersion);
+        } catch (NumberFormatException exception) {
+            throw new IllegalStateException("Failed to read Java version from: " + javaVersionString, exception);
         }
     }
 
@@ -293,71 +263,12 @@ public static ClassFileVersion ofJavaVersionString(String javaVersionString, boo
      * @return A wrapper for the given Java class file version.
      */
     public static ClassFileVersion ofJavaVersion(int javaVersion) {
-        return ofJavaVersion(javaVersion, OpenedClassReader.EXPERIMENTAL);
-    }
-
-    /**
-     * Creates a class file version for a given major release of Java. Currently, all versions reaching from
-     * Java 1 to Java 9 are supported.
-     *
-     * @param javaVersion  The Java version.
-     * @param experimental {@code true} if unknown Java versions should also be considered.
-     * @return A wrapper for the given Java class file version.
-     */
-    public static ClassFileVersion ofJavaVersion(int javaVersion, boolean experimental) {
-        switch (javaVersion) {
-            case 1:
-                return JAVA_V1;
-            case 2:
-                return JAVA_V2;
-            case 3:
-                return JAVA_V3;
-            case 4:
-                return JAVA_V4;
-            case 5:
-                return JAVA_V5;
-            case 6:
-                return JAVA_V6;
-            case 7:
-                return JAVA_V7;
-            case 8:
-                return JAVA_V8;
-            case 9:
-                return JAVA_V9;
-            case 10:
-                return JAVA_V10;
-            case 11:
-                return JAVA_V11;
-            case 12:
-                return JAVA_V12;
-            case 13:
-                return JAVA_V13;
-            case 14:
-                return JAVA_V14;
-            case 15:
-                return JAVA_V15;
-            case 16:
-                return JAVA_V16;
-            case 17:
-                return JAVA_V17;
-            case 18:
-                return JAVA_V18;
-            case 19:
-                return JAVA_V19;
-            case 20:
-                return JAVA_V20;
-            case 21:
-                return JAVA_V21;
-            case 22:
-                return JAVA_V22;
-            case 23:
-                return JAVA_V23;
-            default:
-                if (experimental && javaVersion > 0) {
-                    return new ClassFileVersion(BASE_VERSION + javaVersion);
-                } else {
-                    throw new IllegalArgumentException("Unknown Java version: " + javaVersion);
-                }
+        if (javaVersion < 1) {
+            throw new IllegalArgumentException("Java version must be positive: " + javaVersion);
+        } else if (javaVersion - 1 < CLASS_FILE_VERSIONS.length) {
+            return CLASS_FILE_VERSIONS[javaVersion - 1];
+        } else {
+            return new ClassFileVersion(BASE_VERSION + javaVersion);
         }
     }
 
diff --git a/byte-buddy-dep/src/test/java/net/bytebuddy/ClassFileVersionOtherTest.java b/byte-buddy-dep/src/test/java/net/bytebuddy/ClassFileVersionOtherTest.java
index bb0b008fbd..8d06104148 100644
--- a/byte-buddy-dep/src/test/java/net/bytebuddy/ClassFileVersionOtherTest.java
+++ b/byte-buddy-dep/src/test/java/net/bytebuddy/ClassFileVersionOtherTest.java
@@ -88,6 +88,16 @@ public void testLatestVersion() throws Exception {
         assertThat(ClassFileVersion.latest().getMajorVersion(), is((short) value));
     }
 
+    @Test(expected = IllegalArgumentException.class)
+    public void testNegativeVersion() throws Exception {
+        ClassFileVersion.ofJavaVersion(0);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testOneDotTooNew() throws Exception {
+        ClassFileVersion.ofJavaVersionString("1.9");
+    }
+
     @Test(expected = IllegalArgumentException.class)
     public void testIllegalClassFile() throws Exception {
         ClassFileVersion.ofClassFile(new byte[0]);
diff --git a/byte-buddy-dep/src/test/java/net/bytebuddy/ClassFileVersionTest.java b/byte-buddy-dep/src/test/java/net/bytebuddy/ClassFileVersionTest.java
index 33c8610b47..75c489c70a 100644
--- a/byte-buddy-dep/src/test/java/net/bytebuddy/ClassFileVersionTest.java
+++ b/byte-buddy-dep/src/test/java/net/bytebuddy/ClassFileVersionTest.java
@@ -66,21 +66,21 @@ public static Collection<Object[]> data() {
                 {6, 6, Arrays.asList("1.6", "6"), Opcodes.V1_6, (short) 50, (short) 0, true, false, false},
                 {7, 7, Arrays.asList("1.7", "7"), Opcodes.V1_7, (short) 51, (short) 0, true, true, false},
                 {8, 8, Arrays.asList("1.8", "8"), Opcodes.V1_8, (short) 52, (short) 0, true, true, true},
-                {9, 9, Arrays.asList("1.9", "9"), Opcodes.V9, (short) 53, (short) 0, true, true, true},
-                {10, 10, Arrays.asList("1.10", "10"), Opcodes.V10, (short) 54, (short) 0, true, true, true},
-                {11, 11, Arrays.asList("1.11", "11"), Opcodes.V11, (short) 55, (short) 0, true, true, true},
-                {12, 12, Arrays.asList("1.12", "12"), Opcodes.V12, (short) 56, (short) 0, true, true, true},
-                {13, 13, Arrays.asList("1.13", "13"), Opcodes.V13, (short) 57, (short) 0, true, true, true},
-                {14, 14, Arrays.asList("1.14", "14"), Opcodes.V14, (short) 58, (short) 0, true, true, true},
-                {15, 15, Arrays.asList("1.15", "15"), Opcodes.V15, (short) 59, (short) 0, true, true, true},
-                {16, 16, Arrays.asList("1.16", "16"), Opcodes.V16, (short) 60, (short) 0, true, true, true},
-                {17, 17, Arrays.asList("1.17", "17"), Opcodes.V17, (short) 61, (short) 0, true, true, true},
-                {18, 18, Arrays.asList("1.18", "18"), Opcodes.V18, (short) 62, (short) 0, true, true, true},
-                {19, 19, Arrays.asList("1.19", "19"), Opcodes.V19, (short) 63, (short) 0, true, true, true},
-                {20, 20, Arrays.asList("1.20", "20"), Opcodes.V20, (short) 64, (short) 0, true, true, true},
-                {21, 21, Arrays.asList("1.21", "21"), Opcodes.V21, (short) 65, (short) 0, true, true, true},
-                {22, 22, Arrays.asList("1.22", "22"), Opcodes.V22, (short) 66, (short) 0, true, true, true},
-                {23, 23, Arrays.asList("1.23", "23"), Opcodes.V23, (short) 67, (short) 0, true, true, true}
+                {9, 9, Collections.singletonList("9"), Opcodes.V9, (short) 53, (short) 0, true, true, true},
+                {10, 10, Collections.singletonList("10"), Opcodes.V10, (short) 54, (short) 0, true, true, true},
+                {11, 11, Collections.singletonList("11"), Opcodes.V11, (short) 55, (short) 0, true, true, true},
+                {12, 12, Collections.singletonList("12"), Opcodes.V12, (short) 56, (short) 0, true, true, true},
+                {13, 13, Collections.singletonList("13"), Opcodes.V13, (short) 57, (short) 0, true, true, true},
+                {14, 14, Collections.singletonList("14"), Opcodes.V14, (short) 58, (short) 0, true, true, true},
+                {15, 15, Collections.singletonList("15"), Opcodes.V15, (short) 59, (short) 0, true, true, true},
+                {16, 16, Collections.singletonList("16"), Opcodes.V16, (short) 60, (short) 0, true, true, true},
+                {17, 17, Collections.singletonList("17"), Opcodes.V17, (short) 61, (short) 0, true, true, true},
+                {18, 18, Collections.singletonList("18"), Opcodes.V18, (short) 62, (short) 0, true, true, true},
+                {19, 19, Collections.singletonList("19"), Opcodes.V19, (short) 63, (short) 0, true, true, true},
+                {20, 20, Collections.singletonList("20"), Opcodes.V20, (short) 64, (short) 0, true, true, true},
+                {21, 21, Collections.singletonList("21"), Opcodes.V21, (short) 65, (short) 0, true, true, true},
+                {22, 22, Collections.singletonList("22"), Opcodes.V22, (short) 66, (short) 0, true, true, true},
+                {23, 23, Collections.singletonList("23"), Opcodes.V23, (short) 67, (short) 0, true, true, true}
         });
     }
 

From e8aeef471535f2ef3492aa2b09cb4671fc7daf36 Mon Sep 17 00:00:00 2001
From: Rafael Winterhalter <rafael.wth@gmail.com>
Date: Thu, 26 Sep 2024 22:37:12 +0200
Subject: [PATCH 10/14] Change nullability.

---
 byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java b/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
index eda840224e..9deaadf5ce 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
@@ -31,6 +31,7 @@
 import net.bytebuddy.utility.StreamDrainer;
 import net.bytebuddy.utility.nullability.AlwaysNull;
 import net.bytebuddy.utility.nullability.MaybeNull;
+import net.bytebuddy.utility.nullability.NeverNull;
 import net.bytebuddy.utility.nullability.UnknownNull;
 
 import java.io.*;
@@ -3347,7 +3348,7 @@ protected MultiReleaseVersionMatcher(ClassFileVersion classFileVersion) {
                     /**
                      * {@inheritDoc}
                      */
-                    public boolean matches(@UnknownNull Element target) {
+                    public boolean matches(@NeverNull Element target) {
                         String name = target.getName();
                         if (name.startsWith("/")) {
                             name = name.substring(1);

From b715358717e5f590831b38c0a9b5db57231603d1 Mon Sep 17 00:00:00 2001
From: Rafael Winterhalter <rafael.wth@gmail.com>
Date: Thu, 26 Sep 2024 22:39:22 +0200
Subject: [PATCH 11/14] Add null check.

---
 byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java b/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
index 9deaadf5ce..21d31311d1 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
@@ -3348,7 +3348,10 @@ protected MultiReleaseVersionMatcher(ClassFileVersion classFileVersion) {
                     /**
                      * {@inheritDoc}
                      */
-                    public boolean matches(@NeverNull Element target) {
+                    public boolean matches(@MaybeNull Element target) {
+                        if (target == null) {
+                            return true;
+                        }
                         String name = target.getName();
                         if (name.startsWith("/")) {
                             name = name.substring(1);

From 799090cbc62e9521d0f25211c6c3c3148d1fbe22 Mon Sep 17 00:00:00 2001
From: Rafael Winterhalter <rafael.wth@gmail.com>
Date: Thu, 26 Sep 2024 22:50:17 +0200
Subject: [PATCH 12/14] Remove imports.

---
 byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java b/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
index 21d31311d1..db4ce97ed2 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
@@ -31,8 +31,6 @@
 import net.bytebuddy.utility.StreamDrainer;
 import net.bytebuddy.utility.nullability.AlwaysNull;
 import net.bytebuddy.utility.nullability.MaybeNull;
-import net.bytebuddy.utility.nullability.NeverNull;
-import net.bytebuddy.utility.nullability.UnknownNull;
 
 import java.io.*;
 import java.lang.annotation.*;

From 209b5952cc057b71f00c06c23d9a85c283156d92 Mon Sep 17 00:00:00 2001
From: Rafael Winterhalter <rafael.wth@gmail.com>
Date: Thu, 26 Sep 2024 23:56:52 +0200
Subject: [PATCH 13/14] [release] Release new version


From 2c7a781c96d22514365229f4d1f46a0eaab6d434 Mon Sep 17 00:00:00 2001
From: Rafael Winterhalter <rafael.wth@gmail.com>
Date: Thu, 26 Sep 2024 22:13:05 +0000
Subject: [PATCH 14/14] [maven-release-plugin] prepare release
 byte-buddy-1.15.3

---
 byte-buddy-agent/pom.xml         | 2 +-
 byte-buddy-android-test/pom.xml  | 2 +-
 byte-buddy-android/pom.xml       | 2 +-
 byte-buddy-benchmark/pom.xml     | 2 +-
 byte-buddy-dep/pom.xml           | 2 +-
 byte-buddy-gradle-plugin/pom.xml | 2 +-
 byte-buddy-maven-plugin/pom.xml  | 2 +-
 byte-buddy/pom.xml               | 2 +-
 pom.xml                          | 6 +++---
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/byte-buddy-agent/pom.xml b/byte-buddy-agent/pom.xml
index 714e49af68..76d980d777 100644
--- a/byte-buddy-agent/pom.xml
+++ b/byte-buddy-agent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy-parent</artifactId>
-        <version>1.15.3-SNAPSHOT</version>
+        <version>1.15.3</version>
     </parent>
 
     <artifactId>byte-buddy-agent</artifactId>
diff --git a/byte-buddy-android-test/pom.xml b/byte-buddy-android-test/pom.xml
index 552f01432b..e91c4d9dc6 100644
--- a/byte-buddy-android-test/pom.xml
+++ b/byte-buddy-android-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy-parent</artifactId>
-        <version>1.15.3-SNAPSHOT</version>
+        <version>1.15.3</version>
     </parent>
 
     <artifactId>byte-buddy-android-test</artifactId>
diff --git a/byte-buddy-android/pom.xml b/byte-buddy-android/pom.xml
index c01d12fd9b..fdc6b9cdc7 100644
--- a/byte-buddy-android/pom.xml
+++ b/byte-buddy-android/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy-parent</artifactId>
-        <version>1.15.3-SNAPSHOT</version>
+        <version>1.15.3</version>
     </parent>
 
     <artifactId>byte-buddy-android</artifactId>
diff --git a/byte-buddy-benchmark/pom.xml b/byte-buddy-benchmark/pom.xml
index 747854dd23..759d5511c9 100644
--- a/byte-buddy-benchmark/pom.xml
+++ b/byte-buddy-benchmark/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy-parent</artifactId>
-        <version>1.15.3-SNAPSHOT</version>
+        <version>1.15.3</version>
     </parent>
 
     <artifactId>byte-buddy-benchmark</artifactId>
diff --git a/byte-buddy-dep/pom.xml b/byte-buddy-dep/pom.xml
index c95595d8b2..34046ca12e 100644
--- a/byte-buddy-dep/pom.xml
+++ b/byte-buddy-dep/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy-parent</artifactId>
-        <version>1.15.3-SNAPSHOT</version>
+        <version>1.15.3</version>
     </parent>
 
     <!--
diff --git a/byte-buddy-gradle-plugin/pom.xml b/byte-buddy-gradle-plugin/pom.xml
index 3258db00a2..678f311ff3 100644
--- a/byte-buddy-gradle-plugin/pom.xml
+++ b/byte-buddy-gradle-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy-parent</artifactId>
-        <version>1.15.3-SNAPSHOT</version>
+        <version>1.15.3</version>
     </parent>
 
     <artifactId>byte-buddy-gradle-plugin</artifactId>
diff --git a/byte-buddy-maven-plugin/pom.xml b/byte-buddy-maven-plugin/pom.xml
index 7d4cbe9085..dbf274e773 100644
--- a/byte-buddy-maven-plugin/pom.xml
+++ b/byte-buddy-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy-parent</artifactId>
-        <version>1.15.3-SNAPSHOT</version>
+        <version>1.15.3</version>
     </parent>
 
     <artifactId>byte-buddy-maven-plugin</artifactId>
diff --git a/byte-buddy/pom.xml b/byte-buddy/pom.xml
index 9cba48cda2..b641a81ca1 100644
--- a/byte-buddy/pom.xml
+++ b/byte-buddy/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy-parent</artifactId>
-        <version>1.15.3-SNAPSHOT</version>
+        <version>1.15.3</version>
     </parent>
 
     <artifactId>byte-buddy</artifactId>
diff --git a/pom.xml b/pom.xml
index d105ecbeb6..e0cb8d71e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>net.bytebuddy</groupId>
     <artifactId>byte-buddy-parent</artifactId>
-    <version>1.15.3-SNAPSHOT</version>
+    <version>1.15.3</version>
     <packaging>pom</packaging>
 
     <inceptionYear>2014</inceptionYear>
@@ -61,7 +61,7 @@
         <bytebuddy.integration>false</bytebuddy.integration>
         <bytebuddy.experimental>false</bytebuddy.experimental>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.build.outputTimestamp>1727249941</project.build.outputTimestamp>
+        <project.build.outputTimestamp>1727388686</project.build.outputTimestamp>
         <sourcecode.main.version>1.5</sourcecode.main.version>
         <sourcecode.test.version>1.6</sourcecode.test.version>
         <bytecode.main.version>1.5</bytecode.main.version>
@@ -154,7 +154,7 @@
         <connection>scm:git:${repository.url}</connection>
         <developerConnection>scm:git:${repository.url}</developerConnection>
         <url>${repository.url}</url>
-        <tag>HEAD</tag>
+        <tag>byte-buddy-1.15.3</tag>
     </scm>
 
     <dependencies>