From b89efbed695170e3f2045b96aa126e463f20b4be Mon Sep 17 00:00:00 2001
From: David Pilato <david@pilato.fr>
Date: Tue, 8 Sep 2015 08:47:47 +0200
Subject: [PATCH] [maven] assembly: elasticsearch is already excluded

As elasticsearch is marked as provided we don't need to explicitly exclude it from the assembly descriptor.

We get a warning today for all plugins, the following:

```
[INFO] --- maven-assembly-plugin:2.5.5:single (default) @ repository-s3 ---
[INFO] Reading assembly descriptor: /path/to/plugin-assembly.xml
[WARNING] The following patterns were never triggered in this artifact exclusion filter:
o  'org.elasticsearch:elasticsearch'
[INFO] Building zip: /path/to/target/releases/repository-s3-3.0.0-SNAPSHOT.zip
[INFO]
```

It now gives:

```
[INFO] --- maven-assembly-plugin:2.5.5:single (default) @ repository-s3 ---
[INFO] Reading assembly descriptor: /path/to/plugin-assembly.xml
[INFO] Building zip: /path/to/target/releases/repository-s3-3.0.0-SNAPSHOT.zip
[INFO]
```
---
 .../src/main/resources/plugin-metadata/plugin-assembly.xml     | 3 ---
 plugins/jvm-example/src/main/assemblies/plugin.xml             | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/dev-tools/src/main/resources/plugin-metadata/plugin-assembly.xml b/dev-tools/src/main/resources/plugin-metadata/plugin-assembly.xml
index f9e316f3c13..1649523e152 100644
--- a/dev-tools/src/main/resources/plugin-metadata/plugin-assembly.xml
+++ b/dev-tools/src/main/resources/plugin-metadata/plugin-assembly.xml
@@ -18,9 +18,6 @@
             <useProjectArtifact>true</useProjectArtifact>
             <useTransitiveFiltering>true</useTransitiveFiltering>
             <useTransitiveDependencies>true</useTransitiveDependencies>
-            <excludes>
-                <exclude>org.elasticsearch:elasticsearch</exclude>
-            </excludes>
         </dependencySet>
     </dependencySets>
 </assembly>
diff --git a/plugins/jvm-example/src/main/assemblies/plugin.xml b/plugins/jvm-example/src/main/assemblies/plugin.xml
index 434aaecdaf7..999ae36f4ca 100644
--- a/plugins/jvm-example/src/main/assemblies/plugin.xml
+++ b/plugins/jvm-example/src/main/assemblies/plugin.xml
@@ -28,9 +28,6 @@
             <useProjectArtifact>true</useProjectArtifact>
             <useTransitiveFiltering>true</useTransitiveFiltering>
             <useTransitiveDependencies>true</useTransitiveDependencies>
-            <excludes>
-                <exclude>org.elasticsearch:elasticsearch</exclude>
-            </excludes>
         </dependencySet>
     </dependencySets>
 </assembly>