From 2dfee54de755dde662adbc92f8b46addf22d953b Mon Sep 17 00:00:00 2001
From: Shay Banon <kimchy@gmail.com>
Date: Sun, 26 Feb 2012 10:06:18 +0200
Subject: [PATCH] upgrade to the latest assembly plugin and use artifact id
 (though not in distributions)

---
 pom.xml                           | 2 ++
 src/main/assemblies/targz-bin.xml | 2 +-
 src/main/assemblies/zip-bin.xml   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 540892fab9b..3d06fbd29e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -378,7 +378,9 @@
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2.2</version>
                 <configuration>
+                    <appendAssemblyId>false</appendAssemblyId>
                     <outputDirectory>${project.build.directory}/releases/</outputDirectory>
                     <descriptors>
                         <descriptor>${basedir}/src/main/assemblies/targz-bin.xml</descriptor>
diff --git a/src/main/assemblies/targz-bin.xml b/src/main/assemblies/targz-bin.xml
index 6e21f58e27c..acc703b4216 100644
--- a/src/main/assemblies/targz-bin.xml
+++ b/src/main/assemblies/targz-bin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <assembly>
-    <id></id>
+    <id>targz</id>
     <formats>
         <format>tar.gz</format>
     </formats>
diff --git a/src/main/assemblies/zip-bin.xml b/src/main/assemblies/zip-bin.xml
index acd9ba77322..06d77c2b10c 100644
--- a/src/main/assemblies/zip-bin.xml
+++ b/src/main/assemblies/zip-bin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <assembly>
-    <id></id>
+    <id>zip</id>
     <formats>
         <format>zip</format>
     </formats>