Repository: zeppelin Updated Branches: refs/heads/branch-0.7 76d4f8e2e -> e2a35f3f1
[ZEPPELIN-2135] Don't re-license jdbc/src/main/java/org/apache/zeppelin/jdbc/SqlCompleter.java ### What is this PR for? jdbc/src/main/java/org/apache/zeppelin/jdbc/SqlCompleter.java is taken from SQLLine 1.0.2 (BSD license) and we can't relicense it. Remove Apache License header and exclude from RAT check plugin ### What type of PR is it? Bug Fix ### Todos * [x] - remove license header * [x] - exclude from rat check plugin ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-2135 ### Questions: * Does the licenses files need update? related * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Lee moon soo <[email protected]> Closes #2036 from Leemoonsoo/ZEPPELIN-2135 and squashes the following commits: b850ba1 [Lee moon soo] add comment a2b572b [Lee moon soo] Remove header add SqlCompeleter.java to RAT plugin exclude list 8c43262 [Lee moon soo] fix typo (cherry picked from commit 99b90effdfe3c4b93b1753ba00b01a8b48a00355) Signed-off-by: Lee moon soo <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/e2a35f3f Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/e2a35f3f Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/e2a35f3f Branch: refs/heads/branch-0.7 Commit: e2a35f3f14fec435e406da637e5c0c4426bab1c0 Parents: 76d4f8e Author: Lee moon soo <[email protected]> Authored: Mon Feb 20 08:48:37 2017 +0900 Committer: Lee moon soo <[email protected]> Committed: Thu Feb 23 11:22:55 2017 +0900 ---------------------------------------------------------------------- LICENSE | 2 +- .../java/org/apache/zeppelin/jdbc/SqlCompleter.java | 14 -------------- pom.xml | 3 +++ 3 files changed, 4 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e2a35f3f/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index b243d2c..b8b84ef 100644 --- a/LICENSE +++ b/LICENSE @@ -269,7 +269,7 @@ The following components are provided under the BSD 3-Clause license. See file ======================================================================== BSD 2-Clause licenses ======================================================================== -The following components are provided under the BSD 3-Clause license. See file headers and project links for details. +The following components are provided under the BSD 2-Clause license. See file headers and project links for details. (BSD 2 Clause) portions of SQLLine (http://sqlline.sourceforge.net/) - http://sqlline.sourceforge.net/#license jdbc/src/main/java/org/apache/zeppelin/jdbc/SqlCompleter.java http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e2a35f3f/jdbc/src/main/java/org/apache/zeppelin/jdbc/SqlCompleter.java ---------------------------------------------------------------------- diff --git a/jdbc/src/main/java/org/apache/zeppelin/jdbc/SqlCompleter.java b/jdbc/src/main/java/org/apache/zeppelin/jdbc/SqlCompleter.java index 41dcaab..e5c8987 100644 --- a/jdbc/src/main/java/org/apache/zeppelin/jdbc/SqlCompleter.java +++ b/jdbc/src/main/java/org/apache/zeppelin/jdbc/SqlCompleter.java @@ -1,17 +1,3 @@ -/** - * 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. - */ package org.apache.zeppelin.jdbc; /* http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e2a35f3f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3342727..aec34c9 100644 --- a/pom.xml +++ b/pom.xml @@ -899,6 +899,9 @@ <exclude>**/constants.json</exclude> <exclude>scripts/**</exclude> + <!-- from SQLLine 1.0.2, see ZEPPELIN-2135 --> + <exclude>**/src/main/java/org/apache/zeppelin/jdbc/SqlCompleter.java</exclude> + <!-- bundled from bootstrap --> <exclude>docs/assets/themes/zeppelin/bootstrap/**</exclude> <exclude>docs/assets/themes/zeppelin/css/style.css</exclude>
