diff --git a/0001-Avoid-bundling-asm.patch b/0001-Avoid-bundling-asm.patch index 18da22a..ac9d64e 100644 --- a/0001-Avoid-bundling-asm.patch +++ b/0001-Avoid-bundling-asm.patch @@ -1,42 +1,34 @@ -From 68366dbea6762d338aaefa6d80caaf5abb05555a Mon Sep 17 00:00:00 2001 -From: Marian Koncek -Date: Thu, 23 Feb 2023 13:59:25 +0100 -Subject: [PATCH 1/2] Avoid bundling asm - ---- - byte-buddy/pom.xml | 56 +++++++++------------------------------------- - 1 file changed, 11 insertions(+), 45 deletions(-) - -diff --git a/byte-buddy/pom.xml b/byte-buddy/pom.xml -index 3a2c52000b..5372965676 100644 ---- a/byte-buddy/pom.xml -+++ b/byte-buddy/pom.xml -@@ -26,8 +26,6 @@ +diff -up byte-buddy-byte-buddy-1.16.0/byte-buddy/pom.xml.p0001 byte-buddy-byte-buddy-1.16.0/byte-buddy/pom.xml +--- byte-buddy-byte-buddy-1.16.0/byte-buddy/pom.xml.p0001 2025-01-18 02:22:59.454207769 +0300 ++++ byte-buddy-byte-buddy-1.16.0/byte-buddy/pom.xml 2025-01-18 13:55:24.459735957 +0300 +@@ -26,10 +26,6 @@ --> -- org.objectweb.asm -- net.bytebuddy.jar.asm +- org.objectweb.asm +- net.bytebuddy.jar.asm +- codes.rafael.asmjdkbridge +- net.bytebuddy.jar.asmjdkbridge net.bytebuddy, net.bytebuddy.agent.builder, -@@ -62,10 +60,7 @@ +@@ -64,11 +60,7 @@ net.bytebuddy.utility, net.bytebuddy.utility.nullability, net.bytebuddy.utility.privilege, - net.bytebuddy.utility.visitor, -- ${shade.target}, -- ${shade.target}.signature, -- ${shade.target}.commons +- ${shade.asm.target}, +- ${shade.asm.target}.signature, +- ${shade.asm.target}.commons, +- ${shade.asmjdkbridge.target} + net.bytebuddy.utility.visitor net.bytebuddy.utility.dispatcher -@@ -83,6 +78,16 @@ - ${project.groupId} +@@ -87,6 +79,16 @@ byte-buddy-dep -+ + + org.ow2.asm + asm + ${version.asm} @@ -46,17 +38,27 @@ index 3a2c52000b..5372965676 100644 + asm-commons + ${version.asm} + - ++ net.java.dev.jna jna -@@ -254,45 +259,6 @@ + ${version.jna} +@@ -257,64 +259,6 @@ true ${bytebuddy.extras} true - - -- ${shade.source} -- ${shade.target} +- ${shade.asm.source} +- ${shade.asm.target} +- +- +- ${shade.asmjdkbridge.source} +- ${shade.asmjdkbridge.target} +- +- +- codes/rafael/asmjdkbridge +- net/bytebuddy/jar/asmjdkbridge +- true - - - @@ -77,6 +79,16 @@ index 3a2c52000b..5372965676 100644 - - - +- codes.rafael.asmjdkbridge:* +- +- META-INF/versions/** +- +- +- META-INF/MANIFEST.MF +- **/module-info.class +- +- +- - org.ow2.asm:asm-commons - - org/objectweb/asm/commons/AnnotationRemapper.** @@ -95,6 +107,3 @@ index 3a2c52000b..5372965676 100644 net.bytebuddy.build.Plugin$Engine$Default --- -2.45.1 - diff --git a/byte-buddy-1.15.11.tar.gz b/byte-buddy-1.15.11.tar.gz deleted file mode 100644 index d99a539..0000000 --- a/byte-buddy-1.15.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ad2f94e473f3d717b5dbe8cfd9e590bc4d4c54bbb2729a4410a720ee1bedf2f -size 2059994 diff --git a/byte-buddy-1.17.0.tar.gz b/byte-buddy-1.17.0.tar.gz new file mode 100644 index 0000000..0972cfd --- /dev/null +++ b/byte-buddy-1.17.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ef19d9c4a465a2a6cd08a05a44e7db24be08602c949b6dc99c0dc2af5e79a3b +size 2082140 diff --git a/byte-buddy.changes b/byte-buddy.changes index f262fea..8ba20b1 100644 --- a/byte-buddy.changes +++ b/byte-buddy.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Wed Jan 29 22:22:17 UTC 2025 - Anton Shvetz + +- Update to v1.17.0 + * Changes of v1.17.0 + + Assure that implicit choice for class reader and class writer + are always symmetric with regard to internal representation. + + Retrofit MemberSubstitution to also allow for intercepting + invokedynamic instructions. + + Introduce @Handle annotations to allow for injecting constant + pool-stored method handle in Advice, MemberSubstitution and + MethodDelegation. + + Introduce @DynamicConstant annotations to allow for injecting + constant pool-stored dynamic constants in Advice, + MemberSubstitution and MethodDelegation. + +------------------------------------------------------------------- +Sun Jan 19 10:07:34 UTC 2025 - Anton Shvetz + +- Update to v1.16.1 + * Changes of v1.16.1 + + Correct reflective activation of Class File API. + + Reject array descriptors that are not well-formed in + TypePool. + +------------------------------------------------------------------- +Sat Jan 18 10:59:07 UTC 2025 - Anton Shvetz + +- Update to v1.16.0 + * Changes of v1.16.0 + + Allow for erasure of types of bootstrapped methods in Advice + within instrumented class. + + Rework Advice post-processing to allow for erasure of + bootstrapped methods. + + Fix missing application of hashCode/equals plugin for Java 8 + code. + + Include support for JDK Class File API. + + Allow Plugin.Engine to retain folders. +- Rebase/update patch: + * 0001-Avoid-bundling-asm.patch + ------------------------------------------------------------------- Sun Dec 15 12:21:44 UTC 2024 - Anton Shvetz diff --git a/byte-buddy.spec b/byte-buddy.spec index 11346ed..6acedea 100644 --- a/byte-buddy.spec +++ b/byte-buddy.spec @@ -1,7 +1,7 @@ # # spec file for package byte-buddy # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: byte-buddy -Version: 1.15.11 +Version: 1.17.0 Release: 0 Summary: Runtime code generation for the Java virtual machine License: Apache-2.0 @@ -76,18 +76,18 @@ API documentation for %{name}. %prep %setup -q -n %{name}-%{name}-%{version} -%patch -P 0 -p1 +%patch -P0 -p1 # Remove Windows-specific resources -rm -rf byte-buddy-agent/src/main/resources/win32-x86{,-64} +rm -rf %{name}-agent/src/main/resources/win32-x86{,-64} # Don't ship android or benchmark modules -%pom_disable_module byte-buddy-android -%pom_disable_module byte-buddy-android-test -%pom_disable_module byte-buddy-benchmark +%pom_disable_module %{name}-android +%pom_disable_module %{name}-android-test +%pom_disable_module %{name}-benchmark # Don't ship gradle plugin -%pom_disable_module byte-buddy-gradle-plugin +%pom_disable_module %{name}-gradle-plugin # Remove check plugins unneeded by RPM builds %pom_remove_plugin :jacoco-maven-plugin @@ -100,16 +100,17 @@ rm -rf byte-buddy-agent/src/main/resources/win32-x86{,-64} %pom_remove_plugin :nexus-staging-maven-plugin # Avoid circular dependency -%pom_remove_plugin :byte-buddy-maven-plugin byte-buddy-dep +%pom_remove_plugin :byte-buddy-maven-plugin %{name}-dep # Not interested in shading sources (causes NPE on old versions of shade plugin) -%pom_xpath_set "pom:createSourcesJar" "false" byte-buddy +%pom_xpath_set pom:createSourcesJar false %{name} # Drop build dep on findbugs annotations, used only by the above check plugins %pom_remove_dep -r :findbugs-annotations -%{java_remove_annotations} byte-buddy-agent byte-buddy-dep byte-buddy-maven-plugin -n SuppressFBWarnings +%{java_remove_annotations} %{name}-{agent,dep,maven-plugin} -n SuppressFBWarnings %pom_remove_dep org.ow2.asm:asm-deprecated +%pom_remove_dep codes.rafael.asmjdkbridge:asm-jdk-bridge %{name}-dep %pom_remove_plugin -r :maven-shade-plugin