DRILL-8475: Update the binary distributions LICENSE (apache#2879)

.gitignore

@@ -1,32 +1,35 @@
-.project
+# Please keep this list sorted.
+*~
 .buildpath
-.classpath
-.factorypath
 .checkstyle
-.settings/
-.idea/
-.mvn/maven.config
-TAGS
-*.log
-*.lck
-*.iml
-target/
-*.DS_Store
-*.patch
-*~
-git.properties
-contrib/native/client/build/
-contrib/native/client/build/*
+.classpath
 CMakeCache.txt
 CMakeFiles
-Makefile
 cmake_install.cmake
+contrib/native/client/build/
+contrib/native/client/build/*
+ # binary dist license is by the build
+distribution/src/main/resources/LICENSE
+*.DS_Store
+exec/jdbc-all/dependency-reduced-pom.xml
+.factorypath
+git.properties
+.*.html
+.idea/
+*.iml
 install_manifest.txt
+*.lck
+*.log
+Makefile
 .*.md.html
+.mvn/maven.config
+*.patch
+.project
+.settings/
 *.swp
+TAGS
+target/
 # TODO - DRILL-4336
-exec/jdbc-all/dependency-reduced-pom.xml
-.*.html
-venv/
 tools/venv/
+venv/
 .vscode/*

LICENSE

@@ -202,10 +202,10 @@
    limitations under the License.
 
 ---------------------------------------------------------------------------
-This product includes source licensed under the MIT 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:
+in the source distribution. The files that carry this license are:
 time64.c
 time64.h
 time64_config.h
@@ -215,24 +215,11 @@ 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 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+---------------------------------------------------------------------------
+This product includes source licensed under the BSD 3-clause license.
 
+The source files are located at exec/java-exec/src/main/java/org/apache/drill/exec/compile/
+in the source distribution. The files that carry this license are:
+ClassBodyBuilder.java
 
+Copyright (c) 2001-2010, Arno Unkrig

contrib/storage-phoenix/pom.xml

@@ -205,7 +205,7 @@
     <dependency>
       <groupId>org.apache.kerby</groupId>
       <artifactId>kerb-core</artifactId>
-      <version>1.0.1</version>
+      <version>${kerby.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

distribution/pom.xml

@@ -203,23 +203,23 @@
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-tcnative</artifactId>
-      <version>2.0.48.Final</version>
+      <version>${netty.tcnative.version}</version>
       <classifier>linux-x86_64</classifier>
-      <scope>test</scope>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-tcnative</artifactId>
-      <version>2.0.48.Final</version>
+      <version>${netty.tcnative.version}</version>
       <classifier>linux-x86_64-fedora</classifier>
-      <scope>test</scope>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-tcnative</artifactId>
-      <version>2.0.48.Final</version>
+      <version>${netty.tcnative.version}</version>
       <classifier>osx-x86_64</classifier>
-      <scope>test</scope>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
@@ -228,7 +228,7 @@
       after 2.0.36, see https://repo1.maven.org/maven2/io/netty/netty-tcnative/ -->
       <version>2.0.36.Final</version>
       <classifier>windows-x86_64</classifier>
-      <scope>test</scope>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>de.huxhorn.lilith</groupId>
@@ -289,6 +289,35 @@
           </excludes>
         </configuration>
       </plugin>
+      <plugin>
+        <!--
+        Invoke manually with mvn license:add-third-party to genereate the list
+        of binary dependency licenses src/main/resources/LICENSE.
+        -->
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>license-maven-plugin</artifactId>
+        <version>2.4.0</version>
+        <configuration>
+          <outputDirectory>src/main/resources</outputDirectory>
+          <thirdPartyFilename>LICENSE</thirdPartyFilename>
+          <excludedScopes>test,provided</excludedScopes>
+          <!-- Makes the scope exclusions above transitive. -->
+          <excludeTransitiveDependencies>true</excludeTransitiveDependencies>
+          <fileTemplate>${maven.multiModuleProjectDirectory}/distribution/src/main/resources/licenses/LICENSE-template.ftl</fileTemplate>
+          <missingFile>${maven.multiModuleProjectDirectory}/distribution/src/main/resources/licenses/MISSING.properties</missingFile>
+          <failOnMissing>true</failOnMissing>
+          <acceptPomPackaging>true</acceptPomPackaging>
+          <force>true</force>
+        </configuration>
+        <executions>
+          <execution>
+            <id>generate-binary-license</id>
+            <goals>
+              <goal>add-third-party</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <profiles>

distribution/src/assemble/component.xml

@@ -123,7 +123,6 @@
         <include>org.jvnet.mimepull</include>
         <include>org.reflections</include>
       </includes>
-      <scope>test</scope>
     </dependencySet>
     <dependencySet>
       <outputDirectory>jars/3rdparty/</outputDirectory>
@@ -165,7 +164,6 @@
         <exclude>org.jvnet.mimepull</exclude>
         <exclude>org.reflections</exclude>
       </excludes>
-      <scope>test</scope>
     </dependencySet>
     <dependencySet>
       <outputDirectory>jars/ext</outputDirectory>
@@ -175,43 +173,39 @@
         <include>org.apache.zookeeper:zookeeper</include>
         <include>org.apache.zookeeper:zookeeper-jute</include>
       </includes>
-      <scope>runtime</scope>
     </dependencySet>
     <dependencySet>
       <outputDirectory>jars/3rdparty/linux</outputDirectory>
       <unpack>false</unpack>
       <useProjectArtifact>false</useProjectArtifact>
       <includes>
-        <include>io.netty:netty-tcnative:jar:linux-x86_64:2.0.48.Final</include>
+        <include>io.netty:netty-tcnative:jar:linux-x86_64:${netty.tcnative.version}</include>
       </includes>
-      <scope>test</scope>
     </dependencySet>
     <dependencySet>
       <outputDirectory>jars/3rdparty/fedora</outputDirectory>
       <unpack>false</unpack>
       <useProjectArtifact>false</useProjectArtifact>
       <includes>
-        <include>io.netty:netty-tcnative:jar:linux-x86_64-fedora:2.0.48.Final</include>
+        <include>io.netty:netty-tcnative:jar:linux-x86_64-fedora:${netty.tcnative.version}</include>
       </includes>
-      <scope>test</scope>
     </dependencySet>
     <dependencySet>
       <outputDirectory>jars/3rdparty/windows</outputDirectory>
       <unpack>false</unpack>
       <useProjectArtifact>false</useProjectArtifact>
       <includes>
+        <!-- 2.0.36.Final was last release of netty-tcnative to include a Windows binary -->
         <include>io.netty:netty-tcnative:jar:windows-x86_64:2.0.36.Final</include>
       </includes>
-      <scope>test</scope>
     </dependencySet>
     <dependencySet>
       <outputDirectory>jars/3rdparty/osx</outputDirectory>
       <unpack>false</unpack>
       <useProjectArtifact>false</useProjectArtifact>
       <includes>
-        <include>io.netty:netty-tcnative:jar:osx-x86_64:2.0.48.Final</include>
+        <include>io.netty:netty-tcnative:jar:osx-x86_64:${netty.tcnative.version}</include>
       </includes>
-      <scope>test</scope>
     </dependencySet>
   </dependencySets>