mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-27 13:06:02 +01:00
26f85d2572
- All of these changes have been reviewed to be binary compatible and in general contract compatible with previous versions of the libraries.
171 lines
6.1 KiB
Diff
171 lines
6.1 KiB
Diff
From d049c9dd36773629cf8d52ddd74c5f844f637460 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
|
|
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index 8b22a1c..d1cc48d 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -1,12 +1,20 @@
|
|
<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>
|
|
+
|
|
+ <parent>
|
|
+ <groupId>org.spigotmc</groupId>
|
|
+ <artifactId>spigot-parent</artifactId>
|
|
+ <version>dev-SNAPSHOT</version>
|
|
+ <relativePath>../pom.xml</relativePath>
|
|
+ </parent>
|
|
+
|
|
+ <groupId>org.spigotmc</groupId>
|
|
+ <artifactId>spigot</artifactId>
|
|
<packaging>jar</packaging>
|
|
<version>1.6.1-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>
|
|
@@ -16,25 +24,6 @@
|
|
<minecraft_version>1_6_R1</minecraft_version>
|
|
</properties>
|
|
|
|
- <scm>
|
|
- <connection>scm:git:git://github.com/Bukkit/CraftBukkit.git</connection>
|
|
- <developerConnection>scm:git:ssh://git@github.com/Bukkit/CraftBukkit.git</developerConnection>
|
|
- <url>https://github.com/Bukkit/CraftBukkit</url>
|
|
- </scm>
|
|
-
|
|
- <distributionManagement>
|
|
- <repository>
|
|
- <id>repobo-rel</id>
|
|
- <name>repo.bukkit.org Releases</name>
|
|
- <url>http://repo.bukkit.org/content/repositories/releases/</url>
|
|
- </repository>
|
|
- <snapshotRepository>
|
|
- <id>repobo-snap</id>
|
|
- <name>repo.bukkit.org Snapshots</name>
|
|
- <url>http://repo.bukkit.org/content/repositories/snapshots/</url>
|
|
- </snapshotRepository>
|
|
- </distributionManagement>
|
|
-
|
|
<repositories>
|
|
<repository>
|
|
<id>repobo-snap</id>
|
|
@@ -51,8 +40,8 @@
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
- <groupId>org.bukkit</groupId>
|
|
- <artifactId>bukkit</artifactId>
|
|
+ <groupId>org.spigotmc</groupId>
|
|
+ <artifactId>spigot-api</artifactId>
|
|
<version>${project.version}</version>
|
|
<type>jar</type>
|
|
<scope>compile</scope>
|
|
@@ -105,33 +94,6 @@
|
|
<artifactId>gson</artifactId>
|
|
<version>2.1</version>
|
|
</dependency>
|
|
- <dependency>
|
|
- <groupId>org.avaje</groupId>
|
|
- <artifactId>ebean</artifactId>
|
|
- <version>2.7.3</version>
|
|
- <type>jar</type>
|
|
- <scope>provided</scope>
|
|
- </dependency>
|
|
- <dependency>
|
|
- <groupId>org.yaml</groupId>
|
|
- <artifactId>snakeyaml</artifactId>
|
|
- <version>1.9</version>
|
|
- <type>jar</type>
|
|
- <scope>provided</scope>
|
|
- </dependency>
|
|
- <dependency>
|
|
- <groupId>com.google.guava</groupId>
|
|
- <artifactId>guava</artifactId>
|
|
- <version>10.0</version>
|
|
- <type>jar</type>
|
|
- <scope>provided</scope>
|
|
- </dependency>
|
|
- <dependency>
|
|
- <groupId>commons-lang</groupId>
|
|
- <artifactId>commons-lang</artifactId>
|
|
- <version>2.3</version>
|
|
- <scope>provided</scope>
|
|
- </dependency>
|
|
<!-- testing -->
|
|
<dependency>
|
|
<groupId>junit</groupId>
|
|
@@ -145,18 +107,23 @@
|
|
<version>1.3</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
+ <dependency>
|
|
+ <groupId>net.sf.trove4j</groupId>
|
|
+ <artifactId>trove4j</artifactId>
|
|
+ <version>3.0.3</version>
|
|
+ </dependency>
|
|
</dependencies>
|
|
|
|
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
|
|
<build>
|
|
- <defaultGoal>clean install</defaultGoal>
|
|
+ <defaultGoal>install</defaultGoal>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>com.lukegb.mojo</groupId>
|
|
<artifactId>gitdescribe-maven-plugin</artifactId>
|
|
<version>1.3</version>
|
|
<configuration>
|
|
- <outputPrefix>git-Bukkit-</outputPrefix>
|
|
+ <outputPrefix>git-Spigot-</outputPrefix>
|
|
<outputPostfix></outputPostfix>
|
|
</configuration>
|
|
<executions>
|
|
@@ -210,7 +177,7 @@
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-shade-plugin</artifactId>
|
|
- <version>1.4</version>
|
|
+ <version>2.0</version>
|
|
<executions>
|
|
<execution>
|
|
<phase>package</phase>
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index 6cb50b7..00326c1 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -208,7 +208,7 @@ public final class CraftServer implements Server {
|
|
chunkGCLoadThresh = configuration.getInt("chunk-gc.load-threshold");
|
|
|
|
updater = new AutoUpdater(new BukkitDLUpdaterService(configuration.getString("auto-updater.host")), getLogger(), configuration.getString("auto-updater.preferred-channel"));
|
|
- updater.setEnabled(configuration.getBoolean("auto-updater.enabled"));
|
|
+ updater.setEnabled(false); // Spigot
|
|
updater.setSuggestChannels(configuration.getBoolean("auto-updater.suggest-channels"));
|
|
updater.getOnBroken().addAll(configuration.getStringList("auto-updater.on-broken"));
|
|
updater.getOnUpdate().addAll(configuration.getStringList("auto-updater.on-update"));
|
|
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) {
|
|
--
|
|
1.8.1.2
|
|
|