.byte-buddy.metadata

@@ -1 +1 @@
-501e1b68b4feb5e101f1978af3818eb897dac3e6 SOURCES/byte-buddy-1.10.20.tar.gz
+2a0e28e5fcb69313927ca3fe55d0a1794a168603 SOURCES/byte-buddy-1.12.10.tar.gz

.gitignore

@@ -1 +1,2 @@
-SOURCES/byte-buddy-1.10.20.tar.gz
+/*.src.rpm
+/*.tar.gz

SOURCES/0001-Avoid-bundling-asm.patch

@@ -1,14 +1,14 @@
-From ceca0b287ac211a968e84cee7f05cfd6c2a843ec Mon Sep 17 00:00:00 2001
+From 112daf42699caa2e878d4c3f6509fc0dccf7975d Mon Sep 17 00:00:00 2001
 From: Marian Koncek <mkoncek@redhat.com>
-Date: Tue, 29 Sep 2020 14:46:16 +0200
+Date: Tue, 9 Nov 2021 11:55:22 +0100
-Subject: [PATCH] Avoid bundling asm
+Subject: [PATCH 1/4] Avoid bundling asm
 
 ---
- byte-buddy/pom.xml | 70 ++++++++++------------------------------------
+ byte-buddy/pom.xml | 53 +++++++++-------------------------------------
- 1 file changed, 15 insertions(+), 55 deletions(-)
+ 1 file changed, 10 insertions(+), 43 deletions(-)
 
 diff --git a/byte-buddy/pom.xml b/byte-buddy/pom.xml
-index 16388f3..c97b4d9 100644
+index c0cec10..6b5494d 100644
 --- a/byte-buddy/pom.xml
 +++ b/byte-buddy/pom.xml
 @@ -26,8 +26,6 @@
@@ -17,22 +17,22 @@ index 16388f3..c97b4d9 100644
      <properties>
 -        <shade.source>org.objectweb.asm</shade.source>
 -        <shade.target>net.bytebuddy.jar.asm</shade.target>
-         <packages.list>
+         <packages.list.external>
              net.bytebuddy,
              net.bytebuddy.agent.builder,
-@@ -62,9 +60,6 @@
+@@ -63,9 +61,6 @@
-             net.bytebuddy.utility,
+             net.bytebuddy.utility.nullability,
              net.bytebuddy.utility.privilege,
              net.bytebuddy.utility.visitor,
 -            ${shade.target},
 -            ${shade.target}.signature,
 -            ${shade.target}.commons
-         </packages.list>
+         </packages.list.external>
-     </properties>
+         <packages.list.internal>
- 
+             net.bytebuddy.utility.dispatcher
-@@ -79,6 +74,16 @@
+@@ -166,6 +161,16 @@
-             <artifactId>byte-buddy-dep</artifactId>
+                         <artifactId>asm</artifactId>
-             <version>${project.version}</version>
+                         <version>${version.asm}</version>
                      </dependency>
 +                    <dependency>
 +                        <groupId>org.ow2.asm</groupId>
@@ -45,9 +45,9 @@ index 16388f3..c97b4d9 100644
 +                        <version>${version.asm}</version>
 +                    </dependency>
                  </dependencies>
- 
+                 <executions>
-     <build>
+                     <execution>
-@@ -105,44 +110,6 @@
+@@ -249,44 +254,6 @@
                                      <createDependencyReducedPom>true</createDependencyReducedPom>
                                      <createSourcesJar>${bytebuddy.extras}</createSourcesJar>
                                      <shadeSourcesContent>true</shadeSourcesContent>
@@ -92,33 +92,6 @@ index 16388f3..c97b4d9 100644
                                      <transformers>
                                          <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                              <mainClass>net.bytebuddy.build.Plugin$Engine$Default</mainClass>
-@@ -151,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>
 -- 
-2.26.2
+2.35.1
 

SOURCES/0003-Remove-Java-14-tests.patch

@@ -1,7 +1,7 @@
-From 9763d7d30bcbb8bf56a6682bb7362f3de33a0802 Mon Sep 17 00:00:00 2001
+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] Remove Java 14 tests
+Subject: [PATCH 3/4] Remove Java 14 tests
 
 ---
  .../test/precompiled/SampleRecord.java        | 24 -------------------
@@ -10,7 +10,7 @@ Subject: [PATCH] Remove Java 14 tests
 
 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 522eefa..0000000
+index 137ce19..0000000
 --- a/byte-buddy-dep/src/precompiled/java/net/bytebuddy/test/precompiled/SampleRecord.java
 +++ /dev/null
 @@ -1,24 +0,0 @@
@@ -35,9 +35,9 @@ index 522eefa..0000000
 -
 -import java.util.List;
 -
--public record SampleRecord(@AbstractTypeDescriptionTest.SampleAnnotation @TypeAnnotation(42) List<@TypeAnnotation(84) String> foo) {
+-public record SampleRecord(@AbstractTypeDescriptionTest.SampleAnnotation @TypeAnnotation(42) List<@TypeAnnotation(84) String> foo){
 -        /* empty */
