8 changed files with 678 additions and 573 deletions
--- a/.byte-buddy.metadata
+++ b/.byte-buddy.metadata
@ -1 +1 @@
-f22989caeb364be1c4cdccfe48682a63c4147d23 SOURCES/byte-buddy-1.10.1.tar.gz
+2a0e28e5fcb69313927ca3fe55d0a1794a168603 SOURCES/byte-buddy-1.12.10.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -1 +0,0 @@
-SOURCES/byte-buddy-1.10.1.tar.gz
--- a/SOURCES/0001-Avoid-bundling-asm.patch
+++ b/SOURCES/0001-Avoid-bundling-asm.patch
@ -0,0 +1,97 @@
+From 112daf42699caa2e878d4c3f6509fc0dccf7975d Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Tue, 9 Nov 2021 11:55:22 +0100
+Subject: [PATCH 1/4] Avoid bundling asm
+
+---
+ byte-buddy/pom.xml | 53 +++++++++-------------------------------------
+ 1 file changed, 10 insertions(+), 43 deletions(-)
+
+diff --git a/byte-buddy/pom.xml b/byte-buddy/pom.xml
+index c0cec10..6b5494d 100644
+--- a/byte-buddy/pom.xml
+++ b/byte-buddy/pom.xml
+@@ -26,8 +26,6 @@
+     -->
+ 
+     <properties>
+-        <shade.source>org.objectweb.asm</shade.source>
+-        <shade.target>net.bytebuddy.jar.asm</shade.target>
+         <packages.list.external>
+             net.bytebuddy,
+             net.bytebuddy.agent.builder,
+@@ -63,9 +61,6 @@
+             net.bytebuddy.utility.nullability,
+             net.bytebuddy.utility.privilege,
+             net.bytebuddy.utility.visitor,
+-            ${shade.target},
+-            ${shade.target}.signature,
+-            ${shade.target}.commons
+         </packages.list.external>
+         <packages.list.internal>
+             net.bytebuddy.utility.dispatcher
+@@ -166,6 +161,16 @@
+                         <artifactId>asm</artifactId>
+                         <version>${version.asm}</version>
+                     </dependency>
+                    <dependency>
+                        <groupId>org.ow2.asm</groupId>
+                        <artifactId>asm</artifactId>
+                        <version>${version.asm}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.ow2.asm</groupId>
+                        <artifactId>asm-commons</artifactId>
+                        <version>${version.asm}</version>
+                    </dependency>
+                 </dependencies>
+                 <executions>
+                     <execution>
+@@ -249,44 +254,6 @@
+                                     <createDependencyReducedPom>true</createDependencyReducedPom>
+                                     <createSourcesJar>${bytebuddy.extras}</createSourcesJar>
+                                     <shadeSourcesContent>true</shadeSourcesContent>
+-                                    <relocations>
+-                                        <relocation>
+-                                            <pattern>${shade.source}</pattern>
+-                                            <shadedPattern>${shade.target}</shadedPattern>
+-                                        </relocation>
+-                                    </relocations>
+-                                    <filters>
+-                                        <filter>
+-                                            <artifact>net.bytebuddy:byte-buddy-dep:*</artifact>
+-                                            <excludes>
+-                                                <exclude>META-INF/MANIFEST.MF</exclude>
+-                                            </excludes>
+-                                        </filter>
+-                                        <filter>
+-                                            <artifact>org.ow2.asm:*</artifact>
+-                                            <excludes>
+-                                                <exclude>META-INF/MANIFEST.MF</exclude>
+-                                                <exclude>**/module-info.class</exclude>
+-                                                <exclude>**/LICENSE</exclude>
+-                                                <exclude>**/NOTICE</exclude>
+-                                            </excludes>
+-                                        </filter>
+-                                        <filter>
+-                                            <artifact>org.ow2.asm:asm-commons</artifact>
+-                                            <includes>
+-                                                <include>org/objectweb/asm/commons/AnnotationRemapper.**</include>
+-                                                <include>org/objectweb/asm/commons/ClassRemapper.**</include>
+-                                                <include>org/objectweb/asm/commons/FieldRemapper.**</include>
+-                                                <include>org/objectweb/asm/commons/MethodRemapper.**</include>
+-                                                <include>org/objectweb/asm/commons/ModuleHashesAttribute.**</include>
+-                                                <include>org/objectweb/asm/commons/ModuleRemapper.**</include>
+-                                                <include>org/objectweb/asm/commons/RecordComponentRemapper.**</include>
+-                                                <include>org/objectweb/asm/commons/Remapper.**</include>
+-                                                <include>org/objectweb/asm/commons/SignatureRemapper.**</include>
+-                                                <include>org/objectweb/asm/commons/SimpleRemapper.**</include>
+-                                            </includes>
+-                                        </filter>
+-                                    </filters>
+                                     <transformers>
+                                         <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                             <mainClass>net.bytebuddy.build.Plugin$Engine$Default</mainClass>
+-- 
+2.35.1
+
--- a/SOURCES/0001-Remove-dependency-on-jna.patch
+++ b/SOURCES/0001-Remove-dependency-on-jna.patch
--- a/SOURCES/0003-Remove-Java-14-tests.patch
+++ b/SOURCES/0003-Remove-Java-14-tests.patch
@ -0,0 +1,43 @@
+From 4c1537b368b1f293e982d15b478eb4dc88fc1aaf Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Thu, 4 Feb 2021 15:17:13 +0100
+Subject: [PATCH 3/4] Remove Java 14 tests
+
+---
+ .../test/precompiled/SampleRecord.java        | 24 -------------------
+ 1 file changed, 24 deletions(-)
+ delete mode 100644 byte-buddy-dep/src/precompiled/java/net/bytebuddy/test/precompiled/SampleRecord.java
+
+diff --git a/byte-buddy-dep/src/precompiled/java/net/bytebuddy/test/precompiled/SampleRecord.java b/byte-buddy-dep/src/precompiled/java/net/bytebuddy/test/precompiled/SampleRecord.java
+deleted file mode 100644
+index 137ce19..0000000
+--- a/byte-buddy-dep/src/precompiled/java/net/bytebuddy/test/precompiled/SampleRecord.java
+++ /dev/null
+@@ -1,24 +0,0 @@
+-/*
+- * Copyright 2014 - Present Rafael Winterhalter
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package net.bytebuddy.test.precompiled;
+-
+-import net.bytebuddy.description.type.AbstractTypeDescriptionTest;
+-
+-import java.util.List;
+-
+-public record SampleRecord(@AbstractTypeDescriptionTest.SampleAnnotation @TypeAnnotation(42) List<@TypeAnnotation(84) String> foo){
+-        /* empty */
+-        }
+-- 
+2.35.1
+
--- a/SOURCES/0004-Remove-JDK-15-sealed-classes.patch
+++ b/SOURCES/0004-Remove-JDK-15-sealed-classes.patch
@ -0,0 +1,59 @@
+From 88e2f74d1fa33b32feb3f21bdfd30d475682e6fe Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Tue, 9 Nov 2021 12:23:28 +0100
+Subject: [PATCH 4/4] Remove JDK 15 sealed classes
+
+---
+ .../bytebuddy/test/precompiled/Sealed.java    | 40 -------------------
+ 1 file changed, 40 deletions(-)
+ delete mode 100644 byte-buddy-dep/src/precompiled/java/net/bytebuddy/test/precompiled/Sealed.java
+
+diff --git a/byte-buddy-dep/src/precompiled/java/net/bytebuddy/test/precompiled/Sealed.java b/byte-buddy-dep/src/precompiled/java/net/bytebuddy/test/precompiled/Sealed.java
+deleted file mode 100644
+index bff4718..0000000
+--- a/byte-buddy-dep/src/precompiled/java/net/bytebuddy/test/precompiled/Sealed.java
+++ /dev/null
+@@ -1,40 +0,0 @@
+-/*
+- * Copyright 2014 - Present Rafael Winterhalter
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package net.bytebuddy.test.precompiled;
+-
+-public sealed
+-
+-class Sealed permits Sealed.SubNonSealed, Sealed.SubSealed, Sealed.SubFinal {
+-
+-    public static non-sealed
+-
+-    class SubNonSealed extends Sealed {
+-        /* empty */
+-    }
+-
+-    public static sealed
+-
+-    class SubSealed extends Sealed permits SubSealed.SubSubFinal {
+-
+-        public static final class SubSubFinal extends SubSealed {
+-            /* empty */
+-        }
+-    }
+-
+-    public static final class SubFinal extends Sealed {
+-        /* empty */
+-    }
+-}
+-- 
+2.35.1
+
--- a/SOURCES/avoid-bundling-asm.patch
+++ b/SOURCES/avoid-bundling-asm.patch
@ -1,104 +0,0 @@
-diff --git a/byte-buddy/pom.xml b/byte-buddy/pom.xml
-index 283da43..aca6bc5 100644
--- a/byte-buddy/pom.xml
-+++ b/byte-buddy/pom.xml
-@@ -26,8 +26,6 @@
-     -->
- 
-     <properties>
-        <shade.source>org.objectweb.asm</shade.source>
-        <shade.target>net.bytebuddy.jar.asm</shade.target>
-         <packages.list>
-             net.bytebuddy,
-             net.bytebuddy.agent.builder,
-@@ -62,9 +60,6 @@
-             net.bytebuddy.utility,
-             net.bytebuddy.utility.privilege,
-             net.bytebuddy.utility.visitor,
-            ${shade.target},
-            ${shade.target}.signature,
-            ${shade.target}.commons
-         </packages.list>
-     </properties>
- 
-@@ -79,6 +74,16 @@
-             <artifactId>byte-buddy-dep</artifactId>
-             <version>${project.version}</version>
-         </dependency>
-+        <dependency>
-+            <groupId>org.ow2.asm</groupId>
-+            <artifactId>asm</artifactId>
-+            <version>${version.asm}</version>
-+        </dependency>
-+        <dependency>
-+            <groupId>org.ow2.asm</groupId>
-+            <artifactId>asm-commons</artifactId>
-+            <version>${version.asm}</version>
-+        </dependency>
-     </dependencies>
- 
-     <build>
-@@ -105,36 +110,6 @@
-                             <createDependencyReducedPom>true</createDependencyReducedPom>
-                             <createSourcesJar>${bytebuddy.extras}</createSourcesJar>
-                             <shadeSourcesContent>true</shadeSourcesContent>
-                            <relocations>
-                                <relocation>
-                                    <pattern>${shade.source}</pattern>
-                                    <shadedPattern>${shade.target}</shadedPattern>
-                                </relocation>
-                            </relocations>
-                            <filters>
-                                <filter>
-                                    <artifact>org.ow2.asm:*</artifact>
-                                    <excludes>
-                                        <exclude>**/module-info.class</exclude>
-                                        <exclude>**/LICENSE</exclude>
-                                        <exclude>**/NOTICE</exclude>
-                                    </excludes>
-                                </filter>
-                                <filter>
-                                    <artifact>org.ow2.asm:asm-commons</artifact>
-                                    <includes>
-                                        <include>org/objectweb/asm/commons/AnnotationRemapper.class</include>
-                                        <include>org/objectweb/asm/commons/ClassRemapper.class</include>
-                                        <include>org/objectweb/asm/commons/FieldRemapper.class</include>
-                                        <include>org/objectweb/asm/commons/MethodRemapper.class</include>
-                                        <include>org/objectweb/asm/commons/ModuleHashesAttribute.class</include>
-                                        <include>org/objectweb/asm/commons/ModuleRemapper.class</include>
-                                        <include>org/objectweb/asm/commons/Remapper.class</include>
-                                        <include>org/objectweb/asm/commons/SignatureRemapper.class</include>
-                                        <include>org/objectweb/asm/commons/SimpleRemapper.class</include>
-                                    </includes>
-                                </filter>
-                            </filters>
-                             <transformers>
-                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                     <mainClass>net.bytebuddy.build.Plugin$Engine$Default</mainClass>
-@@ -143,21 +118,14 @@
-                                     <resource>META-INF/LICENSE</resource>
-                                 </transformer>
-                             </transformers>
-+                            <artifactSet>
-+                                <excludes>
-+                                    <exclude>org.ow2.asm:*</exclude>
-+                                </excludes>
-+                            </artifactSet>
-                         </configuration>
-                     </execution>
-                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm</artifactId>
-                        <version>${version.asm}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-commons</artifactId>
-                        <version>${version.asm}</version>
-                    </dependency>
-                </dependencies>
-             </plugin>
-             <!-- Disable pitest as it fails for empty modules -->
-             <plugin>
--- a/SPECS/byte-buddy.spec
+++ b/SPECS/byte-buddy.spec
@ -1,21 +1,27 @@
-Name:          byte-buddy
-Version:       1.10.1
-Release:       2%{?dist}
-Summary:       Runtime code generation for the Java virtual machine
-License:       ASL 2.0
-URL:           http://bytebuddy.net/
+%bcond_with bootstrap
+
+Name:           byte-buddy
+Version:        1.12.10
+Release:        2%{?dist}
+Summary:        Runtime code generation for the Java virtual machine
+License:        ASL 2.0
+URL:            http://bytebuddy.net/
 # ./generate-tarball.sh
