Repository: incubator-drill Updated Branches: refs/heads/master 09b00b1b7 -> 686eb9ef6
DRILL-1372: Separate category B licenses into their own directory in the binary distribution. Adding a statement about the category B licensed software in the NOTICE files and adding the appropriate reference to MIT licensed source in the LICENSE file for the source distribution. Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/686eb9ef Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/686eb9ef Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/686eb9ef Branch: refs/heads/master Commit: 686eb9ef6d5dd425ae2eff4d2da58014b050fe6b Parents: 09b00b1 Author: Jacques Nadeau <jacq...@apache.org> Authored: Wed Sep 3 09:30:56 2014 -0700 Committer: Jacques Nadeau <jacq...@apache.org> Committed: Wed Sep 3 22:19:45 2014 -0700 ---------------------------------------------------------------------- LICENSE | 32 +++ distribution/pom.xml | 64 ++---- distribution/src/assemble/bin-mapr.xml | 180 ---------------- distribution/src/assemble/bin.xml | 105 +++++++-- distribution/src/resources/LICENSE | 270 ------------------------ distribution/src/resources/NOTICE | 7 + distribution/src/resources/drill-config.sh | 6 +- 7 files changed, 154 insertions(+), 510 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/686eb9ef/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 6b0b127..83b0fb9 100644 --- a/LICENSE +++ b/LICENSE @@ -201,3 +201,35 @@ See the License for the specific language governing permissions and limitations under the License. +--------------------------------------------------------------------------- +This product includes source licensed under the MIT license + +The source files are located at contrib/native/client/src/clientlib/y2038/ +in the source distribution. The four files carry this license are: +time64.c +time64.h +time64_config.h +time64_limits.h + +Copyright (c) 2007-2010 Michael G Schwern + +This software originally derived from Paul Sheer's pivotal_gmtime_r.c. + +The MIT License: + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTIO http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/686eb9ef/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index a8a28e0..2309109 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -101,6 +101,26 @@ <build> <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distro-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/assemble/bin.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + <finalName>apache-drill-${project.version}</finalName> + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> @@ -131,28 +151,6 @@ <dependencies> </dependencies> <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distro-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/assemble/bin.xml</descriptor> - </descriptors> - <appendAssemblyId>false</appendAssemblyId> - <finalName>apache-drill-${project.version}</finalName> - <tarLongFileMode>gnu</tarLongFileMode> - </configuration> - </execution> - </executions> - </plugin> - </plugins> </build> </profile> <profile> @@ -178,28 +176,6 @@ </dependencies> <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distro-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/assemble/bin-mapr.xml</descriptor> - </descriptors> - <appendAssemblyId>false</appendAssemblyId> - <finalName>apache-drill-${project.version}</finalName> - <tarLongFileMode>gnu</tarLongFileMode> - </configuration> - </execution> - </executions> - </plugin> - </plugins> </build> </profile> <profile> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/686eb9ef/distribution/src/assemble/bin-mapr.xml ---------------------------------------------------------------------- diff --git a/distribution/src/assemble/bin-mapr.xml b/distribution/src/assemble/bin-mapr.xml deleted file mode 100644 index ad7bb26..0000000 --- a/distribution/src/assemble/bin-mapr.xml +++ /dev/null @@ -1,180 +0,0 @@ -<?xml version="1.0"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You 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 the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - 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. ---> -<assembly - xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> - <id>binary-release</id> - <formats> - <format>tar.gz</format> - <format>dir</format> - </formats> - <includeBaseDirectory>true</includeBaseDirectory> - <moduleSets> - - </moduleSets> - <dependencySets> -<!-- - <dependencySet> - <includes> - <include>org.apache.drill.exec:drill-jdbc-all:jar</include> - </includes> - <outputDirectory>jdbc-driver</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> ---> - <dependencySet> - <!-- Now, select which projects to include in this module-set. --> - <includes> - <include>org.apache.drill.exec:drill-jdbc:jar</include> - <include>org.apache.drill:drill-protocol:jar:rebuffed</include> - <include>org.apache.drill:drill-common:jar:rebuffed</include> - <include>org.apache.drill.exec:drill-java-exec:jar:rebuffed</include> - <include>org.apache.drill.contrib.storage-hive:drill-storage-hive-core</include> - <include>org.apache.drill.contrib.storage-hive:drill-hive-exec-shaded</include> - <include>org.apache.drill.contrib.data:tpch-sample-data:jar</include> - <include>org.apache.drill.contrib:drill-storage-hbase</include> - </includes> - <excludes> - <exclude>org.apache.drill.contrib.storage-hive:drill-storage-hive-core:jar:tests</exclude> - </excludes> - <outputDirectory>jars</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - - <dependencySet> - <outputDirectory>lib</outputDirectory> - <unpack>false</unpack> - <useProjectArtifact>false</useProjectArtifact> - <excludes> - <exclude>org.apache.zookeeper</exclude> - <exclude>org.apache.drill</exclude> - <exclude>org.apache.drill.exec</exclude> - <exclude>org.apache.drill.contrib</exclude> - <exclude>org.apache.drill.contrib.storage-hive</exclude> - <exclude>org.hsqldb:hsqldb</exclude> - <!-- exclude or sqlline has problems --> - <exclude>hsqldb:hsqldb</exclude> - <!-- exclude or sqlline has problems --> - </excludes> - <scope>test</scope> - </dependencySet> - - <dependencySet> - <outputDirectory>extlib</outputDirectory> - <unpack>false</unpack> - <useProjectArtifact>false</useProjectArtifact> - <includes> - <include>org.apache.zookeeper:zookeeper</include> - </includes> - <scope>runtime</scope> - </dependencySet> - - <dependencySet> - <outputDirectory>lib</outputDirectory> - <unpack>false</unpack> - <useProjectArtifact>false</useProjectArtifact> - <includes> - <include>com.google.protobuf:protobuf-java:jar:2.5</include> - </includes> - <scope>test</scope> - </dependencySet> - - </dependencySets> - - <fileSets> - <fileSet> - <directory>../sample-data</directory> - <outputDirectory>sample-data</outputDirectory> - </fileSet> - </fileSets> - - <files> - <file> - <source>../KEYS</source> - <outputDirectory/> - </file> - <file> - <source>../LICENSE</source> - <outputDirectory/> - </file> - <file> - <source>../NOTICE</source> - <outputDirectory/> - </file> - <file> - <source>../git.properties</source> - <outputDirectory/> - </file> - <file> - <source>src/resources/runbit</source> - <fileMode>0755</fileMode> - <outputDirectory>bin</outputDirectory> - </file> - <file> - <source>src/resources/hadoop-excludes.txt</source> - <outputDirectory>bin</outputDirectory> - </file> - <file> - <source>src/resources/drillbit.sh</source> - <fileMode>0755</fileMode> - <outputDirectory>bin</outputDirectory> - </file> - <file> - <source>src/resources/drill-config.sh</source> - <fileMode>0755</fileMode> - <outputDirectory>bin</outputDirectory> - </file> - <file> - <source>src/resources/sqlline</source> - <fileMode>0755</fileMode> - <outputDirectory>bin</outputDirectory> - </file> - <file> - <source>src/resources/sqlline.bat</source> - <outputDirectory>bin</outputDirectory> - </file> - <file> - <source>src/resources/submit_plan</source> - <fileMode>0755</fileMode> - <outputDirectory>bin</outputDirectory> - </file> - <file> - <source>src/resources/drill_dumpcat</source> - <fileMode>0755</fileMode> - <outputDirectory>bin</outputDirectory> - </file> - <file> - <source>src/resources/drill-override.conf</source> - <outputDirectory>conf</outputDirectory> - </file> - <file> - <source>src/resources/logback.xml</source> - <outputDirectory>conf</outputDirectory> - </file> - <file> - <source>src/resources/drill-env.sh</source> - <fileMode>0755</fileMode> - <outputDirectory>conf</outputDirectory> - </file> - <file> - <source>src/resources/drill-override-example.conf</source> - <outputDirectory>conf</outputDirectory> - </file> - </files> -</assembly> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/686eb9ef/distribution/src/assemble/bin.xml ---------------------------------------------------------------------- diff --git a/distribution/src/assemble/bin.xml b/distribution/src/assemble/bin.xml index 455f9bd..86e3802 100644 --- a/distribution/src/assemble/bin.xml +++ b/distribution/src/assemble/bin.xml @@ -34,11 +34,53 @@ <includes> <include>org.apache.drill.exec:drill-jdbc-all:jar</include> </includes> - <outputDirectory>jdbc-driver</outputDirectory> + <outputDirectory>jars/jdbc-driver</outputDirectory> <useProjectArtifact>false</useProjectArtifact> </dependencySet> <dependencySet> + <outputDirectory>jars/classb</outputDirectory> + <unpack>false</unpack> + <useProjectArtifact>false</useProjectArtifact> + <includes> + + <include>org.glassfish.jersey.containers</include> + <include>org.glassfish.jersey.core</include> + <include>org.reflections</include> + + <include>org.glassfish.hk2.external</include> + <include>org.mortbay.jetty</include> + <include>org.jboss.spec.javax.transaction</include> + <include>javax.activation</include> + <include>javax.annotation</include> + <include>org.glassfish.jersey.containers</include> + <include>org.glassfish.jersey.core</include> + <include>org.glassfish.jersey.ext</include> + <include>org.glassfish.jersey.media</include> + <include>org.glassfish.jersey.bundles.repackaged</include> + <include>org.glassfish.hk2</include> + <include>javax.servlet</include> + + <include>javax.ws.rs </include> + <include>com.sun.xml.bind </include> + <include>com.sun.jersey </include> + <include>org.jvnet.mimepull </include> + <include>com.sun.codemodel </include> + <include>javax.xml.bind</include> + + <include>org.jruby</include> + <include>ch.qos.logback </include> + <include>ch.qos.logback</include> + <include>org.eclipse.jdt</include> + <include>com.github.stephenc.high-scale-lib</include> + + <include>org.jamon</include> + + </includes> + <scope>test</scope> + </dependencySet> + + <dependencySet> <!-- Now, select which projects to include in this module-set. --> <includes> <include>org.apache.drill.exec:drill-jdbc:jar</include> @@ -55,10 +97,12 @@ </excludes> <outputDirectory>jars</outputDirectory> <useProjectArtifact>false</useProjectArtifact> - </dependencySet> + </dependencySet> + + <dependencySet> - <outputDirectory>lib</outputDirectory> + <outputDirectory>jars/3rdparty/</outputDirectory> <unpack>false</unpack> <useProjectArtifact>false</useProjectArtifact> <excludes> @@ -68,15 +112,50 @@ <exclude>org.apache.drill.contrib</exclude> <exclude>org.apache.drill.contrib.storage-hive</exclude> <exclude>org.hsqldb:hsqldb</exclude> + <exclude>junit:junit:jar</exclude> + <exclude>com.googlecode.jmockit:jmockit:jar</exclude> <!-- exclude or sqlline has problems --> <exclude>hsqldb:hsqldb</exclude> <!-- exclude or sqlline has problems --> + + <exclude>org.glassfish.jersey.containers</exclude> + <exclude>org.glassfish.jersey.core</exclude> + <exclude>org.reflections</exclude> + + <exclude>org.glassfish.hk2.external</exclude> + <exclude>org.mortbay.jetty</exclude> + <exclude>org.jboss.spec.javax.transaction</exclude> + <exclude>javax.activation</exclude> + <exclude>javax.annotation</exclude> + <exclude>org.glassfish.jersey.containers</exclude> + <exclude>org.glassfish.jersey.core</exclude> + <exclude>org.glassfish.jersey.ext</exclude> + <exclude>org.glassfish.jersey.media</exclude> + <exclude>org.glassfish.jersey.bundles.repackaged</exclude> + <exclude>org.glassfish.hk2</exclude> + <exclude>javax.servlet</exclude> + + <exclude>javax.ws.rs </exclude> + <exclude>com.sun.xml.bind </exclude> + <exclude>com.sun.jersey </exclude> + <exclude>org.jvnet.mimepull </exclude> + <exclude>com.sun.codemodel </exclude> + <exclude>javax.xml.bind</exclude> + + <exclude>org.jruby</exclude> + <exclude>ch.qos.logback </exclude> + <exclude>ch.qos.logback</exclude> + <exclude>org.eclipse.jdt</exclude> + <exclude>com.github.stephenc.high-scale-lib</exclude> + + <exclude>org.jamon</exclude> + </excludes> <scope>test</scope> </dependencySet> <dependencySet> - <outputDirectory>extlib</outputDirectory> + <outputDirectory>jars/ext</outputDirectory> <unpack>false</unpack> <useProjectArtifact>false</useProjectArtifact> <includes> @@ -86,7 +165,7 @@ </dependencySet> <dependencySet> - <outputDirectory>lib</outputDirectory> + <outputDirectory>jars/3rdparty</outputDirectory> <unpack>false</unpack> <useProjectArtifact>false</useProjectArtifact> <includes> @@ -101,33 +180,33 @@ <fileSet> <directory>../sample-data</directory> <outputDirectory>sample-data</outputDirectory> - </fileSet> + </fileSet> </fileSets> <files> <file> <source>../KEYS</source> - <outputDirectory/> + <outputDirectory /> </file> <file> <source>src/resources/LICENSE</source> - <outputDirectory/> + <outputDirectory /> </file> <file> <source>src/resources/README.md</source> - <outputDirectory/> + <outputDirectory /> </file> <file> <source>../NOTICE</source> - <outputDirectory/> + <outputDirectory /> </file> <file> <source>../DISCLAIMER</source> - <outputDirectory/> + <outputDirectory /> </file> <file> <source>../git.properties</source> - <outputDirectory/> + <outputDirectory /> </file> <file> <source>src/resources/runbit</source> @@ -184,5 +263,5 @@ <source>src/resources/drill-override-example.conf</source> <outputDirectory>conf</outputDirectory> </file> - </files> + </files> </assembly> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/686eb9ef/distribution/src/resources/LICENSE ---------------------------------------------------------------------- diff --git a/distribution/src/resources/LICENSE b/distribution/src/resources/LICENSE index 4f5d8d6..650d21b 100644 --- a/distribution/src/resources/LICENSE +++ b/distribution/src/resources/LICENSE @@ -772,221 +772,6 @@ This product bundles which are available under the CDDL v1.1 license (https://glassfish.java.net/public/CDDL+GPL_1_1.html) -------------------------------------------------------------------------------- -This product bundles JUnit (junit:junit:4.11 - http://junit.org) - -which is available under the EPL v1.0 license (http://opensource.org/licenses/eclipse-1.0) -Eclipse Public License - v 1.0 - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE 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 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. -The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation 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. --------------------------------------------------------------------------------- This product bundles JRuby Complete (org.jruby:jruby-complete:1.6.5 - http://www.jruby.org/jruby-common/jruby-complete/) @@ -1078,61 +863,6 @@ This product bundles LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --------------------------------------------------------------------------------- -This product bundles - - Main (com.googlecode.jmockit:jmockit:1.3 - http://code.google.com/p/jmockit) - - which is available under the MIT license (https://code.google.com/p/jmockit/source/browse/trunk/LICENSE.txt) - - The JMockit Testing Toolkit - Copyright (c) 2006-2014 Rogério Liesenfeld - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --------------------------------------------------------------------------------- -This product bundles - - Mockito (org.mockito:mockito-all:1.8.2 - http://www.mockito.org) - Mockito (org.mockito:mockito-all:1.9.0 - http://www.mockito.org) - - which are available under the MIT license (http://opensource.org/licenses/mit-license.php) - - Copyright (c) 2007 Mockito contributors - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. --------------------------------------------------------------------------------å This product bundles http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/686eb9ef/distribution/src/resources/NOTICE ---------------------------------------------------------------------- diff --git a/distribution/src/resources/NOTICE b/distribution/src/resources/NOTICE index abdcb91..bd17b61 100644 --- a/distribution/src/resources/NOTICE +++ b/distribution/src/resources/NOTICE @@ -4,4 +4,11 @@ Copyright 2013-2014 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). +This product depends on third party software that falls under a variety of licenses. +All dependencies with licenses other than Apache are specified in the LICENSE file. +For easy reference, all of the dependencies that fall under Class B licenses Reciprocal +Licenses are included in the binary release under a separate directory located at jar/classb. +More information on Class B licenses is available here: +http://www.apache.org/legal/3party.html + Please see LICENSE for additional copyright and licensing information. http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/686eb9ef/distribution/src/resources/drill-config.sh ---------------------------------------------------------------------- diff --git a/distribution/src/resources/drill-config.sh b/distribution/src/resources/drill-config.sh index 621f947..8afb237 100644 --- a/distribution/src/resources/drill-config.sh +++ b/distribution/src/resources/drill-config.sh @@ -100,7 +100,7 @@ fi CP=$CP:$DRILL_HOME/jars/* # Followed by Drill override dependency jars -CP=$CP:$DRILL_HOME/extlib/* +CP=$CP:$DRILL_HOME/jars/ext/* # Followed by Hadoop's jar if [ "${HADOOP_CLASSPATH}x" != "x" ]; then @@ -113,8 +113,8 @@ if [ "${HBASE_CLASSPATH}x" != "x" ]; then fi # Followed by Drill other dependency jars -CP=$CP:$DRILL_HOME/lib/* -CP=$CP:$DRILL_HOME/contrib/* +CP=$CP:$DRILL_HOME/jars/3rdparty/* +CP=$CP:$DRILL_HOME/jars/classb/* # Finally any user specified if [ "${DRILL_CLASSPATH}x" != "x" ]; then
