2021-06-11 12:02:28 +00:00
|
|
|
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] POM changes
|
|
|
|
|
|
|
|
|
|
|
2021-06-11 18:06:01 +00:00
|
|
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
|
|
|
|
index a0f1c1d1ac63fdcce942922ffe68a8d44c712513..fd47081fbc8cc5d88a57689d1beee5eddc78f845 100644
|
|
|
|
|
--- a/build.gradle.kts
|
|
|
|
|
+++ b/build.gradle.kts
|
|
|
|
|
@@ -15,10 +15,12 @@ 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"
|
|
|
|
|
compileOnly(annotations)
|
2021-06-11 12:02:28 +00:00
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
|
|
|
index debe5bd7adb1f41e8a6878a8545de4bfcad1a590..d7cf64f05d0a2f5b186ca13b2b88e390abe84226 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>
|
