From 42fc43451cd798bf32ba6755991ea832ba407c63 Mon Sep 17 00:00:00 2001
From: Brian Murphy <brian.p.murphy@gmail.com>
Date: Tue, 5 May 2015 16:58:27 -0400
Subject: [PATCH] Unshade the javax.mail and javax.activation jars

This change removes these jars from shading and changes the assemblies file so that they are included as is.

Original commit: elastic/x-pack-elasticsearch@695f5e2b20ae1d4aa7612136a9489671f77e2214
---
 pom.xml                        | 2 --
 src/main/assemblies/plugin.xml | 8 ++++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 39752f9498b..001d833684c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -319,8 +319,6 @@
                         <includes>
 			    <include>com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer</include>
                             <include>com.google.guava:guava</include>
-                            <include>javax.mail:mail</include>
-                            <include>javax.activation:activation</include>
                         </includes>
                     </artifactSet>
                     <relocations>
diff --git a/src/main/assemblies/plugin.xml b/src/main/assemblies/plugin.xml
index 1abdea8c81e..5d42636284e 100644
--- a/src/main/assemblies/plugin.xml
+++ b/src/main/assemblies/plugin.xml
@@ -21,5 +21,13 @@
                 <exclude>org.elasticsearch:elasticsearch</exclude>
             </excludes>
         </dependencySet>
+        <dependencySet>
+	  <outputDirectory>/</outputDirectory>
+          <useTransitiveDependencies>false</useTransitiveDependencies>
+          <includes>
+            <include>javax.mail:mail</include>
+            <include>javax.activation:activation</include>
+          </includes>
+        </dependencySet>
     </dependencySets>
 </assembly>