Merge branch 'java_16' into 1.17

This commit is contained in:
tastybento 2021-06-12 10:24:38 -07:00
commit abe2ede54d
2 changed files with 19 additions and 9 deletions

View File

@ -13,10 +13,10 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Set up JDK 8
- name: Set up JDK 16
uses: actions/setup-java@v1
with:
java-version: 8
java-version: 16
- name: Cache SonarCloud packages
uses: actions/cache@v1
with:

24
pom.xml
View File

@ -63,9 +63,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<java.version>16</java.version>
<!-- Non-minecraft related dependencies -->
<powermock.version>2.0.4</powermock.version>
<powermock.version>2.0.9</powermock.version>
<mongodb.version>3.8.0</mongodb.version>
<!-- More visible way to change dependency versions -->
<spigot.version>1.17-R0.1-SNAPSHOT</spigot.version>
@ -182,6 +182,10 @@
<id>papermc</id>
<url>https://papermc.io/repo/repository/maven-public/</url>
</repository>
<repository>
<id>maven-snapshots</id>
<url>https://repository.apache.org/content/repositories/snapshots/</url>
</repository>
</repositories>
<dependencies>
@ -216,7 +220,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.1.0</version>
<version>3.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -299,6 +303,12 @@
<version>3.1.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.3.0-SNAPSHOT</version>
<type>maven-plugin</type>
</dependency>
</dependencies>
<build>
@ -340,8 +350,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<release>16</release>
<!-- <source>${java.version}</source> <target>${java.version}</target> -->
</configuration>
</plugin>
<plugin>
@ -393,7 +403,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.0-SNAPSHOT</version>
<configuration>
<minimizeJar>true</minimizeJar>
<relocations>
@ -449,7 +459,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.4</version>
<version>0.8.7</version>
<configuration>
<append>true</append>
<excludes>