SHA256
1
0
forked from pool/byte-buddy

Accepting request 1243236 from Java:packages

1.17.0

OBS-URL: https://build.opensuse.org/request/show/1243236
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/byte-buddy?expand=0&rev=13
This commit is contained in:
Ana Guerrero 2025-02-05 11:41:39 +00:00 committed by Git OBS Bridge
commit 325435014d
5 changed files with 95 additions and 44 deletions

View File

@ -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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6ad2f94e473f3d717b5dbe8cfd9e590bc4d4c54bbb2729a4410a720ee1bedf2f
size 2059994

3
byte-buddy-1.17.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7ef19d9c4a465a2a6cd08a05a44e7db24be08602c949b6dc99c0dc2af5e79a3b
size 2082140

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
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>

View File

@ -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