116 lines
5 KiB
Diff
116 lines
5 KiB
Diff
From a326d05aad5efc05a9fabeefbeae21b4a132ed36 Mon Sep 17 00:00:00 2001
|
|
From: md_5 <md_5@live.com.au>
|
|
Date: Tue, 2 Jul 2013 13:07:39 +1000
|
|
Subject: [PATCH] POM Changes
|
|
|
|
Basic changes to the build system which mark the artifact as Spigot, and the necessary code changes to ensure proper functionality. Also disables the auto updater provided by CraftBukkit as it is useless to us.
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index c5503f6..333f528 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.bukkit</groupId>
|
|
- <artifactId>craftbukkit</artifactId>
|
|
+ <groupId>org.spigotmc</groupId>
|
|
+ <artifactId>spigot</artifactId>
|
|
<packaging>jar</packaging>
|
|
<version>1.8.4-R0.1-SNAPSHOT</version>
|
|
- <name>CraftBukkit</name>
|
|
- <url>http://www.bukkit.org</url>
|
|
+ <name>Spigot</name>
|
|
+ <url>http://www.spigotmc.org</url>
|
|
|
|
<properties>
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
@@ -20,10 +20,22 @@
|
|
<maven.compiler.target>1.6</maven.compiler.target>
|
|
</properties>
|
|
|
|
+ <parent>
|
|
+ <groupId>org.spigotmc</groupId>
|
|
+ <artifactId>spigot-parent</artifactId>
|
|
+ <version>dev-SNAPSHOT</version>
|
|
+ <relativePath>../pom.xml</relativePath>
|
|
+ </parent>
|
|
+
|
|
<dependencies>
|
|
<dependency>
|
|
- <groupId>org.bukkit</groupId>
|
|
- <artifactId>bukkit</artifactId>
|
|
+ <groupId>net.sf.trove4j</groupId>
|
|
+ <artifactId>trove4j</artifactId>
|
|
+ <version>3.0.3</version>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>org.spigotmc</groupId>
|
|
+ <artifactId>spigot-api</artifactId>
|
|
<version>${project.version}</version>
|
|
<type>jar</type>
|
|
<scope>compile</scope>
|
|
@@ -88,17 +100,32 @@
|
|
|
|
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
|
|
<build>
|
|
- <defaultGoal>clean install</defaultGoal>
|
|
+ <defaultGoal>install</defaultGoal>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>net.md-5</groupId>
|
|
<artifactId>scriptus</artifactId>
|
|
<version>0.2</version>
|
|
- <configuration>
|
|
- <format>git-Bukkit-%s</format>
|
|
- </configuration>
|
|
<executions>
|
|
<execution>
|
|
+ <id>ex-spigot</id>
|
|
+ <configuration>
|
|
+ <format>git-Spigot-%s</format>
|
|
+ <scmDirectory>../</scmDirectory>
|
|
+ <descriptionProperty>spigot.desc</descriptionProperty>
|
|
+ </configuration>
|
|
+ <phase>initialize</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>
|
|
@@ -115,7 +142,7 @@
|
|
<manifestEntries>
|
|
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
|
|
<Implementation-Title>CraftBukkit</Implementation-Title>
|
|
- <Implementation-Version>${describe}</Implementation-Version>
|
|
+ <Implementation-Version>${spigot.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 f905d17..9304637 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.bukkit/bukkit/pom.properties");
|
|
+ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.spigotmc/spigot-api/pom.properties");
|
|
Properties properties = new Properties();
|
|
|
|
if (stream != null) {
|
|
--
|
|
2.1.4
|
|
|