forked from pool/byte-buddy
This commit is contained in:
Fridrich Strba
Git OBS Bridge
parent
44f0b84462
commit
8c599b9779
95
0001-Avoid-bundling-asm.patch
Normal file
95
0001-Avoid-bundling-asm.patch
Normal file
@ -0,0 +1,95 @@
|
||||
From 07c2d772b5e4bc79c20fc19eb3ed402f74d82cc6 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 | 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 @@
|
||||
-->
|
||||
|
||||
<properties>
|
||||
- <shade.source>org.objectweb.asm</shade.source>
|
||||
- <shade.target>net.bytebuddy.jar.asm</shade.target>
|
||||
<packages.list.external>
|
||||
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
|
||||
</packages.list.external>
|
||||
<packages.list.internal>
|
||||
net.bytebuddy.utility.dispatcher
|
||||
@@ -166,6 +161,11 @@
|
||||
<artifactId>asm</artifactId>
|
||||
<version>${version.asm}</version>
|
||||
</dependency>
|
||||
+ <dependency>
|
||||
+ <groupId>org.ow2.asm</groupId>
|
||||
+ <artifactId>asm-commons</artifactId>
|
||||
+ <version>${version.asm}</version>
|
||||
+ </dependency>
|
||||
</dependencies>
|
||||
<executions>
|
||||
<execution>
|
||||
@@ -254,45 +254,6 @@
|
||||
<createDependencyReducedPom>true</createDependencyReducedPom>
|
||||
<createSourcesJar>${bytebuddy.extras}</createSourcesJar>
|
||||
<shadeSourcesContent>true</shadeSourcesContent>
|
||||
- <relocations>
|
||||
- <relocation>
|
||||
- <pattern>${shade.source}</pattern>
|
||||
- <shadedPattern>${shade.target}</shadedPattern>
|
||||
- </relocation>
|
||||
- </relocations>
|
||||
- <filters>
|
||||
- <filter>
|
||||
- <artifact>net.bytebuddy:byte-buddy-dep:*</artifact>
|
||||
- <excludes>
|
||||
- <exclude>META-INF/MANIFEST.MF</exclude>
|
||||
- <exclude>META-INF/maven/**</exclude>
|
||||
- </excludes>
|
||||
- </filter>
|
||||
- <filter>
|
||||
- <artifact>org.ow2.asm:*</artifact>
|
||||
- <excludes>
|
||||
- <exclude>META-INF/MANIFEST.MF</exclude>
|
||||
- <exclude>**/module-info.class</exclude>
|
||||
- <exclude>**/LICENSE</exclude>
|
||||
- <exclude>**/NOTICE</exclude>
|
||||
- </excludes>
|
||||
- </filter>
|
||||
- <filter>
|
||||
- <artifact>org.ow2.asm:asm-commons</artifact>
|
||||
- <includes>
|
||||
- <include>org/objectweb/asm/commons/AnnotationRemapper.**</include>
|
||||
- <include>org/objectweb/asm/commons/ClassRemapper.**</include>
|
||||
- <include>org/objectweb/asm/commons/FieldRemapper.**</include>
|
||||
- <include>org/objectweb/asm/commons/MethodRemapper.**</include>
|
||||
- <include>org/objectweb/asm/commons/ModuleHashesAttribute.**</include>
|
||||
- <include>org/objectweb/asm/commons/ModuleRemapper.**</include>
|
||||
- <include>org/objectweb/asm/commons/RecordComponentRemapper.**</include>
|
||||
- <include>org/objectweb/asm/commons/Remapper.**</include>
|
||||
- <include>org/objectweb/asm/commons/SignatureRemapper.**</include>
|
||||
- <include>org/objectweb/asm/commons/SimpleRemapper.**</include>
|
||||
- </includes>
|
||||
- </filter>
|
||||
- </filters>
|
||||
<transformers>
|
||||
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
|
||||
<mainClass>net.bytebuddy.build.Plugin$Engine$Default</mainClass>
|
||||
--
|
||||
2.44.0
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 18 11:25:23 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- 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 <shvetz.anton@gmail.com>
|
||||
|
||||
|
||||
@ -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)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user