From 7e8ca0520309408f83d587265eff550eb2623d46 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 4 Mar 2012 10:37:05 +1100 Subject: Complete the transition to maven :D --- pom.xml | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 pom.xml (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..1d922e0e5 --- /dev/null +++ b/pom.xml @@ -0,0 +1,98 @@ + + + 4.0.0 + + net.essentials3 + BuildAll + 3.0-SNAPSHOT + pom + BuildAll + http://tiny.cc/EssentialsWiki + + + Essentials + Essentials2Compat + EssentialsChat + EssentialsGeoIP + EssentialsGroupBridge + EssentialsGroupManager + EssentialsProtect + EssentialsSigns + EssentialsUpdate + EssentialsXMPP + + + + + repobo-snap + http://repo.bukkit.org/content/groups/public + + + nexisonline-repo + http://repo.nexisonline.net:8080/nexus/content/groups/public/ + + + + + + org.bukkit + bukkit + 1.2.3-R0.1-SNAPSHOT + + + + + ${basedir}/src + ${basedir}/test + + + ${basedir}/src + + *.* + + + + + + + UTF-8 + true + 2 + 2 + 2 + 120 + none + project + true + true + true + true + true + true + true + true + true + true + true + true + true + 0 + 2 + NEW_LINE + false + * + 4 + false + NEW_LINE + NEW_LINE + true + true + true + true + false + false + 4 + 4 + + -- cgit v1.2.3 From 6b7e9de5f2a4291041273cd4c06a1c0ce1ef738b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 4 Mar 2012 12:22:30 +1100 Subject: Thanks to @ementalo we now have a repo --- pom.xml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 1d922e0e5..e27de1e90 100644 --- a/pom.xml +++ b/pom.xml @@ -25,12 +25,8 @@ - repobo-snap - http://repo.bukkit.org/content/groups/public - - - nexisonline-repo - http://repo.nexisonline.net:8080/nexus/content/groups/public/ + essentials-repo + http://ess.ementalo.com/nexus/content/groups/public/ -- cgit v1.2.3 From 78f4820876f42f7b50bf88f64afd45bee939e4e4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 12 Mar 2012 10:39:36 +1100 Subject: Initial formatted and slightly tweaked version of @evenprime 's NoCheat. Will be intergrated into the main Essentials as soon as possible --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index e27de1e90..827872d91 100644 --- a/pom.xml +++ b/pom.xml @@ -13,6 +13,7 @@ Essentials Essentials2Compat + EssentialsAntiCheat EssentialsChat EssentialsGeoIP EssentialsGroupBridge @@ -34,7 +35,7 @@ org.bukkit bukkit - 1.2.3-R0.1-SNAPSHOT + 1.2.3-R0.2-SNAPSHOT -- cgit v1.2.3 From 06068212c97ff2a5e8569c2180d8aea3951c0e20 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 14 Mar 2012 17:59:49 +1100 Subject: Move even further away from ant --- pom.xml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 827872d91..29460d62c 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ org.bukkit bukkit - 1.2.3-R0.2-SNAPSHOT + ${bukkitversion} @@ -50,10 +50,22 @@ + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + ${project.artifactId} + ../jars + + + UTF-8 + 1.2.3-R0.3-SNAPSHOT true 2 2 -- cgit v1.2.3 From 60ae0559bc332ebb974c2314205de201e539ca20 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 15 Mar 2012 16:07:57 +1100 Subject: Add craftbukkit.jar to the output, allowing for easy upload --- pom.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 29460d62c..4bfd52174 100644 --- a/pom.xml +++ b/pom.xml @@ -60,6 +60,32 @@ ../jars + + org.apache.maven.plugins + maven-dependency-plugin + 2.4 + + + copy + package + + copy + + + + + org.bukkit + craftbukkit + ${bukkitversion} + true + ../jars + craftbukkit.jar + + + + + + -- cgit v1.2.3 From b643f2c1d6122263b4bd5d934afe762d49ed2072 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 18 Mar 2012 14:21:17 +1100 Subject: Add the maven compile plugin to ensure consistant builds --- pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 4bfd52174..b054285b8 100644 --- a/pom.xml +++ b/pom.xml @@ -51,6 +51,15 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + + org.apache.maven.plugins maven-jar-plugin -- cgit v1.2.3 From 5014b93e169b5808bf06885fa4a5be79bb2209d7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 18 Mar 2012 14:33:16 +1100 Subject: Use maven for versioning. Note GroupManager versioning is broken. --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index b054285b8..1a2465ff7 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,7 @@ ${basedir}/src + true *.* @@ -101,6 +102,7 @@ UTF-8 1.2.3-R0.3-SNAPSHOT + Unknown true 2 2 -- cgit v1.2.3 From a8d8adbefcc3c828dc974b1788547f4303e6a9fa Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 5 Apr 2012 19:38:29 +1000 Subject: Update Bukkit version --- pom.xml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 1a2465ff7..4c40da7fc 100644 --- a/pom.xml +++ b/pom.xml @@ -40,6 +40,8 @@ + ${project.artifactId} + ../jars ${basedir}/src ${basedir}/test @@ -61,15 +63,6 @@ 1.6 - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - ${project.artifactId} - ../jars - - org.apache.maven.plugins maven-dependency-plugin @@ -101,7 +94,7 @@ UTF-8 - 1.2.3-R0.3-SNAPSHOT + 1.2.5-R1.0 Unknown true 2 -- cgit v1.2.3 From fe8fb70db23b7d42f1f6b9274bf5b77c388b4fb4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 7 Apr 2012 21:23:58 +1000 Subject: Fix artifacts (reverse-merged from commit a8d8adbefcc3c828dc974b1788547f4303e6a9fa) --- pom.xml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 4c40da7fc..1a2465ff7 100644 --- a/pom.xml +++ b/pom.xml @@ -40,8 +40,6 @@ - ${project.artifactId} - ../jars ${basedir}/src ${basedir}/test @@ -63,6 +61,15 @@ 1.6 + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + ${project.artifactId} + ../jars + + org.apache.maven.plugins maven-dependency-plugin @@ -94,7 +101,7 @@ UTF-8 - 1.2.5-R1.0 + 1.2.3-R0.3-SNAPSHOT Unknown true 2 -- cgit v1.2.3 From 3ac78236787344b6a7e7d5be232488b46b8b26eb Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 10 Apr 2012 13:07:59 +1000 Subject: Bump Bukkit version and hopefully fix building! --- pom.xml | 52 +++++++++++++--------------------------------------- 1 file changed, 13 insertions(+), 39 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 1a2465ff7..b1a701037 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ pom BuildAll http://tiny.cc/EssentialsWiki - + Essentials Essentials2Compat @@ -35,16 +35,17 @@ org.bukkit bukkit - ${bukkitversion} + ${bukkit.version} - ${basedir}/src - ${basedir}/test + ${project.name} + ${project.basedir}/src + ${project.basedir}/test - ${basedir}/src + ${project.basedir}/src true *.* @@ -52,56 +53,29 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - org.apache.maven.plugins maven-jar-plugin 2.4 - ${project.artifactId} ../jars org.apache.maven.plugins - maven-dependency-plugin - 2.4 - - - copy - package - - copy - - - - - org.bukkit - craftbukkit - ${bukkitversion} - true - ../jars - craftbukkit.jar - - - - - + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + UTF-8 - 1.2.3-R0.3-SNAPSHOT + 1.2.5-R1.2-SNAPSHOT Unknown true 2 -- cgit v1.2.3 From b69a16bcf0abac1ebd2ca3d35520cfcb5b433e88 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 16 Apr 2012 16:51:29 +1000 Subject: Remove EssentialsAntiCheat pending the release of a better alternative in 2.0 by @neatmonster --- pom.xml | 1 - 1 file changed, 1 deletion(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index b1a701037..5d9ef3b78 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,6 @@ Essentials Essentials2Compat - EssentialsAntiCheat EssentialsChat EssentialsGeoIP EssentialsGroupBridge -- cgit v1.2.3