Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-05 10:20:53 +01:00
Code Issues Projects Releases Wiki Activity
f2da19f9e0
Paper/Spigot-API-Patches/0001-POM-changes.patch

76 lines
2.6 KiB
Diff
Raw Normal View History

Squash Java 8 patches into pom changes patches
2016-01-29 09:51:53 +01:00
From 7efc9bdbba963f83977a6f03cec9b1604112ece1 Mon Sep 17 00:00:00 2001
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 22:46:54 +02:00
From: Zach Brown <Zbob750@live.com>
Rebuild patches for upstream changes
2015-01-07 05:13:40 +01:00
Date: Tue, 6 Jan 2015 22:12:31 -0600
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 22:46:54 +02:00
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
Squash Java 8 patches into pom changes patches
2016-01-29 09:51:53 +01:00
index cb142f2..a2dd938 100644
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 22:46:54 +02:00
--- a/pom.xml
+++ b/pom.xml
Squash Java 8 patches into pom changes patches
2016-01-29 09:51:53 +01:00
@@ -4,23 +4,25 @@
Fix parent warning in PaperSpigot-API... and rebuild other patches
2015-01-11 08:10:11 +01:00
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.sonatype.oss</groupId>
- <artifactId>oss-parent</artifactId>
- <version>9</version>
+ <groupId>org.github.paperspigot</groupId>
+ <artifactId>paperspigot-parent</artifactId>
+ <version>dev-SNAPSHOT</version>
Rebuild patches for upstream changes
2015-01-07 05:13:40 +01:00
</parent>
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 22:46:54 +02:00
- <groupId>org.spigotmc</groupId>
- <artifactId>spigot-api</artifactId>
+ <groupId>org.github.paperspigot</groupId>
+ <artifactId>paperspigot-api</artifactId>
Update PaperSpigot to 1.8.8
2015-07-28 00:26:21 +02:00
<version>1.8.8-R0.1-SNAPSHOT</version>
Rebuild patches for upstream changes
2015-01-07 05:13:40 +01:00
<packaging>jar</packaging>
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 22:46:54 +02:00
- <name>Spigot-API</name>
Rebuild patches for upstream changes
2015-01-07 05:13:40 +01:00
- <url>http://www.spigotmc.org/</url>
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 22:46:54 +02:00
+ <name>PaperSpigot-API</name>
Rebuild patches for upstream changes
2015-01-07 05:13:40 +01:00
+ <url>https://hub.spigotmc.org/stash/projects/PAPER/</url>
<description>An enhanced plugin API for Minecraft servers.</description>
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 22:46:54 +02:00
<properties>
Squash Java 8 patches into pom changes patches
2016-01-29 09:51:53 +01:00
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <!--PaperSpigot - Bump to 1.8 - This will haunt me -->
+ <additionalparam>-Xdoclint:none</additionalparam>
+ <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>
@@ -129,26 +131,6 @@
</dependencies>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.13</version>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java16</artifactId>
- <version>1.1</version>
- </signature>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.3</version>
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 22:46:54 +02:00
--
Squash Java 8 patches into pom changes patches
2016-01-29 09:51:53 +01:00
2.7.0
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 22:46:54 +02:00
Reference in New Issue Copy Permalink