forked from PaperMC/Paper
-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
build: upgrade POMs & BuildData to J17
- Loading branch information
Showing
4 changed files
with
70 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
Spigot-API-Patches/0073-Update-source-target-JRE-to-17.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| From 32baede4e7a1012d111acf1feaa391b680834615 Mon Sep 17 00:00:00 2001 | ||
| From: RoccoDev <[email protected]> | ||
| Date: Fri, 22 Sep 2023 16:43:12 +0200 | ||
| Subject: [PATCH] Update source/target JRE to 17 | ||
|
|
||
|
|
||
| diff --git a/pom.xml b/pom.xml | ||
| index 7341ded0..4a796a95 100644 | ||
| --- a/pom.xml | ||
| +++ b/pom.xml | ||
| @@ -20,9 +20,9 @@ | ||
|
|
||
| <properties> | ||
| <!--PaperSpigot - Bump to 1.8 - This will haunt me --> | ||
| + <!-- KigPaper - Java 17 --> | ||
| <additionalparam>-Xdoclint:none</additionalparam> | ||
| - <maven.compiler.source>1.8</maven.compiler.source> | ||
| - <maven.compiler.target>1.8</maven.compiler.target> | ||
| + <maven.compiler.release>17</maven.compiler.release> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
| </properties> | ||
|
|
||
| @@ -121,7 +121,7 @@ | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <!-- versions after this appear to be broken --> | ||
| - <version>3.1</version> | ||
| + <version>3.11.0</version> | ||
| <configuration> | ||
| <!-- we use the Eclipse compiler as it doesn't need a JDK --> | ||
| <compilerId>eclipse</compilerId> | ||
| -- | ||
| 2.41.0 | ||
|
|
33 changes: 33 additions & 0 deletions
33
Spigot-Server-Patches/0240-Update-source-target-JRE-to-17.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| From daec499e31e88540f117d3b946e920f2aca6e32e Mon Sep 17 00:00:00 2001 | ||
| From: RoccoDev <[email protected]> | ||
| Date: Fri, 22 Sep 2023 16:43:08 +0200 | ||
| Subject: [PATCH] Update source/target JRE to 17 | ||
|
|
||
|
|
||
| diff --git a/pom.xml b/pom.xml | ||
| index a7474d133..18c855f16 100644 | ||
| --- a/pom.xml | ||
| +++ b/pom.xml | ||
| @@ -18,8 +18,8 @@ | ||
| <buildtag.prefix>git-Bukkit-</buildtag.prefix> | ||
| <buildtag.suffix></buildtag.suffix> | ||
| <!--PaperSpigot - Bump to 1.8 - This will haunt me --> | ||
| - <maven.compiler.source>1.8</maven.compiler.source> | ||
| - <maven.compiler.target>1.8</maven.compiler.target> | ||
| + <!-- KigPaper - Java 17 --> | ||
| + <maven.compiler.release>17</maven.compiler.release> | ||
| </properties> | ||
|
|
||
| <parent> | ||
| @@ -280,7 +280,7 @@ | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <!-- versions after this appear to be broken --> | ||
| - <version>3.1</version> | ||
| + <version>3.11.0</version> | ||
| <configuration> | ||
| <!-- we use the Eclipse compiler as it doesn't need a JDK --> | ||
| <compilerId>eclipse</compilerId> | ||
| -- | ||
| 2.41.0 | ||
|
|