Merge pull request #11898 from rmuir/lockdown

steps to remove dangerous security permissions
elastic · Jun 29, 2015 · 55c33b2 · 55c33b2
2 parents bf87f3a + 73b8cd4
commit 55c33b2
Show file tree

Hide file tree

Showing 15 changed files with 94 additions and 1,129 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -220,6 +220,14 @@
             <optional>true</optional>
         </dependency>
 
+        <!-- remove this for java 8 -->
+        <dependency>
+            <groupId>com.twitter</groupId>
+            <artifactId>jsr166e</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+
+
         <!-- We don't use this since the publish pom is then messed up -->
         <!--
         <dependency>
@@ -409,7 +417,7 @@
                             <shadedPattern>org.elasticsearch.common.hppc</shadedPattern>
                         </relocation>
                         <relocation>
-                            <pattern>jsr166e</pattern>
+                            <pattern>com.twitter.jsr166e</pattern>
                             <shadedPattern>org.elasticsearch.common.util.concurrent.jsr166e</shadedPattern>
                         </relocation>
                         <relocation>
@@ -1058,7 +1066,6 @@
                <artifactId>jacoco-maven-plugin</artifactId>
                <configuration>
                  <excludes>
-                   <exclude>jsr166e/**</exclude>
                    <exclude>org/apache/lucene/**</exclude>
                  </excludes>
                </configuration>

diff --git a/core/src/main/assemblies/common-bin.xml b/core/src/main/assemblies/common-bin.xml
@@ -25,6 +25,7 @@
                 <include>com.tdunning:t-digest</include>
                 <include>org.apache.commons:commons-lang3</include>
                 <include>commons-cli:commons-cli</include>
+                <include>com.twitter:jsr166e</include>
             </includes>
         </dependencySet>
         <dependencySet>

diff --git a/core/src/main/java/jsr166e/DoubleAdder.java b/core/src/main/java/jsr166e/DoubleAdder.java