twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 12:42:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

Move eclipse compiler patch to POM changes patch

Browse Source 
Also update to Paperclip 1.1-SNAPSHOT
This commit is contained in:
DemonWav
2017-09-23 13:17:20 -05:00
parent fc7479cfe5
commit 81d69d5889
4 changed files with 12 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Spigot-API-Patches/POM-changes.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index 98f2d67a..9934e9af 100644
index 98f2d67a..49fe56cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -0,0 +0,0 @@
@@ -105,6 +105,15 @@ index 98f2d67a..9934e9af 100644
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
- <configuration>
- <!-- we use the Eclipse compiler as it doesn't need a JDK -->
- <compilerId>eclipse</compilerId>
- </configuration>
<dependencies>
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
@@ -0,0 +0,0 @@
</dependency>
</dependencies>

31
Spigot-API-Patches/Remove-eclipse-compiler-we-require-a-JDK-anyways.patch
View File

@@ -1,31 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: DemonWav <demonwav@gmail.com>
Date: Fri, 22 Sep 2017 20:11:42 -0500
Subject: [PATCH] Remove eclipse compiler, we require a JDK anyways Fixes
building with JDK 9
diff --git a/pom.xml b/pom.xml
index a775f4ed..3ce500f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -0,0 +0,0 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
- <configuration>
- <!-- we use the Eclipse compiler as it doesn't need a JDK -->
- <compilerId>eclipse</compilerId>
- </configuration>
- <dependencies>
- <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-compiler-eclipse</artifactId>
- <version>2.8.2-spigotmc</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
--