From e416135ed33deaf6a830aa70f29fd60b06d8f395 Mon Sep 17 00:00:00 2001
From: LegacyGamerHD <wesleyvanneck105@outlook.com>
Date: Tue, 3 Dec 2019 08:41:26 +0100
Subject: [PATCH] merge the latest stuff

---
 bootstrap/bukkit/pom.xml     | 4 ++--
 bootstrap/bungeecord/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bootstrap/bukkit/pom.xml b/bootstrap/bukkit/pom.xml
index cbc0ef15f..7fc2aa4a8 100644
--- a/bootstrap/bukkit/pom.xml
+++ b/bootstrap/bukkit/pom.xml
@@ -25,7 +25,7 @@
         </dependency>
     </dependencies>
     <build>
-        <finalName>${outputName}-Bukkit-noshade</finalName>
+        <finalName>${outputName}-Bukkit</finalName>
         <defaultGoal>clean install</defaultGoal>
         <resources>
             <resource>
@@ -37,7 +37,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
diff --git a/bootstrap/bungeecord/pom.xml b/bootstrap/bungeecord/pom.xml
index 3f26909e0..c61a0ac0e 100644
--- a/bootstrap/bungeecord/pom.xml
+++ b/bootstrap/bungeecord/pom.xml
@@ -25,7 +25,7 @@
         </dependency>
     </dependencies>
     <build>
-        <finalName>${outputName}-BungeeCord-noshade</finalName>
+        <finalName>${outputName}-BungeeCord</finalName>
         <defaultGoal>clean install</defaultGoal>
         <resources>
             <resource>
@@ -37,7 +37,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>