You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2017/02/23 02:22:47 UTC
zeppelin git commit: [ZEPPELIN-2135] Don't re-license
jdbc/src/main/java/org/apache/zeppelin/jdbc/SqlCompleter.java
Repository: zeppelin
Updated Branches:
refs/heads/master 7ada5db9e -> 99b90effd
[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 <mo...@apache.org>
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
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/99b90eff
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/99b90eff
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/99b90eff
Branch: refs/heads/master
Commit: 99b90effdfe3c4b93b1753ba00b01a8b48a00355
Parents: 7ada5db
Author: Lee moon soo <mo...@apache.org>
Authored: Mon Feb 20 08:48:37 2017 +0900
Committer: Lee moon soo <mo...@apache.org>
Committed: Thu Feb 23 11:22:29 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/99b90eff/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 9f49bb8..83a9131 100644
--- a/LICENSE
+++ b/LICENSE
@@ -271,7 +271,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/99b90eff/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 a6527c4..b0be70c 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/99b90eff/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fdca381..de27178 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>