-Source0:       %{name}-%{version}.tar.gz
+Source0:        %{name}-%{version}.tar.gz

 # Patch the build to avoid bundling inside shaded jars
-Patch1:         avoid-bundling-asm.patch
-Patch2:         0001-Remove-dependency-on-jna.patch
+Patch1:         0001-Avoid-bundling-asm.patch
+Patch2:         0002-Remove-dependencies.patch
+Patch3:         0003-Remove-Java-14-tests.patch
+Patch4:         0004-Remove-JDK-15-sealed-classes.patch

+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(net.bytebuddy:byte-buddy)
 BuildRequires:  mvn(net.bytebuddy:byte-buddy-dep)
-BuildRequires:  mvn(net.bytebuddy:byte-buddy-maven-plugin)
 BuildRequires:  mvn(org.apache.maven:maven-compat)
 BuildRequires:  mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness)
 BuildRequires:  mvn(org.mockito:mockito-core)
@ -31,8 +37,10 @@ BuildRequires:  mvn(org.eclipse.aether:aether-api)
 BuildRequires:  mvn(org.eclipse.aether:aether-util)
 BuildRequires:  mvn(org.ow2.asm:asm)
 BuildRequires:  mvn(org.ow2.asm:asm-commons)
+%endif

-BuildArch:     noarch
+BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch

 %description
 Byte Buddy is a code generation library for creating Java classes during the