--}
+-        }
 -- 
-2.29.2
+2.35.1
 

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
+

SOURCES/README.md

@@ -0,0 +1,3 @@
+# byte-buddy
+
+The byte-buddy package

SOURCES/generate-tarball.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+set -e
+
+name=byte-buddy
+version="$(sed -n 's/Version:\s*//p' *.spec)"
+
+# RETRIEVE
+wget "https://github.com/raphw/byte-buddy/archive/${name}-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz"
+
+rm -rf tarball-tmp
+mkdir tarball-tmp
+pushd tarball-tmp
+tar -xf "../${name}-${version}.orig.tar.gz"
+
+# CLEAN TARBALL
+find -name '*.jar' -delete
+find -name '*.class' -delete
+find -name '*.zip' -delete
+find -name '*.dll' -delete
+
+tar -czf "../${name}-${version}.tar.gz" *
+popd
+rm -r tarball-tmp "${name}-${version}.orig.tar.gz"

SPECS/byte-buddy.spec

@@ -1,8 +1,8 @@
 %bcond_with bootstrap
 
 Name:           byte-buddy
-Version:        1.10.20
+Version:        1.12.10
-Release:        7%{?dist}
+Release:        2%{?dist}
 Summary:        Runtime code generation for the Java virtual machine
 License:        ASL 2.0
 URL:            http://bytebuddy.net/
@@ -11,13 +11,14 @@ Source0:        %{name}-%{version}.tar.gz
 
 # Patch the build to avoid bundling inside shaded jars
 Patch1:         0001-Avoid-bundling-asm.patch
-Patch2:         0002-Remove-dependency-on-jna.patch
+Patch2:         0002-Remove-dependencies.patch
 Patch3:         0003-Remove-Java-14-tests.patch
+Patch4:         0004-Remove-JDK-15-sealed-classes.patch
 
-BuildRequires:  maven-local
 %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)
@@ -39,6 +40,7 @@ BuildRequires:  mvn(org.ow2.asm:asm-commons)
 %endif
 
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
 %description
 Byte Buddy is a code generation library for creating Java classes during the
@@ -75,11 +77,13 @@ This package contains API documentation for %{name}.
 %prep
 %setup -q -n %{name}-%{name}-%{version}
 
-%patch -P 1 -p1
+%patch1 -p1
-%patch -P 2 -p1
+%patch2 -p1
-%patch -P 3 -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 \
@@ -87,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
@@ -105,6 +110,7 @@ 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
@@ -124,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 net.java.dev.jna:jna byte-buddy
-%pom_remove_dep :jna-platform byte-buddy-agent
+%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
@@ -152,21 +163,26 @@ sed -i -e '/SuppressFBWarnings/d' $(grep -lr SuppressFBWarnings)
 %license LICENSE NOTICE
 
 %changelog
-* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 1.10.20-7
+* Fri Jul 14 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 1.12.10-2
-- Fix patch usage
+- Rebuilt for MSVSphere 9.2
+
+* 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
 
-* Tue Nov 19 2024 Marián Konček <mkoncek@redhat.com> - 1.10.20-6
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.12.0-3
-- Rebuild with regenerated Requires on Java
+- Rebuilt for java-17-openjdk as system jdk
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.10.20-5
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-  Related: rhbz#1991688
 
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.20-4
+* Tue Nov 09 2021 Marian Koncek <mkoncek@redhat.com> - 1.12.0-1
-- Rebuild to workaround DistroBaker issue
+- Update to upstream version 1.12.0
 
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.20-3
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.20-3
-- Bootstrap Maven for CentOS Stream 9
+- 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