From f59e4672a0655460335ffabd2bef0dbd2faa0ac9 Mon Sep 17 00:00:00 2001 From: RednedEpic Date: Sun, 8 Dec 2019 22:41:50 -0600 Subject: [PATCH] Exclude dependencies already present in servers (only affects plugin) --- api/pom.xml | 6 ------ bootstrap/bukkit/pom.xml | 20 +++++++++++++++++-- bootstrap/bungeecord/pom.xml | 32 ++++++++++++++++++++++-------- bootstrap/standalone/pom.xml | 7 +++---- connector/pom.xml | 27 ------------------------- pom.xml | 38 +++++++++--------------------------- 6 files changed, 54 insertions(+), 76 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 2d4b1239..f9a35f4c 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -10,12 +10,6 @@ api - - org.projectlombok - lombok - 1.18.4 - provided - com.google.code.gson gson diff --git a/bootstrap/bukkit/pom.xml b/bootstrap/bukkit/pom.xml index 8e597635..46e7a14e 100644 --- a/bootstrap/bukkit/pom.xml +++ b/bootstrap/bukkit/pom.xml @@ -27,7 +27,6 @@ ${outputName}-Bukkit ../../target - clean install src/main/resources/ @@ -45,10 +44,27 @@ shade + + true + - true + + + *:* + + META-INF/* + + + + + + com.google.code.gson:* + org.yaml:* + io.netty:* + + diff --git a/bootstrap/bungeecord/pom.xml b/bootstrap/bungeecord/pom.xml index e30e8767..58525b64 100644 --- a/bootstrap/bungeecord/pom.xml +++ b/bootstrap/bungeecord/pom.xml @@ -27,7 +27,6 @@ ${outputName}-BungeeCord ../../target - clean install src/main/resources/ @@ -45,16 +44,33 @@ shade + + + + net.md_5.bungee.jni + org.geysermc.platform.bungeecord.shaded.jni + + + true + - - - net.md_5.bungee.jni - org.geysermc.platform.bungeecord.shaded.jni - - - true + + + *:* + + META-INF/* + + + + + + com.google.code.gson:* + org.yaml:* + io.netty:* + + diff --git a/bootstrap/standalone/pom.xml b/bootstrap/standalone/pom.xml index 7f0aef55..05e63ad7 100644 --- a/bootstrap/standalone/pom.xml +++ b/bootstrap/standalone/pom.xml @@ -46,7 +46,6 @@ ${outputName} ../../target - clean install org.apache.maven.plugins @@ -70,11 +69,11 @@ shade + + true + - - true - diff --git a/connector/pom.xml b/connector/pom.xml index fe01a370..238b7116 100644 --- a/connector/pom.xml +++ b/connector/pom.xml @@ -92,32 +92,5 @@ - - org.projectlombok - lombok - 1.18.4 - provided - - - ${project.artifactId}-${project.version}-noshade - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - - package - - shade - - - - - true - - - - diff --git a/pom.xml b/pom.xml index e534fbc0..2f0908c5 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ geyser-parent parent pom - GeyserMC + Geyser Allows for players from Minecraft Bedrock Edition to join Minecraft Java Edition servers. https://geysermc.org @@ -83,32 +83,12 @@ - - clean install - - - src/main/resources/ - false - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - true - - - - + + + org.projectlombok + lombok + 1.18.4 + provided + +