From 9017dadc15878a852f67510e00c93ead6802215c Mon Sep 17 00:00:00 2001
From: Phoenix616 <mail@moep.tv>
Date: Wed, 23 Jan 2019 00:48:02 +0100
Subject: [PATCH] Fix issues with maven build

---
 pom.xml                                       | 32 ++-----------
 randomteleport-plugin-hooks/pom.xml           |  3 +-
 .../worldguard-7/pom.xml                      | 12 +++++
 randomteleport-plugin/pom.xml                 | 48 +++++++++++++++++--
 4 files changed, 64 insertions(+), 31 deletions(-)

diff --git a/pom.xml b/pom.xml
index a7d4833..e9c91d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,6 +14,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <build.number>${buildNumber}</build.number>
+        <minecraft.plugin.name>${project.name}</minecraft.plugin.name>
         <minecraft.plugin.version>${project.version} ${buildDescription}</minecraft.plugin.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
@@ -37,6 +38,10 @@
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/groups/public</url>
         </repository>
+        <repository>
+            <id>paper-repo</id>
+            <url>https://papermc.io/repo/content/groups/public</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -81,31 +86,4 @@
         </profile>
     </profiles>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.1</version>
-                <configuration>
-                    <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
-                    <relocations>
-                        <relocation>
-                            <pattern>io.papermc.lib</pattern>
-                            <shadedPattern>de.themoep.randomteleport.paperlib</shadedPattern>
-                        </relocation>
-                    </relocations>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
\ No newline at end of file
diff --git a/randomteleport-plugin-hooks/pom.xml b/randomteleport-plugin-hooks/pom.xml
index 22da68f..ea39f90 100644
--- a/randomteleport-plugin-hooks/pom.xml
+++ b/randomteleport-plugin-hooks/pom.xml
@@ -24,7 +24,8 @@
         <dependency>
             <groupId>de.themoep.randomteleport</groupId>
             <artifactId>randomteleport-hook</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/randomteleport-plugin-hooks/worldguard-7/pom.xml b/randomteleport-plugin-hooks/worldguard-7/pom.xml
index ee13edc..e83c87c 100644
--- a/randomteleport-plugin-hooks/worldguard-7/pom.xml
+++ b/randomteleport-plugin-hooks/worldguard-7/pom.xml
@@ -25,6 +25,18 @@
             <artifactId>worldguard-legacy</artifactId>
             <version>7.0.0-SNAPSHOT</version>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bukkit</groupId>
+                    <artifactId>bukkit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <version>1.13-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/randomteleport-plugin/pom.xml b/randomteleport-plugin/pom.xml
index 3967a96..accdd0d 100644
--- a/randomteleport-plugin/pom.xml
+++ b/randomteleport-plugin/pom.xml
@@ -19,15 +19,33 @@
 
     <dependencies>
         <dependency>
-            <groupId>de.themoep.randomteleport</groupId>
-            <artifactId>randomteleport-hooks</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>randomteleport-hook</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}.pluginhook</groupId>
+            <artifactId>worldguard-6</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}.pluginhook</groupId>
+            <artifactId>worldguard-7</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}.pluginhook</groupId>
+            <artifactId>worldborder</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
 
     <build>
-        <finalName>${parent.name}</finalName>
+        <finalName>${minecraft.plugin.name}</finalName>
         <outputDirectory>../target/</outputDirectory>
         <resources>
             <resource>
@@ -35,6 +53,30 @@
                 <directory>${project.basedir}/src/main/resources</directory>
             </resource>
         </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.1.1</version>
+                <configuration>
+                    <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
+                    <relocations>
+                        <relocation>
+                            <pattern>io.papermc.lib</pattern>
+                            <shadedPattern>de.themoep.randomteleport.paperlib</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 
 </project>
\ No newline at end of file