From 19d80a7f1b7d41415d208976d464fc3b2a45f84e Mon Sep 17 00:00:00 2001 From: Shay Banon Date: Tue, 6 Dec 2011 13:41:49 +0200 Subject: [PATCH] assemblies --- LICENSE.txt | 335 ----------------------------- NOTICE.txt | 9 +- README.textile | 8 +- pom.xml | 136 ++++++++++-- src/main/assemblies/common-bin.xml | 40 ++++ src/main/assemblies/targz-bin.xml | 36 ++++ src/main/assemblies/zip-bin.xml | 31 +++ 7 files changed, 233 insertions(+), 362 deletions(-) create mode 100644 src/main/assemblies/common-bin.xml create mode 100644 src/main/assemblies/targz-bin.xml create mode 100644 src/main/assemblies/zip-bin.xml diff --git a/LICENSE.txt b/LICENSE.txt index 45412802d6b..d6456956733 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -200,338 +200,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - - -APACHE CASSANDRA THIRD-PARTY DEPENDENCIES - -Apache Cassandra includes convenience copies of a number of third-party -dependencies that have separate copyright notices and license terms. Your -use of these libraries is subject to the terms and conditions of the -following licenses. - -For lib/flexjson-1.7.jar and lib/google-collect-1.0-rc1.jar: - -While developed outside the ASF, these projects are also licensed under -the Apache License 2.0. The full text of the Apache License 2.0 can be -found at top of this file. - -See NOTICE.txt for the respective copyright notices of these libraries. - - -For lib/antlr-3.1.3.jar: ------------------------- - -[The "BSD licence"] -Copyright (c) 2003-2006 Terence Parr -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -For lib/high-scale-lib.jar: ---------------------------- - -The person or persons who have associated work with this document (the -"Dedicator" or "Certifier") hereby either (a) certifies that, to the best -of his knowledge, the work of authorship identified is in the public -domain of the country from which the work is published, or (b) hereby -dedicates whatever copyright the dedicators holds in the work of -authorship identified below (the "Work") to the public domain. A -certifier, moreover, dedicates any copyright interest he may have in the -associated work, and for these purposes, is described as a "dedicator" -below. - -A certifier has taken reasonable steps to verify the copyright status of -this work. Certifier recognizes that his good faith efforts may not -shield him from liability if in fact the work certified is not in the -public domain. - -Dedicator makes this dedication for the benefit of the public at large and -to the detriment of the Dedicator's heirs and successors. Dedicator -intends this dedication to be an overt act of relinquishment in perpetuity -of all present and future rights under copyright law, whether vested or -contingent, in the Work. Dedicator understands that such relinquishment of -all rights includes the relinquishment of all rights to enforce (by -lawsuit or otherwise) those copyrights in the Work. - -Dedicator recognizes that, once placed in the public domain, the Work may -be freely reproduced, distributed, transmitted, used, modified, built -upon, or otherwise exploited by anyone for any purpose, commercial or -non-commercial, and in any way, including by methods that have not yet -been invented or conceived. - - -For lib/jline-0.9.94.jar: -------------------------- - -Copyright (c) 2002-2006, Marc Prud'hommeaux -All rights reserved. - -Redistribution and use in source and binary forms, with or -without modification, are permitted provided that the following -conditions are met: - -Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - -Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with -the distribution. - -Neither the name of JLine nor the names of its contributors -may be used to endorse or promote products derived from this -software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, -BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY -AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, -OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. - - -For lib/junit-4.6.jar: ----------------------- - -Common Public License Version 1.0 - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC -LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM -CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - -a) in the case of the initial Contributor, the initial code and -documentation distributed under this Agreement, and - -b) in the case of each subsequent Contributor: - -i) changes to the Program, and - -ii) additions to the Program; - -where such changes and/or additions to the Program originate from and are -distributed by that particular Contributor. A Contribution 'originates' from a -Contributor if it was added to the Program by such Contributor itself or anyone -acting on such Contributor's behalf. Contributions do not include additions to -the Program which: (i) are separate modules of software distributed in -conjunction with the Program under their own license agreement, and (ii) are not -derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents " mean patent claims licensable by a Contributor which are -necessarily infringed by the use or sale of its Contribution alone or when -combined with the Program. - -"Program" means the Contributions distributed in accordance with this Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, -including all Contributors. - -2. GRANT OF RIGHTS - -a) Subject to the terms of this Agreement, each Contributor hereby grants -Recipient a non-exclusive, worldwide, royalty-free copyright license to -reproduce, prepare derivative works of, publicly display, publicly perform, -distribute and sublicense the Contribution of such Contributor, if any, and such -derivative works, in source code and object code form. - -b) Subject to the terms of this Agreement, each Contributor hereby grants -Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed -Patents to make, use, sell, offer to sell, import and otherwise transfer the -Contribution of such Contributor, if any, in source code and object code form. -This patent license shall apply to the combination of the Contribution and the -Program if, at the time the Contribution is added by the Contributor, such -addition of the Contribution causes such combination to be covered by the -Licensed Patents. The patent license shall not apply to any other combinations -which include the Contribution. No hardware per se is licensed hereunder. - -c) Recipient understands that although each Contributor grants the licenses -to its Contributions set forth herein, no assurances are provided by any -Contributor that the Program does not infringe the patent or other intellectual -property rights of any other entity. Each Contributor disclaims any liability to -Recipient for claims brought by any other entity based on infringement of -intellectual property rights or otherwise. As a condition to exercising the -rights and licenses granted hereunder, each Recipient hereby assumes sole -responsibility to secure any other intellectual property rights needed, if any. -For example, if a third party patent license is required to allow Recipient to -distribute the Program, it is Recipient's responsibility to acquire that license -before distributing the Program. - -d) Each Contributor represents that to its knowledge it has sufficient -copyright rights in its Contribution, if any, to grant the copyright license set -forth in this Agreement. - -3. REQUIREMENTS - -A Contributor may choose to distribute the Program in object code form under its -own license agreement, provided that: - -a) it complies with the terms and conditions of this Agreement; and - -b) its license agreement: - -i) effectively disclaims on behalf of all Contributors all warranties and -conditions, express and implied, including warranties or conditions of title and -non-infringement, and implied warranties or conditions of merchantability and -fitness for a particular purpose; - -ii) effectively excludes on behalf of all Contributors all liability for -damages, including direct, indirect, special, incidental and consequential -damages, such as lost profits; - -iii) states that any provisions which differ from this Agreement are offered -by that Contributor alone and not by any other party; and - -iv) states that source code for the Program is available from such -Contributor, and informs licensees how to obtain it in a reasonable manner on or -through a medium customarily used for software exchange. - -When the Program is made available in source code form: - -a) it must be made available under this Agreement; and - -b) a copy of this Agreement must be included with each copy of the Program. - -Contributors may not remove or alter any copyright notices contained within the -Program. - -Each Contributor must identify itself as the originator of its Contribution, if -any, in a manner that reasonably allows subsequent Recipients to identify the -originator of the Contribution. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities with -respect to end users, business partners and the like. While this license is -intended to facilitate the commercial use of the Program, the Contributor who -includes the Program in a commercial product offering should do so in a manner -which does not create potential liability for other Contributors. Therefore, if -a Contributor includes the Program in a commercial product offering, such -Contributor ("Commercial Contributor") hereby agrees to defend and indemnify -every other Contributor ("Indemnified Contributor") against any losses, damages -and costs (collectively "Losses") arising from claims, lawsuits and other legal -actions brought by a third party against the Indemnified Contributor to the -extent caused by the acts or omissions of such Commercial Contributor in -connection with its distribution of the Program in a commercial product -offering. The obligations in this section do not apply to any claims or Losses -relating to any actual or alleged intellectual property infringement. In order -to qualify, an Indemnified Contributor must: a) promptly notify the Commercial -Contributor in writing of such claim, and b) allow the Commercial Contributor to -control, and cooperate with the Commercial Contributor in, the defense and any -related settlement negotiations. The Indemnified Contributor may participate in -any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial product -offering, Product X. That Contributor is then a Commercial Contributor. If that -Commercial Contributor then makes performance claims, or offers warranties -related to Product X, those performance claims and warranties are such -Commercial Contributor's responsibility alone. Under this section, the -Commercial Contributor would have to defend claims against the other -Contributors related to those performance claims and warranties, and if a court -requires any other Contributor to pay any damages as a result, the Commercial -Contributor must pay those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR -IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, -NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each -Recipient is solely responsible for determining the appropriateness of using and -distributing the Program and assumes all risks associated with its exercise of -rights under this Agreement, including but not limited to the risks and costs of -program errors, compliance with applicable laws, damage to or loss of data, -programs or equipment, and unavailability or interruption of operations. - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY -CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST -PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS -GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under applicable -law, it shall not affect the validity or enforceability of the remainder of the -terms of this Agreement, and without further action by the parties hereto, such -provision shall be reformed to the minimum extent necessary to make such -provision valid and enforceable. - -If Recipient institutes patent litigation against a Contributor with respect to -a patent applicable to software (including a cross-claim or counterclaim in a -lawsuit), then any patent licenses granted by that Contributor to such Recipient -under this Agreement shall terminate as of the date such litigation is filed. In -addition, if Recipient institutes patent litigation against any entity -(including a cross-claim or counterclaim in a lawsuit) alleging that the Program -itself (excluding combinations of the Program with other software or hardware) -infringes such Recipient's patent(s), then such Recipient's rights granted under -Section 2(b) shall terminate as of the date such litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to -comply with any of the material terms or conditions of this Agreement and does -not cure such failure in a reasonable period of time after becoming aware of -such noncompliance. If all Recipient's rights under this Agreement terminate, -Recipient agrees to cease use and distribution of the Program as soon as -reasonably practicable. However, Recipient's obligations under this Agreement -and any licenses granted by Recipient relating to the Program shall continue and -survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in -order to avoid inconsistency the Agreement is copyrighted and may only be -modified in the following manner. The Agreement Steward reserves the right to -publish new versions (including revisions) of this Agreement from time to time. -No one other than the Agreement Steward has the right to modify this Agreement. -IBM is the initial Agreement Steward. IBM may assign the responsibility to serve -as the Agreement Steward to a suitable separate entity. Each new version of the -Agreement will be given a distinguishing version number. The Program (including -Contributions) may always be distributed subject to the version of the Agreement -under which it was received. In addition, after a new version of the Agreement -is published, Contributor may elect to distribute the Program (including its -Contributions) under the new version. Except as expressly stated in Sections -2(a) and 2(b) above, Recipient receives no rights or licenses to the -intellectual property of any Contributor under this Agreement, whether -expressly, by implication, estoppel or otherwise. All rights in the Program not -expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and the -intellectual property laws of the United States of America. No party to this -Agreement will bring a legal action under this Agreement more than one year -after the cause of action arose. Each party waives its rights to a jury trial in -any resulting litigation. diff --git a/NOTICE.txt b/NOTICE.txt index b54a1fbcb97..6ca34233a26 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,12 +1,5 @@ ElasticSearch -Copyright 2009-2011 Elastic Search and Shay Banon +Copyright 2009-2011 ElasticSearch and Shay Banon This product includes software developed by The Apache Software Foundation (http://www.apache.org/). - -This product makes use of the google-collections library from -http://code.google.com/p/google-collections/. -Copyright (C) 2008 Google Inc. - -Yaml support uses SnakeYaml Copyright of Andrey Somov under the -Apache 2 License. diff --git a/README.textile b/README.textile index d14df368b8f..18d94055300 100644 --- a/README.textile +++ b/README.textile @@ -196,18 +196,18 @@ We have just covered a very small portion of what ElasticSearch is all about. Fo h3. Building from Source -ElasticSearch uses "Gradle":http://www.gradle.org for its build system. +ElasticSearch uses "Maven":http://maven.apache.org for its build system. -In order to create a distribution, simply run the @./gradlew@ command in the cloned directory. +In order to create a distribution, simply run the @mvn assembly:assembly -DskipTests@ command in the cloned directory. -The distribution will be created under @build/distributions@. +The distribution will be created under @target/releases@. h1. License 
 This software is licensed under the Apache 2 license, quoted below.
 
