mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 07:39:16 +01:00
89 lines
3.6 KiB
Diff
89 lines
3.6 KiB
Diff
From e7cac10d2cbd228ba6715da4592dcf78ba0a0303 Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
Date: Mon, 12 Jan 2015 11:21:04 -0600
|
|
Subject: [PATCH] POM changes
|
|
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index bcd3a30..003caf1 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>org.github.paperspigot</groupId>
|
|
+ <artifactId>paperspigot</artifactId>
|
|
<packaging>jar</packaging>
|
|
<version>1.8-R0.1-SNAPSHOT</version>
|
|
- <name>Spigot</name>
|
|
- <url>http://www.spigotmc.org</url>
|
|
+ <name>PaperSpigot</name>
|
|
+ <url>https://hub.spigotmc.org/stash/projects/PAPER/</url>
|
|
|
|
<properties>
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
@@ -21,16 +21,16 @@
|
|
</properties>
|
|
|
|
<parent>
|
|
- <groupId>org.spigotmc</groupId>
|
|
- <artifactId>spigot-parent</artifactId>
|
|
+ <groupId>org.github.paperspigot</groupId>
|
|
+ <artifactId>paperspigot-parent</artifactId>
|
|
<version>dev-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
- <groupId>org.spigotmc</groupId>
|
|
- <artifactId>spigot-api</artifactId>
|
|
+ <groupId>org.github.paperspigot</groupId>
|
|
+ <artifactId>paperspigot-api</artifactId>
|
|
<version>${project.version}</version>
|
|
<type>jar</type>
|
|
<scope>compile</scope>
|
|
@@ -113,12 +113,12 @@
|
|
</configuration>
|
|
<executions>
|
|
<execution>
|
|
- <id>ex-spigot</id>
|
|
+ <id>ex-paperspigot</id>
|
|
<configuration>
|
|
- <outputPrefix>git-Spigot-</outputPrefix>
|
|
+ <outputPrefix>git-PaperSpigot-</outputPrefix>
|
|
<outputPostfix></outputPostfix>
|
|
<scmDirectory>../</scmDirectory>
|
|
- <descriptionProperty>spigot.desc</descriptionProperty>
|
|
+ <descriptionProperty>paperspigot.desc</descriptionProperty>
|
|
</configuration>
|
|
<phase>compile</phase>
|
|
<goals>
|
|
@@ -149,7 +149,7 @@
|
|
<manifestEntries>
|
|
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
|
|
<Implementation-Title>CraftBukkit</Implementation-Title>
|
|
- <Implementation-Version>${spigot.desc}${craftbukkit.desc}</Implementation-Version>
|
|
+ <Implementation-Version>${paperspigot.desc}${craftbukkit.desc}</Implementation-Version>
|
|
<Implementation-Vendor>Bukkit Team</Implementation-Vendor>
|
|
<Specification-Title>Bukkit</Specification-Title>
|
|
<Specification-Version>${api.version}</Specification-Version>
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
|
|
index 9304637..3a4b142 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/org.github.paperspigot/paperspigot-api/pom.properties");
|
|
Properties properties = new Properties();
|
|
|
|
if (stream != null) {
|
|
--
|
|
1.9.1
|
|
|