diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c72688b41..000000000 --- a/.travis.yml +++ /dev/null @@ -1,18 +0,0 @@ -language: java -jdk: - - oraclejdk7 - - openjdk7 - - openjdk6 -script: mvn compile test -install: true -notifications: - irc: - channels: - - "irc.esper.net#drtshock" - on_success: change - on_failure: always - email: - recipients: - - "drtshock13@gmail.com" - on_success: change - on_failure: always diff --git a/Essentials/pom.xml b/Essentials/pom.xml index c2e2b8480..ae5d8849e 100644 --- a/Essentials/pom.xml +++ b/Essentials/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 + 3.7.0 false @@ -31,7 +31,7 @@ org.apache.maven.plugins maven-shade-plugin - 1.4 + 3.1.0 package diff --git a/EssentialsGeoIP/pom.xml b/EssentialsGeoIP/pom.xml index 1f69e5578..b6e839e79 100644 --- a/EssentialsGeoIP/pom.xml +++ b/EssentialsGeoIP/pom.xml @@ -18,12 +18,6 @@ - - scm:git:https://github.com/essentials/Essentials.git - scm:git:https://github.com/essentials/Essentials.git - https://github.com/essentials/Essentials - - net.ess3 @@ -42,7 +36,7 @@ org.apache.maven.plugins maven-shade-plugin - 2.1 + 3.1.0 package diff --git a/EssentialsXMPP/pom.xml b/EssentialsXMPP/pom.xml index a127be087..412cc76ad 100644 --- a/EssentialsXMPP/pom.xml +++ b/EssentialsXMPP/pom.xml @@ -23,11 +23,13 @@ net.ess3 EssentialsX ${project.version} + provided org.igniterealtime.smack smack 3.2.1 + compile @@ -36,7 +38,7 @@ org.apache.maven.plugins maven-shade-plugin - 2.1 + 3.1.0 package @@ -45,13 +47,6 @@ - - - - org.igniterealtime.smack:smack - - - diff --git a/README.md b/README.md index b5be087ef..7779623dc 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ EssentialsX is almost a completely drop-in replacement for Essentials. However, * **If you have an unsupported permissions plugin but still wish to use wildcards, enable `use-bukkit-permissions` in the configuration. Otherwise, the plugin will fall back to config-based permissions.** -* **EssentialsX requires Java 7 or higher.** +* **EssentialsX requires Java 8 or higher.** * **1.7.10 is no longer supported.** diff --git a/nbactions.xml b/nbactions.xml index bdec16480..b4d59eee5 100644 --- a/nbactions.xml +++ b/nbactions.xml @@ -6,8 +6,6 @@ package dependency:copy - - diff --git a/nms/ReflectionProvider/pom.xml b/nms/ReflectionProvider/pom.xml index 101327ba5..6906b71f7 100644 --- a/nms/ReflectionProvider/pom.xml +++ b/nms/ReflectionProvider/pom.xml @@ -12,13 +12,6 @@ ReflectionProvider - - - spigot-repo - https://hub.spigotmc.org/nexus/content/groups/public/ - - - net.ess3 diff --git a/nms/UpdatedMetaProvider/pom.xml b/nms/UpdatedMetaProvider/pom.xml index 9ed83fb85..dfa6a4f14 100644 --- a/nms/UpdatedMetaProvider/pom.xml +++ b/nms/UpdatedMetaProvider/pom.xml @@ -11,14 +11,7 @@ 4.0.0 UpdatedMetaProvider - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/groups/public/ - - - + net.ess3 diff --git a/pom.xml b/pom.xml index 8e557c94b..6c81a14b1 100644 --- a/pom.xml +++ b/pom.xml @@ -17,9 +17,9 @@ - scm:git:https://github.com/drtshock/Essentials.git - scm:git:https://github.com/drtshock/Essentials.git - https://github.com/drtshock/Essentials + scm:git:https://github.com/EssentialsX/Essentials.git + scm:git:https://github.com/EssentialsX/Essentials.git + https://github.com/EssentialsX/Essentials @@ -59,13 +59,13 @@ junit junit - 4.11 + 4.12 test org.projectlombok lombok - 1.12.2 + 1.16.20 provided @@ -77,10 +77,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + 3.7.0 - 1.7 - 1.7 + 1.8 + 1.8 @@ -109,7 +109,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.8 + 3.0.2 jars true @@ -155,7 +155,7 @@ maven-resources-plugin - 2.6 + 3.0.2 package @@ -186,7 +186,7 @@ com.google.code.maven-replacer-plugin replacer - 1.5.2 + 1.5.3 process-sources @@ -240,12 +240,12 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.9.1 + 3.0.0 org.apache.maven.plugins maven-deploy-plugin - 2.8.1 + 2.8.2 true