Update to 1.12.1

This commit is contained in:
BlackHole 2017-08-03 16:36:06 +02:00
parent 2e157dd1b4
commit 6879328bf6
69 changed files with 414 additions and 489 deletions

View file

@ -1,14 +1,14 @@
From 69671c3d50b5ad75e2c8f11130e76efc5c676fbb Mon Sep 17 00:00:00 2001
From ed103e824a3c48330567e5b1a0a7bc112e94c4da Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 17:16:08 -0600
Date: Tue, 1 Mar 2016 00:16:08 +0100
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index 0c3bf997..cce94262 100644
index 8c6d1aa1..07143b46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,35 +4,36 @@
@@ -4,44 +4,38 @@
<modelVersion>4.0.0</modelVersion>
<parent>
@ -24,7 +24,7 @@ index 0c3bf997..cce94262 100644
- <artifactId>spigot-api</artifactId>
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-api</artifactId>
<version>1.12-R0.1-SNAPSHOT</version>
<version>1.12.1-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Spigot-API</name>
@ -42,7 +42,6 @@ index 0c3bf997..cce94262 100644
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<!-- just until we get deployment to central approved -->
<distributionManagement>
<repository>
- <id>spigotmc-releases</id>
@ -58,12 +57,26 @@ index 0c3bf997..cce94262 100644
</snapshotRepository>
</distributionManagement>
@@ -44,6 +45,13 @@
- <repositories>
- <repository>
- <id>spigotmc-public</id>
- <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
- </repository>
- </repositories>
-
<pluginRepositories>
<pluginRepository>
<id>spigotmc-public</id>
@@ -49,6 +43,17 @@
</pluginRepository>
</pluginRepositories>
+ <repositories>
+ <repository>
+ <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>
@ -72,7 +85,7 @@ index 0c3bf997..cce94262 100644
<dependencies>
<dependency>
<groupId>commons-lang</groupId>
@@ -58,6 +66,13 @@
@@ -63,6 +68,13 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
@ -86,7 +99,7 @@ index 0c3bf997..cce94262 100644
<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.guava</groupId>
@@ -102,6 +117,7 @@
@@ -107,6 +119,7 @@
</dependencies>
<build>
@ -94,7 +107,7 @@ index 0c3bf997..cce94262 100644
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -121,26 +137,6 @@
@@ -126,26 +139,6 @@
</dependencies>
</plugin>
<plugin>
@ -121,7 +134,7 @@ index 0c3bf997..cce94262 100644
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.0.0</version>
@@ -153,8 +149,7 @@
@@ -158,8 +151,7 @@
</execution>
</executions>
<configuration>
@ -132,5 +145,5 @@ index 0c3bf997..cce94262 100644
<shadedArtifactAttached>true</shadedArtifactAttached>
</configuration>
--
2.13.0
2.13.3.windows.1