forked from pool/byte-buddy
Compare commits
20 Commits
Author | SHA256 | Date | |
---|---|---|---|
|
325435014d | ||
|
05647a53ea | ||
|
5db9be7dac | ||
|
e4d7ee444e | ||
|
05f3683125 | ||
|
a80e537090 | ||
|
1a98b45899 | ||
|
5ad6a06f14 | ||
|
b8af66bacc | ||
|
b6a0af5ddd | ||
|
8d473f2852 | ||
|
fb2c647900 | ||
|
8e2ca4d9ba | ||
|
1458a18892 | ||
|
4aa91e2174 | ||
|
ed89996ce5 | ||
|
1692472220 | ||
|
071a02219f | ||
|
1731eaee1b | ||
|
04cf25068a |
@ -1,42 +1,34 @@
|
||||
From 68366dbea6762d338aaefa6d80caaf5abb05555a Mon Sep 17 00:00:00 2001
|
||||
From: Marian Koncek <mkoncek@redhat.com>
|
||||
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 @@
|
||||
-->
|
||||
|
||||
<properties>
|
||||
- <shade.source>org.objectweb.asm</shade.source>
|
||||
- <shade.target>net.bytebuddy.jar.asm</shade.target>
|
||||
- <shade.asm.source>org.objectweb.asm</shade.asm.source>
|
||||
- <shade.asm.target>net.bytebuddy.jar.asm</shade.asm.target>
|
||||
- <shade.asmjdkbridge.source>codes.rafael.asmjdkbridge</shade.asmjdkbridge.source>
|
||||
- <shade.asmjdkbridge.target>net.bytebuddy.jar.asmjdkbridge</shade.asmjdkbridge.target>
|
||||
<packages.list.external>
|
||||
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
|
||||
</packages.list.external>
|
||||
<packages.list.internal>
|
||||
net.bytebuddy.utility.dispatcher
|
||||
@@ -83,6 +78,16 @@
|
||||
<groupId>${project.groupId}</groupId>
|
||||
@@ -87,6 +79,16 @@
|
||||
<artifactId>byte-buddy-dep</artifactId>
|
||||
</dependency>
|
||||
+ <dependency>
|
||||
<dependency>
|
||||
+ <groupId>org.ow2.asm</groupId>
|
||||
+ <artifactId>asm</artifactId>
|
||||
+ <version>${version.asm}</version>
|
||||
@ -46,17 +38,27 @@ index 3a2c52000b..5372965676 100644
|
||||
+ <artifactId>asm-commons</artifactId>
|
||||
+ <version>${version.asm}</version>
|
||||
+ </dependency>
|
||||
<dependency>
|
||||
+ <dependency>
|
||||
<groupId>net.java.dev.jna</groupId>
|
||||
<artifactId>jna</artifactId>
|
||||
@@ -254,45 +259,6 @@
|
||||
<version>${version.jna}</version>
|
||||
@@ -257,64 +259,6 @@
|
||||
<createDependencyReducedPom>true</createDependencyReducedPom>
|
||||
<createSourcesJar>${bytebuddy.extras}</createSourcesJar>
|
||||
<shadeSourcesContent>true</shadeSourcesContent>
|
||||
- <relocations>
|
||||
- <relocation>
|
||||
- <pattern>${shade.source}</pattern>
|
||||
- <shadedPattern>${shade.target}</shadedPattern>
|
||||
- <pattern>${shade.asm.source}</pattern>
|
||||
- <shadedPattern>${shade.asm.target}</shadedPattern>
|
||||
- </relocation>
|
||||
- <relocation>
|
||||
- <pattern>${shade.asmjdkbridge.source}</pattern>
|
||||
- <shadedPattern>${shade.asmjdkbridge.target}</shadedPattern>
|
||||
- </relocation>
|
||||
- <relocation>
|
||||
- <pattern>codes/rafael/asmjdkbridge</pattern>
|
||||
- <shadedPattern>net/bytebuddy/jar/asmjdkbridge</shadedPattern>
|
||||
- <rawString>true</rawString>
|
||||
- </relocation>
|
||||
- </relocations>
|
||||
- <filters>
|
||||
@ -77,6 +79,16 @@ index 3a2c52000b..5372965676 100644
|
||||
- </excludes>
|
||||
- </filter>
|
||||
- <filter>
|
||||
- <artifact>codes.rafael.asmjdkbridge:*</artifact>
|
||||
- <includes>
|
||||
- <include>META-INF/versions/**</include>
|
||||
- </includes>
|
||||
- <excludes>
|
||||
- <exclude>META-INF/MANIFEST.MF</exclude>
|
||||
- <exclude>**/module-info.class</exclude>
|
||||
- </excludes>
|
||||
- </filter>
|
||||
- <filter>
|
||||
- <artifact>org.ow2.asm:asm-commons</artifact>
|
||||
- <includes>
|
||||
- <include>org/objectweb/asm/commons/AnnotationRemapper.**</include>
|
||||
@ -95,6 +107,3 @@ index 3a2c52000b..5372965676 100644
|
||||
<transformers>
|
||||
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
|
||||
<mainClass>net.bytebuddy.build.Plugin$Engine$Default</mainClass>
|
||||
--
|
||||
2.45.1
|
||||
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:74129de1641d7d4090535b775ecb01bdd6fca4d44044f0844c875494fcfb6957
|
||||
size 2042176
|
3
byte-buddy-1.17.0.tar.gz
Normal file
3
byte-buddy-1.17.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7ef19d9c4a465a2a6cd08a05a44e7db24be08602c949b6dc99c0dc2af5e79a3b
|
||||
size 2082140
|
@ -1,3 +1,137 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 29 22:22:17 UTC 2025 - Anton Shvetz <shvetz.anton@gmail.com>
|
||||
|
||||
- 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 <shvetz.anton@gmail.com>
|
||||
|
||||
- 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 <shvetz.anton@gmail.com>
|
||||
|
||||
- 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 <shvetz.anton@gmail.com>
|
||||
|
||||
- Update to v1.15.11
|
||||
* Changes of v1.15.11
|
||||
+ Avoid dependency of CachedReturnPlugin on precompiled class
|
||||
files.
|
||||
+ Add NOP instruction when Advice is used on void methods as
|
||||
those might be empty which results on a frame being written
|
||||
to the same offset, causing an exception.
|
||||
+ Allow Plugin.Enging to link files instead of copying.
|
||||
+ Adjust validator code to avoid compiler bug that was reported
|
||||
by multiple users.
|
||||
+ Allow injection of class path as File[] to Plugin
|
||||
constructors.
|
||||
+ Allow for configuring variants when using the Android Gradle
|
||||
plugin.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Nov 3 23:45:15 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>
|
||||
|
||||
- Update to v1.15.10
|
||||
* Changes of v1.15.10
|
||||
+ Fix Java 8 patterns for multi-release jars to avoid that
|
||||
inner classes are excluded.
|
||||
* Changes of v1.15.9
|
||||
+ Additional release after time out during previous Gradle
|
||||
plugin release.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 2 15:49:57 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>
|
||||
|
||||
- Update to v1.15.8
|
||||
* Changes of v1.15.8
|
||||
+ Extend ClassInjector API to support lazy resolution of class
|
||||
files.
|
||||
+ Extend DynamicType API to support lazy resolution of
|
||||
auxiliary types.
|
||||
+ Extend AgentBuilder.Transformer.ForAdvice to support
|
||||
injection of new classes by their name.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 23 10:55:21 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>
|
||||
|
||||
- Update to v1.15.7
|
||||
* Changes of v1.15.7
|
||||
+ Additional release after time out during previous Gradle
|
||||
plugin release.
|
||||
* Changes of v1.15.6
|
||||
+ Add ConstructorResolver to Super annotation for
|
||||
MethodDelegation to allow for dynamic constructor resolution.
|
||||
+ Add Java 8 versions of shaded ASM to allow for faster class
|
||||
file validation and CDS support.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 17 10:23:16 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>
|
||||
|
||||
- Update to v1.15.5
|
||||
* Changes of v1.15.5
|
||||
+ Publish Byte Buddy and Byte Buddy agent artifacts as
|
||||
multi-release jars to support CDS and faster validation.
|
||||
- Remove Windows-specific resources
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Oct 12 00:15:26 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>
|
||||
|
||||
- Update to v1.15.4
|
||||
* Add non-experimental support for Java 24.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 26 22:46:31 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>
|
||||
|
||||
- Update to v1.15.3
|
||||
* Changes of v1.15.3
|
||||
+ Treat multi-release class files that are newer than the
|
||||
supported version as regular resources.
|
||||
+ Allow overriding the multi-release class file version from
|
||||
Maven and Gradle plugin.
|
||||
+ Correctly resolve multi-release class files in Android.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 25 21:44:53 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>
|
||||
|
||||
- Update to v1.15.2
|
||||
* Changes of v1.15.2
|
||||
+ Add support for multi-release JAR files in ClassFileLocators
|
||||
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.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 1 16:25:12 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>
|
||||
|
||||
|
@ -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.1
|
||||
Version: 1.17.0
|
||||
Release: 0
|
||||
Summary: Runtime code generation for the Java virtual machine
|
||||
License: Apache-2.0
|
||||
@ -39,7 +39,7 @@ BuildRequires: mvn(org.apache.maven:maven-core)
|
||||
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
|
||||
BuildRequires: mvn(org.eclipse.aether:aether-api)
|
||||
BuildRequires: mvn(org.eclipse.aether:aether-util)
|
||||
BuildRequires: mvn(org.ow2.asm:asm) >= 9.7
|
||||
BuildRequires: mvn(org.ow2.asm:asm) >= 9.7.1
|
||||
BuildRequires: mvn(org.ow2.asm:asm-commons)
|
||||
BuildRequires: mvn(org.sonatype.plexus:plexus-build-api)
|
||||
BuildArch: noarch
|
||||
@ -76,15 +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 %{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
|
||||
@ -97,16 +100,17 @@ API documentation for %{name}.
|
||||
%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
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user