From 821f0fc2ac54cb835cae98d69223fd911bbce80c Mon Sep 17 00:00:00 2001 From: Daniel Saukel Date: Tue, 12 Jul 2016 02:11:49 +0200 Subject: [PATCH] Minor changes to allow JavaDoc generation --- .gitignore | 4 +--- abstract/pom.xml | 2 +- .../dre2n/dungeonsxl/util/worldloader/InternalsProvider.java | 2 +- build.bat | 2 +- core/pom.xml | 2 +- core/src/main/resources/plugin.yml | 2 +- craftbukkit_1_10_R1/pom.xml | 2 +- .../io/github/dre2n/dungeonsxl/util/worldloader/v1_10_R1.java | 2 +- craftbukkit_1_9_R1/pom.xml | 2 +- .../io/github/dre2n/dungeonsxl/util/worldloader/v1_9_R1.java | 2 +- craftbukkit_1_9_R2/pom.xml | 2 +- .../io/github/dre2n/dungeonsxl/util/worldloader/v1_9_R2.java | 2 +- pom.xml | 2 +- shade/pom.xml | 4 ++-- 14 files changed, 15 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index df34b828..6e2e21de 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ -nb-configuration.xml -dependency-reduced-pom.xml licenseheader.txt *dependency-reduced-pom.xml *nb-configuration.xml -*/target +*target diff --git a/abstract/pom.xml b/abstract/pom.xml index 1589d16e..f868ac05 100644 --- a/abstract/pom.xml +++ b/abstract/pom.xml @@ -8,6 +8,6 @@ io.github.dre2n dungeonsxl - 0.14${buildNo} + 0.14.1-SNAPSHOT diff --git a/abstract/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/InternalsProvider.java b/abstract/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/InternalsProvider.java index 20db89cd..ca97928e 100644 --- a/abstract/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/InternalsProvider.java +++ b/abstract/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/InternalsProvider.java @@ -22,7 +22,7 @@ import org.bukkit.WorldCreator; /** * @author Daniel Saukel */ -abstract class InternalsProvider { +public abstract class InternalsProvider { abstract World createWorld(WorldCreator creator); diff --git a/build.bat b/build.bat index 93f50072..b39292ee 100644 --- a/build.bat +++ b/build.bat @@ -1 +1 @@ -mvn clean package -DbuildNo="" +mvn clean install diff --git a/core/pom.xml b/core/pom.xml index 7ef8b43c..5f8fd7f2 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -8,7 +8,7 @@ io.github.dre2n dungeonsxl - 0.14${buildNo} + 0.14.1-SNAPSHOT diff --git a/core/src/main/resources/plugin.yml b/core/src/main/resources/plugin.yml index 0d928e4a..c4d3a622 100644 --- a/core/src/main/resources/plugin.yml +++ b/core/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: DungeonsXL main: io.github.dre2n.dungeonsxl.DungeonsXL -version: ${project.version} +version: ${project.version}${buildNo} authors: [Frank Baumann, Milan Albrecht, Tobias Schmitz, Daniel Saukel] description: ${project.description} website: ${project.url} diff --git a/craftbukkit_1_10_R1/pom.xml b/craftbukkit_1_10_R1/pom.xml index e9669326..e5cfecf3 100644 --- a/craftbukkit_1_10_R1/pom.xml +++ b/craftbukkit_1_10_R1/pom.xml @@ -8,7 +8,7 @@ io.github.dre2n dungeonsxl - 0.14${buildNo} + 0.14.1-SNAPSHOT diff --git a/craftbukkit_1_10_R1/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/v1_10_R1.java b/craftbukkit_1_10_R1/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/v1_10_R1.java index 5432a8ee..b2c76000 100644 --- a/craftbukkit_1_10_R1/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/v1_10_R1.java +++ b/craftbukkit_1_10_R1/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/v1_10_R1.java @@ -48,7 +48,7 @@ import org.bukkit.plugin.PluginManager; /** * @author Daniel Saukel */ -class v1_10_R1 extends InternalsProvider { +public class v1_10_R1 extends InternalsProvider { MinecraftServer console; CraftServer server = ((CraftServer) Bukkit.getServer()); diff --git a/craftbukkit_1_9_R1/pom.xml b/craftbukkit_1_9_R1/pom.xml index 16fce996..0f2cd1d6 100644 --- a/craftbukkit_1_9_R1/pom.xml +++ b/craftbukkit_1_9_R1/pom.xml @@ -8,7 +8,7 @@ io.github.dre2n dungeonsxl - 0.14${buildNo} + 0.14.1-SNAPSHOT diff --git a/craftbukkit_1_9_R1/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/v1_9_R1.java b/craftbukkit_1_9_R1/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/v1_9_R1.java index 44f8be31..489cae53 100644 --- a/craftbukkit_1_9_R1/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/v1_9_R1.java +++ b/craftbukkit_1_9_R1/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/v1_9_R1.java @@ -48,7 +48,7 @@ import org.bukkit.plugin.PluginManager; /** * @author Daniel Saukel */ -class v1_9_R1 extends InternalsProvider { +public class v1_9_R1 extends InternalsProvider { MinecraftServer console; CraftServer server = ((CraftServer) Bukkit.getServer()); diff --git a/craftbukkit_1_9_R2/pom.xml b/craftbukkit_1_9_R2/pom.xml index 28301afa..1f3e5dbe 100644 --- a/craftbukkit_1_9_R2/pom.xml +++ b/craftbukkit_1_9_R2/pom.xml @@ -8,7 +8,7 @@ io.github.dre2n dungeonsxl - 0.14${buildNo} + 0.14.1-SNAPSHOT diff --git a/craftbukkit_1_9_R2/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/v1_9_R2.java b/craftbukkit_1_9_R2/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/v1_9_R2.java index 565fbd49..5e8f4504 100644 --- a/craftbukkit_1_9_R2/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/v1_9_R2.java +++ b/craftbukkit_1_9_R2/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/v1_9_R2.java @@ -48,7 +48,7 @@ import org.bukkit.plugin.PluginManager; /** * @author Daniel Saukel */ -class v1_9_R2 extends InternalsProvider { +public class v1_9_R2 extends InternalsProvider { MinecraftServer console; CraftServer server = ((CraftServer) Bukkit.getServer()); diff --git a/pom.xml b/pom.xml index 9e82f8b2..4888ccf8 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 io.github.dre2n dungeonsxl - 0.14${buildNo} + 0.14.1-SNAPSHOT pom DungeonsXL https://dre2n.github.io diff --git a/shade/pom.xml b/shade/pom.xml index 21a34c31..5c1f3c93 100644 --- a/shade/pom.xml +++ b/shade/pom.xml @@ -8,10 +8,10 @@ io.github.dre2n dungeonsxl - 0.14${buildNo} + 0.14.1-SNAPSHOT - dungeonsxl-${project.version} + dungeonsxl-${project.version}${buildNo} org.apache.maven.plugins