From 4110bb0715fb2cd59da12c0b29d17b6d92065689 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 5ddf33938..2a2abac96 100644 --- a/pom.xml +++ b/pom.xml @@ -2,34 +2,29 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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> + <parent> + <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.14.2-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> - <skipTests>true</skipTests> + <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well --> + <!-- 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> - </repository> - <snapshotRepository> - <id>spigotmc-snapshots</id> - <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url> - </snapshotRepository> - </distributionManagement> - <repositories> <!-- If you are a plugin developer, please use https://hub.spigotmc.org/nexus/content/repositories/snapshots/ @@ -41,6 +36,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> @@ -57,6 +56,20 @@ <version>2.6</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> + <!-- used in previous versions of the API --> + <dependency> + <groupId>com.googlecode.json-simple</groupId> + <artifactId>json-simple</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> <!-- bundled with Minecraft, should be kept in sync --> <dependency> <groupId>com.google.guava</groupId> @@ -113,15 +126,12 @@ </dependencies> <build> + <defaultGoal>clean install</defaultGoal> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>3.8.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> @@ -156,6 +166,7 @@ </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> -- 2.21.0