Use correct jetbrains annotations

2021-06-13 18:48:31 -07:00 · 2021-06-13 18:48:31 -07:00 · 6c30949610
commit 6c30949610
parent 2a46c72164
1 changed files with 7 additions and 4 deletions
--- a/patches/api/0002-Build-system-changes.patch
+++ b/patches/api/0002-Build-system-changes.patch
@ -0,0 +1,126 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <zach.brown@destroystokyo.com>
+Date: Tue, 1 Mar 2016 00:16:08 +0100
+Subject: [PATCH] Build system changes
+
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index 35b57f52fcfd91cff04dc60c3a8a16b31f775fc0..328fe3d7708b0e93dad080c7689d0d7cde138288 100644
+--- a/build.gradle.kts
+++ b/build.gradle.kts
+@@ -16,12 +16,14 @@ dependencies {
+     api("com.google.code.gson:gson:2.8.0")
+     api("net.md-5:bungeecord-chat:1.16-R0.4")
+     api("org.yaml:snakeyaml:1.29")
+    api("com.googlecode.json-simple:json-simple:1.1.1") // Paper
+ 
+     compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
+     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
+     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0")
+    compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper
+ 
+-    val annotations = "org.jetbrains:annotations-java5:21.0.1"
+    val annotations = "org.jetbrains:annotations:21.0.1" // Paper - we don't want Java 5 annotations...
+     compileOnly(annotations)
+     testCompileOnly(annotations)
+ 
+diff --git a/pom.xml b/pom.xml
+index 10eeaef61be733e63f6680f1675e0b527eb30fd9..e5802bcb6fc2376cff2ee8b3069150127312b154 100644
+--- a/pom.xml
+++ b/pom.xml
+@@ -2,33 +2,34 @@
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+     <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.destroystokyo.paper</groupId>
+        <artifactId>paper-parent</artifactId>
+        <version>dev-SNAPSHOT</version>
+    </parent>
+ 
+-    <groupId>org.spigotmc</groupId>
+-    <artifactId>spigot-api</artifactId>
+    <groupId>com.destroystokyo.paper</groupId>
+    <artifactId>paper-api</artifactId>
+     <version>1.17-R0.1-SNAPSHOT</version>
+     <packaging>jar</packaging>
+ 
+-    <name>Spigot-API</name>
+-    <url>https://www.spigotmc.org/</url>
+    <name>Paper-API</name>
+    <url>https://github.com/PaperMC/Paper</url>
+     <description>An enhanced plugin API for Minecraft servers.</description>
+ 
+     <properties>
+-        <skipTests>true</skipTests>
+        <!-- <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>
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+     </properties>
+ 
+-    <distributionManagement>
+    <repositories>
+         <repository>
+-            <id>spigotmc-releases</id>
+-            <url>https://hub.spigotmc.org/nexus/content/repositories/releases/</url>
+            <id>sonatype</id>
+            <url>https://oss.sonatype.org/content/groups/public/</url>
+         </repository>
+-        <snapshotRepository>
+-            <id>spigotmc-snapshots</id>
+-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+-        </snapshotRepository>
+-    </distributionManagement>
+    </repositories>
+ 
+     <dependencies>
+         <dependency>
+@@ -37,6 +38,20 @@
+             <version>2.6</version>
+             <scope>compile</scope>
+         </dependency>
+        <!-- bundled with Minecraft, shouldn't ever change -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>1.3.9</version>
+            <scope>compile</scope>
+        </dependency>
+        <!-- used in previous versions of the API -->
+        <dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>1.1.1</version>
+            <scope>compile</scope>
+        </dependency>
+         <!-- bundled with Minecraft, should be kept in sync -->
+         <dependency>
+             <groupId>com.google.guava</groupId>
+@@ -112,6 +127,7 @@
+     </dependencies>
+ 
+     <build>
+        <defaultGoal>clean install</defaultGoal>
+         <plugins>
+             <plugin>
+                 <groupId>net.md-5</groupId>
+@@ -130,10 +146,6 @@
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-compiler-plugin</artifactId>
+                 <version>3.8.1</version>
+-                <configuration>
+-                    <!-- we use the Eclipse compiler as it doesn't need a JDK -->
+-                    <compilerId>eclipse</compilerId>
+-                </configuration>
+                 <dependencies>
+                     <dependency>
+                         <groupId>org.codehaus.plexus</groupId>
+@@ -183,6 +195,7 @@
+                             </excludes>
+                         </filter>
+                     </filters>
+                    <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
+                     <!-- when downloading via Maven we can pull depends individually -->
+                     <shadedArtifactAttached>true</shadedArtifactAttached>
+                 </configuration>