111 lines
3.5 KiB
Diff
111 lines
3.5 KiB
Diff
|
From 90c154d7287ae9c3480f31c4b0d56c33b7a1dba4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: md_5 <md_5@live.com.au>
|
||
|
|
Date: Sun, 3 Feb 2013 09:37:03 +1100
|
||
|
|
Subject: [PATCH] POM Changes.
|
||
|
|
|
||
|
|
---
|
||
|
|
pom.xml | 43 +++++++++++++++++--------------------------
|
||
|
|
1 file changed, 17 insertions(+), 26 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/pom.xml b/pom.xml
|
||
|
|
index d697ca1..5704b92 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.4.7-R1.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,22 +16,15 @@
|
||
|
|
<minecraft_version>1_4_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>
|
||
|
|
+ <id>md_5-releases</id>
|
||
|
|
+ <url>http://repo.md-5.net/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>
|
||
|
|
+ <id>md_5-snapshots</id>
|
||
|
|
+ <url>http://repo.md-5.net/content/repositories/snapshots/</url>
|
||
|
|
</snapshotRepository>
|
||
|
|
</distributionManagement>
|
||
|
|
|
||
|
|
@@ -42,17 +35,10 @@
|
||
|
|
</repository>
|
||
|
|
</repositories>
|
||
|
|
|
||
|
|
- <pluginRepositories>
|
||
|
|
- <pluginRepository>
|
||
|
|
- <id>bukkit-plugins</id>
|
||
|
|
- <url>http://repo.bukkit.org/content/groups/public</url>
|
||
|
|
- </pluginRepository>
|
||
|
|
- </pluginRepositories>
|
||
|
|
-
|
||
|
|
<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>
|
||
|
|
@@ -145,6 +131,11 @@
|
||
|
|
<version>1.3</version>
|
||
|
|
<scope>test</scope>
|
||
|
|
</dependency>
|
||
|
|
+ <dependency>
|
||
|
|
+ <groupId>net.sf.trove4j</groupId>
|
||
|
|
+ <artifactId>trove4j</artifactId>
|
||
|
|
+ <version>3.0.2</version>
|
||
|
|
+ </dependency>
|
||
|
|
</dependencies>
|
||
|
|
|
||
|
|
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
|
||
|
|
@@ -156,7 +147,7 @@
|
||
|
|
<artifactId>gitdescribe-maven-plugin</artifactId>
|
||
|
|
<version>1.3</version>
|
||
|
|
<configuration>
|
||
|
|
- <outputPrefix>git-Bukkit-</outputPrefix>
|
||
|
|
+ <outputPrefix>git-Spigot-</outputPrefix>
|
||
|
|
<outputPostfix></outputPostfix>
|
||
|
|
</configuration>
|
||
|
|
<executions>
|
||
|
|
@@ -210,7 +201,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>
|
||
|
|
--
|
||
|
|
1.8.1-rc2
|
||
|
|
|