This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-3.4
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.4 by this push:
new 73437cedfd8 [SPARK-43374][INFRA] Move protobuf-java to BSD 3-clause
group and update the license copy
73437cedfd8 is described below
commit 73437cedfd89cb6d7f015033c66bdbad978b055f
Author: Kent Yao <[email protected]>
AuthorDate: Fri May 5 16:07:00 2023 -0700
[SPARK-43374][INFRA] Move protobuf-java to BSD 3-clause group and update
the license copy
### What changes were proposed in this pull request?
protobuf-java is licensed under the BSD 3-clause, not the 2 we claimed.
And the copy should be updated via
https://github.com/protocolbuffers/protobuf/commit/9e080f7ac007b75dacbd233b214e5c0cb2e48e0f
### Why are the changes needed?
fix license issue
### Does this PR introduce _any_ user-facing change?
no
### How was this patch tested?
Existing tests.
Closes #41043 from yaooqinn/SPARK-43374.
Authored-by: Kent Yao <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
(cherry picked from commit 4351d414ab03643fdb6ec18b8e8a4ac718a9a2b2)
Signed-off-by: Dongjoon Hyun <[email protected]>
---
LICENSE-binary | 2 +-
licenses-binary/LICENSE-protobuf.txt | 12 +-----------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index b8a471aed5a..9472d28e509 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -431,7 +431,6 @@ javolution:javolution
com.esotericsoftware:kryo-shaded
com.esotericsoftware:minlog
com.esotericsoftware:reflectasm
-com.google.protobuf:protobuf-java
org.codehaus.janino:commons-compiler
org.codehaus.janino:janino
jline:jline
@@ -443,6 +442,7 @@ pl.edu.icm:JLargeArrays
BSD 3-Clause
------------
+com.google.protobuf:protobuf-java
dk.brics.automaton:automaton
org.antlr:antlr-runtime
org.antlr:ST4
diff --git a/licenses-binary/LICENSE-protobuf.txt
b/licenses-binary/LICENSE-protobuf.txt
index b4350ec83c7..97a6e3d199a 100644
--- a/licenses-binary/LICENSE-protobuf.txt
+++ b/licenses-binary/LICENSE-protobuf.txt
@@ -1,14 +1,4 @@
-This license applies to all parts of Protocol Buffers except the following:
-
- - Atomicops support for generic gcc, located in
- src/google/protobuf/stubs/atomicops_internals_generic_gcc.h.
- This file is copyrighted by Red Hat Inc.
-
- - Atomicops support for AIX/POWER, located in
- src/google/protobuf/stubs/atomicops_internals_aix.h.
- This file is copyrighted by Bloomberg Finance LP.
-
-Copyright 2014, Google Inc. All rights reserved.
+Copyright 2008 Google Inc. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
