This is an automated email from the ASF dual-hosted git repository.

jshao pushed a commit to branch branch-0.7
in repository https://gitbox.apache.org/repos/asf/incubator-livy.git


The following commit(s) were added to refs/heads/branch-0.7 by this push:
     new 3c52a9d  [LIVY-738][BUILD] Fix Livy third-party library license 
generating issue
3c52a9d is described below

commit 3c52a9dc828e6818c17ac45fdbc698b503f80d05
Author: jerryshao <jerrys...@tencent.com>
AuthorDate: Tue Jan 7 20:09:56 2020 +0800

    [LIVY-738][BUILD] Fix Livy third-party library license generating issue
    
    Some libraries' license file are missing, so Livy cannot correctly generate 
the license file, here fixing them manually.
    
    Author: jerryshao <jerrys...@tencent.com>
    
    Closes #272 from jerryshao/LIVY-738.
    
    (cherry picked from commit 1ca3dfd163d33c516bbab1296ecc677c32676893)
    Signed-off-by: jerryshao <jerrys...@tencent.com>
---
 dev/third-party-missing-license.properties | 27 +++++++++++++++++++++++++++
 pom.xml                                    |  2 ++
 2 files changed, 29 insertions(+)

diff --git a/dev/third-party-missing-license.properties 
b/dev/third-party-missing-license.properties
new file mode 100644
index 0000000..7d906cd
--- /dev/null
+++ b/dev/third-party-missing-license.properties
@@ -0,0 +1,27 @@
+# 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.
+
+commons-beanutils--commons-beanutils--1.7.0=Apache License, Version 2.0
+javax.servlet.jsp--jsp-api--2.1=CDDL 1.1
+javax.transaction--jta--1.1=CDDL 1.1
+org.antlr--antlr-runtime--3.4=BSD License
+org.apache.zookeeper--zookeeper--3.4.6=Apache License, Version 2.0
+oro--oro--2.0.8=Apache License, Version 2.0
+asm--asm--3.1=The BSD 3-Clause license
+org.codehaus.jettison--jettison--1.1=Apache License, Version 2.0
+ldapsdk--ldapsdk--4.1=
+javax.servlet--servlet-api--2.5=CDDL 1.1
+javax.transaction--transaction-api--1.1=CDDL 1.0
+javax.servlet--jsp-api--2.0=CDDL 1.1
diff --git a/pom.xml b/pom.xml
index 1322aeb..938bdbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1100,6 +1100,8 @@
               <thirdPartyFilename>THIRD-PARTY</thirdPartyFilename>
               <sortArtifactByName>true</sortArtifactByName>
               
<fileTemplate>${execution.root}/dev/third-party-file.ftl</fileTemplate>
+              <useMissingFile>true</useMissingFile>
+              
<missingFile>${execution.root}/dev/third-party-missing-license.properties</missingFile>
             </configuration>
             <executions>
               <execution>

Reply via email to