-Copyright 2009-2011 Shay Banon and ElasticSearch 
+Copyright 2009-2011 Shay Banon and ElasticSearch 
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not
 use this file except in compliance with the License. You may obtain a copy of
diff --git a/pom.xml b/pom.xml
index d75a985fe49..7f0fbcafa1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,12 @@
             lucene-queries
             ${lucene.version}
             compile
+            
+                
+                    jakarta-regexp
+                    jakarta-regexp
+                
+            
         
         
             org.apache.lucene
@@ -79,42 +85,42 @@
             com.googlecode.concurrentlinkedhashmap
             concurrentlinkedhashmap-lru
             1.2
-            provided
+            compile
         
 
         
             com.google.guava
             guava
             r09
-            provided
+            compile
         
 
         
             org.elasticsearch
             es-trove
             3.0.0
-            provided
+            compile
         
 
         
             org.elasticsearch
             es-jsr166y
             20110918
-            provided
+            compile
         
 
         
             org.elasticsearch
             es-jsr166e
             20110918
-            provided
+            compile
         
 
         
             commons-codec
             commons-codec
             1.5
-            provided
+            compile
         
 
         
@@ -122,42 +128,42 @@
             joda-time
             
             1.6.2
-            provided
+            compile
         
 
         
             org.mvel
             mvel2
             2.1.Beta7
