From e67427d4aff07c6b9f727be8c541fe31bf01ca0a Mon Sep 17 00:00:00 2001
From: Shay Banon <kimchy@gmail.com>
Date: Sat, 20 Aug 2011 21:52:52 +0300
Subject: [PATCH] add a new version of jsr166y, and add jsr166e

---
 modules/jarjar/build.gradle | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/jarjar/build.gradle b/modules/jarjar/build.gradle
index 1619b447361..7429fbccbea 100644
--- a/modules/jarjar/build.gradle
+++ b/modules/jarjar/build.gradle
@@ -6,7 +6,8 @@ dependencies {
     runtime 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.2'
     runtime 'com.google.guava:guava:r09'
     runtime 'org.elasticsearch:es-trove:3.0.0rc2'
-    runtime 'org.elasticsearch:es-jsr166y:20110710'
+    runtime 'org.elasticsearch:es-jsr166y:20110820'
+    runtime 'org.elasticsearch:es-jsr166e:20110820'
 
     runtime 'commons-codec:commons-codec:1.5'
 
@@ -36,7 +37,7 @@ jar << {
         jarjar(jarfile: jarjarArchivePath) {
             zipfileset(src: jar.archivePath)
             configurations.runtime.files.findAll {file ->
-                ['inject', 'codec', 'mvel', 'jackson', 'joda', 'snakeyaml', 'netty', 'guice', 'javax.inject', 'aopalliance', 'guava', 'concurrentlinkedhashmap', 'trove', 'jsr166y'].any { file.name.contains(it) }
+                ['inject', 'codec', 'mvel', 'jackson', 'joda', 'snakeyaml', 'netty', 'guice', 'javax.inject', 'aopalliance', 'guava', 'concurrentlinkedhashmap', 'trove', 'jsr166y', 'jsr166e'].any { file.name.contains(it) }
             }.each { jarjarFile ->
                 zipfileset(src: jarjarFile) {
                     exclude(name: "META-INF/**")
@@ -46,6 +47,7 @@ jar << {
             rule pattern: "com.google.common.**", result: "org.elasticsearch.common.@1"
             rule pattern: "gnu.trove.**", result: "org.elasticsearch.common.trove.@1"
             rule pattern: "jsr166y.**", result: "org.elasticsearch.common.util.concurrent.jsr166y.@1"
+            rule pattern: "jsr166e.**", result: "org.elasticsearch.common.util.concurrent.jsr166e.@1"
 
             rule pattern: "org.aopalliance.**", result: "org.elasticsearch.common.aopalliance.@1"
             rule pattern: "javax.inject.**", result: "org.elasticsearch.common.inject.jex.@1"
@@ -72,6 +74,7 @@ jar << {
         delete(file: "build/tmp/extracted/LICENSE")
         delete(file: "build/tmp/extracted/build.properties")
         delete(dir: "build/tmp/extracted/jsr166y")
+        delete(dir: "build/tmp/extracted/jsr166e")
         delete(dir: "build/tmp/extracted/gnu")
         delete(dir: "build/tmp/extracted/org/codehaus")
         delete(dir: "build/tmp/extracted/org/aopalliance")