@ -71,6 +79,11 @@ This package contains API documentation for %{name}.

 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+rm byte-buddy-agent/src/test/java/net/bytebuddy/agent/VirtualMachineAttachmentTest.java
+rm byte-buddy-agent/src/test/java/net/bytebuddy/agent/VirtualMachineForOpenJ9Test.java

 # Cause pre-compiled stuff to be re-compiled
 mv byte-buddy-dep/src/precompiled/java/net/bytebuddy/build/*.java \
@ -78,6 +91,7 @@ mv byte-buddy-dep/src/precompiled/java/net/bytebuddy/build/*.java \
 mkdir -p byte-buddy-dep/src/test/java/net/bytebuddy/test/precompiled/
 mv byte-buddy-dep/src/precompiled/java/net/bytebuddy/test/precompiled/*.java \
  byte-buddy-dep/src/test/java/net/bytebuddy/test/precompiled/
+rm byte-buddy-dep/src/test/java/net/bytebuddy/test/precompiled/GenericRecordSample.java

 # Don't ship android or benchmark modules
 %pom_disable_module byte-buddy-android
@ -96,6 +110,10 @@ mv byte-buddy-dep/src/precompiled/java/net/bytebuddy/test/precompiled/*.java \
 %pom_remove_plugin :jitwatch-jarscan-maven-plugin
 %pom_remove_plugin :clirr-maven-plugin
 %pom_remove_plugin :maven-release-plugin
+%pom_remove_plugin :nexus-staging-maven-plugin
+
+# Avoid circural dependency
+%pom_remove_plugin :byte-buddy-maven-plugin byte-buddy-dep

 # Not interested in shading sources (causes NPE on old versions of shade plugin)
 %pom_xpath_set "pom:createSourcesJar" "false" byte-buddy
@ -112,8 +130,13 @@ sed -i -e '/SuppressFBWarnings/d' $(grep -lr SuppressFBWarnings)
 %pom_remove_plugin :maven-shade-plugin byte-buddy
 %pom_remove_plugin :maven-shade-plugin byte-buddy-benchmark

-%pom_remove_dep :jna byte-buddy-agent
-%pom_remove_dep :jna-platform byte-buddy-agent
+%pom_remove_dep net.java.dev.jna:jna byte-buddy
+%pom_remove_dep net.java.dev.jna:jna byte-buddy-dep
+%pom_remove_dep net.java.dev.jna:jna byte-buddy-agent
+
+%pom_remove_dep net.java.dev.jna:jna-platform byte-buddy
+%pom_remove_dep net.java.dev.jna:jna-platform byte-buddy-dep
+%pom_remove_dep net.java.dev.jna:jna-platform byte-buddy-agent

 %build
 # Ignore test failures, there seems to be something different about the
@ -140,12 +163,66 @@ sed -i -e '/SuppressFBWarnings/d' $(grep -lr SuppressFBWarnings)
 %license LICENSE NOTICE

 %changelog
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon May 09 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.12.10-1
+- Update to upstream version 1.12.10
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.12.0-3
+- Rebuilt for java-17-openjdk as system jdk
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Nov 09 2021 Marian Koncek <mkoncek@redhat.com> - 1.12.0-1
+- Update to upstream version 1.12.0
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.20-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.20-2
+- Bootstrap build
+- Non-bootstrap build
+
+* Thu Feb 04 2021 Marian Koncek <mkoncek@redhat.com> - 1.10.20-1
+- Update to upstream version 1.10.20
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Sep 29 2020 Marian Koncek <mkoncek@redhat.com> - 1.10.16-1
+- Update to upstram version 1.10.16
+
+* Fri Aug 14 2020 Jerry James <loganjerry@gmail.com> - 1.10.14-1
+- Version 1.10.14
+- Remove no longer needed no-unixsocket.patch
+- Add workaround for compiling tests with JDK 11
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.9.5-8
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Jan 21 2020 Marian Koncek <mkoncek@redhat.com> - 1.10.7-1
+- Update to upstream version 1.10.7
+
+* Thu Nov 21 2019 Marian Koncek <mkoncek@redhat.com> - 1.10.3-1
+- Update to upstream version 1.10.3
+
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.1-2
 - Mass rebuild for javapackages-tools 201902

 * Thu Sep 12 2019 Marian Koncek <mkoncek@redhat.com> - 1.10.1-1
 - Update to upstream version 1.10.1

+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Wed Jul 10 2019 Marian Koncek <mkoncek@redhat.com> - 1.9.13-2
 - Remove the dependency on maven-shade-plugin

@ -155,6 +232,9 @@ sed -i -e '/SuppressFBWarnings/d' $(grep -lr SuppressFBWarnings)
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9.5-5
 - Mass rebuild for javapackages-tools 201901

+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Thu Dec 06 2018 Mat Booth <mat.booth@redhat.com> - 1.9.5-4
 - Prevent NPE in maven-shade-plugin