From 4a8902ad21bec79cad044867bdd0184c5eb5bd5d Mon Sep 17 00:00:00 2001
From: YouHaveTrouble <garrenpolska@gmail.com>
Date: Mon, 5 Jul 2021 05:20:34 +0200
Subject: [PATCH] maven is yes

---
 CommandWhitelistBukkit/pom.xml    | 17 +++++++------
 CommandWhitelistCommon/pom.xml    | 14 +++++++++--
 CommandWhitelistVelocity/pom.xml  | 15 ++++++-----
 CommandWhitelistWaterfall/pom.xml | 17 +++++++------
 pom.xml                           | 42 +------------------------------
 5 files changed, 42 insertions(+), 63 deletions(-)

diff --git a/CommandWhitelistBukkit/pom.xml b/CommandWhitelistBukkit/pom.xml
index 64bea9c..fe28f71 100644
--- a/CommandWhitelistBukkit/pom.xml
+++ b/CommandWhitelistBukkit/pom.xml
@@ -3,13 +3,15 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>eu.endermite.commandwhitelist</groupId>
+        <artifactId>CommandWhitelist</artifactId>
+        <version>2.0</version>
+    </parent>
 
-    <groupId>eu.endermite.bukkit</groupId>
-    <artifactId>CommandWhitelistBukkit</artifactId>
-    <version>2.0</version>
+    <artifactId>Bukkit</artifactId>
     <packaging>jar</packaging>
-
-    <name>CommandWhitelistBukkit</name>
+    <name>CommandWhitelist</name>
 
     <description>You decide what commands players can use or tab complete on your server!</description>
     <properties>
@@ -40,6 +42,7 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <finalName>${name}-${artifactId}-${project.parent.version}</finalName>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
                             <relocations>
                                 <relocation>
@@ -85,9 +88,9 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>eu.endermite</groupId>
+            <groupId>eu.endermite.commandwhitelist</groupId>
             <artifactId>Common</artifactId>
-            <version>2.0</version>
+            <version>${parent.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/CommandWhitelistCommon/pom.xml b/CommandWhitelistCommon/pom.xml
index 286a375..5294971 100644
--- a/CommandWhitelistCommon/pom.xml
+++ b/CommandWhitelistCommon/pom.xml
@@ -2,14 +2,23 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
+        <groupId>eu.endermite.commandwhitelist</groupId>
         <artifactId>CommandWhitelist</artifactId>
-        <groupId>eu.endermite</groupId>
         <version>2.0</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>Common</artifactId>
+    <packaging>jar</packaging>
+    <name>CommandWhitelist</name>
+
+    <description>You decide what commands players can use or tab complete on your server!</description>
+    <properties>
+        <java.version>1.8</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <url>youhavetrouble.me</url>
 
     <build>
         <plugins>
@@ -34,6 +43,7 @@
                         </goals>
                         <configuration>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <finalName>${name}-${artifactId}-${project.parent.version}</finalName>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/CommandWhitelistVelocity/pom.xml b/CommandWhitelistVelocity/pom.xml
index ecd2a01..9306b74 100644
--- a/CommandWhitelistVelocity/pom.xml
+++ b/CommandWhitelistVelocity/pom.xml
@@ -3,13 +3,15 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>eu.endermite.commandwhitelist</groupId>
+        <artifactId>CommandWhitelist</artifactId>
+        <version>2.0</version>
+    </parent>
 
-    <groupId>eu.endermite.commandwhitelist</groupId>
-    <artifactId>CommandWhitelistVelocity</artifactId>
-    <version>2.0</version>
+    <artifactId>Velocity</artifactId>
     <packaging>jar</packaging>
-
-    <name>CommandWhitelistVelocity</name>
+    <name>CommandWhitelist</name>
 
     <description>You decide what commands players can use or tab complete on your server!</description>
     <properties>
@@ -41,6 +43,7 @@
                         </goals>
                         <configuration>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <finalName>${name}-${artifactId}-${project.parent.version}</finalName>
                             <relocations>
                                 <relocation>
                                     <pattern>org.bstats</pattern>
@@ -83,7 +86,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>eu.endermite</groupId>
+            <groupId>eu.endermite.commandwhitelist</groupId>
             <artifactId>Common</artifactId>
             <version>2.0</version>
             <scope>compile</scope>
diff --git a/CommandWhitelistWaterfall/pom.xml b/CommandWhitelistWaterfall/pom.xml
index a74a7f4..0edb4e5 100644
--- a/CommandWhitelistWaterfall/pom.xml
+++ b/CommandWhitelistWaterfall/pom.xml
@@ -3,12 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>eu.endermite.commandwhitelist</groupId>
+        <artifactId>CommandWhitelist</artifactId>
+        <version>2.0</version>
+    </parent>
 
-    <groupId>eu.endermite.commandwhitelist</groupId>
-    <artifactId>CommandWhitelistWaterfall</artifactId>
-    <version>2.0</version>
+    <artifactId>Waterfall</artifactId>
     <packaging>jar</packaging>
-
     <name>CommandWhitelist</name>
 
     <description>You decide what commands players can use or tab complete on your server!</description>
@@ -16,9 +18,9 @@
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+    <url>youhavetrouble.me</url>
 
     <build>
-        <defaultGoal>clean package</defaultGoal>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -41,6 +43,7 @@
                         </goals>
                         <configuration>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <finalName>${name}-${artifactId}-${project.parent.version}</finalName>
                             <relocations>
                                 <relocation>
                                     <pattern>org.bstats</pattern>
@@ -83,9 +86,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>eu.endermite</groupId>
+            <groupId>eu.endermite.commandwhitelist</groupId>
             <artifactId>Common</artifactId>
-            <version>2.0</version>
+            <version>${parent.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index ccf9b64..f12d4bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>eu.endermite</groupId>
+    <groupId>eu.endermite.commandwhitelist</groupId>
     <artifactId>CommandWhitelist</artifactId>
     <version>2.0</version>
     <modules>
@@ -23,51 +23,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-
     <repositories>
         <repository>
             <id>sonatype</id>
             <url>https://oss.sonatype.org/content/groups/public/</url>
         </repository>
-        <repository>
-            <id>minecraft-repo</id>
-            <url>https://libraries.minecraft.net/</url>
-        </repository>
     </repositories>
 
     <dependencies>