Merge remote-tracking branch 'alron/master'

This commit is contained in:
FrozenCow 2011-02-24 16:10:29 +01:00
commit 119abb33eb
2 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,6 @@
<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>
<groupId>org.dynmap</groupId>
<artifactId>dynmap</artifactId>
<version>0.13</version>
<name>DynamicMap</name>
@ -20,7 +20,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>assembly.xml</descriptor>
<descriptor>src/main/assembly/package.xml</descriptor>
</descriptors>
</configuration>
<executions>

View File

@ -1,5 +1,5 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>build</id>
<id>bin</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>tar.bz2</format>
@ -13,7 +13,7 @@
<include>README*</include>
<include>LICENSE*</include>
<include>NOTICE*</include>
<include>LICENSE*</include>
<include>CHANGELOG*</include>
</includes>
</fileSet>
<fileSet>