Shade asm into the core, not all java versions contains it. Fix shading for reactivestreams.

This commit is contained in:
ceze88 2024-01-12 16:27:02 +01:00
parent dcf9fa4a29
commit cd3acd87f5

View File

@ -94,6 +94,7 @@
<include>me.lucko:jar-relocator</include> <include>me.lucko:jar-relocator</include>
<include>com.github.GeorgeV220:LibraryLoader</include> <include>com.github.GeorgeV220:LibraryLoader</include>
<include>org.ow2.asm:asm</include>
</includes> </includes>
</artifactSet> </artifactSet>
@ -118,6 +119,11 @@
<shadedPattern>com.craftaro.third_party.org.apache.commons</shadedPattern> <shadedPattern>com.craftaro.third_party.org.apache.commons</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>org.reactivestreams</pattern>
<shadedPattern>com.craftaro.third_party.org.reactivestreams</shadedPattern>
</relocation>
<relocation> <relocation>
<pattern>org.jooq</pattern> <pattern>org.jooq</pattern>
<shadedPattern>com.craftaro.third_party.org.jooq</shadedPattern> <shadedPattern>com.craftaro.third_party.org.jooq</shadedPattern>
@ -147,6 +153,11 @@
<pattern>com.georgev22.api</pattern> <pattern>com.georgev22.api</pattern>
<shadedPattern>com.craftaro.core.third_party.com.georgev22.api</shadedPattern> <shadedPattern>com.craftaro.core.third_party.com.georgev22.api</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>org.objectweb.asm</pattern>
<shadedPattern>com.craftaro.core.third_party.org.objectweb.asm</shadedPattern>
</relocation>
</relocations> </relocations>
<filters> <filters>
@ -240,6 +251,13 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.6</version>
<scope>compile</scope>
</dependency>
<!-- DB Stuff Start --> <!-- DB Stuff Start -->
<dependency> <dependency>
<groupId>com.zaxxer</groupId> <groupId>com.zaxxer</groupId>