diff --git a/.gitignore b/.gitignore index 60fc3717b..f594a93a3 100644 --- a/.gitignore +++ b/.gitignore @@ -44,4 +44,6 @@ /jars /out .idea/ -*.iml \ No newline at end of file +*.iml +target/ +dependency-reduced-pom.xml \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index b68a6c495..4b22a6737 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ jdk: - openjdk7 - openjdk6 script: ant collect +install: true notifications: irc: channels: diff --git a/Essentials/nbproject/project.properties b/Essentials/nbproject/project.properties index 7537d9812..db24707b0 100644 --- a/Essentials/nbproject/project.properties +++ b/Essentials/nbproject/project.properties @@ -64,14 +64,14 @@ dist.jar=${dist.dir}/Essentials.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= -file.reference.BOSEconomy7.jar=../lib/BOSEconomy7.jar -file.reference.bpermissions2.jar=../lib/bpermissions2.jar +file.reference.BOSEconomy.jar=../lib/BOSEconomy.jar +file.reference.bPermissions.jar=../lib/bPermissions.jar file.reference.bukkit.jar=../lib/bukkit.jar file.reference.iCo5.jar=../lib/iCo5.jar file.reference.iCo6.jar=../lib/iCo6.jar -file.reference.lombok.jar=../lib/lombok-0.10.8.jar +file.reference.lombok.jar=../lib/lombok-1.12.2.jar file.reference.MultiCurrency.jar=../lib/MultiCurrency.jar -file.reference.PermissionsBukkit-1.2.jar=../lib/PermissionsBukkit-1.2.jar +file.reference.PermissionsBukkit-1.2.jar=../lib/PermissionsBukkit.jar file.reference.PermissionsEx.jar=../lib/PermissionsEx.jar file.reference.Privileges.jar=..\\lib\\Privileges.jar file.reference.Vault.jar=../lib/Vault.jar @@ -85,7 +85,7 @@ javac.classpath=\ ${file.reference.iCo5.jar}:\ ${file.reference.iCo6.jar}:\ ${file.reference.MultiCurrency.jar}:\ - ${file.reference.BOSEconomy7.jar}:\ + ${file.reference.BOSEconomy.jar}:\ ${file.reference.PermissionsEx.jar}:\ ${file.reference.PermissionsBukkit-1.2.jar}:\ ${file.reference.lombok.jar}:\ @@ -93,7 +93,7 @@ javac.classpath=\ ${file.reference.bukkit.jar}:\ ${file.reference.Vault.jar}:\ ${file.reference.Privileges.jar}:\ - ${file.reference.bpermissions2.jar}:\ + ${file.reference.bPermissions.jar}:\ ${file.reference.SimplyPerms.jar}:\ ${file.reference.zPermissions.jar} # Space-separated list of extra javac options diff --git a/Essentials/pom.xml b/Essentials/pom.xml new file mode 100644 index 000000000..d65b3e6bb --- /dev/null +++ b/Essentials/pom.xml @@ -0,0 +1,137 @@ + + 4.0.0 + + + net.ess3 + EssentialsParent + 2.x-SNAPSHOT + + + Essentials + + http://ess3.net/ + + + Essentials Team + http://ess3.net/ + + + + + GPLv3 + http://www.gnu.org/copyleft/gpl.html + + + + + scm:git:https://github.com/essentials/Essentials.git + scm:git:https://github.com/essentials/Essentials.git + https://github.com/essentials/Essentials + + + + JIRA + http://essentials3.atlassian.net + + + + TeamCity + http://ci.ess3.net/ + + + + + vault-repo + http://ci.herocraftonline.com/plugin/repository/everything + + + kitteh-repo + http://repo.kitteh.org/content/groups/public/ + + + + + + BOSEconomy + BOSEconomy + v0.7.8.1 + system + ${project.basedir}/../lib/BOSEconomy.jar + + + de.bananaco + bPermissions + v2.12-DEV + + + iConomy + iConomy5 + 5 + system + ${project.basedir}/../lib/iCo5.jar + + + iConomy + iConomy6 + 6 + system + ${project.basedir}/../lib/iCo6.jar + + + net.ess3 + GroupManager + ${project.version} + system + ${project.basedir}/../EssentialsGroupManager/dist/EssentialsGroupManager.jar + + + MultiCurrency + MultiCurrency + 2.2 + system + ${project.basedir}/../lib/MultiCurrency.jar + + + com.platymuus + bukkit-permissions + 2.0 + system + ${project.basedir}/../lib/PermissionsBukkit.jar + + + ru.tehkode + PermissionsEx + 1.20.4 + system + ${project.basedir}/../lib/PermissionsEx.jar + + + Privileges + Privileges + 1.8.1 + system + ${project.basedir}/../lib/Privileges.jar + + + SimplyPerms + SimplyPerms + 1.7.6 + system + ${project.basedir}/../lib/SimplyPerms.jar + + + net.milkbowl + vault + 1.2.27 + + + zPermissions + zPermissions + 1.1 + system + ${project.basedir}/../lib/zPermissions.jar + + + \ No newline at end of file diff --git a/EssentialsAntiBuild/pom.xml b/EssentialsAntiBuild/pom.xml new file mode 100644 index 000000000..224ac1afd --- /dev/null +++ b/EssentialsAntiBuild/pom.xml @@ -0,0 +1,51 @@ + + 4.0.0 + + + net.ess3 + EssentialsParent + 2.x-SNAPSHOT + + + EssentialsAntiBuild + + http://ess3.net/ + + + Essentials Team + http://ess3.net/ + + + + + GPLv3 + http://www.gnu.org/copyleft/gpl.html + + + + + scm:git:https://github.com/essentials/Essentials.git + scm:git:https://github.com/essentials/Essentials.git + https://github.com/essentials/Essentials + + + + JIRA + http://essentials3.atlassian.net + + + + TeamCity + http://ci.ess3.net/ + + + + + net.ess3 + Essentials + ${project.version} + + + \ No newline at end of file diff --git a/EssentialsChat/pom.xml b/EssentialsChat/pom.xml new file mode 100644 index 000000000..b84845c25 --- /dev/null +++ b/EssentialsChat/pom.xml @@ -0,0 +1,51 @@ + + 4.0.0 + + + net.ess3 + EssentialsParent + 2.x-SNAPSHOT + + + EssentialsChat + + http://ess3.net/ + + + Essentials Team + http://ess3.net/ + + + + + GPLv3 + http://www.gnu.org/copyleft/gpl.html + + + + + scm:git:https://github.com/essentials/Essentials.git + scm:git:https://github.com/essentials/Essentials.git + https://github.com/essentials/Essentials + + + + JIRA + http://essentials3.atlassian.net + + + + TeamCity + http://ci.ess3.net/ + + + + + net.ess3 + Essentials + ${project.version} + + + \ No newline at end of file diff --git a/EssentialsGeoIP/pom.xml b/EssentialsGeoIP/pom.xml new file mode 100644 index 000000000..4a832e820 --- /dev/null +++ b/EssentialsGeoIP/pom.xml @@ -0,0 +1,51 @@ + + 4.0.0 + + + net.ess3 + EssentialsParent + 2.x-SNAPSHOT + + + EssentialsGeoIP + + http://ess3.net/ + + + Essentials Team + http://ess3.net/ + + + + + GPLv3 + http://www.gnu.org/copyleft/gpl.html + + + + + scm:git:https://github.com/essentials/Essentials.git + scm:git:https://github.com/essentials/Essentials.git + https://github.com/essentials/Essentials + + + + JIRA + http://essentials3.atlassian.net + + + + TeamCity + http://ci.ess3.net/ + + + + + net.ess3 + Essentials + ${project.version} + + + \ No newline at end of file diff --git a/EssentialsProtect/pom.xml b/EssentialsProtect/pom.xml new file mode 100644 index 000000000..6434509fb --- /dev/null +++ b/EssentialsProtect/pom.xml @@ -0,0 +1,51 @@ + + 4.0.0 + + + net.ess3 + EssentialsParent + 2.x-SNAPSHOT + + + EssentialsProtect + + http://ess3.net/ + + + Essentials Team + http://ess3.net/ + + + + + GPLv3 + http://www.gnu.org/copyleft/gpl.html + + + + + scm:git:https://github.com/essentials/Essentials.git + scm:git:https://github.com/essentials/Essentials.git + https://github.com/essentials/Essentials + + + + JIRA + http://essentials3.atlassian.net + + + + TeamCity + http://ci.ess3.net/ + + + + + net.ess3 + Essentials + ${project.version} + + + \ No newline at end of file diff --git a/EssentialsSpawn/pom.xml b/EssentialsSpawn/pom.xml new file mode 100644 index 000000000..a482fe4f0 --- /dev/null +++ b/EssentialsSpawn/pom.xml @@ -0,0 +1,51 @@ + + 4.0.0 + + + net.ess3 + EssentialsParent + 2.x-SNAPSHOT + + + EssentialsSpawn + + http://ess3.net/ + + + Essentials Team + http://ess3.net/ + + + + + GPLv3 + http://www.gnu.org/copyleft/gpl.html + + + + + scm:git:https://github.com/essentials/Essentials.git + scm:git:https://github.com/essentials/Essentials.git + https://github.com/essentials/Essentials + + + + JIRA + http://essentials3.atlassian.net + + + + TeamCity + http://ci.ess3.net/ + + + + + net.ess3 + Essentials + ${project.version} + + + \ No newline at end of file diff --git a/EssentialsXMPP/pom.xml b/EssentialsXMPP/pom.xml new file mode 100644 index 000000000..36d47d7a2 --- /dev/null +++ b/EssentialsXMPP/pom.xml @@ -0,0 +1,82 @@ + + 4.0.0 + + + net.ess3 + EssentialsParent + 2.x-SNAPSHOT + + + EssentialsXMPP + + http://ess3.net/ + + + Essentials Team + http://ess3.net/ + + + + + GPLv3 + http://www.gnu.org/copyleft/gpl.html + + + + + scm:git:https://github.com/essentials/Essentials.git + scm:git:https://github.com/essentials/Essentials.git + https://github.com/essentials/Essentials + + + + JIRA + http://essentials3.atlassian.net + + + + TeamCity + http://ci.ess3.net/ + + + + + net.ess3 + Essentials + ${project.version} + + + org.igniterealtime.smack + smack + 3.2.1 + + + + + + + org.apache.maven.plugins + maven-shade-plugin + 2.1 + + + package + + shade + + + + + + + org.igniterealtime.smack:smack + + + + + + + + \ No newline at end of file diff --git a/README.markdown b/README.markdown index cc55bb847..a4b88a7cf 100644 --- a/README.markdown +++ b/README.markdown @@ -11,6 +11,21 @@ Recommended NetBeans plugins: * Git * PMD & FindBugs ( http://kenai.com/projects/sqe/pages/Home ) +Building +-------- +To build with Maven, use the command +``` +mvn package dependency:copy +``` + +To build with Ant, use the command +``` +ant +``` + +Jar files can then be found in the /jars folder + + Commit Guidelines ----------------- diff --git a/lib/BOSEconomy.jar b/lib/BOSEconomy.jar new file mode 100644 index 000000000..14add8d94 Binary files /dev/null and b/lib/BOSEconomy.jar differ diff --git a/lib/BOSEconomy7.jar b/lib/BOSEconomy7.jar deleted file mode 100644 index 2ce672afa..000000000 Binary files a/lib/BOSEconomy7.jar and /dev/null differ diff --git a/lib/MultiCurrency.jar b/lib/MultiCurrency.jar index 6a0a02d54..2140699e6 100644 Binary files a/lib/MultiCurrency.jar and b/lib/MultiCurrency.jar differ diff --git a/lib/PermissionsBukkit-1.2.jar b/lib/PermissionsBukkit-1.2.jar deleted file mode 100644 index 3f5caf1b4..000000000 Binary files a/lib/PermissionsBukkit-1.2.jar and /dev/null differ diff --git a/lib/PermissionsBukkit.jar b/lib/PermissionsBukkit.jar new file mode 100644 index 000000000..fe61e7af7 Binary files /dev/null and b/lib/PermissionsBukkit.jar differ diff --git a/lib/PermissionsEx.jar b/lib/PermissionsEx.jar index 9f686b387..8711b8eb4 100644 Binary files a/lib/PermissionsEx.jar and b/lib/PermissionsEx.jar differ diff --git a/lib/Privileges.jar b/lib/Privileges.jar index e9dd1d04d..3e5b6b30b 100644 Binary files a/lib/Privileges.jar and b/lib/Privileges.jar differ diff --git a/lib/bPermissions.jar b/lib/bPermissions.jar new file mode 100644 index 000000000..46bf008b0 Binary files /dev/null and b/lib/bPermissions.jar differ diff --git a/lib/bpermissions2.jar b/lib/bpermissions2.jar deleted file mode 100644 index b6d344b82..000000000 Binary files a/lib/bpermissions2.jar and /dev/null differ diff --git a/lib/craftbukkit.jar b/lib/craftbukkit.jar deleted file mode 100644 index 26d9933b4..000000000 Binary files a/lib/craftbukkit.jar and /dev/null differ diff --git a/lib/lombok-0.10.8.jar b/lib/lombok-1.12.2.jar similarity index 65% rename from lib/lombok-0.10.8.jar rename to lib/lombok-1.12.2.jar index 3737eb096..7a1f3bc36 100644 Binary files a/lib/lombok-0.10.8.jar and b/lib/lombok-1.12.2.jar differ diff --git a/lib/zPermissions.jar b/lib/zPermissions.jar index 77b8ed40c..2260faf76 100644 Binary files a/lib/zPermissions.jar and b/lib/zPermissions.jar differ diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..75657da2e --- /dev/null +++ b/pom.xml @@ -0,0 +1,260 @@ + + 4.0.0 + + net.ess3 + EssentialsParent + 2.x-SNAPSHOT + + pom + + http://ess3.net/ + + + Essentials Team + http://ess3.net/ + + + + + GPLv3 + http://www.gnu.org/copyleft/gpl.html + + + + + scm:git:https://github.com/essentials/Essentials.git + scm:git:https://github.com/essentials/Essentials.git + https://github.com/essentials/Essentials + + + + JIRA + http://essentials3.atlassian.net + + + + TeamCity + http://ci.ess3.net/ + + + + + bukkit-repo + http://repo.bukkit.org/content/groups/public + + + + + Essentials + EssentialsAntiBuild + EssentialsChat + EssentialsGeoIP + EssentialsProtect + EssentialsSpawn + EssentialsXMPP + + + + + org.bukkit + bukkit + 1.6.4-R0.1-SNAPSHOT + + + junit + junit + 4.11 + test + + + org.projectlombok + lombok + 1.12.2 + + + + + TeamCity + GMBuildVer + UTF-8 + + + + src + test + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.6 + 1.6 + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + jars + true + + + ${project.groupId} + Essentials + ${project.version} + + + ${project.groupId} + EssentialsAntiBuild + ${project.version} + + + ${project.groupId} + EssentialsChat + ${project.version} + + + ${project.groupId} + EssentialsGeoIP + ${project.version} + + + ${project.groupId} + EssentialsProtect + ${project.version} + + + ${project.groupId} + EssentialsSpawn + ${project.version} + + + ${project.groupId} + EssentialsXMPP + ${project.version} + + + + + + maven-resources-plugin + 2.6 + + + copy-resources + + validate + + copy-resources + + + ${basedir}/jars + + + Essentials/src + + messages*.properties + config.yml + items.csv + + + plugin.yml + + true + + + EssentialsGroupManager/dist + + EssentialsGroupManager.jar + + + + + + + + + com.google.code.maven-replacer-plugin + replacer + 1.5.2 + + + process-sources + + replace + + + + + **/src/* + + + TeamCity + ${build.number} + + + GMBuildVer + ${GMVer} + + + $${build.number} + ${build.number} + + + $${GMVer} + ${GMVer} + + + + + + org.apache.maven.plugins + maven-clean-plugin + 2.5 + + + + ${basedir} + + jars/** + + + build/** + dist/** + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + package + + javadoc + + + + + + + + src + + *.properties + *.yml + *.csv + *.txt + + true + + + + \ No newline at end of file