diff options
author | ementalo <ementalodev@gmx.co.uk> | 2012-07-17 12:26:55 +0100 |
---|---|---|
committer | ementalo <ementalodev@gmx.co.uk> | 2012-07-17 14:21:03 +0100 |
commit | a661bce7b3de3f53e2b7b79c1283f0affa6fe9c3 (patch) | |
tree | 2aa10b6300f6c8d3cb2b298c124180fade74857a /pom.xml | |
parent | 3c385e69271dfe8530fadc3f67e13ee495e4b0e1 (diff) | |
parent | 9f05e43ecf8e6e1a8fcaef757678e762f0d82573 (diff) | |
download | Essentials-a661bce7b3de3f53e2b7b79c1283f0affa6fe9c3.tar Essentials-a661bce7b3de3f53e2b7b79c1283f0affa6fe9c3.tar.gz Essentials-a661bce7b3de3f53e2b7b79c1283f0affa6fe9c3.tar.lz Essentials-a661bce7b3de3f53e2b7b79c1283f0affa6fe9c3.tar.xz Essentials-a661bce7b3de3f53e2b7b79c1283f0affa6fe9c3.zip |
Merge of server-layer branch
Diffstat (limited to 'pom.xml')
-rw-r--r-- | pom.xml | 53 |
1 files changed, 13 insertions, 40 deletions
@@ -9,11 +9,10 @@ <packaging>pom</packaging> <name>BuildAll</name> <url>http://tiny.cc/EssentialsWiki</url> - + <modules> <module>Essentials</module> <module>Essentials2Compat</module> - <module>EssentialsAntiCheat</module> <module>EssentialsChat</module> <module>EssentialsGeoIP</module> <module>EssentialsGroupBridge</module> @@ -35,16 +34,17 @@ <dependency> <groupId>org.bukkit</groupId> <artifactId>bukkit</artifactId> - <version>${bukkitversion}</version> + <version>${bukkit.version}</version> </dependency> </dependencies> <build> - <sourceDirectory>${basedir}/src</sourceDirectory> - <testSourceDirectory>${basedir}/test</testSourceDirectory> + <finalName>${project.name}</finalName> + <sourceDirectory>${project.basedir}/src</sourceDirectory> + <testSourceDirectory>${project.basedir}/test</testSourceDirectory> <resources> <resource> - <directory>${basedir}/src</directory> + <directory>${project.basedir}/src</directory> <filtering>true</filtering> <includes> <include>*.*</include> @@ -54,54 +54,27 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <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> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.4</version> - <executions> - <execution> - <id>copy</id> - <phase>package</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.bukkit</groupId> - <artifactId>craftbukkit</artifactId> - <version>${bukkitversion}</version> - <overWrite>true</overWrite> - <outputDirectory>../jars</outputDirectory> - <destFileName>craftbukkit.jar</destFileName> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3.2</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> </plugin> </plugins> </build> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <bukkitversion>1.2.3-R0.3-SNAPSHOT</bukkitversion> + <bukkit.version>1.2.5-R4.1-SNAPSHOT</bukkit.version> <build.number>Unknown</build.number> <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> |