fe4678c414
Fixes our own, and upstream's, issues with the stricter Java 8 JavaDoc linter. Also removes the destroystokyo-release maven repository. I'm not sure why I added it originally, but it's unnecessary now.
136 lines
4.9 KiB
Diff
136 lines
4.9 KiB
Diff
From 121bc2816dfe4ab6c4c7b4c155fb57e04b3f7caa Mon Sep 17 00:00:00 2001
|
|
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
|
|
index ecb870a0..968f9091 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -4,35 +4,36 @@
|
|
<modelVersion>4.0.0</modelVersion>
|
|
|
|
<parent>
|
|
- <groupId>org.sonatype.oss</groupId>
|
|
- <artifactId>oss-parent</artifactId>
|
|
- <version>9</version>
|
|
+ <groupId>com.destroystokyo.paper</groupId>
|
|
+ <artifactId>paper-parent</artifactId>
|
|
+ <version>dev-SNAPSHOT</version>
|
|
</parent>
|
|
|
|
- <groupId>org.spigotmc</groupId>
|
|
- <artifactId>spigot-api</artifactId>
|
|
+ <groupId>com.destroystokyo.paper</groupId>
|
|
+ <artifactId>paper-api</artifactId>
|
|
<version>1.12-R0.1-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
- <name>Spigot-API</name>
|
|
- <url>http://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.6</maven.compiler.source>
|
|
- <maven.compiler.target>1.6</maven.compiler.target>
|
|
+ <!-- Paper - Bump to 1.8 - Because Duh... -->
|
|
+ <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>
|
|
|
|
<!-- 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>
|
|
+ <url>https://repo.destroystokyo.com/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://repo.destroystokyo.com/repository/maven-snapshots/</url>
|
|
</snapshotRepository>
|
|
</distributionManagement>
|
|
|
|
@@ -44,6 +45,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 +66,13 @@
|
|
<type>jar</type>
|
|
<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>
|
|
@@ -102,6 +117,7 @@
|
|
</dependencies>
|
|
|
|
<build>
|
|
+ <defaultGoal>clean install</defaultGoal>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
@@ -124,26 +140,6 @@
|
|
</dependencies>
|
|
</plugin>
|
|
<plugin>
|
|
- <groupId>org.codehaus.mojo</groupId>
|
|
- <artifactId>animal-sniffer-maven-plugin</artifactId>
|
|
- <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>
|
|
<version>2.4.3</version>
|
|
@@ -156,8 +152,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>
|
|
--
|
|
2.13.0.windows.1
|
|
|