81 lines
3.4 KiB
Diff
81 lines
3.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: lexikiq <noellekiq@gmail.com>
|
|
Date: Sun, 9 May 2021 17:03:09 -0400
|
|
Subject: [PATCH] Update to Java 15
|
|
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index 6857042b3475925f426cbe9f4858438a02bebd23..a295e88e8c05306c0e5876608797d64df6dc1699 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -19,8 +19,10 @@
|
|
|
|
<properties>
|
|
<!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
|
|
- <maven.compiler.source>1.8</maven.compiler.source>
|
|
- <maven.compiler.target>1.8</maven.compiler.target>
|
|
+ <!-- Parchment start -->
|
|
+ <maven.compiler.source>15</maven.compiler.source>
|
|
+ <maven.compiler.target>15</maven.compiler.target>
|
|
+ <!-- Parchment end -->
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
<adventure.version>4.7.0</adventure.version> <!-- Paper - When updating this make sure to update the linked JavaDocs on the homepage as well! -->
|
|
</properties>
|
|
@@ -148,7 +150,7 @@
|
|
<!-- annotations -->
|
|
<dependency>
|
|
<groupId>org.jetbrains</groupId>
|
|
- <artifactId>annotations-java5</artifactId>
|
|
+ <artifactId>annotations</artifactId> <!-- Parchment -->
|
|
<version>20.1.0</version>
|
|
<scope>provided</scope>
|
|
</dependency>
|
|
@@ -278,15 +280,38 @@
|
|
</properties>
|
|
</configuration>
|
|
</plugin>
|
|
+ <!-- Parchment start -->
|
|
+ <plugin>
|
|
+ <groupId>org.apache.maven.plugins</groupId>
|
|
+ <artifactId>maven-source-plugin</artifactId>
|
|
+ <version>3.2.0</version>
|
|
+ <executions>
|
|
+ <execution>
|
|
+ <id>attach-sources</id>
|
|
+ <goals>
|
|
+ <goal>jar</goal>
|
|
+ </goals>
|
|
+ </execution>
|
|
+ </executions>
|
|
+ </plugin>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-javadoc-plugin</artifactId>
|
|
<version>3.2.0</version>
|
|
+ <executions>
|
|
+ <execution>
|
|
+ <id>attach-javadocs</id>
|
|
+ <goals>
|
|
+ <goal>jar</goal>
|
|
+ </goals>
|
|
+ </execution>
|
|
+ </executions>
|
|
<configuration>
|
|
+ <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
|
|
<links>
|
|
<link>https://guava.dev/releases/21.0/api/docs/</link>
|
|
<link>https://javadoc.io/doc/org.yaml/snakeyaml/1.27/</link>
|
|
- <link>https://javadoc.io/doc/org.jetbrains/annotations-java5/20.1.0/</link>
|
|
+ <link>https://javadoc.io/doc/org.jetbrains/annotations/20.1.0/</link> <!-- Parchment -->
|
|
<link>https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/</link>
|
|
<!-- Paper start -->
|
|
<link>https://jd.adventure.kyori.net/api/${adventure.version}/</link>
|
|
@@ -297,6 +322,7 @@
|
|
</links>
|
|
</configuration>
|
|
</plugin>
|
|
+ <!-- Parchment end -->
|
|
</plugins>
|
|
</build>
|
|
|