Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 19:10:09 +01:00
Go back to disabling javadoc linting for now
It's breaking our maven deployments. This should be fixed properly in the future when I have more time and have had less to drink.
Dieser Commit ist enthalten in:
Ursprung
90b2d02091
Commit
1df56f4369
@ -1,14 +1,14 @@
|
||||
From b106ae7ff8bc4c4cefd1e34a6c8447a9f03d8614 Mon Sep 17 00:00:00 2001
|
||||
From 8baf2feff02aeb2080fdafe260e4f5192877825f Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Mon, 29 Feb 2016 17:16:08 -0600
|
||||
Subject: [PATCH] POM changes
|
||||
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index cad55895..869be1b5 100644
|
||||
index ecb870a0..48c2e544 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -4,35 +4,36 @@
|
||||
@@ -4,35 +4,37 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
@ -37,6 +37,7 @@ index cad55895..869be1b5 100644
|
||||
- <maven.compiler.source>1.6</maven.compiler.source>
|
||||
- <maven.compiler.target>1.6</maven.compiler.target>
|
||||
+ <!-- Paper - Bump to 1.8 - Because Duh... -->
|
||||
+ <additionalparam>-Xdoclint:none</additionalparam>
|
||||
+ <maven.compiler.source>1.8</maven.compiler.source>
|
||||
+ <maven.compiler.target>1.8</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
@ -58,7 +59,7 @@ index cad55895..869be1b5 100644
|
||||
</snapshotRepository>
|
||||
</distributionManagement>
|
||||
|
||||
@@ -44,6 +45,13 @@
|
||||
@@ -44,6 +46,13 @@
|
||||
</pluginRepository>
|
||||
</pluginRepositories>
|
||||
|
||||
@ -72,7 +73,7 @@ index cad55895..869be1b5 100644
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>commons-lang</groupId>
|
||||
@@ -58,6 +66,13 @@
|
||||
@@ -58,6 +67,13 @@
|
||||
<type>jar</type>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
@ -86,7 +87,7 @@ index cad55895..869be1b5 100644
|
||||
<!-- bundled with Minecraft, should be kept in sync -->
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
@@ -102,6 +117,7 @@
|
||||
@@ -102,6 +118,7 @@
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
@ -94,7 +95,7 @@ index cad55895..869be1b5 100644
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
@@ -124,26 +140,6 @@
|
||||
@@ -124,26 +141,6 @@
|
||||
</dependencies>
|
||||
</plugin>
|
||||
<plugin>
|
||||
@ -121,7 +122,7 @@ index cad55895..869be1b5 100644
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-shade-plugin</artifactId>
|
||||
<version>2.4.3</version>
|
||||
@@ -156,8 +152,7 @@
|
||||
@@ -156,8 +153,7 @@
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
@ -132,5 +133,5 @@ index cad55895..869be1b5 100644
|
||||
<shadedArtifactAttached>true</shadedArtifactAttached>
|
||||
</configuration>
|
||||
--
|
||||
2.13.1
|
||||
2.13.0.windows.1
|
||||
|
||||
|
@ -1,14 +1,14 @@
|
||||
From abf6ef5d9306c02a64d2463f9b5080aa36c1ddd9 Mon Sep 17 00:00:00 2001
|
||||
From bab3dd6f3335c4da837a24234ac0455bcedd6a0f Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Fri, 1 Apr 2016 00:02:47 -0400
|
||||
Subject: [PATCH] add Trove and FastUtil to Bukkit
|
||||
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 0899a127..8990bdcc 100644
|
||||
index 48c2e544..5336fe55 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -54,6 +54,19 @@
|
||||
@@ -55,6 +55,19 @@
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 35fae0eeb31476dc9704645cce8045ebb19f0f18 Mon Sep 17 00:00:00 2001
|
||||
From 31a91b94783da85083becaa48afbad20fc8019bb Mon Sep 17 00:00:00 2001
|
||||
From: Techcable <Techcable@outlook.com>
|
||||
Date: Thu, 3 Mar 2016 13:20:33 -0700
|
||||
Subject: [PATCH] Use ASM for event executors.
|
||||
@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors.
|
||||
Uses method handles for private or static methods.
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 8990bdcc..e7a4eb2c 100644
|
||||
index 5336fe55..a9009636 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -127,6 +127,12 @@
|
||||
@@ -128,6 +128,12 @@
|
||||
<version>1.3</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren