mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-05 10:20:53 +01:00
7d915467fe
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 7ba8d633 SPIGOT-4265: Declare org.bukkit module
144 lines
5.3 KiB
Diff
144 lines
5.3 KiB
Diff
From 78932fdd2a280f8bc6eb8cd540dbb14c9413fcd6 Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
Date: Tue, 1 Mar 2016 00:16:08 +0100
|
|
Subject: [PATCH] POM changes
|
|
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index f06c89c1..97c13752 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -3,29 +3,35 @@
|
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
<modelVersion>4.0.0</modelVersion>
|
|
|
|
- <groupId>org.spigotmc</groupId>
|
|
- <artifactId>spigot-api</artifactId>
|
|
+ <parent>
|
|
+ <groupId>com.destroystokyo.paper</groupId>
|
|
+ <artifactId>paper-parent</artifactId>
|
|
+ <version>dev-SNAPSHOT</version>
|
|
+ </parent>
|
|
+
|
|
+ <artifactId>paper-api</artifactId>
|
|
<version>1.13-R0.1-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
- <name>Spigot-API</name>
|
|
- <url>https://www.spigotmc.org/</url>
|
|
+ <name>Paper-API</name>
|
|
+ <url>https://github.com/PaperMC/Paper</url>
|
|
<description>An enhanced plugin API for Minecraft servers.</description>
|
|
|
|
<properties>
|
|
- <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>
|
|
|
|
<distributionManagement>
|
|
<repository>
|
|
- <id>spigotmc-releases</id>
|
|
- <url>https://hub.spigotmc.org/nexus/content/repositories/releases/</url>
|
|
+ <id>destroystokyo-releases</id>
|
|
+ <url>https://destroystokyo.com/repo/repository/maven-releases/</url>
|
|
</repository>
|
|
<snapshotRepository>
|
|
- <id>spigotmc-snapshots</id>
|
|
- <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
|
|
+ <id>destroystokyo-snapshots</id>
|
|
+ <url>https://destroystokyo.com/repo/repository/maven-snapshots/</url>
|
|
</snapshotRepository>
|
|
</distributionManagement>
|
|
|
|
@@ -34,6 +40,10 @@
|
|
<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>
|
|
</repositories>
|
|
|
|
<pluginRepositories>
|
|
@@ -56,6 +66,13 @@
|
|
<version>1.1.1</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
+ <!-- bundled with Minecraft, shouldn't ever change -->
|
|
+ <dependency>
|
|
+ <groupId>com.google.code.findbugs</groupId>
|
|
+ <artifactId>jsr305</artifactId>
|
|
+ <version>1.3.9</version>
|
|
+ <scope>compile</scope>
|
|
+ </dependency>
|
|
<!-- bundled with Minecraft, should be kept in sync -->
|
|
<dependency>
|
|
<groupId>com.google.guava</groupId>
|
|
@@ -100,15 +117,12 @@
|
|
</dependencies>
|
|
|
|
<build>
|
|
+ <defaultGoal>clean install</defaultGoal>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<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>
|
|
@@ -143,40 +157,11 @@
|
|
</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>
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
-
|
|
- <profiles>
|
|
- <profile>
|
|
- <id>development</id>
|
|
- <build>
|
|
- <plugins>
|
|
- <plugin>
|
|
- <groupId>org.codehaus.mojo</groupId>
|
|
- <artifactId>animal-sniffer-maven-plugin</artifactId>
|
|
- <version>1.17</version>
|
|
- <executions>
|
|
- <execution>
|
|
- <phase>process-classes</phase>
|
|
- <goals>
|
|
- <goal>check</goal>
|
|
- </goals>
|
|
- </execution>
|
|
- </executions>
|
|
- <configuration>
|
|
- <signature>
|
|
- <groupId>org.codehaus.mojo.signature</groupId>
|
|
- <artifactId>java17</artifactId>
|
|
- <version>1.0</version>
|
|
- </signature>
|
|
- </configuration>
|
|
- </plugin>
|
|
- </plugins>
|
|
- </build>
|
|
- </profile>
|
|
- </profiles>
|
|
</project>
|
|
--
|
|
2.18.0
|
|
|