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 28c526d9bd NIFI-15199 Bump NiFi API to 2.5.0, Commons IO to 2.21.0,
Excel Streaming Reader to 5.1.2, and others (#10509)
28c526d9bd is described below
commit 28c526d9bdb963a6966b469bd9707723ce0aa1b0
Author: Pierre Villard <[email protected]>
AuthorDate: Mon Nov 10 16:26:23 2025 +0100
NIFI-15199 Bump NiFi API to 2.5.0, Commons IO to 2.21.0, Excel Streaming
Reader to 5.1.2, and others (#10509)
- Reactor Netty HTTP from 1.2.10 to 1.3.0 -
https://github.com/reactor/reactor-netty/releases/tag/v1.3.0
- Reactor from 3.7.13 to 3.8.0 -
https://github.com/reactor/reactor-core/releases/tag/v3.8.0
- JanusGraph from 1.2.0-20251106-225718.92a1b98 to
1.2.0-20251108-015359.2fa5bca - https://github.com/JanusGraph/janusgraph
- Excel Streaming Reader from 5.1.1 to 5.1.2 -
https://github.com/pjfanning/excel-streaming-reader/releases/tag/v5.1.2
- Error Prone Annotations from 2.43.0 to 2.44.0 -
https://github.com/google/error-prone/releases/tag/v2.44.0
- NiFi API from 2.4.0 to 2.5.0 -
https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-NiFiAPIVersion2.5.0
- AWS SDK v2 from 2.38.1 to 2.38.2 -
https://github.com/aws/aws-sdk-java-v2/blob/master/CHANGELOG.md
- Apache Commons IO from 2.20.0 to 2.21.0 -
https://commons.apache.org/proper/commons-io/changes.html#a2.21.0
- Properly handle MessageEOFException following changes in commons-io
Signed-off-by: David Handermann <[email protected]>
---
nifi-code-coverage/pom.xml | 2 +-
.../nifi-azure-bundle/nifi-azure-processors/pom.xml | 4 ++--
nifi-extension-bundles/nifi-azure-bundle/pom.xml | 2 +-
.../nifi-graph-bundle/nifi-graph-test-clients/pom.xml | 2 +-
.../nifi/jms/processors/MessageBodyToBytesConverter.java | 11 +++++++++--
nifi-extension-bundles/nifi-poi-bundle/pom.xml | 2 +-
.../nifi-standard-shared-bom/pom.xml | 2 +-
pom.xml | 6 +++---
8 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/nifi-code-coverage/pom.xml b/nifi-code-coverage/pom.xml
index 841153cab8..01eb29656b 100644
--- a/nifi-code-coverage/pom.xml
+++ b/nifi-code-coverage/pom.xml
@@ -88,7 +88,7 @@
<dependency>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-http</artifactId>
- <version>1.2.10</version>
+ <version>1.3.0</version>
</dependency>
<!-- SSHD from Registry and other modules -->
<dependency>
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
index 17bef6db44..ae86d16cdb 100644
--- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
+++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
@@ -110,7 +110,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
- <version>3.7.13</version>
+ <version>3.8.0</version>
</dependency>
<dependency>
<groupId>com.azure</groupId>
@@ -190,7 +190,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
- <version>3.7.13</version>
+ <version>3.8.0</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-extension-bundles/nifi-azure-bundle/pom.xml
b/nifi-extension-bundles/nifi-azure-bundle/pom.xml
index 0a9c87e9d6..58d1a75ee3 100644
--- a/nifi-extension-bundles/nifi-azure-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-azure-bundle/pom.xml
@@ -78,7 +78,7 @@
<dependency>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-http</artifactId>
- <version>1.2.10</version>
+ <version>1.3.0</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git
a/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml
b/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml
index 3c21b81e34..b421bcc8a1 100644
--- a/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml
+++ b/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml
@@ -25,7 +25,7 @@
<artifactId>nifi-graph-test-clients</artifactId>
<packaging>jar</packaging>
<properties>
- <janusgraph.version>1.2.0-20251106-225718.92a1b98</janusgraph.version>
+ <janusgraph.version>1.2.0-20251108-015359.2fa5bca</janusgraph.version>
<guava.version>33.5.0-jre</guava.version>
<amqp-client.version>5.27.1</amqp-client.version>
</properties>
diff --git
a/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/MessageBodyToBytesConverter.java
b/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/MessageBodyToBytesConverter.java
index bed0846ae4..8a6a3bf503 100644
---
a/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/MessageBodyToBytesConverter.java
+++
b/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/MessageBodyToBytesConverter.java
@@ -178,7 +178,7 @@ abstract class MessageBodyToBytesConverter {
}
private static class BytesMessageInputStream extends InputStream {
- private BytesMessage message;
+ private final BytesMessage message;
public BytesMessageInputStream(BytesMessage message) {
this.message = message;
@@ -187,7 +187,10 @@ abstract class MessageBodyToBytesConverter {
@Override
public int read() throws IOException {
try {
- return this.message.readByte();
+ int value = Byte.toUnsignedInt(this.message.readByte());
+ return value;
+ } catch (MessageEOFException eof) {
+ return -1;
} catch (JMSException e) {
throw new IOException(e.toString());
}
@@ -201,6 +204,8 @@ abstract class MessageBodyToBytesConverter {
} else {
return super.read(buffer, offset, length);
}
+ } catch (MessageEOFException eof) {
+ return -1;
} catch (JMSException e) {
throw new IOException(e.toString());
}
@@ -210,6 +215,8 @@ abstract class MessageBodyToBytesConverter {
public int read(byte[] buffer) throws IOException {
try {
return this.message.readBytes(buffer);
+ } catch (MessageEOFException eof) {
+ return -1;
} catch (JMSException e) {
throw new IOException(e.toString());
}
diff --git a/nifi-extension-bundles/nifi-poi-bundle/pom.xml
b/nifi-extension-bundles/nifi-poi-bundle/pom.xml
index 9513c2f476..c56d742dd0 100644
--- a/nifi-extension-bundles/nifi-poi-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-poi-bundle/pom.xml
@@ -45,7 +45,7 @@
<dependency>
<groupId>com.github.pjfanning</groupId>
<artifactId>excel-streaming-reader</artifactId>
- <version>5.1.1</version>
+ <version>5.1.2</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git
a/nifi-extension-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml
b/nifi-extension-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml
index 8b434cd08f..42ec86785c 100644
---
a/nifi-extension-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml
+++
b/nifi-extension-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml
@@ -127,7 +127,7 @@
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
- <version>2.43.0</version>
+ <version>2.44.0</version>
<scope>provided</scope>
</dependency>
<!-- OkHttp -->
diff --git a/pom.xml b/pom.xml
index 38f4760d8d..4559697feb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,11 +116,11 @@
<node.version>v22.19.0</node.version>
<!-- NiFi build -->
- <nifi-api.version>2.4.0</nifi-api.version>
+ <nifi-api.version>2.5.0</nifi-api.version>
<nifi.nar.maven.plugin.version>2.2.0</nifi.nar.maven.plugin.version>
<!-- CSPs SDK -->
- <software.amazon.awssdk.version>2.38.1</software.amazon.awssdk.version>
+ <software.amazon.awssdk.version>2.38.2</software.amazon.awssdk.version>
<software.amazon.encryption.s3.version>3.5.0</software.amazon.encryption.s3.version>
<azure.sdk.bom.version>1.3.2</azure.sdk.bom.version> <!-- when
changing this version, also update msal4j to the version that is required by
azure-identity -->
@@ -131,7 +131,7 @@
<org.apache.commons.compress.version>1.28.0</org.apache.commons.compress.version>
<org.apache.commons.configuration.version>2.12.0</org.apache.commons.configuration.version>
<org.apache.commons.csv.version>1.14.1</org.apache.commons.csv.version>
- <org.apache.commons.io.version>2.20.0</org.apache.commons.io.version>
+ <org.apache.commons.io.version>2.21.0</org.apache.commons.io.version>
<org.apache.commons.lang3.version>3.19.0</org.apache.commons.lang3.version>
<org.apache.commons.net.version>3.12.0</org.apache.commons.net.version>
<org.apache.commons.text.version>1.14.0</org.apache.commons.text.version>