Just use the parent pom.

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot 2013-02-03 09:48:23 +11:00
parent 4911597232
commit a6f60283d4
3 changed files with 54 additions and 46 deletions

View file

@ -1,17 +1,17 @@
From 1b48da0399fbc347ad1ccd1b2ed0d079247e9cde Mon Sep 17 00:00:00 2001 From adc1a050f272a44a702f9334e33ee8e7126a679a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: EvilSeph <evilseph@gmail.com>
Date: Sun, 3 Feb 2013 09:32:19 +1100 Date: Wed, 30 Jan 2013 23:44:29 -0500
Subject: [PATCH] Spigot POM Changes Subject: [PATCH] Spigot POM Changes.
--- ---
pom.xml | 30 +++++++++--------------------- pom.xml | 36 ++++--------------------------------
1 file changed, 9 insertions(+), 21 deletions(-) 1 file changed, 4 insertions(+), 32 deletions(-)
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 18bda4b..46b6157 100644 index 18bda4b..b531cec 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -1,40 +1,28 @@ @@ -1,43 +1,15 @@
<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"> <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> <modelVersion>4.0.0</modelVersion>
- <groupId>org.bukkit</groupId> - <groupId>org.bukkit</groupId>
@ -34,33 +34,31 @@ index 18bda4b..46b6157 100644
- <url>https://github.com/Bukkit/Bukkit/tree/master/</url> - <url>https://github.com/Bukkit/Bukkit/tree/master/</url>
- </scm> - </scm>
- -
<ciManagement> - <ciManagement>
<system>jenkins</system> - <system>jenkins</system>
- <url>http://ci.bukkit.org</url> - <url>http://ci.bukkit.org</url>
+ <url>http://ci.md-5.net/job/Spigot-API</url> - </ciManagement>
</ciManagement> -
- <distributionManagement>
<distributionManagement>
- <site> - <site>
- <id>jd.bukkit.org</id> - <id>jd.bukkit.org</id>
- <url>file:///home/javadocs/public_html/</url> - <url>file:///home/javadocs/public_html/</url>
- </site> - </site>
<repository> - <repository>
- <id>repobo-rel</id> - <id>repobo-rel</id>
- <name>repo.bukkit.org Releases</name> - <name>repo.bukkit.org Releases</name>
- <url>http://repo.bukkit.org/content/repositories/releases/</url> - <url>http://repo.bukkit.org/content/repositories/releases/</url>
+ <id>md_5-releases</id> - </repository>
+ <url>http://repo.md-5.net/content/repositories/releases/</url> - <snapshotRepository>
</repository>
<snapshotRepository>
- <id>repobo-snap</id> - <id>repobo-snap</id>
- <name>repo.bukkit.org Snapshots</name> - <name>repo.bukkit.org Snapshots</name>
- <url>http://repo.bukkit.org/content/repositories/snapshots/</url> - <url>http://repo.bukkit.org/content/repositories/snapshots/</url>
+ <id>md_5-snapshots</id> - </snapshotRepository>
+ <url>http://repo.md-5.net/content/repositories/snapshots/</url> - </distributionManagement>
</snapshotRepository> -
</distributionManagement> <build>
<plugins>
<plugin>
-- --
1.8.1-rc2 1.8.1-rc2

View file

@ -1,14 +1,14 @@
From 90c154d7287ae9c3480f31c4b0d56c33b7a1dba4 Mon Sep 17 00:00:00 2001 From 4cbb6243977214e595efa83ba0445c571dcb303b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 09:37:03 +1100 Date: Sun, 3 Feb 2013 09:44:24 +1100
Subject: [PATCH] POM Changes. Subject: [PATCH] POM Changes.
--- ---
pom.xml | 43 +++++++++++++++++-------------------------- pom.xml | 47 +++++++++++++----------------------------------
1 file changed, 17 insertions(+), 26 deletions(-) 1 file changed, 13 insertions(+), 34 deletions(-)
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index d697ca1..5704b92 100644 index d697ca1..5a1a5dd 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
@ -28,7 +28,7 @@ index d697ca1..5704b92 100644
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -16,22 +16,15 @@ @@ -16,25 +16,6 @@
<minecraft_version>1_4_R1</minecraft_version> <minecraft_version>1_4_R1</minecraft_version>
</properties> </properties>
@ -37,25 +37,24 @@ index d697ca1..5704b92 100644
- <developerConnection>scm:git:ssh://git@github.com/Bukkit/CraftBukkit.git</developerConnection> - <developerConnection>scm:git:ssh://git@github.com/Bukkit/CraftBukkit.git</developerConnection>
- <url>https://github.com/Bukkit/CraftBukkit</url> - <url>https://github.com/Bukkit/CraftBukkit</url>
- </scm> - </scm>
-
<distributionManagement> - <distributionManagement>
<repository> - <repository>
- <id>repobo-rel</id> - <id>repobo-rel</id>
- <name>repo.bukkit.org Releases</name> - <name>repo.bukkit.org Releases</name>
- <url>http://repo.bukkit.org/content/repositories/releases/</url> - <url>http://repo.bukkit.org/content/repositories/releases/</url>
+ <id>md_5-releases</id> - </repository>
+ <url>http://repo.md-5.net/content/repositories/releases/</url> - <snapshotRepository>
</repository>
<snapshotRepository>
- <id>repobo-snap</id> - <id>repobo-snap</id>
- <name>repo.bukkit.org Snapshots</name> - <name>repo.bukkit.org Snapshots</name>
- <url>http://repo.bukkit.org/content/repositories/snapshots/</url> - <url>http://repo.bukkit.org/content/repositories/snapshots/</url>
+ <id>md_5-snapshots</id> - </snapshotRepository>
+ <url>http://repo.md-5.net/content/repositories/snapshots/</url> - </distributionManagement>
</snapshotRepository> -
</distributionManagement> <repositories>
<repository>
@@ -42,17 +35,10 @@ <id>repobo-snap</id>
@@ -42,17 +23,10 @@
</repository> </repository>
</repositories> </repositories>
@ -75,7 +74,7 @@ index d697ca1..5704b92 100644
<version>${project.version}</version> <version>${project.version}</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
@@ -145,6 +131,11 @@ @@ -145,6 +119,11 @@
<version>1.3</version> <version>1.3</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@ -87,7 +86,7 @@ index d697ca1..5704b92 100644
</dependencies> </dependencies>
<!-- This builds a completely 'ready to start' jar with all dependencies inside --> <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
@@ -156,7 +147,7 @@ @@ -156,7 +135,7 @@
<artifactId>gitdescribe-maven-plugin</artifactId> <artifactId>gitdescribe-maven-plugin</artifactId>
<version>1.3</version> <version>1.3</version>
<configuration> <configuration>
@ -96,7 +95,7 @@ index d697ca1..5704b92 100644
<outputPostfix></outputPostfix> <outputPostfix></outputPostfix>
</configuration> </configuration>
<executions> <executions>
@@ -210,7 +201,7 @@ @@ -210,7 +189,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>

11
pom.xml
View file

@ -20,4 +20,15 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<distributionManagement>
<repository>
<id>md_5-releases</id>
<url>http://repo.md-5.net/content/repositories/releases/</url>
</repository>
<snapshotRepository>
<id>md_5-snapshots</id>
<url>http://repo.md-5.net/content/repositories/snapshots/</url>
</snapshotRepository>
</distributionManagement>
</project> </project>