From 5258658fb54ee446f0043988e56a589b2e9ffdae Mon Sep 17 00:00:00 2001 From: Zach Brown <zach.brown@destroystokyo.com> Date: Mon, 29 Feb 2016 20:40:33 -0600 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml index 1278c628e..4abf8dde7 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ <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> - <groupId>org.spigotmc</groupId> - <artifactId>spigot</artifactId> + <groupId>com.destroystokyo.paper</groupId> + <artifactId>paper</artifactId> <packaging>jar</packaging> <version>1.12.2-R0.1-SNAPSHOT</version> - <name>Spigot</name> - <url>http://www.spigotmc.org</url> + <name>Paper</name> + <url>https://github.com/PaperMC/Paper</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -21,8 +21,8 @@ </properties> <parent> - <groupId>org.spigotmc</groupId> - <artifactId>spigot-parent</artifactId> + <groupId>com.destroystokyo.paper</groupId> + <artifactId>paper-parent</artifactId> <version>dev-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -36,8 +36,8 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>org.spigotmc</groupId> - <artifactId>spigot-api</artifactId> + <groupId>com.destroystokyo.paper</groupId> + <artifactId>paper-api</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> @@ -108,34 +108,22 @@ <!-- This builds a completely 'ready to start' jar with all dependencies inside --> <build> + <finalName>paper-${minecraft.version}</finalName> + <defaultGoal>clean install</defaultGoal> <!-- Paper --> <plugins> <plugin> - <groupId>net.md-5</groupId> - <artifactId>scriptus</artifactId> - <version>0.2</version> + <groupId>com.lukegb.mojo</groupId> + <artifactId>gitdescribe-maven-plugin</artifactId> + <version>1.3</version> + <configuration> + <outputPrefix>git-Paper-</outputPrefix> + <scmDirectory>..</scmDirectory> + </configuration> <executions> <execution> - <id>ex-spigot</id> - <configuration> - <format>git-Spigot-%s</format> - <scmDirectory>../</scmDirectory> - <descriptionProperty>spigot.desc</descriptionProperty> - </configuration> - <phase>initialize</phase> + <phase>compile</phase> <goals> - <goal>describe</goal> - </goals> - </execution> - <execution> - <id>ex-craftbukkit</id> - <configuration> - <format>-%s</format> - <scmDirectory>../../CraftBukkit</scmDirectory> - <descriptionProperty>craftbukkit.desc</descriptionProperty> - </configuration> - <phase>initialize</phase> - <goals> - <goal>describe</goal> + <goal>gitdescribe</goal> </goals> </execution> </executions> @@ -145,11 +133,12 @@ <artifactId>maven-jar-plugin</artifactId> <version>3.0.2</version> <configuration> + <forceCreation>true</forceCreation> <!-- Required to prevent shading the jar multiple times --> <archive> <manifestEntries> <Main-Class>org.bukkit.craftbukkit.Main</Main-Class> <Implementation-Title>CraftBukkit</Implementation-Title> - <Implementation-Version>${spigot.desc}${craftbukkit.desc}</Implementation-Version> + <Implementation-Version>${describe}</Implementation-Version> <Implementation-Vendor>${maven.build.timestamp}</Implementation-Vendor> <Specification-Title>Bukkit</Specification-Title> <Specification-Version>${api.version}</Specification-Version> @@ -189,19 +178,22 @@ <goal>shade</goal> </goals> <configuration> + <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation> <!-- Paper --> <relocations> - <relocation> - <pattern>joptsimple</pattern> - <shadedPattern>org.bukkit.craftbukkit.libs.joptsimple</shadedPattern> - </relocation> + <!-- Paper - Workaround for hardcoded path lookup in dependency, easier than forking it - GH-189 --> + <!--<relocation>--> + <!--<pattern>joptsimple</pattern>--> + <!--<shadedPattern>org.bukkit.craftbukkit.libs.joptsimple</shadedPattern>--> + <!--</relocation>--> <relocation> <pattern>jline</pattern> <shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern> </relocation> - <relocation> - <pattern>it.unimi</pattern> - <shadedPattern>org.bukkit.craftbukkit.libs.it.unimi</shadedPattern> - </relocation> + <!-- Paper - Don't relocate fastutil in order to prevent api breakage --> + <!--<relocation>--> + <!--<pattern>it.unimi</pattern>--> + <!--<shadedPattern>org.bukkit.craftbukkit.libs.it.unimi</shadedPattern>--> + <!--</relocation>--> <relocation> <pattern>org.bukkit.craftbukkit</pattern> <shadedPattern>org.bukkit.craftbukkit.v${minecraft_version}</shadedPattern> @@ -227,18 +219,6 @@ <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> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-compiler-eclipse</artifactId> - <version>2.8.1-spigotmc</version> - </dependency> - </dependencies> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -258,6 +238,11 @@ <profiles> <profile> <id>development</id> + <!-- Paper start - activate by default --> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <!-- Paper end --> <build> <plugins> <plugin> diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java index 93046379d..674096cab 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -11,7 +11,7 @@ public final class Versioning { public static String getBukkitVersion() { String result = "Unknown-Version"; - InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.spigotmc/spigot-api/pom.properties"); + InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/com.destroystokyo.paper/paper-api/pom.properties"); Properties properties = new Properties(); if (stream != null) { -- 2.15.0