Fridrich Strba 2024-04-18 12:00:49 +00:00 committed by Git OBS Bridge
parent 348d920794
commit 1e0ce5b17b

View File

@ -1,14 +1,14 @@
From 07c2d772b5e4bc79c20fc19eb3ed402f74d82cc6 Mon Sep 17 00:00:00 2001
From a87d1515a3425dad03240b31478bcf1c8097a738 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(-)
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 ad2343d3fd..d6e5c70151 100644
index ad2343d3fd..edae9d9ad9 100644
--- a/byte-buddy/pom.xml
+++ b/byte-buddy/pom.xml
@@ -26,8 +26,6 @@
@ -32,19 +32,24 @@ index ad2343d3fd..d6e5c70151 100644
</packages.list.external>
<packages.list.internal>
net.bytebuddy.utility.dispatcher
@@ -166,6 +161,11 @@
<artifactId>asm</artifactId>
<version>${version.asm}</version>
@@ -83,6 +78,16 @@
<groupId>${project.groupId}</groupId>
<artifactId>byte-buddy-dep</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <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 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
@@ -254,45 +259,6 @@
<createDependencyReducedPom>true</createDependencyReducedPom>
<createSourcesJar>${bytebuddy.extras}</createSourcesJar>
<shadeSourcesContent>true</shadeSourcesContent>