From d29317695914023cb3384a99b6c3bc7563b004f9 Mon Sep 17 00:00:00 2001 From: Graham 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 91d95e20a8..4d6f0ea756 100644 --- a/asm/pom.xml +++ b/asm/pom.xml @@ -13,6 +13,10 @@ OpenRS2 ASM Utilities + + ${project.parent.basedir} + + dev.openrs2 diff --git a/decompiler/pom.xml b/decompiler/pom.xml index 0c0dc6faf0..21f2aaede7 100644 --- a/decompiler/pom.xml +++ b/decompiler/pom.xml @@ -13,6 +13,10 @@ OpenRS2 Decompiler + + ${project.parent.basedir} + + dev.openrs2 diff --git a/deob-annotations/pom.xml b/deob-annotations/pom.xml index 9ee6fd4d39..13c8e944e8 100644 --- a/deob-annotations/pom.xml +++ b/deob-annotations/pom.xml @@ -12,4 +12,8 @@ jar OpenRS2 Deobfuscator Annotations + + + ${project.parent.basedir} + diff --git a/deob/pom.xml b/deob/pom.xml index 0ceac8af37..d522e9c8c7 100644 --- a/deob/pom.xml +++ b/deob/pom.xml @@ -13,6 +13,10 @@ OpenRS2 Deobfuscator + + ${project.parent.basedir} + + dev.openrs2 diff --git a/game/pom.xml b/game/pom.xml index bf84bd11e5..90e0f96453 100644 --- a/game/pom.xml +++ b/game/pom.xml @@ -13,6 +13,10 @@ OpenRS2 Game Server + + ${project.parent.basedir} + + co.paralleluniverse diff --git a/gl-dri-natives/pom.xml b/gl-dri-natives/pom.xml index 75592f6895..ac2fa22c48 100644 --- a/gl-dri-natives/pom.xml +++ b/gl-dri-natives/pom.xml @@ -13,6 +13,10 @@ OpenRS2 GL DRI Natives + + ${project.parent.basedir} + + unix diff --git a/gl-natives/pom.xml b/gl-natives/pom.xml index 6c1feb44ba..4a5247c07d 100644 --- a/gl-natives/pom.xml +++ b/gl-natives/pom.xml @@ -13,6 +13,10 @@ OpenRS2 GL Natives + + ${project.parent.basedir} + + diff --git a/misc-natives/pom.xml b/misc-natives/pom.xml index a2352200dd..a8a6b8a312 100644 --- a/misc-natives/pom.xml +++ b/misc-natives/pom.xml @@ -12,4 +12,8 @@ nar OpenRS2 Misc Natives + + + ${project.parent.basedir} + diff --git a/pom.xml b/pom.xml index 175244f6d8..e44f57cd98 100644 --- a/pom.xml +++ b/pom.xml @@ -19,6 +19,7 @@ + ${project.basedir} UTF-8 @@ -264,7 +265,7 @@ org.codehaus.mojo versions-maven-plugin - file://${maven.multiModuleProjectDirectory}/version-rules.xml + file://${openrs2.root}/version-rules.xml diff --git a/util/pom.xml b/util/pom.xml index 72ec40aeba..1c3be01187 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -13,6 +13,10 @@ OpenRS2 Utilities + + ${project.parent.basedir} + + com.google.guava