Relocated org.slf4j to remove conflict with other plugins using HikariCP

This commit is contained in:
Rsl1122 2018-07-28 10:00:08 +03:00
parent 53ed4e81ea
commit bcdcc152cd
2 changed files with 10 additions and 14 deletions

View File

@ -71,22 +71,20 @@
<relocation>
<pattern>com.maxmind</pattern>
<shadedPattern>plan.com.maxmind</shadedPattern>
<excludes>
<exclude>org.apache.logging.**</exclude>
</excludes>
</relocation>
<relocation>
<pattern>com.fasterxml</pattern>
<shadedPattern>plan.com.fasterxml</shadedPattern>
<excludes>
<exclude>org.apache.logging.**</exclude>
</excludes>
</relocation>
<relocation>
<pattern>com.zaxxer</pattern>
<shadedPattern>plan.com.zaxxer</shadedPattern>
</relocation>
<relocation>
<pattern>org.slf4j</pattern>
<shadedPattern>plan.org.slf4j</shadedPattern>
<excludes>
<exclude>org.apache.logging.**</exclude>
<exclude>org.slf4j.Logger</exclude>
</excludes>
</relocation>
</relocations>

View File

@ -190,22 +190,20 @@
<relocation>
<pattern>com.maxmind</pattern>
<shadedPattern>plan.com.maxmind</shadedPattern>
<excludes>
<exclude>org.apache.logging.**</exclude>
</excludes>
</relocation>
<relocation>
<pattern>com.fasterxml</pattern>
<shadedPattern>plan.com.fasterxml</shadedPattern>
<excludes>
<exclude>org.apache.logging.**</exclude>
</excludes>
</relocation>
<relocation>
<pattern>com.zaxxer</pattern>
<shadedPattern>plan.com.zaxxer</shadedPattern>
</relocation>
<relocation>
<pattern>org.slf4j</pattern>
<shadedPattern>plan.org.slf4j</shadedPattern>
<excludes>
<exclude>org.apache.logging.**</exclude>
<exclude>org.slf4j.Logger</exclude>
</excludes>
</relocation>
</relocations>