diff --git a/0001-Avoid-bundling-asm.patch b/0001-Avoid-bundling-asm.patch new file mode 100644 index 0000000..9abcd9e --- /dev/null +++ b/0001-Avoid-bundling-asm.patch @@ -0,0 +1,95 @@ +From 07c2d772b5e4bc79c20fc19eb3ed402f74d82cc6 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 | 51 ++++++---------------------------------------- + 1 file changed, 6 insertions(+), 45 deletions(-) + +diff --git a/byte-buddy/pom.xml b/byte-buddy/pom.xml +index ad2343d3fd..d6e5c70151 100644 +--- a/byte-buddy/pom.xml ++++ b/byte-buddy/pom.xml +@@ -26,8 +26,6 @@ + --> + + +- org.objectweb.asm +- net.bytebuddy.jar.asm + + net.bytebuddy, + net.bytebuddy.agent.builder, +@@ -62,10 +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 ++ net.bytebuddy.utility.visitor + + + net.bytebuddy.utility.dispatcher +@@ -166,6 +161,11 @@ + asm + ${version.asm} + ++ ++ org.ow2.asm ++ asm-commons ++ ${version.asm} ++ + + + +@@ -254,45 +254,6 @@ + true + ${bytebuddy.extras} + true +- +- +- ${shade.source} +- ${shade.target} +- +- +- +- +- net.bytebuddy:byte-buddy-dep:* +- +- META-INF/MANIFEST.MF +- META-INF/maven/** +- +- +- +- org.ow2.asm:* +- +- META-INF/MANIFEST.MF +- **/module-info.class +- **/LICENSE +- **/NOTICE +- +- +- +- org.ow2.asm:asm-commons +- +- org/objectweb/asm/commons/AnnotationRemapper.** +- org/objectweb/asm/commons/ClassRemapper.** +- org/objectweb/asm/commons/FieldRemapper.** +- org/objectweb/asm/commons/MethodRemapper.** +- org/objectweb/asm/commons/ModuleHashesAttribute.** +- org/objectweb/asm/commons/ModuleRemapper.** +- org/objectweb/asm/commons/RecordComponentRemapper.** +- org/objectweb/asm/commons/Remapper.** +- org/objectweb/asm/commons/SignatureRemapper.** +- org/objectweb/asm/commons/SimpleRemapper.** +- +- +- + + + net.bytebuddy.build.Plugin$Engine$Default +-- +2.44.0 + diff --git a/byte-buddy.changes b/byte-buddy.changes index dfb2498..7f9175e 100644 --- a/byte-buddy.changes +++ b/byte-buddy.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Apr 18 11:25:23 UTC 2024 - Fridrich Strba + +- Added patch: + * 0001-Avoid-bundling-asm.patch + + Do not bundle asm, but use external artifact + ------------------------------------------------------------------- Thu Mar 28 20:38:55 UTC 2024 - Anton Shvetz diff --git a/byte-buddy.spec b/byte-buddy.spec index b492868..afd9f08 100644 --- a/byte-buddy.spec +++ b/byte-buddy.spec @@ -24,6 +24,7 @@ License: Apache-2.0 Group: Development/Libraries/Java URL: https://bytebuddy.net/ Source0: https://github.com/raphw/%{name}/archive/refs/tags/%{name}-%{version}.tar.gz +Patch0: 0001-Avoid-bundling-asm.patch BuildRequires: fdupes BuildRequires: jurand BuildRequires: maven-local @@ -67,6 +68,7 @@ API documentation for %{name}. %prep %setup -q -n %{name}-%{name}-%{version} +%patch -P 0 -p1 # Don't ship android or benchmark modules %pom_disable_module byte-buddy-android @@ -86,7 +88,7 @@ API documentation for %{name}. %pom_remove_plugin :maven-release-plugin %pom_remove_plugin :nexus-staging-maven-plugin -# Avoid circural dependency +# Avoid circular dependency %pom_remove_plugin :byte-buddy-maven-plugin byte-buddy-dep # Not interested in shading sources (causes NPE on old versions of shade plugin)