From 984059a84e2b04a249b719be7bf8930c69cf658b Mon Sep 17 00:00:00 2001
From: Olivoz <lucas.sivars@gmail.com>
Date: Fri, 28 Aug 2020 23:23:14 +0200
Subject: [PATCH] Pom changes

Minor changes for the POMs.
Now Minimizing jar.
Untested if this will cause issues. Doubt this is the case
---
 API/pom.xml          |  6 ------
 NMS/v1_15_R1/pom.xml |  7 ++-----
 NMS/v1_16_R1/pom.xml |  7 ++-----
 NMS/v1_16_R2/pom.xml |  7 ++-----
 Plugin/pom.xml       | 31 +++++++++++++++++++++++++++----
 pom.xml              | 17 ++++++-----------
 6 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/API/pom.xml b/API/pom.xml
index 79e09fa2..f2be6757 100644
--- a/API/pom.xml
+++ b/API/pom.xml
@@ -10,15 +10,9 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
     <artifactId>API</artifactId>
     <name>EcoEnchants API</name>
-    <packaging>jar</packaging>
 
-    <version>${project.parent.version}</version>
     <dependencies>
         <dependency>
             <groupId>org.spigotmc</groupId>
diff --git a/NMS/v1_15_R1/pom.xml b/NMS/v1_15_R1/pom.xml
index 1a7def3c..4618a5ca 100644
--- a/NMS/v1_15_R1/pom.xml
+++ b/NMS/v1_15_R1/pom.xml
@@ -6,21 +6,18 @@
         <artifactId>parent</artifactId>
         <groupId>com.willfp.ecoenchants</groupId>
         <version>4.1.0-pre11</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>v1_15_R1</artifactId>
 
-    <properties>
-        <main.basedir>${project.parent.basedir}</main.basedir>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.willfp.ecoenchants</groupId>
             <artifactId>API</artifactId>
             <version>${project.parent.version}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
diff --git a/NMS/v1_16_R1/pom.xml b/NMS/v1_16_R1/pom.xml
index ed31ee4f..47c30ac8 100644
--- a/NMS/v1_16_R1/pom.xml
+++ b/NMS/v1_16_R1/pom.xml
@@ -6,21 +6,18 @@
         <artifactId>parent</artifactId>
         <groupId>com.willfp.ecoenchants</groupId>
         <version>4.1.0-pre11</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>v1_16_R1</artifactId>
 
-    <properties>
-        <main.basedir>${project.parent.basedir}</main.basedir>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.willfp.ecoenchants</groupId>
             <artifactId>API</artifactId>
             <version>${project.parent.version}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
diff --git a/NMS/v1_16_R2/pom.xml b/NMS/v1_16_R2/pom.xml
index 209a9efd..28d68f42 100644
--- a/NMS/v1_16_R2/pom.xml
+++ b/NMS/v1_16_R2/pom.xml
@@ -6,21 +6,18 @@
         <artifactId>parent</artifactId>
         <groupId>com.willfp.ecoenchants</groupId>
         <version>4.1.0-pre11</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>v1_16_R2</artifactId>
 
-    <properties>
-        <main.basedir>${project.parent.basedir}</main.basedir>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.willfp.ecoenchants</groupId>
             <artifactId>API</artifactId>
             <version>${project.parent.version}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
diff --git a/Plugin/pom.xml b/Plugin/pom.xml
index 947fab65..0ca924c9 100644
--- a/Plugin/pom.xml
+++ b/Plugin/pom.xml
@@ -21,7 +21,6 @@
     </properties>
 
     <build>
-        <defaultGoal>clean package install</defaultGoal>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -35,7 +34,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.2</version>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -43,6 +42,28 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <artifactSet>
+                                <excludes>org.codehaus.plexus:plexus-utils</excludes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.jetbrains.annotations</pattern>
+                                    <shadedPattern>com.willfp.ecoenchants.shaded.annotations</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.apache.maven</pattern>
+                                    <shadedPattern>com.willfp.ecoenchants.shaded.maven</shadedPattern>
+                                </relocation>
+                            </relocations>
+                            <minimizeJar>true</minimizeJar>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
                         </configuration>
                     </execution>
@@ -70,7 +91,7 @@
                 <executions>
                     <execution>
                         <id>install-external-non-maven1-jar</id>
-                        <phase>clean</phase>
+                        <phase>compile</phase>
                         <configuration>
                             <repositoryLayout>default</repositoryLayout>
                             <groupId>n3kas.ae</groupId>
@@ -86,7 +107,7 @@
                     </execution>
                     <execution>
                         <id>install-external-non-maven2-jar</id>
-                        <phase>clean</phase>
+                        <phase>compile</phase>
                         <configuration>
                             <repositoryLayout>default</repositoryLayout>
                             <groupId>me.vagdedes</groupId>
@@ -153,12 +174,14 @@
             <artifactId>worldguard-bukkit</artifactId>
             <version>7.0.4-SNAPSHOT</version>
             <scope>provided</scope>
+            <!--
             <exclusions>
                 <exclusion>
                     <groupId>com.destroystokyo.paper</groupId>
                     <artifactId>paper-api</artifactId>
                 </exclusion>
             </exclusions>
+            -->
         </dependency>
         <dependency>
             <groupId>com.github.TechFortress</groupId>
diff --git a/pom.xml b/pom.xml
index 12abefb4..930654af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,11 +11,11 @@
     <name>EcoEnchants Parent</name>
 
     <modules>
-        <module>Plugin</module>
-        <module>v1_15_R1</module>
         <module>API</module>
-        <module>v1_16_R1</module>
-        <module>v1_16_R2</module>
+        <module>NMS/v1_15_R1</module>
+        <module>NMS/v1_16_R1</module>
+        <module>NMS/v1_16_R2</module>
+		<module>Plugin</module>
     </modules>
 
     <properties>
@@ -28,10 +28,6 @@
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
-        <repository>
-            <id>maven-central</id>
-            <url>https://repo1.maven.org/maven2/</url>
-        </repository>
         <repository>
             <id>CodeMC</id>
             <url>https://repo.codemc.org/repository/maven-public</url>
@@ -68,9 +64,8 @@
 
 
     <build>
-        <defaultGoal>clean package install</defaultGoal>
-        <finalName>${project.name} v${project.parent.version}</finalName>
-        <sourceDirectory>src/main/java</sourceDirectory>
+        <finalName>${project.name} v${project.version}</finalName>
+        <defaultGoal>clean install</defaultGoal>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>