Commits
md_5 authored 99c2a370408
| 1 - | From fa917208a168e57d2477c18972f3f5a4ba6ab9e4 Mon Sep 17 00:00:00 2001 |
| 1 + | From 19fce923645c8d0144355e1f98dde5162b60f88e Mon Sep 17 00:00:00 2001 |
| 2 2 | From: md_5 <md_5@live.com.au> |
| 3 3 | Date: Tue, 2 Jul 2013 13:07:39 +1000 |
| 4 4 | Subject: [PATCH] POM Changes |
| 5 5 | |
| 6 6 | 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. |
| 7 7 | |
| 8 8 | diff --git a/pom.xml b/pom.xml |
| 9 - | index 3588a56d8..9bdc62ab8 100644 |
| 9 + | index 95fec0dd8..e5f17214a 100644 |
| 10 10 | --- a/pom.xml |
| 11 11 | +++ b/pom.xml |
| 12 12 | |
| 13 13 | <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
| 14 14 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
| 15 15 | <modelVersion>4.0.0</modelVersion> |
| 16 16 | - <groupId>org.bukkit</groupId> |
| 17 17 | - <artifactId>craftbukkit</artifactId> |
| 18 18 | + <groupId>org.spigotmc</groupId> |
| 19 19 | + <artifactId>spigot</artifactId> |
| 20 20 | <packaging>jar</packaging> |
| 21 21 | <version>1.12-R0.1-SNAPSHOT</version> |
| 22 22 | - <name>CraftBukkit</name> |
| 23 23 | - <url>http://www.bukkit.org</url> |
| 24 24 | + <name>Spigot</name> |
| 25 25 | + <url>http://www.spigotmc.org</url> |
| 26 26 | |
| 27 27 | <properties> |
| 28 28 | <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
| 29 - | |
| 29 + | |
| 30 30 | <maven.compiler.target>1.8</maven.compiler.target> |
| 31 31 | </properties> |
| 32 32 | |
| 33 33 | + <parent> |
| 34 34 | + <groupId>org.spigotmc</groupId> |
| 35 35 | + <artifactId>spigot-parent</artifactId> |
| 36 36 | + <version>dev-SNAPSHOT</version> |
| 37 37 | + <relativePath>../pom.xml</relativePath> |
| 38 38 | + </parent> |
| 39 39 | + |
| 40 40 | <dependencies> |
| 41 + | <!-- bugfixes (netty#6607) --> |
| 42 + | <dependency> |
| 43 + | |
| 44 + | <scope>compile</scope> |
| 45 + | </dependency> |
| 41 46 | <dependency> |
| 42 47 | - <groupId>org.bukkit</groupId> |
| 43 48 | - <artifactId>bukkit</artifactId> |
| 44 49 | + <groupId>org.spigotmc</groupId> |
| 45 50 | + <artifactId>spigot-api</artifactId> |
| 46 51 | <version>${project.version}</version> |
| 47 52 | <scope>compile</scope> |
| 48 53 | </dependency> |
| 49 54 | |
| 50 - | <version>4.1.12.Final</version> |
| 55 + | <version>5.1.42</version> |
| 51 56 | <scope>compile</scope> |
| 52 57 | </dependency> |
| 53 58 | + <dependency> |
| 54 59 | + <groupId>net.sf.trove4j</groupId> |
| 55 60 | + <artifactId>trove4j</artifactId> |
| 56 61 | + <version>3.0.3</version> |
| 57 62 | + <scope>compile</scope> |
| 58 63 | + </dependency> |
| 59 64 | <!-- testing --> |
| 60 65 | <dependency> |