Remove sigar completely

elastic · Jul 3, 2015 · 9495816 · 9495816
1 parent ac32f3d
commit 9495816
Show file tree

Hide file tree

Showing 27 changed files with 20 additions and 1,042 deletions.
diff --git a/core/bin/elasticsearch.in.bat b/core/bin/elasticsearch.in.bat
@@ -88,7 +88,7 @@ set JAVA_OPTS=%JAVA_OPTS% -Dfile.encoding=UTF-8
 REM Use our provided JNA always versus the system one
 set JAVA_OPTS=%JAVA_OPTS% -Djna.nosys=true
 
-set CORE_CLASSPATH=%ES_HOME%/lib/${project.build.finalName}.jar;%ES_HOME%/lib/*;%ES_HOME%/lib/sigar/*
+set CORE_CLASSPATH=%ES_HOME%/lib/${project.build.finalName}.jar;%ES_HOME%/lib/*
 if "%ES_CLASSPATH%" == "" (
 set ES_CLASSPATH=%CORE_CLASSPATH%
 ) else (

diff --git a/core/bin/elasticsearch.in.sh b/core/bin/elasticsearch.in.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-CORE_CLASSPATH="$ES_HOME/lib/${project.build.finalName}.jar:$ES_HOME/lib/*:$ES_HOME/lib/sigar/*"
+CORE_CLASSPATH="$ES_HOME/lib/${project.build.finalName}.jar:$ES_HOME/lib/*"
 
 if [ "x$ES_CLASSPATH" = "x" ]; then
     ES_CLASSPATH="$CORE_CLASSPATH"

diff --git a/core/licenses/sigar-1.6.4.jar.sha1 b/core/licenses/sigar-1.6.4.jar.sha1
diff --git a/core/licenses/sigar-LICENSE.txt b/core/licenses/sigar-LICENSE.txt
diff --git a/core/licenses/sigar-NOTICE.txt b/core/licenses/sigar-NOTICE.txt
diff --git a/core/pom.xml b/core/pom.xml
@@ -214,11 +214,6 @@
             <artifactId>jna</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.fusesource</groupId>
-            <artifactId>sigar</artifactId>
-            <optional>true</optional>
-        </dependency>
 
         <!-- remove this for java 8 -->
         <dependency>
@@ -708,20 +703,9 @@
                                         <group>root</group>
                                     </mapper>
                                 </data>
-                                <data>
-                                    <src>${project.basedir}/lib/sigar/</src>
-                                    <includes>sigar-*.jar, libsigar-*-linux.*</includes>
-                                    <type>directory</type>
-                                    <mapper>
-                                        <type>perm</type>
-                                        <prefix>${packaging.elasticsearch.home.dir}/lib/sigar</prefix>
-                                        <user>root</user>
-                                        <group>root</group>
-                                    </mapper>
-                                </data>
                                 <data>
                                     <src>${project.build.directory}/lib</src>
-                                    <excludes>${project.build.finalName}-shaded.jar,${project.build.finalName}-sources.jar,${project.build.finalName}-tests.jar,${project.build.finalName}-test-sources.jar,slf4j-api-*.jar,sigar-*.jar</excludes>
+                                    <excludes>${project.build.finalName}-shaded.jar,${project.build.finalName}-sources.jar,${project.build.finalName}-tests.jar,${project.build.finalName}-test-sources.jar,slf4j-api-*.jar</excludes>
                                     <type>directory</type>
                                     <mapper>
                                         <type>perm</type>
@@ -889,7 +873,6 @@
                                         <exclude>${project.build.finalName}-tests.jar</exclude>
                                         <exclude>${project.build.finalName}-test-sources.jar</exclude>
                                         <exclude>slf4j-api-*.jar</exclude>
-                                        <exclude>sigar-*.jar</exclude>
                                     </excludes>
                                 </source>
                                 <source>
@@ -900,18 +883,6 @@
                                 </source>
                             </sources>
                         </mapping>
-                        <mapping>
-                            <directory>${packaging.elasticsearch.home.dir}/lib/sigar</directory>
-                            <sources>
-                                <source>
-                                    <location>lib/sigar</location>
-                                    <includes>
-                                        <include>sigar*.jar</include>
-                                        <include>libsigar-*-linux.*</include>
-                                    </includes>
-                                </source>
-                            </sources>
-                        </mapping>
                         <!-- Add init.d files  -->
                         <mapping>
                             <directory>/etc/init.d</directory>