(nifi) branch main updated: NIFI-12871 Upgraded Commons Compress from 1.25.0 to 1.26.1

[pvillard]

This is an automated email from the ASF dual-hosted git repository.

pvillard 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 90c7dba34f NIFI-12871 Upgraded Commons Compress from 1.25.0 to 1.26.1
90c7dba34f is described below

commit 90c7dba34f08921b0b3b528c6a9fc20bf298a288
Author: exceptionfactory <exceptionfact...@apache.org>
AuthorDate: Fri Mar 8 20:37:12 2024 -0600

    NIFI-12871 Upgraded Commons Compress from 1.25.0 to 1.26.1
    
    - Adjusted Excel Record Reader test failure to use OpenXML Exception 
instead of message matching
    
    Signed-off-by: Pierre Villard <pierre.villard...@gmail.com>
    
    This closes #8488.
---
 .../src/test/java/org/apache/nifi/excel/TestExcelRecordReader.java    | 4 +++-
 pom.xml                                                               | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelRecordReader.java
 
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelRecordReader.java
index b83bb52968..6fde3d07f1 100644
--- 
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelRecordReader.java
+++ 
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelRecordReader.java
@@ -25,6 +25,7 @@ import org.apache.nifi.serialization.record.Record;
 import org.apache.nifi.serialization.record.RecordField;
 import org.apache.nifi.serialization.record.RecordFieldType;
 import org.apache.nifi.serialization.record.RecordSchema;
+import org.apache.poi.openxml4j.exceptions.OpenXML4JRuntimeException;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -59,7 +60,8 @@ public class TestExcelRecordReader {
                 .build();
 
         MalformedRecordException mre = 
assertThrows(MalformedRecordException.class, () -> new 
ExcelRecordReader(configuration, getInputStream("notExcel.txt"), logger));
-        assertTrue(ExceptionUtils.getStackTrace(mre).contains("this is not a 
valid OOXML"));
+        final Throwable cause = mre.getCause();
+        assertInstanceOf(OpenXML4JRuntimeException.class, cause);
     }
 
     @Test
diff --git a/pom.xml b/pom.xml
index 711916f202..1fadf4fcad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
         <okio.version>3.8.0</okio.version>
         <org.apache.commons.cli.version>1.6.0</org.apache.commons.cli.version>
         
<org.apache.commons.codec.version>1.16.1</org.apache.commons.codec.version>
-        
<org.apache.commons.compress.version>1.25.0</org.apache.commons.compress.version>
+        
<org.apache.commons.compress.version>1.26.1</org.apache.commons.compress.version>
         
<org.apache.commons.lang3.version>3.14.0</org.apache.commons.lang3.version>
         <org.apache.commons.net.version>3.10.0</org.apache.commons.net.version>
         <org.apache.commons.io.version>2.15.1</org.apache.commons.io.version>