summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--.travis.yml1
-rw-r--r--Essentials/nbproject/project.properties12
-rw-r--r--Essentials/pom.xml137
-rw-r--r--EssentialsAntiBuild/pom.xml51
-rw-r--r--EssentialsChat/pom.xml51
-rw-r--r--EssentialsGeoIP/pom.xml51
-rw-r--r--EssentialsProtect/pom.xml51
-rw-r--r--EssentialsSpawn/pom.xml51
-rw-r--r--EssentialsXMPP/pom.xml82
-rw-r--r--README.markdown15
-rw-r--r--lib/BOSEconomy.jarbin0 -> 279896 bytes
-rw-r--r--lib/BOSEconomy7.jarbin155916 -> 0 bytes
-rw-r--r--lib/MultiCurrency.jarbin14873 -> 13232 bytes
-rw-r--r--lib/PermissionsBukkit-1.2.jarbin23673 -> 0 bytes
-rw-r--r--lib/PermissionsBukkit.jarbin0 -> 29617 bytes
-rw-r--r--lib/PermissionsEx.jarbin132878 -> 181728 bytes
-rw-r--r--lib/Privileges.jarbin101774 -> 169190 bytes
-rw-r--r--lib/bPermissions.jarbin0 -> 110605 bytes
-rw-r--r--lib/bpermissions2.jarbin129139 -> 0 bytes
-rw-r--r--lib/craftbukkit.jarbin15293814 -> 0 bytes
-rw-r--r--lib/lombok-1.12.2.jar (renamed from lib/lombok-0.10.8.jar)bin1733245 -> 1937813 bytes
-rw-r--r--lib/zPermissions.jarbin327241 -> 359821 bytes
-rw-r--r--pom.xml260
24 files changed, 759 insertions, 7 deletions
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 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.ess3</groupId>
+ <artifactId>EssentialsParent</artifactId>
+ <version>2.x-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>Essentials</artifactId>
+
+ <url>http://ess3.net/</url>
+
+ <organization>
+ <name>Essentials Team</name>
+ <url>http://ess3.net/</url>
+ </organization>
+
+ <licenses>
+ <license>
+ <name>GPLv3</name>
+ <url>http://www.gnu.org/copyleft/gpl.html</url>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>scm:git:https://github.com/essentials/Essentials.git</connection>
+ <developerConnection>scm:git:https://github.com/essentials/Essentials.git</developerConnection>
+ <url>https://github.com/essentials/Essentials</url>
+ </scm>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://essentials3.atlassian.net</url>
+ </issueManagement>
+
+ <ciManagement>
+ <system>TeamCity</system>
+ <url>http://ci.ess3.net/</url>
+ </ciManagement>
+
+ <repositories>
+ <repository>
+ <id>vault-repo</id>
+ <url>http://ci.herocraftonline.com/plugin/repository/everything</url>
+ </repository>
+ <repository>
+ <id>kitteh-repo</id>
+ <url>http://repo.kitteh.org/content/groups/public/</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>BOSEconomy</groupId>
+ <artifactId>BOSEconomy</artifactId>
+ <version>v0.7.8.1</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/../lib/BOSEconomy.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>de.bananaco</groupId>
+ <artifactId>bPermissions</artifactId>
+ <version>v2.12-DEV</version>
+ </dependency>
+ <dependency>
+ <groupId>iConomy</groupId>
+ <artifactId>iConomy5</artifactId>
+ <version>5</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/../lib/iCo5.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>iConomy</groupId>
+ <artifactId>iConomy6</artifactId>
+ <version>6</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/../lib/iCo6.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>net.ess3</groupId>
+ <artifactId>GroupManager</artifactId>
+ <version>${project.version}</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/../EssentialsGroupManager/dist/EssentialsGroupManager.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>MultiCurrency</groupId>
+ <artifactId>MultiCurrency</artifactId>
+ <version>2.2</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/../lib/MultiCurrency.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>com.platymuus</groupId>
+ <artifactId>bukkit-permissions</artifactId>
+ <version>2.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/../lib/PermissionsBukkit.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>ru.tehkode</groupId>
+ <artifactId>PermissionsEx</artifactId>
+ <version>1.20.4</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/../lib/PermissionsEx.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>Privileges</groupId>
+ <artifactId>Privileges</artifactId>
+ <version>1.8.1</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/../lib/Privileges.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>SimplyPerms</groupId>
+ <artifactId>SimplyPerms</artifactId>
+ <version>1.7.6</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/../lib/SimplyPerms.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>net.milkbowl</groupId>
+ <artifactId>vault</artifactId>
+ <version>1.2.27</version>
+ </dependency>
+ <dependency>
+ <groupId>zPermissions</groupId>
+ <artifactId>zPermissions</artifactId>
+ <version>1.1</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/../lib/zPermissions.jar</systemPath>
+ </dependency>
+ </dependencies>
+</project> \ 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 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.ess3</groupId>
+ <artifactId>EssentialsParent</artifactId>
+ <version>2.x-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>EssentialsAntiBuild</artifactId>
+
+ <url>http://ess3.net/</url>
+
+ <organization>
+ <name>Essentials Team</name>
+ <url>http://ess3.net/</url>
+ </organization>
+
+ <licenses>
+ <license>
+ <name>GPLv3</name>
+ <url>http://www.gnu.org/copyleft/gpl.html</url>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>scm:git:https://github.com/essentials/Essentials.git</connection>
+ <developerConnection>scm:git:https://github.com/essentials/Essentials.git</developerConnection>
+ <url>https://github.com/essentials/Essentials</url>
+ </scm>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://essentials3.atlassian.net</url>
+ </issueManagement>
+
+ <ciManagement>
+ <system>TeamCity</system>
+ <url>http://ci.ess3.net/</url>
+ </ciManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>net.ess3</groupId>
+ <artifactId>Essentials</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+</project> \ 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 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.ess3</groupId>
+ <artifactId>EssentialsParent</artifactId>
+ <version>2.x-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>EssentialsChat</artifactId>
+
+ <url>http://ess3.net/</url>
+
+ <organization>
+ <name>Essentials Team</name>
+ <url>http://ess3.net/</url>
+ </organization>
+
+ <licenses>
+ <license>
+ <name>GPLv3</name>
+ <url>http://www.gnu.org/copyleft/gpl.html</url>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>scm:git:https://github.com/essentials/Essentials.git</connection>
+ <developerConnection>scm:git:https://github.com/essentials/Essentials.git</developerConnection>
+ <url>https://github.com/essentials/Essentials</url>
+ </scm>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://essentials3.atlassian.net</url>
+ </issueManagement>
+
+ <ciManagement>
+ <system>TeamCity</system>
+ <url>http://ci.ess3.net/</url>
+ </ciManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>net.ess3</groupId>
+ <artifactId>Essentials</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+</project> \ 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 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.ess3</groupId>
+ <artifactId>EssentialsParent</artifactId>
+ <version>2.x-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>EssentialsGeoIP</artifactId>
+
+ <url>http://ess3.net/</url>
+
+ <organization>
+ <name>Essentials Team</name>
+ <url>http://ess3.net/</url>
+ </organization>
+
+ <licenses>
+ <license>
+ <name>GPLv3</name>
+ <url>http://www.gnu.org/copyleft/gpl.html</url>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>scm:git:https://github.com/essentials/Essentials.git</connection>
+ <developerConnection>scm:git:https://github.com/essentials/Essentials.git</developerConnection>
+ <url>https://github.com/essentials/Essentials</url>
+ </scm>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://essentials3.atlassian.net</url>
+ </issueManagement>
+
+ <ciManagement>
+ <system>TeamCity</system>
+ <url>http://ci.ess3.net/</url>
+ </ciManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>net.ess3</groupId>
+ <artifactId>Essentials</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+</project> \ 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 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.ess3</groupId>
+ <artifactId>EssentialsParent</artifactId>
+ <version>2.x-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>EssentialsProtect</artifactId>
+
+ <url>http://ess3.net/</url>
+
+ <organization>
+ <name>Essentials Team</name>
+ <url>http://ess3.net/</url>
+ </organization>
+
+ <licenses>
+ <license>
+ <name>GPLv3</name>
+ <url>http://www.gnu.org/copyleft/gpl.html</url>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>scm:git:https://github.com/essentials/Essentials.git</connection>
+ <developerConnection>scm:git:https://github.com/essentials/Essentials.git</developerConnection>
+ <url>https://github.com/essentials/Essentials</url>
+ </scm>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://essentials3.atlassian.net</url>
+ </issueManagement>
+
+ <ciManagement>
+ <system>TeamCity</system>
+ <url>http://ci.ess3.net/</url>
+ </ciManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>net.ess3</groupId>
+ <artifactId>Essentials</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+</project> \ 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 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.ess3</groupId>
+ <artifactId>EssentialsParent</artifactId>
+ <version>2.x-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>EssentialsSpawn</artifactId>
+
+ <url>http://ess3.net/</url>
+
+ <organization>
+ <name>Essentials Team</name>
+ <url>http://ess3.net/</url>
+ </organization>
+
+ <licenses>
+ <license>
+ <name>GPLv3</name>
+ <url>http://www.gnu.org/copyleft/gpl.html</url>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>scm:git:https://github.com/essentials/Essentials.git</connection>
+ <developerConnection>scm:git:https://github.com/essentials/Essentials.git</developerConnection>
+ <url>https://github.com/essentials/Essentials</url>
+ </scm>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://essentials3.atlassian.net</url>
+ </issueManagement>
+
+ <ciManagement>
+ <system>TeamCity</system>
+ <url>http://ci.ess3.net/</url>
+ </ciManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>net.ess3</groupId>
+ <artifactId>Essentials</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+</project> \ 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 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.ess3</groupId>
+ <artifactId>EssentialsParent</artifactId>
+ <version>2.x-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>EssentialsXMPP</artifactId>
+
+ <url>http://ess3.net/</url>
+
+ <organization>
+ <name>Essentials Team</name>
+ <url>http://ess3.net/</url>
+ </organization>
+
+ <licenses>
+ <license>
+ <name>GPLv3</name>
+ <url>http://www.gnu.org/copyleft/gpl.html</url>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>scm:git:https://github.com/essentials/Essentials.git</connection>
+ <developerConnection>scm:git:https://github.com/essentials/Essentials.git</developerConnection>
+ <url>https://github.com/essentials/Essentials</url>
+ </scm>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://essentials3.atlassian.net</url>
+ </issueManagement>
+
+ <ciManagement>
+ <system>TeamCity</system>
+ <url>http://ci.ess3.net/</url>
+ </ciManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>net.ess3</groupId>
+ <artifactId>Essentials</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>org.igniterealtime.smack:smack</include>
+ </includes>
+ </artifactSet>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project> \ 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
--- /dev/null
+++ b/lib/BOSEconomy.jar
Binary files differ
diff --git a/lib/BOSEconomy7.jar b/lib/BOSEconomy7.jar
deleted file mode 100644
index 2ce672afa..000000000
--- a/lib/BOSEconomy7.jar
+++ /dev/null
Binary files differ
diff --git a/lib/MultiCurrency.jar b/lib/MultiCurrency.jar
index 6a0a02d54..2140699e6 100644
--- a/lib/MultiCurrency.jar
+++ b/lib/MultiCurrency.jar
Binary files differ
diff --git a/lib/PermissionsBukkit-1.2.jar b/lib/PermissionsBukkit-1.2.jar
deleted file mode 100644
index 3f5caf1b4..000000000
--- a/lib/PermissionsBukkit-1.2.jar
+++ /dev/null
Binary files differ
diff --git a/lib/PermissionsBukkit.jar b/lib/PermissionsBukkit.jar
new file mode 100644
index 000000000..fe61e7af7
--- /dev/null
+++ b/lib/PermissionsBukkit.jar
Binary files differ
diff --git a/lib/PermissionsEx.jar b/lib/PermissionsEx.jar
index 9f686b387..8711b8eb4 100644
--- a/lib/PermissionsEx.jar
+++ b/lib/PermissionsEx.jar
Binary files differ
diff --git a/lib/Privileges.jar b/lib/Privileges.jar
index e9dd1d04d..3e5b6b30b 100644
--- a/lib/Privileges.jar
+++ b/lib/Privileges.jar
Binary files differ
diff --git a/lib/bPermissions.jar b/lib/bPermissions.jar
new file mode 100644
index 000000000..46bf008b0
--- /dev/null
+++ b/lib/bPermissions.jar
Binary files differ
diff --git a/lib/bpermissions2.jar b/lib/bpermissions2.jar
deleted file mode 100644
index b6d344b82..000000000
--- a/lib/bpermissions2.jar
+++ /dev/null
Binary files differ
diff --git a/lib/craftbukkit.jar b/lib/craftbukkit.jar
deleted file mode 100644
index 26d9933b4..000000000
--- a/lib/craftbukkit.jar
+++ /dev/null
Binary files differ
diff --git a/lib/lombok-0.10.8.jar b/lib/lombok-1.12.2.jar
index 3737eb096..7a1f3bc36 100644
--- a/lib/lombok-0.10.8.jar
+++ b/lib/lombok-1.12.2.jar
Binary files differ
diff --git a/lib/zPermissions.jar b/lib/zPermissions.jar
index 77b8ed40c..2260faf76 100644
--- a/lib/zPermissions.jar
+++ b/lib/zPermissions.jar
Binary files 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 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>net.ess3</groupId>
+ <artifactId>EssentialsParent</artifactId>
+ <version>2.x-SNAPSHOT</version>
+
+ <packaging>pom</packaging>
+
+ <url>http://ess3.net/</url>
+
+ <organization>
+ <name>Essentials Team</name>
+ <url>http://ess3.net/</url>
+ </organization>
+
+ <licenses>
+ <license>
+ <name>GPLv3</name>
+ <url>http://www.gnu.org/copyleft/gpl.html</url>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>scm:git:https://github.com/essentials/Essentials.git</connection>
+ <developerConnection>scm:git:https://github.com/essentials/Essentials.git</developerConnection>
+ <url>https://github.com/essentials/Essentials</url>
+ </scm>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://essentials3.atlassian.net</url>
+ </issueManagement>
+
+ <ciManagement>
+ <system>TeamCity</system>
+ <url>http://ci.ess3.net/</url>
+ </ciManagement>
+
+ <repositories>
+ <repository>
+ <id>bukkit-repo</id>
+ <url>http://repo.bukkit.org/content/groups/public</url>
+ </repository>
+ </repositories>
+
+ <modules>
+ <module>Essentials</module>
+ <module>EssentialsAntiBuild</module>
+ <module>EssentialsChat</module>
+ <module>EssentialsGeoIP</module>
+ <module>EssentialsProtect</module>
+ <module>EssentialsSpawn</module>
+ <module>EssentialsXMPP</module>
+ </modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.bukkit</groupId>
+ <artifactId>bukkit</artifactId>
+ <version>1.6.4-R0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.12.2</version>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <build.number>TeamCity</build.number>
+ <GMVer>GMBuildVer</GMVer>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <testSourceDirectory>test</testSourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.8</version>
+ <configuration>
+ <outputDirectory>jars</outputDirectory>
+ <stripVersion>true</stripVersion>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>Essentials</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>EssentialsAntiBuild</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>EssentialsChat</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>EssentialsGeoIP</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>EssentialsProtect</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>EssentialsSpawn</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>EssentialsXMPP</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <!-- here the phase you need -->
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/jars</outputDirectory>
+ <resources>
+ <resource>
+ <directory>Essentials/src</directory>
+ <includes>
+ <include>messages*.properties</include>
+ <include>config.yml</include>
+ <include>items.csv</include>
+ </includes>
+ <excludes>
+ <exclude>plugin.yml</exclude>
+ </excludes>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>EssentialsGroupManager/dist</directory>
+ <includes>
+ <include>EssentialsGroupManager.jar</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>replacer</artifactId>
+ <version>1.5.2</version>
+ <executions>
+ <execution>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>replace</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <filesToInclude>**/src/*</filesToInclude>
+ <replacements>
+ <replacement>
+ <token>TeamCity</token>
+ <value>${build.number}</value>
+ </replacement>
+ <replacement>
+ <token>GMBuildVer</token>
+ <value>${GMVer}</value>
+ </replacement>
+ <replacement>
+ <token>$${build.number}</token>
+ <value>${build.number}</value>
+ </replacement>
+ <replacement>
+ <token>$${GMVer}</token>
+ <value>${GMVer}</value>
+ </replacement>
+ </replacements>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>jars/**</include>
+
+ <!-- Following folders clear Ant build directories -->
+ <include>build/**</include>
+ <include>dist/**</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <includes>
+ <include>*.properties</include>
+ <include>*.yml</include>
+ <include>*.csv</include>
+ <include>*.txt</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </build>
+</project> \ No newline at end of file