feedc0de/FastLogin
1
0
Fork 0
forked from TuxCoding/FastLogin
Code Pull Requests Activity

Move excluded shaded list to dependencies directly

Browse Source 
It seems to be easier where the dependencies are coming from.
This commit is contained in:
games647
2024-05-05 13:23:07 +02:00
parent 47b6835f37
commit c905ca3d33
2 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
bungee/pom.xml
View File

@ -57,14 +57,6 @@
<createDependencyReducedPom>false</createDependencyReducedPom> <createDependencyReducedPom>false</createDependencyReducedPom>
<shadedArtifactAttached>false</shadedArtifactAttached> <shadedArtifactAttached>false</shadedArtifactAttached>
<artifactSet>
<excludes>
<!--Those classes are already present in BungeeCord version-->
<exclude>net.md-5:bungeecord-config</exclude>
<exclude>com.google.code.gson:gson</exclude>
<exclude>com.google.guava:guava</exclude>
</excludes>
</artifactSet>
<relocations> <relocations>
<relocation> <relocation>
<pattern>com.zaxxer.hikari</pattern> <pattern>com.zaxxer.hikari</pattern>
@ -124,6 +116,21 @@
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>fastlogin.core</artifactId> <artifactId>fastlogin.core</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<!--Those classes are already present in BungeeCord version-->
<exclusions>
<exclusion>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-config</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!--BungeeCord with also the part outside the API--> <!--BungeeCord with also the part outside the API-->

42
velocity/pom.xml
View File

@ -84,24 +84,6 @@
<shadedPattern>fastlogin.mariadb</shadedPattern> <shadedPattern>fastlogin.mariadb</shadedPattern>
</relocation> </relocation>
</relocations> </relocations>
<artifactSet>
<!--org.slf4j is part of velocity api and runtime,
shading and relocating it causes logger injection to fail-->
<excludes>
<exclude>org.slf4j:*</exclude>
<exclude>com.google.code.gson:gson</exclude>
<!-- Ships the same old version -->
<exclude>com.google.guava:guava</exclude>
<exclude>org.checkerframework:checker-qual</exclude>
<exclude>com.google.errorprone:error_prone_annotations</exclude>
<exclude>com.github.ben-manes.caffeine:caffeine</exclude>
<!-- Exclude JNA implementation for WAFFLE - Windows Authentication Framework (mariadb)-->
<exclude>com.github.waffle:waffle-jna</exclude>
<exclude>net.java.dev.jna:*</exclude>
</excludes>
</artifactSet>
<transformers> <transformers>
<transformer <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
@ -150,6 +132,23 @@
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>fastlogin.core</artifactId> <artifactId>fastlogin.core</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<exclusions>
<!-- Velocity ships an older version -->
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
<!--org.slf4j is part of velocity api and runtime, shading and relocating it causes
logger injection to fail-->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!--Velocity api--> <!--Velocity api-->
@ -165,6 +164,13 @@
<groupId>org.mariadb.jdbc</groupId> <groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId> <artifactId>mariadb-java-client</artifactId>
<version>3.3.3</version> <version>3.3.3</version>
<exclusions>
<!-- Exclude JNA implementation for WAFFLE - Windows Authentication Framework (mariadb)-->
<exclusion>
<groupId>com.github.waffle</groupId>
<artifactId>waffle-jna</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- Bedrock player bridge --> <!-- Bedrock player bridge -->