mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-22 15:17:17 +01:00
Java 8 javadoc lint bypass. Until we can fix this properly (massive patch for old bukkit ???!?!?!?!) this will have to do
This commit is contained in:
parent
5faccece77
commit
861d6c6247
2 changed files with 8 additions and 7 deletions
|
@ -1,26 +1,27 @@
|
||||||
From 1075d256ef7221d811991952a51e5a16b3773ca4 Mon Sep 17 00:00:00 2001
|
From 9d2935793a954b2b8f1aa1ab7d61999906b34253 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Fri, 8 Jan 2016 23:50:25 -0600
|
Date: Fri, 8 Jan 2016 23:50:25 -0600
|
||||||
Subject: [PATCH] Require Java 8
|
Subject: [PATCH] Require Java 8
|
||||||
|
|
||||||
|
|
||||||
diff --git a/pom.xml b/pom.xml
|
diff --git a/pom.xml b/pom.xml
|
||||||
index bc6964d..2c43d25 100644
|
index bc6964d..a2dd938 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -19,8 +19,9 @@
|
@@ -19,8 +19,10 @@
|
||||||
<description>An enhanced plugin API for Minecraft servers.</description>
|
<description>An enhanced plugin API for Minecraft servers.</description>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
- <maven.compiler.source>1.6</maven.compiler.source>
|
- <maven.compiler.source>1.6</maven.compiler.source>
|
||||||
- <maven.compiler.target>1.6</maven.compiler.target>
|
- <maven.compiler.target>1.6</maven.compiler.target>
|
||||||
+ <!--PaperSpigot - Bump to 1.8 - This will haunt me -->
|
+ <!--PaperSpigot - Bump to 1.8 - This will haunt me -->
|
||||||
|
+ <additionalparam>-Xdoclint:none</additionalparam>
|
||||||
+ <maven.compiler.source>1.8</maven.compiler.source>
|
+ <maven.compiler.source>1.8</maven.compiler.source>
|
||||||
+ <maven.compiler.target>1.8</maven.compiler.target>
|
+ <maven.compiler.target>1.8</maven.compiler.target>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
@@ -129,26 +130,6 @@
|
@@ -129,26 +131,6 @@
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
From 4f9f4ee4270ba3bf65c69559bbd1e8157f70c78e Mon Sep 17 00:00:00 2001
|
From 4e504cf9841d2e312e7c33c87298b276ee8c7921 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Fri, 8 Jan 2016 23:12:28 -0600
|
Date: Fri, 8 Jan 2016 23:12:28 -0600
|
||||||
Subject: [PATCH] Timings v2
|
Subject: [PATCH] Timings v2
|
||||||
|
|
||||||
|
|
||||||
diff --git a/pom.xml b/pom.xml
|
diff --git a/pom.xml b/pom.xml
|
||||||
index 2c43d25..7dd0adb 100644
|
index a2dd938..2f8fcf9 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -47,6 +47,13 @@
|
@@ -48,6 +48,13 @@
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
Loading…
Reference in a new issue