From 3f7a11e38ccb4db0d960edd19459e5b30d60abc7 Mon Sep 17 00:00:00 2001
From: Rob McDougall <rmcdougawww@rogers.com>
Date: Tue, 6 Jan 2026 09:36:40 -0500
Subject: [PATCH 1/3] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20dependencies?=
 =?UTF-8?q?=20to=20latest=20compatible=20versions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 41 +++++------------------------------------
 1 file changed, 5 insertions(+), 36 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5038351..61c8e01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,15 +12,13 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- Project Dependencies -->
-		<apache-poi.version>5.2.5</apache-poi.version> <!-- reminder - remove the explicit commons-compress dependency when this gets updated. -->
-		<commons-collections4.version>4.4</commons-collections4.version>
-		<commons-compress.version>1.26.0</commons-compress.version>	<!-- Included to address CVE-2024-25710 and CVE-2024-26308 -->
+		<apache-poi.version>5.5.1</apache-poi.version>
+		<commons-collections4.version>4.5.0</commons-collections4.version>
 
 		<!-- Testing Dependencies -->
-		<junit.version>5.10.2</junit.version>
-		<mockito.version>5.10.0</mockito.version>
-		<hamcrest.version>2.2</hamcrest.version>
-		<junit-addons.version>1.4</junit-addons.version>
+		<junit.version>5.14.1</junit.version>
+		<mockito.version>5.21.0</mockito.version>
+		<hamcrest.version>3.0</hamcrest.version>
 		<jimfs.version>1.3.0</jimfs.version>
 	</properties>
 
@@ -44,12 +42,6 @@
 			<artifactId>poi-ooxml</artifactId>
 			<version>${apache-poi.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-compress</artifactId>
-			<version>1.26.0</version>
-			<scope>compile</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-collections4</artifactId>
@@ -75,29 +67,6 @@
 			<version>${mockito.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>junit-addons</groupId>
-			<artifactId>junit-addons</artifactId>
-			<version>${junit-addons.version}</version>
-			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<!-- Exclude this really old version of junit that junit-addons depends on -->
-					<groupId>junit</groupId>
-					<artifactId>junit</artifactId>
-				</exclusion>
-				<exclusion>
-					<!-- Exclude this really old version of xerces that junit-addons depends on -->
-					<groupId>xerces</groupId>
-					<artifactId>xercesImpl</artifactId>
-				</exclusion>
-				<exclusion>
-					<!-- Exclude this really old version of xerces that junit-addons depends on -->
-					<groupId>xerces</groupId>
-					<artifactId>xmlParserAPIs</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-library</artifactId>

From 2c7bf6b5d1ac25adff1ff6977b57d2a29680e25d Mon Sep 17 00:00:00 2001
From: Rob McDougall <rmcdougawww@rogers.com>
Date: Wed, 7 Jan 2026 07:31:29 -0500
Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=91=B7=20Update=20CI=20to=20use=20lat?=
 =?UTF-8?q?est=20github=20actions=20steps?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also add experimental Java 25 build.  Modify to only deploy from main.
---
 .github/workflows/simple-excel-publish.yml | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/simple-excel-publish.yml b/.github/workflows/simple-excel-publish.yml
index adfd5a5..24955b9 100644
--- a/.github/workflows/simple-excel-publish.yml
+++ b/.github/workflows/simple-excel-publish.yml
@@ -12,15 +12,25 @@ on:
 
 jobs:
   build:
+    name: Java ${{ matrix.java }} build
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: true
+      matrix:
+        java: [ 11 ]
+        experimental: [false]
+        include:
+          - java: 25
+            experimental: true
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 11 for Shared Runner
-      uses: actions/setup-java@v3
+    - uses: actions/checkout@v6
+    - name: Set up JDK ${{ matrix.java }}
+      uses: actions/setup-java@v5
       with:
         distribution: 'zulu'
-        java-version: '11'
+        java-version: ${{ matrix.java }}
         cache: 'maven'
         server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
         settings-path: ${{ github.workspace }} # location for the settings.xml file
@@ -31,6 +41,7 @@ jobs:
         GITHUB_TOKEN: ${{ github.token }}
 
     - name: Publish to GitHub Packages Apache Maven
-      run: mvn -B deploy -s $GITHUB_WORKSPACE/settings.xml
+      if: (github.ref == 'refs/heads/master' || github.ref == 'refs/tags/*') &&  !matrix.experimental # Only run on main branch or tags and non-experimental
+      run: mvn -B deploy -DskipTests -s $GITHUB_WORKSPACE/settings.xml
       env:
         GITHUB_TOKEN: ${{ github.token }}
\ No newline at end of file

From 7dc51fa4b0fea19041bc2707b33722f1b208d724 Mon Sep 17 00:00:00 2001
From: Rob McDougall <rmcdougawww@rogers.com>
Date: Wed, 7 Jan 2026 07:41:59 -0500
Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=91=B7=20Switch=20maven=20to=20using?=
 =?UTF-8?q?=20maven.compiler.release=20property?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 61c8e01..acfc2b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,8 +7,7 @@
 	<description>Library that utilizes Apache POI to read Excel files simply.</description>
 	<properties>
 		<java.version>11</java.version>
-		<maven.compiler.source>${java.version}</maven.compiler.source>
-		<maven.compiler.target>${java.version}</maven.compiler.target>
+		<maven.compiler.release>${java.version}</maven.compiler.release>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- Project Dependencies -->