You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by ya...@apache.org on 2022/04/06 11:43:15 UTC
[incubator-kyuubi] branch master updated: [KYUUBI #2280] [INFRA] Replace BSD 3-clause with ASF License v2 for scala binaries
This is an automated email from the ASF dual-hosted git repository.
yao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-kyuubi.git
The following commit(s) were added to refs/heads/master by this push:
new 03b72268e [KYUUBI #2280] [INFRA] Replace BSD 3-clause with ASF License v2 for scala binaries
03b72268e is described below
commit 03b72268e8f5bb8c45bae0953fdf1fe9e529a5c5
Author: Kent Yao <ya...@apache.org>
AuthorDate: Wed Apr 6 19:43:06 2022 +0800
[KYUUBI #2280] [INFRA] Replace BSD 3-clause with ASF License v2 for scala binaries
### _Why are the changes needed?_
Scala distribution is released under the ASF License v2 since 2.12.x, while 2.11.x is BSD 3-clause
https://www.scala-lang.org/download/2.11.12.html
https://www.scala-lang.org/download/2.13.8.html
https://www.scala-lang.org/download/2.12.15.html
### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible
- [ ] Add screenshots for manual tests if appropriate
- [ ] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request
Closes #2280 from yaooqinn/scalal.
Closes #2280
9e0ff440 [Kent Yao] rm licenses-binary/LICENSE-scala.txt
720f5966 [Kent Yao] [INFRA] Replace BSD 3-clause with ASF License v2 for scala binaries
Authored-by: Kent Yao <ya...@apache.org>
Signed-off-by: Kent Yao <ya...@apache.org>
---
LICENSE-binary | 6 ++----
licenses-binary/LICENSE-scala.txt | 30 ------------------------------
2 files changed, 2 insertions(+), 34 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index 6dfdf5d2c..9559b9aee 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -286,6 +286,8 @@ io.swagger.core.v3:swagger-integration
io.swagger.core.v3:swagger-jaxrs2
io.swagger.core.v3:swagger-models
org.apache.zookeeper:zookeeper
+org.scala-lang:scala-library
+
kyuubi-server/src/main/resources/org/apache/kyuubi/ui/swagger/*
@@ -294,10 +296,6 @@ BSD
jline:jline
com.thoughtworks.paranamer:paranamer
-BSD 3-Clause
-------------
-org.scala-lang:scala-library
-
Eclipse Distribution License - v 1.0
------------------------------------
jakarta.activation:jakarta.activation-api
diff --git a/licenses-binary/LICENSE-scala.txt b/licenses-binary/LICENSE-scala.txt
deleted file mode 100644
index 4846076ab..000000000
--- a/licenses-binary/LICENSE-scala.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Copyright (c) 2002-2013 EPFL
-Copyright (c) 2011-2013 Typesafe, Inc.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-- Neither the name of the EPFL nor the names of its contributors may be
- used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.