114 lines
5.5 KiB
Diff
114 lines
5.5 KiB
Diff
|
--- byte-buddy/pom.xml.orig 2020-07-31 08:09:49.000000000 -0600
|
||
|
|
+++ byte-buddy/pom.xml 2020-08-14 13:55:09.300521492 -0600
|
||
|
|
@@ -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,
|
||
|
|
@@ -61,10 +59,7 @@
|
||
|
|
net.bytebuddy.pool,
|
||
|
|
net.bytebuddy.utility,
|
||
|
|
net.bytebuddy.utility.privilege,
|
||
|
|
- net.bytebuddy.utility.visitor,
|
||
|
|
- ${shade.target},
|
||
|
|
- ${shade.target}.signature,
|
||
|
|
- ${shade.target}.commons
|
||
|
|
+ net.bytebuddy.utility.visitor
|
||
|
|
</packages.list>
|
||
|
|
</properties>
|
||
|
|
|
||
|
|
@@ -77,7 +72,17 @@
|
||
|
|
<dependency>
|
||
|
|
<groupId>${project.groupId}</groupId>
|
||
|
|
<artifactId>byte-buddy-dep</artifactId>
|
||
|
|
- <version>${project.version}</version>
|
||
|
|
+ <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>
|
||
|
|
|
||
|
|
@@ -105,12 +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>
|
||
|
|
@@ -118,30 +117,6 @@
|
||
|
|
<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">
|
||
|
|
@@ -151,21 +126,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>
|