From 1fc846a241630205e14eed154d03fb0d3724fc9f Mon Sep 17 00:00:00 2001
From: Christian Koop <contact@sprax2013.de>
Date: Mon, 26 Jun 2023 16:44:28 +0200
Subject: [PATCH] Modernize and clean up `pom.xml` and `plugin.yml`

---
 pom.xml                       | 140 ++++++++++++++++------------------
 src/main/resources/plugin.yml |  18 +++--
 2 files changed, 76 insertions(+), 82 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7c3f1ba..7724fb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,104 +1,94 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0">
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
     <groupId>com.songoda</groupId>
     <artifactId>EpicHoppers</artifactId>
-    <modelVersion>4.0.0</modelVersion>
     <version>4.7.9</version>
-    <build>
-        <defaultGoal>clean install</defaultGoal>
-        <finalName>EpicHoppers-${project.version}</finalName>
 
+    <name>EpicHoppers</name>
+    <description>Connect hoppers over long distances, filter out unwanted items, auto break blocks, auto sell items and much more.</description>
+    <url>https://craftaro.com/marketplace/product/15</url>
+
+    <properties>
+        <maven.compiler.release>8</maven.compiler.release>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <issueManagement>
+        <url>https://discord.gg/craftaro</url>
+        <system>Discord server</system>
+    </issueManagement>
+
+    <scm>
+        <url>https://github.com/craftaro/EpicHoppers</url>
+        <connection>scm:git:git://github.com/craftaro/EpicHoppers.git</connection>
+    </scm>
+
+    <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
-
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>com.google.code.maven-replacer-plugin</groupId>
-                <artifactId>replacer</artifactId>
-                <version>1.5.3</version>
-
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>replace</goal>
-                        </goals>
-                    </execution>
-                </executions>
-
-                <configuration>
-                    <file>${project.build.directory}/classes/plugin.yml</file>
-                    <replacements>
-                        <replacement>
-                            <token>maven-version-number</token>
-                            <value>${project.version}</value>
-                        </replacement>
-                    </replacements>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.1</version>
 
                 <executions>
                     <execution>
-                        <id>shaded</id>
                         <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
 
                         <configuration>
-                            <shadedArtifactAttached>false</shadedArtifactAttached>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <finalName>${project.name}-${project.version}</finalName>
 
-                            <artifactSet>
-                                <includes>
-                                    <include>com.songoda:SongodaCore</include>
-                                </includes>
-                            </artifactSet>
+                            <shadedArtifactAttached>false</shadedArtifactAttached>
+                            <useDependencyReducedPomInJar>true</useDependencyReducedPomInJar>
+                            <minimizeJar>true</minimizeJar>
+
+                            <relocations>
+                                <relocation>
+                                    <pattern>com.craftaro.core</pattern>
+                                    <shadedPattern>com.songoda.epichoppers.core</shadedPattern>
+                                </relocation>
+                            </relocations>
 
                             <filters>
                                 <filter>
                                     <artifact>*:*</artifact>
+
                                     <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
+                                        <exclude>META-INF/**</exclude>
+                                        <exclude>LICENSE</exclude>
+                                        <exclude>LICENSE.**</exclude>
                                     </excludes>
                                 </filter>
                             </filters>
-
-                            <relocations>
-                                <relocation>
-                                    <pattern>com.songoda.core</pattern>
-                                    <shadedPattern>${project.groupId}.epichoppers.core</shadedPattern>
-                                </relocation>
-                            </relocations>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
+
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
     </build>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>apache.snapshots</id>
-            <url>https://repository.apache.org/snapshots/</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <repositories>
+        <repository>
+            <id>craftaro-minecraft-plugins</id>
+            <url>https://repo.craftaro.com/repository/minecraft-plugins/</url>
+        </repository>
+
         <repository>
             <id>public</id>
             <url>https://repo.songoda.com/repository/public/</url>
@@ -110,12 +100,19 @@
         </repository>
 
         <repository>
-            <id>spigotmc-repo</id>
+            <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
     </repositories>
 
     <dependencies>
+        <dependency>
+            <groupId>com.songoda</groupId>
+            <artifactId>SongodaCore</artifactId>
+            <version>2.6.20</version>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
@@ -130,13 +127,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.songoda</groupId>
-            <artifactId>SongodaCore</artifactId>
-            <version>2.6.20</version>
-            <scope>compile</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.songoda</groupId>
             <artifactId>EpicFarming</artifactId>
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 64c9f68..91b21e0 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,9 +1,12 @@
-name: EpicHoppers
-description: EpicHoppers
+name: ${project.name}
+description: ${project.description}
+version: ${project.version}
+api-version: 1.13
+
 main: com.songoda.epichoppers.EpicHoppers
 softdepend:
-  - ASkyBlock
   - AdvancedChests
+  - ASkyBlock
   - EconomyShopGUI
   - EconomyShopGUI-Premium
   - EpicFarming
@@ -16,14 +19,15 @@ softdepend:
   - RedProtect
   - Reserve
   - Towny
-  - USkyBlock
   - UltimateStacker
+  - USkyBlock
   - Vault
   - WildStacker
   - WorldGuard
-version: maven-version-number
-author: Songoda
-api-version: 1.13
+
+author: Craftaro
+website: ${project.url}
+
 commands:
   eh:
     description: View information on this plugin.