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!
This commit is contained in:
DoNotSpamPls 2018-07-17 11:38:01 +03:00 committed by md678685
parent ace361af60
commit 03b25a0f06
9 changed files with 21 additions and 66 deletions

View File

@ -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

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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.**

View File

@ -6,8 +6,6 @@
<goals>
<goal>package</goal>
<goal>dependency:copy</goal>
</goals>
</action>
<action>

View File

@ -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>

View File

@ -12,13 +12,6 @@
<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>

26
pom.xml
View File

@ -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>