From 03b25a0f063d50046e9bb0870db6f6ddef216f51 Mon Sep 17 00:00:00 2001
From: DoNotSpamPls <kgvelkov@gmail.com>
Date: Tue, 17 Jul 2018 11:38:01 +0300
Subject: [PATCH] Set target to Java 8 (for 1.13) & update Maven plugins
 (#1922) @DoNotSpamPls

This is the same PR as the last one (PR #1823), but I messed that one up accidently, sorry for that!
---
 .travis.yml                     | 18 ------------------
 Essentials/pom.xml              |  4 ++--
 EssentialsGeoIP/pom.xml         |  8 +-------
 EssentialsXMPP/pom.xml          | 11 +++--------
 README.md                       |  2 +-
 nbactions.xml                   |  2 --
 nms/ReflectionProvider/pom.xml  |  7 -------
 nms/UpdatedMetaProvider/pom.xml |  9 +--------
 pom.xml                         | 26 +++++++++++++-------------
 9 files changed, 21 insertions(+), 66 deletions(-)
 delete mode 100644 .travis.yml

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 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.7.0</version>
                 <configuration>
                     <showDeprecation>false</showDeprecation>
                 </configuration>
@@ -31,7 +31,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>1.4</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
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 @@
         </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>
-
     <dependencies>
         <dependency>
             <groupId>net.ess3</groupId>
@@ -42,7 +36,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.1</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
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 @@
             <groupId>net.ess3</groupId>
             <artifactId>EssentialsX</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.igniterealtime.smack</groupId>
             <artifactId>smack</artifactId>
             <version>3.2.1</version>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 
@@ -36,7 +38,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.1</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -45,13 +47,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <configuration>
-                    <artifactSet>
-                        <includes>
-                            <include>org.igniterealtime.smack:smack</include>
-                        </includes>
-                    </artifactSet>
-                </configuration>
             </plugin>
         </plugins>
     </build>
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 @@
         <goals>
             <goal>package</goal>
             <goal>dependency:copy</goal>
-
-
         </goals>
     </action>
     <action>
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 @@
 
     <artifactId>ReflectionProvider</artifactId>
 
-    <repositories>
-        <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
-        </repository>
-    </repositories>
-
     <dependencies>
          <dependency>
             <groupId>net.ess3</groupId>
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 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>UpdatedMetaProvider</artifactId>
-
-    <repositories>
-        <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
-        </repository>
-    </repositories>
-
+    
     <dependencies>
         <dependency>
             <groupId>net.ess3</groupId>
diff --git a/pom.xml b/pom.xml
index 8e557c94b..6c81a14b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,9 +17,9 @@
     </licenses>
 
     <scm>
-        <connection>scm:git:https://github.com/drtshock/Essentials.git</connection>
-        <developerConnection>scm:git:https://github.com/drtshock/Essentials.git</developerConnection>
-        <url>https://github.com/drtshock/Essentials</url>
+        <connection>scm:git:https://github.com/EssentialsX/Essentials.git</connection>
+        <developerConnection>scm:git:https://github.com/EssentialsX/Essentials.git</developerConnection>
+        <url>https://github.com/EssentialsX/Essentials</url>
     </scm>
 
     <repositories>
@@ -59,13 +59,13 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>4.12</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.12.2</version>
+            <version>1.16.20</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -77,10 +77,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.7.0</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -109,7 +109,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.8</version>
+                <version>3.0.2</version>
                 <configuration>
                     <outputDirectory>jars</outputDirectory>
                     <stripVersion>true</stripVersion>
@@ -155,7 +155,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.6</version>
+                <version>3.0.2</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -186,7 +186,7 @@
             <plugin>
                 <groupId>com.google.code.maven-replacer-plugin</groupId>
                 <artifactId>replacer</artifactId>
-                <version>1.5.2</version>
+                <version>1.5.3</version>
                 <executions>
                     <execution>
                         <phase>process-sources</phase>
@@ -240,12 +240,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
+                <version>3.0.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8.1</version>
+                <version>2.8.2</version>
                 <configuration>
                     <deployAtEnd>true</deployAtEnd>
                 </configuration>