This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 53c4e5b3b1 NIFI-14415 Removed protobuf-java version override from
nifi-aws-bundle (#9835)
53c4e5b3b1 is described below
commit 53c4e5b3b1b0f68df1ea50640ca347a5e68d347c
Author: Dariusz Seweryn <[email protected]>
AuthorDate: Tue Apr 1 19:12:27 2025 +0200
NIFI-14415 Removed protobuf-java version override from nifi-aws-bundle
(#9835)
Signed-off-by: David Handermann <[email protected]>
---
.../nifi-aws-nar/src/main/resources/META-INF/NOTICE | 8 ++++++++
nifi-extension-bundles/nifi-aws-bundle/pom.xml | 6 ------
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE
index 2bb3811cca..4954e8a9bc 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE
@@ -161,6 +161,14 @@ The multi-part copy code in CopyS3Object was derived from
code found in the Amaz
This code was provided under the terms of the Apache Software License V2
per this:
https://github.com/awsdocs/aws-doc-sdk-examples/blob/df606a664bf2f7cfe3abc76c187e024451d0279c/LICENSE
+************************
+Berkeley Software Distribution License 3-Clause
+************************
+
+The following binary components are provided under the BSD License. See
project link for details.
+
+ (BSD License) Protocol Buffers (com.google.protobuf:protobuf-java:jar -
https://github.com/protocolbuffers/protobuf)
+
************************
Eclipse Distribution License 1.0
************************
diff --git a/nifi-extension-bundles/nifi-aws-bundle/pom.xml
b/nifi-extension-bundles/nifi-aws-bundle/pom.xml
index dd3c78fed5..b4a2181c42 100644
--- a/nifi-extension-bundles/nifi-aws-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-aws-bundle/pom.xml
@@ -66,12 +66,6 @@
</exclusion>
</exclusions>
</dependency>
- <!-- Override protobuf-java from amazon-kinesis-client -->
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>3.25.6</version>
- </dependency>
<!-- Override kotlin-stdlib-common from amazon-kinesis-client -->
<!-- can be removed when not relying on kotlin-stdlib-common:jar
anymore -->
<dependency>
