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