From 2a3fd6062a7d0f4b496013161d0a16a13b6e7d43 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Mar 2025 13:48:21 +0000
Subject: [PATCH 1/2] MINOR: Bump com.google.protobuf:protobuf-bom from 3.25.5
 to 4.30.0

Bumps [com.google.protobuf:protobuf-bom](https://github.com/protocolbuffers/protobuf) from 3.25.5 to 4.30.0.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.25.5...v4.30.0)

---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-bom
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f27013c0ba..86561bc087 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@ under the License.
     <dep.guava-bom.version>33.4.0-jre</dep.guava-bom.version>
     <dep.netty-bom.version>4.1.119.Final</dep.netty-bom.version>
     <dep.grpc-bom.version>1.71.0</dep.grpc-bom.version>
-    <dep.protobuf-bom.version>3.25.5</dep.protobuf-bom.version>
+    <dep.protobuf-bom.version>4.30.0</dep.protobuf-bom.version>
     <dep.jackson-bom.version>2.18.3</dep.jackson-bom.version>
     <dep.hadoop.version>3.4.1</dep.hadoop.version>
     <dep.fbs.version>25.2.10</dep.fbs.version>

From 6f2a178c7cc97171b631fe9210708588fd0b42a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JB=20Onofr=C3=A9?= <jbonofre@apache.org>
Date: Wed, 12 Mar 2025 11:12:39 +0100
Subject: [PATCH 2/2] Update LICENSE/NOTICE Remove the null check (not
 necessary anymore)

---
 .../java/org/apache/arrow/flight/auth/ClientAuthWrapper.java  | 4 +---
 .../java/org/apache/arrow/flight/auth/ServerAuthWrapper.java  | 4 +---
 flight/flight-integration-tests/src/shade/LICENSE.txt         | 4 ++--
 flight/flight-sql-jdbc-driver/src/shade/LICENSE.txt           | 4 ++--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ClientAuthWrapper.java b/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ClientAuthWrapper.java
index dd62f7756e..19d4f77a03 100644
--- a/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ClientAuthWrapper.java
+++ b/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ClientAuthWrapper.java
@@ -76,9 +76,7 @@ public AuthObserver() {
     @Override
     public void onNext(HandshakeResponse value) {
       ByteString payload = value.getPayload();
-      if (payload != null) {
-        messages.add(payload.toByteArray());
-      }
+      messages.add(payload.toByteArray());
     }
 
     private Iterator<byte[]> iter =
diff --git a/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ServerAuthWrapper.java b/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ServerAuthWrapper.java
index 879a93a73b..fba9f9baba 100644
--- a/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ServerAuthWrapper.java
+++ b/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ServerAuthWrapper.java
@@ -84,9 +84,7 @@ public AuthObserver(StreamObserver<HandshakeResponse> responseObserver) {
     @Override
     public void onNext(HandshakeRequest value) {
       ByteString payload = value.getPayload();
-      if (payload != null) {
-        messages.add(payload.toByteArray());
-      }
+      messages.add(payload.toByteArray());
     }
 
     private Iterator<byte[]> iter =
diff --git a/flight/flight-integration-tests/src/shade/LICENSE.txt b/flight/flight-integration-tests/src/shade/LICENSE.txt
index b4aba55f70..6ee8645869 100644
--- a/flight/flight-integration-tests/src/shade/LICENSE.txt
+++ b/flight/flight-integration-tests/src/shade/LICENSE.txt
@@ -272,11 +272,11 @@ License: https://www.apache.org/licenses/LICENSE-2.0
 
 --------------------------------------------------------------------------------
 
-This binary artifact contains Google Protobuf 3.25.5.
+This binary artifact contains Google Protobuf 4.30.0.
 
 Copyright: Copyright 2008 Google Inc.  All rights reserved.
 Home page: https://protobuf.dev/
-License: https://github.com/protocolbuffers/protobuf/blob/v3.25.5/LICENSE (BSD)
+License: https://github.com/protocolbuffers/protobuf/blob/v4.30.0/LICENSE (BSD)
 License text:
 
 | Copyright 2008 Google Inc.  All rights reserved.
diff --git a/flight/flight-sql-jdbc-driver/src/shade/LICENSE.txt b/flight/flight-sql-jdbc-driver/src/shade/LICENSE.txt
index 41c80d948c..c58a03831f 100644
--- a/flight/flight-sql-jdbc-driver/src/shade/LICENSE.txt
+++ b/flight/flight-sql-jdbc-driver/src/shade/LICENSE.txt
@@ -234,11 +234,11 @@ License: https://www.apache.org/licenses/LICENSE-2.0
 
 --------------------------------------------------------------------------------
 
-This binary artifact contains Protobuf 3.25.5.
+This binary artifact contains Protobuf 4.30.0.
 
 Copyright: Copyright 2008 Google Inc.  All rights reserved.
 Home page: https://protobuf.dev/
-License: https://github.com/protocolbuffers/protobuf/blob/v3.25.3/LICENSE (BSD)
+License: https://github.com/protocolbuffers/protobuf/blob/v4.30.0/LICENSE (BSD)
 License text:
 
 | Copyright 2008 Google Inc.  All rights reserved.