Permalink
Browse files

Merge remote-tracking branch 'elasticsearch/master'

Conflicts:
	pom.xml
  • Loading branch information...
2 parents dd557c5 + 2cc84c6 commit 2999dbef6fd44d985636b86e958d20b533390832 @dadoonet committed Feb 26, 2012
Showing with 3 additions and 2 deletions.
  1. +2 −1 pom.xml
  2. +1 −1 src/main/assemblies/plugin.xml
View
@@ -109,8 +109,9 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
+ <version>2.2.2</version>
<configuration>
+ <appendAssemblyId>false</appendAssemblyId>
<outputDirectory>${project.build.directory}/releases/</outputDirectory>
<descriptors>
<descriptor>${basedir}/src/main/assemblies/plugin.xml</descriptor>
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<assembly>
- <id></id>
+ <id>plugin</id>
<formats>
<format>zip</format>
</formats>

0 comments on commit 2999dbe

Please sign in to comment.