Compare commits
1 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
|
9c7c4afc62 |
@@ -1,109 +0,0 @@
|
||||
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.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,
|
||||
@@ -64,11 +60,7 @@
|
||||
net.bytebuddy.utility,
|
||||
net.bytebuddy.utility.nullability,
|
||||
net.bytebuddy.utility.privilege,
|
||||
- net.bytebuddy.utility.visitor,
|
||||
- ${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
|
||||
@@ -87,6 +79,16 @@
|
||||
<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>
|
||||
+ <dependency>
|
||||
<groupId>net.java.dev.jna</groupId>
|
||||
<artifactId>jna</artifactId>
|
||||
<version>${version.jna}</version>
|
||||
@@ -257,64 +259,6 @@
|
||||
<createDependencyReducedPom>true</createDependencyReducedPom>
|
||||
<createSourcesJar>${bytebuddy.extras}</createSourcesJar>
|
||||
<shadeSourcesContent>true</shadeSourcesContent>
|
||||
- <relocations>
|
||||
- <relocation>
|
||||
- <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>
|
||||
- <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>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>
|
||||
- <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>
|
||||
@@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 18 16:30:14 UTC 2026 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Removed patch:
|
||||
* 0001-Avoid-bundling-asm.patch
|
||||
+ needed for migration of uyuni to hibernate 7 which imports the
|
||||
shaded asm classes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 19 15:36:15 UTC 2025 - Anton Shvetz <shvetz.anton@gmail.com>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package byte-buddy
|
||||
#
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
# Copyright (c) 2026 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -24,7 +24,6 @@ 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
|
||||
@@ -35,6 +34,7 @@ BuildRequires: mvn(net.java.dev.jna:jna-platform)
|
||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin)
|
||||
BuildRequires: mvn(org.apache.maven:maven-core)
|
||||
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
|
||||
BuildRequires: mvn(org.apache.maven:maven-resolver-provider)
|
||||
@@ -77,7 +77,6 @@ API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{name}-%{version}
|
||||
%patch -P0 -p1
|
||||
|
||||
# Remove Windows-specific resources
|
||||
rm -rf %{name}-agent/src/main/resources/win32-x86{,-64}
|
||||
@@ -114,8 +113,6 @@ rm -rf %{name}-agent/src/main/resources/win32-x86{,-64}
|
||||
%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
|
||||
|
||||
%pom_add_dep org.apache.maven:maven-resolver-provider:\${version.maven}:provided \
|
||||
byte-buddy-maven-plugin
|
||||
|
||||
|
||||
Reference in New Issue
Block a user