From 1eddc2cb8b2ed055db6e35dbd86d1182afde761a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 26 Apr 2020 17:43:08 -0400
Subject: [PATCH] Clean up build scripts and rework shading/relocation

ACF deps such as timings lib and expiring map will now properly
be relocated into ACF.

This will avoid version conflicts with ExpiringMap and TimingsLib

Sadly, because locales is an exposed API, we can not relocate locales...

It will still be on plugins to add the locales relocation themselves.
Will update wiki to document this.

also updated maven plugins to newest versions, minus surefire, as
3.0 doesn't work with current setup. Went to latest 2.x there.

Got rid of a lot of duplicated shade configuration stuff across
submodules too.
---
 bukkit/pom.xml  | 26 --------------------------
 core/pom.xml    | 32 +-------------------------------
 example/pom.xml |  9 +++++++--
 jda/pom.xml     | 22 ----------------------
 pom.xml         | 30 ++++++++++++++++++++++--------
 5 files changed, 30 insertions(+), 89 deletions(-)

diff --git a/bukkit/pom.xml b/bukkit/pom.xml
index 5433b2b9..4e8d40d6 100644
--- a/bukkit/pom.xml
+++ b/bukkit/pom.xml
@@ -60,32 +60,6 @@
         </dependency>
     </dependencies>
     <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.1</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
-                    <!-- when downloading via Maven we can pull depends individually -->
-                    <shadedArtifactAttached>true</shadedArtifactAttached>
-                    <relocations>
-                        <relocation>
-                            <pattern>co.aikar.timings.lib</pattern>
-                            <shadedPattern>co.aikar.commands.timings</shadedPattern>
-                        </relocation>
-                    </relocations>
-                </configuration>
-            </plugin>
-        </plugins>
         <resources>
             <resource>
                 <directory>${project.basedir}/../languages/minecraft/</directory>
diff --git a/core/pom.xml b/core/pom.xml
index 52645ea1..bfe2e16a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -55,41 +55,11 @@
         <dependency>
             <groupId>net.jodah</groupId>
             <artifactId>expiringmap</artifactId>
-            <version>0.5.8</version>
+            <version>0.5.9</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
     <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.1</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
-                    <!-- when downloading via Maven we can pull depends individually -->
-                    <shadedArtifactAttached>true</shadedArtifactAttached>
-                    <relocations>
-                        <relocation>
-                            <pattern>co.aikar.locales</pattern>
-                            <shadedPattern>co.aikar.commands.locales</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>net.jodah.expiringmap</pattern>
-                            <shadedPattern>co.aikar.commands.lib.expiringmap</shadedPattern>
-                        </relocation>
-                    </relocations>
-                </configuration>
-            </plugin>
-        </plugins>
         <resources>
             <resource>
                 <directory>${project.basedir}/../languages/core/</directory>
diff --git a/example/pom.xml b/example/pom.xml
index 2d71723f..26843cd0 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -62,11 +62,16 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>3.1.1</version>
                 <configuration>
-                    <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
+                    <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml
+                    </dependencyReducedPomLocation>
                     <relocations>
                         <relocation>
                             <pattern>co.aikar.commands</pattern>
-                            <shadedPattern>com.exampleplugin.acf</shadedPattern>
+                            <shadedPattern>com.exampleplugin.lib.acf</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>co.aikar.locales</pattern>
+                            <shadedPattern>com.exampleplugin.lib.locales</shadedPattern>
                         </relocation>
                     </relocations>
                 </configuration>
diff --git a/jda/pom.xml b/jda/pom.xml
index 56135850..1a80e91a 100644
--- a/jda/pom.xml
+++ b/jda/pom.xml
@@ -62,28 +62,6 @@
         </dependency>
     </dependencies>
     <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.1</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
-                    <!-- when downloading via Maven we can pull depends individually -->
-                    <shadedArtifactAttached>true</shadedArtifactAttached>
-                    <relocations>
-                    </relocations>
-                </configuration>
-            </plugin>
-        </plugins>
         <resources>
             <!--resource>
                 <directory>${project.basedir}/../languages/minecraft/</directory>
diff --git a/pom.xml b/pom.xml
index a1fd7847..8305a1ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
+                <version>3.8.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -76,12 +76,12 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.1</version>
+                <version>2.22.2</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -94,7 +94,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.2.3</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -104,15 +104,29 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
-                    <!-- when downloading via Maven we can pull depends individually -->
-                    <shadedArtifactAttached>true</shadedArtifactAttached>
+                    <relocations>
+                        <relocation>
+                            <pattern>net.jodah.expiringmap</pattern>
+                            <shadedPattern>co.aikar.commands.lib.expiringmap</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>co.aikar.util</pattern>
+                            <shadedPattern>co.aikar.commands.lib.util</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>co.aikar.timings.lib</pattern>
+                            <shadedPattern>co.aikar.commands.lib.timings</shadedPattern>
+                        </relocation>
+                    </relocations>
+                    <dependencyReducedPomLocation>
+                        ${project.build.directory}/dependency-reduced-pom.xml
+                    </dependencyReducedPomLocation>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.2.0</version>
                 <configuration>
                     <destDir>../docs/${project.artifactId}/</destDir>
                     <quiet>true</quiet>