Paper/Spigot-API-Patches/0001-POM-changes.patch

116 lines
4.4 KiB
Diff
Raw Normal View History

2019-07-20 06:01:24 +02:00
From 9524ffe0f99ca69cf2478a834000bd6959a981d5 Mon Sep 17 00:00:00 2001
2016-03-01 00:09:49 +01:00
From: Zach Brown <zach.brown@destroystokyo.com>
2017-08-03 16:36:06 +02:00
Date: Tue, 1 Mar 2016 00:16:08 +0100
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
2019-07-20 06:01:24 +02:00
index 23d0a44a2..aef4ec33d 100644
--- a/pom.xml
+++ b/pom.xml
2019-07-20 06:01:24 +02:00
@@ -2,34 +2,28 @@
2019-05-14 04:20:58 +02:00
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2017-08-06 00:36:47 +02:00
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>
2017-08-06 00:36:47 +02:00
+ <parent>
2016-03-01 00:09:49 +01:00
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-parent</artifactId>
2016-04-24 04:41:46 +02:00
+ <version>dev-SNAPSHOT</version>
2017-08-06 00:36:47 +02:00
+ </parent>
2019-05-14 04:20:58 +02:00
- <groupId>org.spigotmc</groupId>
- <artifactId>spigot-api</artifactId>
2019-04-23 06:47:07 +02:00
+ <groupId>com.destroystokyo.paper</groupId>
2016-03-01 00:09:49 +01:00
+ <artifactId>paper-api</artifactId>
2019-07-20 06:01:24 +02:00
<version>1.14.4-R0.1-SNAPSHOT</version>
2015-01-07 05:13:40 +01:00
<packaging>jar</packaging>
- <name>Spigot-API</name>
2017-08-06 00:36:47 +02:00
- <url>https://www.spigotmc.org/</url>
2016-03-01 00:09:49 +01:00
+ <name>Paper-API</name>
2016-09-04 08:26:05 +02:00
+ <url>https://github.com/PaperMC/Paper</url>
2015-01-07 05:13:40 +01:00
<description>An enhanced plugin API for Minecraft servers.</description>
<properties>
- <skipTests>true</skipTests>
+ <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
2019-05-06 04:58:04 +02:00
<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>
2018-09-22 18:58:09 +02:00
- <distributionManagement>
- <repository>
2016-02-21 11:12:03 +01:00
- <id>spigotmc-releases</id>
- <url>https://hub.spigotmc.org/nexus/content/repositories/releases/</url>
2018-09-22 18:58:09 +02:00
- </repository>
- <snapshotRepository>
2016-02-21 11:12:03 +01:00
- <id>spigotmc-snapshots</id>
- <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
2018-09-22 18:58:09 +02:00
- </snapshotRepository>
- </distributionManagement>
-
<repositories>
<!--
If you are a plugin developer, please use https://hub.spigotmc.org/nexus/content/repositories/snapshots/
2019-07-20 06:01:24 +02:00
@@ -41,6 +35,10 @@
2017-08-03 16:36:06 +02:00
<id>spigotmc-public</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
2017-08-03 16:36:06 +02:00
+ <repository>
+ <id>sonatype</id>
+ <url>https://oss.sonatype.org/content/groups/public/</url>
+ </repository>
</repositories>
<pluginRepositories>
2019-07-20 06:01:24 +02:00
@@ -57,6 +55,20 @@
2019-04-23 06:47:07 +02:00
<version>2.6</version>
<scope>compile</scope>
</dependency>
2016-11-03 20:28:58 +01:00
+ <!-- bundled with Minecraft, shouldn't ever change -->
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
2016-11-03 20:51:00 +01:00
+ <version>1.3.9</version>
+ <scope>compile</scope>
2019-04-23 06:47:07 +02:00
+ </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>
2019-07-20 06:01:24 +02:00
@@ -113,15 +125,12 @@
</dependencies>
<build>
+ <defaultGoal>clean install</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
- <configuration>
- <!-- we use the Eclipse compiler as it doesn't need a JDK -->
- <compilerId>eclipse</compilerId>
- </configuration>
<dependencies>
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
2019-07-20 06:01:24 +02:00
@@ -156,6 +165,7 @@
</execution>
</executions>
<configuration>
+ <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<!-- when downloading via Maven we can pull depends individually -->
<shadedArtifactAttached>true</shadedArtifactAttached>
</configuration>
--
2.22.0