From d29317695914023cb3384a99b6c3bc7563b004f9 Mon Sep 17 00:00:00 2001
From: Graham <gpe@openrs2.dev>
Date: Sat, 10 Aug 2019 12:32:51 +0100
Subject: [PATCH] Replace maven.multiModuleProjectDirectory with openrs2.root

openrs2.root works correctly even if the root of the reactor is a child
project, at the expense of having to re-define the property in each
module.
---
 asm/pom.xml              | 4 ++++
 decompiler/pom.xml       | 4 ++++
 deob-annotations/pom.xml | 4 ++++
 deob/pom.xml             | 4 ++++
 game/pom.xml             | 4 ++++
 gl-dri-natives/pom.xml   | 4 ++++
 gl-natives/pom.xml       | 4 ++++
 misc-natives/pom.xml     | 4 ++++
 pom.xml                  | 3 ++-
 util/pom.xml             | 4 ++++
 10 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/asm/pom.xml b/asm/pom.xml
index 91d95e20..4d6f0ea7 100644
--- a/asm/pom.xml
+++ b/asm/pom.xml
@@ -13,6 +13,10 @@
 
   <name>OpenRS2 ASM Utilities</name>
 
+  <properties>
+    <openrs2.root>${project.parent.basedir}</openrs2.root>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>dev.openrs2</groupId>
diff --git a/decompiler/pom.xml b/decompiler/pom.xml
index 0c0dc6fa..21f2aaed 100644
--- a/decompiler/pom.xml
+++ b/decompiler/pom.xml
@@ -13,6 +13,10 @@
 
   <name>OpenRS2 Decompiler</name>
 
+  <properties>
+    <openrs2.root>${project.parent.basedir}</openrs2.root>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>dev.openrs2</groupId>
diff --git a/deob-annotations/pom.xml b/deob-annotations/pom.xml
index 9ee6fd4d..13c8e944 100644
--- a/deob-annotations/pom.xml
+++ b/deob-annotations/pom.xml
@@ -12,4 +12,8 @@
   <packaging>jar</packaging>
 
   <name>OpenRS2 Deobfuscator Annotations</name>
+
+  <properties>
+    <openrs2.root>${project.parent.basedir}</openrs2.root>
+  </properties>
 </project>
diff --git a/deob/pom.xml b/deob/pom.xml
index 0ceac8af..d522e9c8 100644
--- a/deob/pom.xml
+++ b/deob/pom.xml
@@ -13,6 +13,10 @@
 
   <name>OpenRS2 Deobfuscator</name>
 
+  <properties>
+    <openrs2.root>${project.parent.basedir}</openrs2.root>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>dev.openrs2</groupId>
diff --git a/game/pom.xml b/game/pom.xml
index bf84bd11..90e0f964 100644
--- a/game/pom.xml
+++ b/game/pom.xml
@@ -13,6 +13,10 @@
 
   <name>OpenRS2 Game Server</name>
 
+  <properties>
+    <openrs2.root>${project.parent.basedir}</openrs2.root>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>co.paralleluniverse</groupId>
diff --git a/gl-dri-natives/pom.xml b/gl-dri-natives/pom.xml
index 75592f68..ac2fa22c 100644
--- a/gl-dri-natives/pom.xml
+++ b/gl-dri-natives/pom.xml
@@ -13,6 +13,10 @@
 
   <name>OpenRS2 GL DRI Natives</name>
 
+  <properties>
+    <openrs2.root>${project.parent.basedir}</openrs2.root>
+  </properties>
+
   <profiles>
     <profile>
       <id>unix</id>
diff --git a/gl-natives/pom.xml b/gl-natives/pom.xml
index 6c1feb44..4a5247c0 100644
--- a/gl-natives/pom.xml
+++ b/gl-natives/pom.xml
@@ -13,6 +13,10 @@
 
   <name>OpenRS2 GL Natives</name>
 
+  <properties>
+    <openrs2.root>${project.parent.basedir}</openrs2.root>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
diff --git a/misc-natives/pom.xml b/misc-natives/pom.xml
index a2352200..a8a6b8a3 100644
--- a/misc-natives/pom.xml
+++ b/misc-natives/pom.xml
@@ -12,4 +12,8 @@
   <packaging>nar</packaging>
 
   <name>OpenRS2 Misc Natives</name>
+
+  <properties>
+    <openrs2.root>${project.parent.basedir}</openrs2.root>
+  </properties>
 </project>
diff --git a/pom.xml b/pom.xml
index 175244f6..e44f57cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,7 @@
   </modules>
 
   <properties>
+    <openrs2.root>${project.basedir}</openrs2.root>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
@@ -264,7 +265,7 @@
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>versions-maven-plugin</artifactId>
         <configuration>
-          <rulesUri>file://${maven.multiModuleProjectDirectory}/version-rules.xml</rulesUri>
+          <rulesUri>file://${openrs2.root}/version-rules.xml</rulesUri>
         </configuration>
       </plugin>
     </plugins>
diff --git a/util/pom.xml b/util/pom.xml
index 72ec40ae..1c3be011 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -13,6 +13,10 @@
 
   <name>OpenRS2 Utilities</name>
 
+  <properties>
+    <openrs2.root>${project.parent.basedir}</openrs2.root>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>com.google.guava</groupId>