mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-22 18:45:54 +01:00
c0d07c1b67
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: f009c3dd SPIGOT-5810, SPIGOT-5835: 'Better' handling of Player.isOnGround e677c370 Update ECJ version 5058a35d SPIGOT-5860: Item.setItemStack should be NotNull CraftBukkit Changes:d77f4d9bSPIGOT-5810, SPIGOT-5835: 'Better' handling of Player.isOnGround53c95627SPIGOT-5865: Piglin does not trigger EntityPickupItemEvent2ab04d24Update ECJ version7884e079SPIGOT-5868: Blocks do not tick in custom nether / end2a848286SPIGOT-5863: Don't check colour in scoreboard length validationf2cbce30SPIGOT-5866: Beehive unknown TargetReason Spigot Changes: ad703da0 SPIGOT-5870: /plugins "website" field shows "version" 1a27cfd8 #98: Improve output of /plugins command using text components 732d5bab Disable checkstyle in Spigot blocks 0199a9a6 #97: Add Memory Usage to Ticks Per Second Command. 33ea98fc SPIGOT-5858: NPE: Joining the server with an invalid dimension
115 lines
4.5 KiB
Diff
115 lines
4.5 KiB
Diff
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
|
|
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index 274fd7d65ed48af7c4c055db0f99d1637f1af88f..14383eb14c5f3893edc7c76db90881d1abd4b675 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -2,34 +2,28 @@
|
|
<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.16.1-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>
|
|
- <repository>
|
|
- <id>spigotmc-releases</id>
|
|
- <url>https://hub.spigotmc.org/nexus/content/repositories/releases/</url>
|
|
- </repository>
|
|
- <snapshotRepository>
|
|
- <id>spigotmc-snapshots</id>
|
|
- <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
|
|
- </snapshotRepository>
|
|
- </distributionManagement>
|
|
-
|
|
<repositories>
|
|
<!--
|
|
If you are a plugin developer, please use https://hub.spigotmc.org/nexus/content/repositories/snapshots/
|
|
@@ -41,6 +35,10 @@
|
|
<id>spigotmc-public</id>
|
|
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
|
|
</repository>
|
|
+ <repository>
|
|
+ <id>sonatype</id>
|
|
+ <url>https://oss.sonatype.org/content/groups/public/</url>
|
|
+ </repository>
|
|
</repositories>
|
|
|
|
<pluginRepositories>
|
|
@@ -57,6 +55,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>
|
|
@@ -113,6 +125,7 @@
|
|
</dependencies>
|
|
|
|
<build>
|
|
+ <defaultGoal>clean install</defaultGoal>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>net.md-5</groupId>
|
|
@@ -131,10 +144,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>
|
|
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
|
|
<dependency>
|
|
@@ -185,6 +194,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>
|