-            provided
+            compile
         
 
         
             org.codehaus.jackson
             jackson-core-asl
             1.9.2
-            provided
+            compile
         
 
         
             org.codehaus.jackson
             jackson-smile
             1.9.2
-            provided
+            compile
         
 
         
             org.yaml
             snakeyaml
             1.6
-            provided
+            compile
         
 
         
             org.jboss.netty
             netty
             3.2.7.Final
-            provided
+            compile
         
         
 
@@ -165,7 +171,7 @@
             log4j
             log4j
             1.2.16
-            provided
+            runtime
         
 
         
@@ -186,14 +192,14 @@
             net.java.dev.jna
             jna
             3.3.0
-            provided
+            runtime
         
 
         
             jline
             jline
             1.0
-            provided
+            runtime
         
 
         
@@ -294,6 +300,106 @@
                     
                 
             
+            
+                org.apache.maven.plugins
+                maven-shade-plugin
+                1.5
+                
+                    
+                        package
+                        
+                            shade
+                        
+                    
+                
+                
+                    true
+                    
+                        
+                            com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru
+                            com.google.guava:guava
+                            org.elasticsearch:es-trove
+                            org.elasticsearch:es-jsr166y
+                            org.elasticsearch:es-jsr166e
+                            commons-codec:commons-codec
+                            org.mvel:mvel2
+                            org.codehaus.jackson:jackson-core-asl
+                            org.codehaus.jackson:jackson-smile
+                            org.yaml:snakeyaml
+                            joda-time:joda-time
+                            org.jboss.netty:netty
+                        
+                    
+                    
+                        
+                            com.googlecode.concurrentlinkedhashmap
+                            org.elasticsearch.common.concurrentlinkedhashmap
+                        
+                        
+                            com.google.common
+                            org.elasticsearch.common
+                        
+                        
+                            gnu.trove
+                            org.elasticsearch.common.trove
+                        
+                        
+                            jsr166y
+                            org.elasticsearch.common.util.concurrent.jsr166y
+                        
+                        
+                            jsr166e
+                            org.elasticsearch.common.util.concurrent.jsr166e
+                        
+                        
+                            org.apache.commons.codec
+                            org.elasticsearch.common.codec
+                        
+                        
+                            org.mvel2
+                            org.elasticsearch.common.mvel2
+                        
+                        
+                            org.codehaus.jackson
+                            org.elasticsearch.common.jackson
+                        
+                        
+                            org.yaml
+                            org.elasticsearch.common.yaml
+                        
+                        
+                            org.joda
+                            org.elasticsearch.common.joda
+                        
+                        
+                            org.jboss.netty
+                            org.elasticsearch.common.netty
+                        
+                    
+                    
+                        
+                            *:*
+                            
+                                META-INF/**
+                                LICENSE
+                                NOTICE
+                                /*.txt
+                                build.properties
+                            
+                        
+                    
+                
+            
+            
+                maven-assembly-plugin
+                
+                    ${project.build.directory}/releases/
+                    
+                        ${basedir}/src/main/assemblies/targz-bin.xml
+                        ${basedir}/src/main/assemblies/zip-bin.xml
+                    
+                
+            
         
     
 
\ No newline at end of file
diff --git a/src/main/assemblies/common-bin.xml b/src/main/assemblies/common-bin.xml
new file mode 100644
index 00000000000..130fef6c810
--- /dev/null
+++ b/src/main/assemblies/common-bin.xml
@@ -0,0 +1,40 @@
+
+    
+        
+            /lib
+            true
+            
+                org.apache.lucene:lucene*
+                log4j:log4j
+                jline:jline
+                net.java.dev.jna:jna
+            
+        
+        
+            /lib
+            false
+            
+                org.elasticsearch:elasticsearch
+            
+        
+    
+    
+        
+            config
+            config
+            
+                *
+            
+        
+    
+    
+        
+            LICENSE.txt
+            /
+        
+        
+            NOTICE.txt
+            /
+        
+    
+
\ No newline at end of file
diff --git a/src/main/assemblies/targz-bin.xml b/src/main/assemblies/targz-bin.xml
new file mode 100644
index 00000000000..6e21f58e27c
--- /dev/null
+++ b/src/main/assemblies/targz-bin.xml
@@ -0,0 +1,36 @@
+
+
+    
+    
+        tar.gz
+    
+
+    true
+
+    
+        
+            bin
+            bin
+            0755
+            0755
+            unix
+            
+                elasticsearch.in.sh
+                elasticsearch
+                plugin
+            
+        
+
+        
+            lib/sigar
+            lib/sigar
+            
+                *.dll
+            
+        
+    
+
+    
+        src/main/assemblies/common-bin.xml
+    
+
\ No newline at end of file
diff --git a/src/main/assemblies/zip-bin.xml b/src/main/assemblies/zip-bin.xml
new file mode 100644
index 00000000000..506b0afb7ba
--- /dev/null
+++ b/src/main/assemblies/zip-bin.xml
@@ -0,0 +1,31 @@
+
+
+    
+    
+        zip
+    
+
+    true
+
+    
+        
+            bin
+            bin
+            
+                *
+            
+        
+
+        
+            lib/sigar
+            lib/sigar
+            
+                *
+            
+        
+    
+
+    
+        src/main/assemblies/common-bin.xml
+    
+
\ No newline at end of file