mirror of
https://github.com/AuthMe/AuthMeReloaded.git
synced 2024-11-26 04:05:28 +01:00
Bump the mysql connector version, fix minor dependency shading issues
This commit is contained in:
parent
053519faa4
commit
4fe6cfe485
1
.github/dependabot.yml
vendored
1
.github/dependabot.yml
vendored
@ -9,5 +9,4 @@ updates:
|
|||||||
- dependency-name: com.google.code.gson:gson
|
- dependency-name: com.google.code.gson:gson
|
||||||
- dependency-name: com.google.guava:guava
|
- dependency-name: com.google.guava:guava
|
||||||
- dependency-name: org.apache.logging.log4j:log4j-core
|
- dependency-name: org.apache.logging.log4j:log4j-core
|
||||||
- dependency-name: mysql:mysql-connector-java
|
|
||||||
- dependency-name: com.zaxxer:HikariCP
|
- dependency-name: com.zaxxer:HikariCP
|
||||||
|
48
pom.xml
48
pom.xml
@ -293,7 +293,13 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<artifactSet>
|
<artifactSet>
|
||||||
<excludes>
|
<excludes>
|
||||||
|
<!-- Guava -->
|
||||||
<exclude>com.google.guava:guava</exclude>
|
<exclude>com.google.guava:guava</exclude>
|
||||||
|
<exclude>com.google.guava:failureaccess</exclude>
|
||||||
|
<exclude>com.google.guava:listenablefuture</exclude>
|
||||||
|
<exclude>com.google.errorprone:error_prone_annotations</exclude>
|
||||||
|
<exclude>com.google.j2objc:j2objc-annotations</exclude>
|
||||||
|
<!-- Gson -->
|
||||||
<exclude>com.google.code.gson:gson</exclude>
|
<exclude>com.google.code.gson:gson</exclude>
|
||||||
</excludes>
|
</excludes>
|
||||||
</artifactSet>
|
</artifactSet>
|
||||||
@ -316,6 +322,14 @@
|
|||||||
<pattern>com.google.thirdparty</pattern>
|
<pattern>com.google.thirdparty</pattern>
|
||||||
<shadedPattern>fr.xephi.authme.libs.com.google.thirdparty</shadedPattern>
|
<shadedPattern>fr.xephi.authme.libs.com.google.thirdparty</shadedPattern>
|
||||||
</relocation>
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>com.google.j2objc</pattern>
|
||||||
|
<shadedPattern>fr.xephi.authme.libs.com.google.j2objc</shadedPattern>
|
||||||
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>com.google.errorprone</pattern>
|
||||||
|
<shadedPattern>fr.xephi.authme.libs.com.google.errorprone</shadedPattern>
|
||||||
|
</relocation>
|
||||||
<relocation>
|
<relocation>
|
||||||
<pattern>com.google.gson</pattern>
|
<pattern>com.google.gson</pattern>
|
||||||
<shadedPattern>fr.xephi.authme.libs.com.google.gson</shadedPattern>
|
<shadedPattern>fr.xephi.authme.libs.com.google.gson</shadedPattern>
|
||||||
@ -365,6 +379,18 @@
|
|||||||
<pattern>de.rtner</pattern>
|
<pattern>de.rtner</pattern>
|
||||||
<shadedPattern>fr.xephi.authme.libs.de.rtner</shadedPattern>
|
<shadedPattern>fr.xephi.authme.libs.de.rtner</shadedPattern>
|
||||||
</relocation>
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>org.picketbox</pattern>
|
||||||
|
<shadedPattern>fr.xephi.authme.libs.org.picketbox</shadedPattern>
|
||||||
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>org.jboss.crypto</pattern>
|
||||||
|
<shadedPattern>fr.xephi.authme.libs.org.jboss.crypto</shadedPattern>
|
||||||
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>org.jboss.security</pattern>
|
||||||
|
<shadedPattern>fr.xephi.authme.libs.org.jboss.security</shadedPattern>
|
||||||
|
</relocation>
|
||||||
<relocation>
|
<relocation>
|
||||||
<pattern>de.mkammerer</pattern>
|
<pattern>de.mkammerer</pattern>
|
||||||
<shadedPattern>fr.xephi.authme.libs.de.mkammerer</shadedPattern>
|
<shadedPattern>fr.xephi.authme.libs.de.mkammerer</shadedPattern>
|
||||||
@ -398,6 +424,10 @@
|
|||||||
<pattern>com.mysql</pattern>
|
<pattern>com.mysql</pattern>
|
||||||
<shadedPattern>fr.xephi.authme.libs.com.mysql</shadedPattern>
|
<shadedPattern>fr.xephi.authme.libs.com.mysql</shadedPattern>
|
||||||
</relocation>
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>com.google.protobuf</pattern>
|
||||||
|
<shadedPattern>fr.xephi.authme.libs.com.google.protobuf</shadedPattern>
|
||||||
|
</relocation>
|
||||||
</relocations>
|
</relocations>
|
||||||
|
|
||||||
<filters>
|
<filters>
|
||||||
@ -660,7 +690,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>mysql</groupId>
|
<groupId>mysql</groupId>
|
||||||
<artifactId>mysql-connector-java</artifactId>
|
<artifactId>mysql-connector-java</artifactId>
|
||||||
<version>8.0.26</version>
|
<version>8.0.28</version>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -713,6 +743,12 @@
|
|||||||
<artifactId>guava</artifactId>
|
<artifactId>guava</artifactId>
|
||||||
<version>31.0.1-jre</version>
|
<version>31.0.1-jre</version>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>org.checkerframework</groupId>
|
||||||
|
<artifactId>checker-qual</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- Keep in sync with spigot 1.19 -->
|
<!-- Keep in sync with spigot 1.19 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -761,6 +797,10 @@
|
|||||||
<artifactId>BukkitExecutors</artifactId>
|
<artifactId>BukkitExecutors</artifactId>
|
||||||
<groupId>com.comphenix.executors</groupId>
|
<groupId>com.comphenix.executors</groupId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
|
<exclusion>
|
||||||
|
<artifactId>byte-buddy</artifactId>
|
||||||
|
<groupId>net.bytebuddy</groupId>
|
||||||
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
@ -963,6 +1003,12 @@
|
|||||||
<artifactId>postgresql</artifactId>
|
<artifactId>postgresql</artifactId>
|
||||||
<version>42.4.0</version>
|
<version>42.4.0</version>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>org.checkerframework</groupId>
|
||||||
|
<artifactId>checker-qual</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Unit Testing Libraries -->
|
<!-- Unit Testing Libraries -->
|
||||||
|
Loading…
Reference in New Issue
Block a user