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

138 lines
5.0 KiB
Diff
Raw Normal View History

2016-12-21 17:21:40 +00:00
From e9476e0764a94d5000a6add8386864f4fe8d8b88 Mon Sep 17 00:00:00 2001
2016-02-29 23:09:49 +00:00
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 17:16:08 -0600
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
2016-12-21 17:21:40 +00:00
index 28d2a57..0b6fd28 100644
--- a/pom.xml
+++ b/pom.xml
2016-02-21 10:12:03 +00:00
@@ -4,35 +4,37 @@
<modelVersion>4.0.0</modelVersion>
<parent>
2016-04-24 02:41:46 +00:00
- <groupId>org.sonatype.oss</groupId>
- <artifactId>oss-parent</artifactId>
- <version>9</version>
2016-02-29 23:09:49 +00:00
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-parent</artifactId>
2016-04-24 02:41:46 +00:00
+ <version>dev-SNAPSHOT</version>
2015-01-07 04:13:40 +00:00
</parent>
- <groupId>org.spigotmc</groupId>
- <artifactId>spigot-api</artifactId>
2016-02-29 23:09:49 +00:00
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-api</artifactId>
2016-12-21 17:21:40 +00:00
<version>1.11.2-R0.1-SNAPSHOT</version>
2015-01-07 04:13:40 +00:00
<packaging>jar</packaging>
- <name>Spigot-API</name>
2015-01-07 04:13:40 +00:00
- <url>http://www.spigotmc.org/</url>
2016-02-29 23:09:49 +00:00
+ <name>Paper-API</name>
2016-09-04 06:26:05 +00:00
+ <url>https://github.com/PaperMC/Paper</url>
2015-01-07 04:13:40 +00:00
<description>An enhanced plugin API for Minecraft servers.</description>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <!-- Paper - 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>
2016-02-21 10:12:03 +00:00
<!-- just until we get deployment to central approved -->
<distributionManagement>
<repository>
- <id>spigotmc-releases</id>
- <url>https://hub.spigotmc.org/nexus/content/repositories/releases/</url>
+ <id>destroystokyo-releases</id>
2016-08-06 21:49:55 +00:00
+ <url>https://repo.destroystokyo.com/repository/maven-releases/</url>
2016-02-21 10:12:03 +00:00
</repository>
<snapshotRepository>
- <id>spigotmc-snapshots</id>
- <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+ <id>destroystokyo-snapshots</id>
2016-08-06 21:49:55 +00:00
+ <url>https://repo.destroystokyo.com/repository/maven-snapshots/</url>
2016-02-21 10:12:03 +00:00
</snapshotRepository>
</distributionManagement>
@@ -44,6 +46,13 @@
</pluginRepository>
</pluginRepositories>
+ <repositories>
+ <repository>
+ <id>sonatype</id>
+ <url>https://oss.sonatype.org/content/groups/public/</url>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>commons-lang</groupId>
@@ -58,6 +67,13 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
2016-11-03 19:28:58 +00:00
+ <!-- bundled with Minecraft, shouldn't ever change -->
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
2016-11-03 19:51:00 +00:00
+ <version>1.3.9</version>
+ <scope>compile</scope>
+ </dependency>
<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.guava</groupId>
2016-11-19 04:58:56 +00:00
@@ -108,6 +124,7 @@
</dependencies>
<build>
+ <defaultGoal>clean install</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
2016-11-19 04:58:56 +00:00
@@ -130,26 +147,6 @@
</dependencies>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
2016-11-17 02:23:38 +00:00
- <version>1.15</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>
2016-11-17 02:23:38 +00:00
<version>2.4.3</version>
2016-11-19 04:58:56 +00:00
@@ -162,8 +159,7 @@
</execution>
</executions>
<configuration>
- <!-- utterly useless artifact from shade 2.x -->
- <createDependencyReducedPom>false</createDependencyReducedPom>
+ <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<!-- when downloading via Maven we can pull depends individually -->
<shadedArtifactAttached>true</shadedArtifactAttached>
</configuration>
--
2016-12-20 22:34:27 +00:00
2.9.3