Merge remote-tracking branch 'elasticsearch/master'

Conflicts: pom.xml
2025-03-06 10:59:12 +00:00 · 2012-02-26 17:19:12 +01:00 · 2012-02-26 17:19:12 +01:00 · 79d7860a72
commit 79d7860a72
parent 623952f839 dfd0e2cc41
2 changed files with 3 additions and 2 deletions
--- a/pom.xml
+++ b/pom.xml
@ -129,8 +129,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>
--- a/src/main/assemblies/plugin.xml
+++ b/src/main/assemblies/plugin.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <assembly>
-    <id></id>
+    <id>plugin</id>
    <formats>
        <format>zip</format>
    </formats>