byte-buddy/0001-Avoid-bundling-asm.patch
Anton Shvetz e4d7ee444e - 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

OBS-URL: https://build.opensuse.org/package/show/Java:packages/byte-buddy?expand=0&rev=46
2025-01-18 11:15:58 +00:00

110 lines
6.7 KiB
Diff

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>