diff --git a/byte-buddy-agent/pom.xml b/byte-buddy-agent/pom.xml index bd46750bb29..9f0373f4f2a 100644 --- a/byte-buddy-agent/pom.xml +++ b/byte-buddy-agent/pom.xml @@ -69,7 +69,7 @@ net.bytebuddy byte-buddy - 1.10.14 + 1.10.15 test diff --git a/byte-buddy-dep/pom.xml b/byte-buddy-dep/pom.xml index 684755cf010..1914a418204 100644 --- a/byte-buddy-dep/pom.xml +++ b/byte-buddy-dep/pom.xml @@ -101,7 +101,7 @@ net.bytebuddy byte-buddy-maven-plugin - 1.10.14 + 1.10.15 compile @@ -116,13 +116,13 @@ net.bytebuddy byte-buddy - 1.10.14 + 1.10.15 net.bytebuddy.build.HashCodeAndEqualsPlugin$WithNonNullableFields net.bytebuddy byte-buddy - 1.10.14 + 1.10.15 net.bytebuddy.build.CachedReturnPlugin 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 515fa348bb1..2b4d9bb0d73 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java @@ -119,7 +119,7 @@ public class ClassFileVersion implements Comparable { /** * The class file version of Java 16. */ - public static final ClassFileVersion JAVA_V16 = new ClassFileVersion(Opcodes.V15 + 1); + public static final ClassFileVersion JAVA_V16 = new ClassFileVersion(Opcodes.V16); /** * A version locator for the executing JVM. diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/TypeWriter.java b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/TypeWriter.java index 867f08a79c0..b189d5b7bf5 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/TypeWriter.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/TypeWriter.java @@ -2323,11 +2323,11 @@ record = false; super.visit(version, modifiers, name, signature, superName, interfaces); } - /*@Override + @Override public void visitPermittedSubclass(String permittedSubclass) { constraint.assertPermittedSubclass(); super.visitPermittedSubclass(permittedSubclass); - }*/ + } @Override public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) { @@ -4862,19 +4862,19 @@ protected void onNestHost() { } } - /*@Override + @Override protected void onVisitPermittedSubclass(String permittedSubclass) { if (permittedSubclasses.remove(permittedSubclass)) { cv.visitPermittedSubclass(permittedSubclass); } - }*/ + } - /*@Override + @Override protected void onAfterPermittedSubclasses() { for (String permittedSubclass : permittedSubclasses) { cv.visitPermittedSubclass(permittedSubclass); } - }*/ + } @Override protected void onVisitOuterClass(String owner, String name, String descriptor) { @@ -5729,9 +5729,9 @@ protected UnresolvedType create(TypeInitializer typeInitializer, ClassDumpAction if (!instrumentedType.isNestHost()) { classVisitor.visitNestHost(instrumentedType.getNestHost().getInternalName()); } - /*for (TypeDescription typeDescription : instrumentedType.getPermittedSubclasses()) { + for (TypeDescription typeDescription : instrumentedType.getPermittedSubclasses()) { classVisitor.visitPermittedSubclass(typeDescription.getInternalName()); - }*/ + } MethodDescription.InDefinedShape enclosingMethod = instrumentedType.getEnclosingMethod(); if (enclosingMethod != null) { classVisitor.visitOuterClass(enclosingMethod.getDeclaringType().getInternalName(), diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/pool/TypePool.java b/byte-buddy-dep/src/main/java/net/bytebuddy/pool/TypePool.java index b54b209945a..67e776a4fd6 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/pool/TypePool.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/pool/TypePool.java @@ -7813,10 +7813,10 @@ public RecordComponentVisitor visitRecordComponent(String name, String descripto return new RecordComponentExtractor(name, descriptor, signature); } - /*@Override + @Override public void visitPermittedSubclass(String permittedSubclass) { permittedSubclasses.add(permittedSubclass); - }*/ + } /** * Creates a type description from all data that is currently collected. This method should only be invoked diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/utility/OpenedClassReader.java b/byte-buddy-dep/src/main/java/net/bytebuddy/utility/OpenedClassReader.java index 21786a96ccf..637f086ff72 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/utility/OpenedClassReader.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/utility/OpenedClassReader.java @@ -53,7 +53,7 @@ public class OpenedClassReader { experimental = false; } EXPERIMENTAL = experimental; - ASM_API = Opcodes.ASM8; + ASM_API = Opcodes.ASM9; } /** diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/utility/visitor/MetadataAwareClassVisitor.java b/byte-buddy-dep/src/main/java/net/bytebuddy/utility/visitor/MetadataAwareClassVisitor.java index 00833dac41b..37136641bd6 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/utility/visitor/MetadataAwareClassVisitor.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/utility/visitor/MetadataAwareClassVisitor.java @@ -162,7 +162,7 @@ protected void onVisitNestHost(String nestHost) { super.visitNestHost(nestHost); } - /*@Override + @Override public final void visitPermittedSubclass(String permittedSubclass) { onVisitPermittedSubclass(permittedSubclass); } @@ -171,10 +171,10 @@ public final void visitPermittedSubclass(String permittedSubclass) { * An order-sensitive invocation of {@code ClassVisitor#visitPermittedSubclass}. * * @param permittedSubclass The internal name of the permitted subclass. - *//* + */ protected void onVisitPermittedSubclass(String permittedSubclass) { super.visitPermittedSubclass(permittedSubclass); - }*/ + } @Override public final void visitOuterClass(String owner, String name, String descriptor) { diff --git a/byte-buddy-dep/src/test/java/net/bytebuddy/ClassFileVersionKnownVersionsTest.java b/byte-buddy-dep/src/test/java/net/bytebuddy/ClassFileVersionKnownVersionsTest.java index ea38a59b5ac..5af07f0cf42 100644 --- a/byte-buddy-dep/src/test/java/net/bytebuddy/ClassFileVersionKnownVersionsTest.java +++ b/byte-buddy-dep/src/test/java/net/bytebuddy/ClassFileVersionKnownVersionsTest.java @@ -73,7 +73,7 @@ public static Collection data() { {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.V15 + 1, (short) 60, (short) 0, true, true, true} + {16, 16, Arrays.asList("1.16", "16"), Opcodes.V16, (short) 60, (short) 0, true, true, true} }); } diff --git a/byte-buddy-gradle-plugin/buildSrc/src/main/java/net/bytebuddy/build/gradle/transform/GradleTypeTransformer.java b/byte-buddy-gradle-plugin/buildSrc/src/main/java/net/bytebuddy/build/gradle/transform/GradleTypeTransformer.java index b3cba0402ea..0f7f3f9ca43 100644 --- a/byte-buddy-gradle-plugin/buildSrc/src/main/java/net/bytebuddy/build/gradle/transform/GradleTypeTransformer.java +++ b/byte-buddy-gradle-plugin/buildSrc/src/main/java/net/bytebuddy/build/gradle/transform/GradleTypeTransformer.java @@ -158,7 +158,7 @@ protected static class GradlePackageVisitor extends ClassVisitor { * @param names The names being discovered. */ protected GradlePackageVisitor(String type, Map names) { - super(Opcodes.ASM8); + super(Opcodes.ASM9); this.type = type; this.names = names; } @@ -221,7 +221,7 @@ protected class GradleTypeAnnotationVisitor extends AnnotationVisitor { * Creates a new package annotation visitor. */ protected GradleTypeAnnotationVisitor() { - super(Opcodes.ASM8); + super(Opcodes.ASM9); } @Override diff --git a/byte-buddy-gradle-plugin/buildSrc/src/test/java/net/bytebuddy/build/gradle/transform/GradleTypeTransformerTest.java b/byte-buddy-gradle-plugin/buildSrc/src/test/java/net/bytebuddy/build/gradle/transform/GradleTypeTransformerTest.java index 89306ad9a6e..05114d7411b 100644 --- a/byte-buddy-gradle-plugin/buildSrc/src/test/java/net/bytebuddy/build/gradle/transform/GradleTypeTransformerTest.java +++ b/byte-buddy-gradle-plugin/buildSrc/src/test/java/net/bytebuddy/build/gradle/transform/GradleTypeTransformerTest.java @@ -60,7 +60,7 @@ public void testJarTransformation() throws Exception { JarEntry entry = jarInputStream.getNextJarEntry(); assertThat(entry, notNullValue(JarEntry.class)); assertThat(entry.getName(), is(Target.class.getName().replace('.', '/') + ".class")); - new ClassReader(jarInputStream).accept(new ClassVisitor(Opcodes.ASM8) { + new ClassReader(jarInputStream).accept(new ClassVisitor(Opcodes.ASM9) { private boolean found; diff --git a/pom.xml b/pom.xml index 3b16e1c8f69..68f4c613e0a 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 1.6 net.bytebuddy https://asm.ow2.io - 8.0.1 + 9.0-beta 4.13 2.23.0 3.0.0