summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <md_5@bigpond.com>2012-03-14 17:59:49 +1100
committermd_5 <md_5@bigpond.com>2012-03-14 17:59:49 +1100
commit06068212c97ff2a5e8569c2180d8aea3951c0e20 (patch)
treecddfbc1e8d1af020e044cf7665ae3a386ccbf6ea
parentf9668be20ea977f271de288ec09b1dc45a6708b1 (diff)
downloadEssentials-06068212c97ff2a5e8569c2180d8aea3951c0e20.tar
Essentials-06068212c97ff2a5e8569c2180d8aea3951c0e20.tar.gz
Essentials-06068212c97ff2a5e8569c2180d8aea3951c0e20.tar.lz
Essentials-06068212c97ff2a5e8569c2180d8aea3951c0e20.tar.xz
Essentials-06068212c97ff2a5e8569c2180d8aea3951c0e20.zip
Move even further away from ant
-rw-r--r--.gitignore3
-rw-r--r--EssentialsAntiCheat/pom.xml2
-rw-r--r--packager.xml11
-rw-r--r--pom.xml14
4 files changed, 16 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore
index 90401bb3c..a76656100 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,5 @@ manifest.mf
*.iws
.idea/
-EssentialsRelease/ \ No newline at end of file
+EssentialsRelease/
+jars/ \ No newline at end of file
diff --git a/EssentialsAntiCheat/pom.xml b/EssentialsAntiCheat/pom.xml
index 785a25c7a..f80fa4656 100644
--- a/EssentialsAntiCheat/pom.xml
+++ b/EssentialsAntiCheat/pom.xml
@@ -15,7 +15,7 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
- <version>1.2.3-R0.2-SNAPSHOT</version>
+ <version>${bukkitversion}</version>
</dependency>
</dependencies>
</project>
diff --git a/packager.xml b/packager.xml
index cc86ec046..2dfd60743 100644
--- a/packager.xml
+++ b/packager.xml
@@ -11,16 +11,5 @@
</fileset>
<flattenmapper/>
</copy>
- <move file="jars/Essentials-3.0-SNAPSHOT.jar" tofile="jars/Essentials.jar"/>
- <move file="jars/EssentialsAntiCheat-3.0-SNAPSHOT.jar" tofile="jars/EssentialsAntiCheat.jar"/>
- <move file="jars/EssentialsChat-3.0-SNAPSHOT.jar" tofile="jars/EssentialsChat.jar"/>
- <move file="jars/EssentialsProtect-3.0-SNAPSHOT.jar" tofile="jars/EssentialsProtect.jar"/>
- <move file="jars/EssentialsGeoIP-3.0-SNAPSHOT.jar" tofile="jars/EssentialsGeoIP.jar"/>
- <move file="jars/EssentialsGroupManager-3.0-SNAPSHOT.jar" tofile="jars/EssentialsGroupManager.jar"/>
- <move file="jars/EssentialsGroupBridge-3.0-SNAPSHOT.jar" tofile="jars/EssentialsGroupBridge.jar"/>
- <move file="jars/EssentialsXMPP-3.0-SNAPSHOT.jar" tofile="jars/EssentialsXMPP.jar"/>
- <move file="jars/Essentials2Compat-3.0-SNAPSHOT.jar" tofile="jars/Essentials2Compat.jar"/>
- <move file="jars/EssentialsSigns-3.0-SNAPSHOT.jar" tofile="jars/EssentialsSigns.jar"/>
- <move file="jars/EssentialsUpdate-3.0-SNAPSHOT.jar" tofile="jars/EssentialsUpdate.jar"/>
</target>
</project>
diff --git a/pom.xml b/pom.xml
index 827872d91..29460d62c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
- <version>1.2.3-R0.2-SNAPSHOT</version>
+ <version>${bukkitversion}</version>
</dependency>
</dependencies>
@@ -50,10 +50,22 @@
</includes>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <finalName>${project.artifactId}</finalName>
+ <outputDirectory>../jars</outputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <bukkitversion>1.2.3-R0.3-SNAPSHOT</bukkitversion>
<org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>true</org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>
<org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>2</org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>
<org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab>2</org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab>