diff options
Diffstat (limited to '0001-Avoid-bundling-asm.patch')
| -rw-r--r-- | 0001-Avoid-bundling-asm.patch | 124 |
1 files changed, 124 insertions, 0 deletions
diff --git a/0001-Avoid-bundling-asm.patch b/0001-Avoid-bundling-asm.patch new file mode 100644 index 0000000..84216a8 --- /dev/null +++ b/0001-Avoid-bundling-asm.patch @@ -0,0 +1,124 @@ +From ceca0b287ac211a968e84cee7f05cfd6c2a843ec Mon Sep 17 00:00:00 2001 +From: Marian Koncek <mkoncek@redhat.com> +Date: Tue, 29 Sep 2020 14:46:16 +0200 +Subject: [PATCH] Avoid bundling asm + +--- + byte-buddy/pom.xml | 70 ++++++++++------------------------------------ + 1 file changed, 15 insertions(+), 55 deletions(-) + +diff --git a/byte-buddy/pom.xml b/byte-buddy/pom.xml +index 16388f3..c97b4d9 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> + net.bytebuddy, + net.bytebuddy.agent.builder, +@@ -62,9 +60,6 @@ + net.bytebuddy.utility, + net.bytebuddy.utility.privilege, + net.bytebuddy.utility.visitor, +- ${shade.target}, +- ${shade.target}.signature, +- ${shade.target}.commons + </packages.list> + </properties> + +@@ -79,6 +74,16 @@ + <artifactId>byte-buddy-dep</artifactId> + <version>${project.version}</version> + </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> + + <build> +@@ -105,44 +110,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> +- </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> +@@ -151,21 +118,14 @@ + <resource>META-INF/LICENSE</resource> + </transformer> + </transformers> ++ <artifactSet> ++ <excludes> ++ <exclude>org.ow2.asm:*</exclude> ++ </excludes> ++ </artifactSet> + </configuration> + </execution> + </executions> +- <dependencies> +- <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> + </plugin> + <!-- Disable pitest as it fails for empty modules --> + <plugin> +-- +2.26.2 + |