EpicKnarvik97/Stargate
2
0
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases 27 Wiki Activity

Fixes dependency relocations to remove all warnings

Browse Source 
Removes unused adventure-platform-bukkit dependency
Explicitly includes bstats-base
Adds and fixes filters and relocations
This commit is contained in:
Kristian Knarvik
2024-11-08 16:50:14 +01:00
parent 966fed331f
commit 7dd01995ed
2 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -523,8 +523,6 @@ portalInfoServer=Server: %server%
# Changes # Changes
#
#### \[Version 0.11.5.9] Unified Legacy Fork #### \[Version 0.11.5.9] Unified Legacy Fork
- Hotfix for the previous release, which accidently broke backwards compatibility for older servers (1.17-1.19). - Hotfix for the previous release, which accidently broke backwards compatibility for older servers (1.17-1.19).

53
pom.xml
View File

@@ -89,14 +89,13 @@
<dependency> <dependency>
<groupId>org.bstats</groupId> <groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId> <artifactId>bstats-bukkit</artifactId>
<version>3.0.1</version> <version>3.0.2</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.kyori</groupId> <groupId>org.bstats</groupId>
<artifactId>adventure-platform-bukkit</artifactId> <artifactId>bstats-base</artifactId>
<version>4.3.2</version> <version>3.0.2</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.themoep</groupId> <groupId>de.themoep</groupId>
@@ -140,16 +139,6 @@
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.4.1</version> <version>3.4.1</version>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<artifactSet>
<includes>
<include>org.bstats:*</include>
<include>net.knarcraft:knarlib</include>
<include>de.themoep:minedown</include>
</includes>
</artifactSet>
</configuration>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
@@ -157,24 +146,38 @@
<goal>shade</goal> <goal>shade</goal>
</goals> </goals>
<configuration> <configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<relocations> <relocations>
<relocation> <relocation>
<pattern>org.bstats</pattern> <pattern>org.bstats</pattern>
<shadedPattern>net.knarcraft.stargate.metrics</shadedPattern> <shadedPattern>net.knarcraft.stargate.lib.metrics</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>net.knarcraft</pattern> <pattern>net.knarcraft.knarlib</pattern>
<shadedPattern>net.knarcraft</shadedPattern> <shadedPattern>net.knarcraft.stargate.lib.knarlib</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>net.kyori</pattern> <pattern>de.themoep</pattern>
<shadedPattern>net.knarcraft.stargate.lib.minedown</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>de.themoep.minedown</pattern> <pattern>org.jetbrains.annotations</pattern>
<shadedPattern>net.knarcraft.stargate.minedown</shadedPattern> <shadedPattern>net.knarcraft.blacksmith.lib.annotations</shadedPattern>
</relocation> </relocation>
</relocations> </relocations>
<filters> <filters>
<filter>
<artifact>de.themoep:minedown</artifact>
<includes>
<include>de/themoep/minedown/**</include>
</includes>
</filter>
<filter>
<artifact>org.bstats</artifact>
<includes>
<include>org/bstats/**</include>
</includes>
</filter>
<filter> <filter>
<artifact>net.knarcraft:knarlib</artifact> <artifact>net.knarcraft:knarlib</artifact>
<includes> <includes>
@@ -182,10 +185,10 @@
</includes> </includes>
</filter> </filter>
<filter> <filter>
<excludes> <artifact>org.jetbrains:annotations</artifact>
<exclude>*.MF</exclude> <includes>
<exclude>*.yml</exclude> <include>org/jetbrains/annotations/**</include>
</excludes> </includes>
</filter> </filter>
</filters> </filters>
</configuration> </configuration>