This is an automated email from the ASF dual-hosted git repository.
srowen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 62cc198cc0f [SPARK-38799][INFRA] Replace BSD 3-clause with ASF License
v2 for scala binaries
62cc198cc0f is described below
commit 62cc198cc0f26e6f01276ff3338a6b21ae2663a8
Author: Kent Yao <y...@apache.org>
AuthorDate: Wed Apr 6 07:28:17 2022 -0500
[SPARK-38799][INFRA] Replace BSD 3-clause with ASF License v2 for scala
binaries
### What changes were proposed in this pull request?
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, see https://www.scala-lang.org/news/license-change.html
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
### Does this PR introduce _any_ user-facing change?
yes, people who use the binary distribution of spark shall be aware of the
licenses from upstream.
### How was this patch tested?
pass GHA
Closes #36081 from yaooqinn/SPARK-38799.
Authored-by: Kent Yao <y...@apache.org>
Signed-off-by: Sean Owen <sro...@gmail.com>
---
LICENSE-binary | 8 ++++----
licenses-binary/LICENSE-scala.txt | 30 ------------------------------
2 files changed, 4 insertions(+), 34 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index 8bbc913262c..a090e5205cc 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -382,6 +382,10 @@ org.eclipse.jetty:jetty-servlets
org.eclipse.jetty:jetty-util
org.eclipse.jetty:jetty-webapp
org.eclipse.jetty:jetty-xml
+org.scala-lang:scala-compiler
+org.scala-lang:scala-library
+org.scala-lang:scala-reflect
+org.scala-lang.modules:scala-parser-combinators_2.12
org.scala-lang.modules:scala-xml_2.12
com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter
com.zaxxer.HikariCP
@@ -445,10 +449,6 @@ org.antlr:stringtemplate
org.antlr:antlr4-runtime
antlr:antlr
com.thoughtworks.paranamer:paranamer
-org.scala-lang:scala-compiler
-org.scala-lang:scala-library
-org.scala-lang:scala-reflect
-org.scala-lang.modules:scala-parser-combinators_2.12
org.fusesource.leveldbjni:leveldbjni-all
net.sourceforge.f2j:arpack_combined_all
xmlenc:xmlenc
diff --git a/licenses-binary/LICENSE-scala.txt
b/licenses-binary/LICENSE-scala.txt
deleted file mode 100644
index 4846076aba2..00000000000
--- 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
