2018-10-23 07:16:21 +08:00
|
|
|
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
|
2016-03-01 07:09:49 +08:00
|
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
2017-08-03 22:36:06 +08:00
|
|
|
Date: Tue, 1 Mar 2016 00:16:08 +0100
|
2014-07-22 04:46:54 +08:00
|
|
|
Subject: [PATCH] POM changes
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
2018-10-23 07:16:21 +08:00
|
|
|
index 7ac07ac07ac0..7ac07ac07ac0 100644
|
2014-07-22 04:46:54 +08:00
|
|
|
--- a/pom.xml
|
|
|
|
+++ b/pom.xml
|
2018-09-23 00:58:09 +08:00
|
|
|
@@ -3,37 +3,36 @@
|
2017-08-06 06:36:47 +08:00
|
|
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
2015-01-11 15:10:11 +08:00
|
|
|
<modelVersion>4.0.0</modelVersion>
|
|
|
|
|
2017-08-06 06:36:47 +08:00
|
|
|
- <groupId>org.spigotmc</groupId>
|
|
|
|
- <artifactId>spigot-api</artifactId>
|
|
|
|
+ <parent>
|
2016-03-01 07:09:49 +08:00
|
|
|
+ <groupId>com.destroystokyo.paper</groupId>
|
|
|
|
+ <artifactId>paper-parent</artifactId>
|
2016-04-24 10:41:46 +08:00
|
|
|
+ <version>dev-SNAPSHOT</version>
|
2017-08-06 06:36:47 +08:00
|
|
|
+ </parent>
|
|
|
|
+
|
2016-03-01 07:09:49 +08:00
|
|
|
+ <artifactId>paper-api</artifactId>
|
2018-10-23 07:16:21 +08:00
|
|
|
<version>1.13.2-R0.1-SNAPSHOT</version>
|
2015-01-07 12:13:40 +08:00
|
|
|
<packaging>jar</packaging>
|
|
|
|
|
2014-07-22 04:46:54 +08:00
|
|
|
- <name>Spigot-API</name>
|
2017-08-06 06:36:47 +08:00
|
|
|
- <url>https://www.spigotmc.org/</url>
|
2016-03-01 07:09:49 +08:00
|
|
|
+ <name>Paper-API</name>
|
2016-09-04 14:26:05 +08:00
|
|
|
+ <url>https://github.com/PaperMC/Paper</url>
|
2015-01-07 12:13:40 +08:00
|
|
|
<description>An enhanced plugin API for Minecraft servers.</description>
|
2014-07-22 04:46:54 +08:00
|
|
|
|
|
|
|
<properties>
|
2018-07-15 09:53:17 +08:00
|
|
|
- <maven.compiler.source>1.7</maven.compiler.source>
|
|
|
|
- <maven.compiler.target>1.7</maven.compiler.target>
|
|
|
|
+ <!-- Paper - #Logic -->
|
|
|
|
+ <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-01-29 16:51:53 +08:00
|
|
|
|
2018-09-23 00:58:09 +08:00
|
|
|
- <distributionManagement>
|
|
|
|
- <repository>
|
2016-02-21 18:12:03 +08:00
|
|
|
- <id>spigotmc-releases</id>
|
|
|
|
- <url>https://hub.spigotmc.org/nexus/content/repositories/releases/</url>
|
2018-09-23 00:58:09 +08:00
|
|
|
- </repository>
|
|
|
|
- <snapshotRepository>
|
2016-02-21 18:12:03 +08:00
|
|
|
- <id>spigotmc-snapshots</id>
|
|
|
|
- <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
|
2018-09-23 00:58:09 +08:00
|
|
|
- </snapshotRepository>
|
|
|
|
- </distributionManagement>
|
|
|
|
-
|
|
|
|
<repositories>
|
|
|
|
<repository>
|
2017-08-03 22:36:06 +08:00
|
|
|
<id>spigotmc-public</id>
|
2018-07-14 09:44:35 +08:00
|
|
|
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
|
|
|
|
</repository>
|
2017-08-03 22:36:06 +08:00
|
|
|
+ <repository>
|
2016-06-23 13:32:41 +08:00
|
|
|
+ <id>sonatype</id>
|
|
|
|
+ <url>https://oss.sonatype.org/content/groups/public/</url>
|
|
|
|
+ </repository>
|
2018-07-14 09:44:35 +08:00
|
|
|
</repositories>
|
|
|
|
|
|
|
|
<pluginRepositories>
|
2018-09-23 00:58:09 +08:00
|
|
|
@@ -56,6 +55,13 @@
|
2017-08-08 11:05:16 +08:00
|
|
|
<version>1.1.1</version>
|
2016-09-17 03:38:52 +08:00
|
|
|
<scope>compile</scope>
|
|
|
|
</dependency>
|
2016-11-04 03:28:58 +08:00
|
|
|
+ <!-- bundled with Minecraft, shouldn't ever change -->
|
2016-09-17 03:38:52 +08:00
|
|
|
+ <dependency>
|
2016-11-04 03:25:50 +08:00
|
|
|
+ <groupId>com.google.code.findbugs</groupId>
|
|
|
|
+ <artifactId>jsr305</artifactId>
|
2016-11-04 03:51:00 +08:00
|
|
|
+ <version>1.3.9</version>
|
2016-09-17 03:38:52 +08:00
|
|
|
+ <scope>compile</scope>
|
|
|
|
+ </dependency>
|
|
|
|
<!-- bundled with Minecraft, should be kept in sync -->
|
|
|
|
<dependency>
|
|
|
|
<groupId>com.google.guava</groupId>
|
2018-09-23 00:58:09 +08:00
|
|
|
@@ -100,15 +106,12 @@
|
2016-03-18 14:13:51 +08:00
|
|
|
</dependencies>
|
|
|
|
|
|
|
|
<build>
|
|
|
|
+ <defaultGoal>clean install</defaultGoal>
|
|
|
|
<plugins>
|
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
2017-09-24 02:17:20 +08:00
|
|
|
<artifactId>maven-compiler-plugin</artifactId>
|
|
|
|
<version>3.7.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>
|
2018-09-23 00:58:09 +08:00
|
|
|
@@ -143,40 +146,11 @@
|
2016-11-19 10:09:03 +08:00
|
|
|
</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>
|
2018-07-14 09:44:35 +08:00
|
|
|
</plugin>
|
2017-11-17 17:40:49 +08:00
|
|
|
</plugins>
|
|
|
|
</build>
|
2018-07-14 09:44:35 +08:00
|
|
|
-
|
2017-11-17 17:40:49 +08:00
|
|
|
- <profiles>
|
|
|
|
- <profile>
|
|
|
|
- <id>development</id>
|
|
|
|
- <build>
|
|
|
|
- <plugins>
|
|
|
|
- <plugin>
|
|
|
|
- <groupId>org.codehaus.mojo</groupId>
|
|
|
|
- <artifactId>animal-sniffer-maven-plugin</artifactId>
|
2018-07-15 09:53:17 +08:00
|
|
|
- <version>1.17</version>
|
2017-11-17 17:40:49 +08:00
|
|
|
- <executions>
|
|
|
|
- <execution>
|
|
|
|
- <phase>process-classes</phase>
|
|
|
|
- <goals>
|
|
|
|
- <goal>check</goal>
|
|
|
|
- </goals>
|
|
|
|
- </execution>
|
|
|
|
- </executions>
|
|
|
|
- <configuration>
|
|
|
|
- <signature>
|
|
|
|
- <groupId>org.codehaus.mojo.signature</groupId>
|
2018-07-15 09:53:17 +08:00
|
|
|
- <artifactId>java17</artifactId>
|
2018-07-13 15:39:44 +08:00
|
|
|
- <version>1.0</version>
|
2017-11-17 17:40:49 +08:00
|
|
|
- </signature>
|
|
|
|
- </configuration>
|
|
|
|
- </plugin>
|
|
|
|
- </plugins>
|
|
|
|
- </build>
|
|
|
|
- </profile>
|
|
|
|
- </profiles>
|
|
|
|
</project>
|
2014-07-22 04:46:54 +08:00
|
|
|
--
|
2018-10-23 07:16:21 +08:00
|
|
|
2.19.1
|
2014-07-22 04:46:54 +08:00
|
|
|
|