From f206bd742c5eb09be38baec4601daf00b40b8453 Mon Sep 17 00:00:00 2001
From: Russ Poetker <rpoetke1@jh.edu>
Date: Tue, 19 Aug 2025 09:14:04 -0400
Subject: [PATCH 1/2] Disable flaky tests

---
 .../dispatch/email/SpringUriTemplateResolverTest.java          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pass-notification-service/src/test/java/org/eclipse/pass/notification/dispatch/email/SpringUriTemplateResolverTest.java b/pass-notification-service/src/test/java/org/eclipse/pass/notification/dispatch/email/SpringUriTemplateResolverTest.java
index 87e6d1ce3..2485b1154 100644
--- a/pass-notification-service/src/test/java/org/eclipse/pass/notification/dispatch/email/SpringUriTemplateResolverTest.java
+++ b/pass-notification-service/src/test/java/org/eclipse/pass/notification/dispatch/email/SpringUriTemplateResolverTest.java
@@ -25,6 +25,7 @@
 import java.net.URL;
 
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -45,11 +46,13 @@ public void resolveClasspathUrl() {
         assertNotNull(springUriTemplateResolver.resolve(null, "classpath:" + packageName + "/" + "templateToResolve"));
     }
 
+    @Disabled("flaky test using example.com")
     @Test
     public void resolveHttpUrl() {
         assertNotNull(springUriTemplateResolver.resolve(null, "http://example.org"));
     }
 
+    @Disabled("flaky test using example.com")
     @Test
     public void resolveHttpsUrl() {
         assertNotNull(springUriTemplateResolver.resolve(null, "https://example.org"));

From 7105f50d2d78f65852bbb63c7733f59b3cd58973 Mon Sep 17 00:00:00 2001
From: Russ Poetker <rpoetke1@jh.edu>
Date: Tue, 19 Aug 2025 09:16:01 -0400
Subject: [PATCH 2/2] Bump commons-lang3 dep version

---
 pass-data-client/pom.xml          | 2 +-
 pass-deposit-services/pom.xml     | 6 ++++++
 pass-grant-loader/pom.xml         | 6 ++++++
 pass-journal-loader/pom.xml       | 4 ++--
 pass-nihms-loader/pom.xml         | 6 ++++++
 pass-notification-service/pom.xml | 6 ++++++
 6 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/pass-data-client/pom.xml b/pass-data-client/pom.xml
index 5a11d8d4a..95be57788 100644
--- a/pass-data-client/pom.xml
+++ b/pass-data-client/pom.xml
@@ -17,7 +17,7 @@
     <jsonapi-adapters.version>1.1.0</jsonapi-adapters.version>
     <slf4j.version>2.0.16</slf4j.version>
     <logback.version>1.5.16</logback.version>
-    <commons-lang3.version>3.14.0</commons-lang3.version>
+    <commons-lang3.version>3.18.0</commons-lang3.version>
     <junit.jupiter.version>5.10.5</junit.jupiter.version>
     <mockito.version>5.11.0</mockito.version>
     <testcontainers.version>1.19.8</testcontainers.version>
diff --git a/pass-deposit-services/pom.xml b/pass-deposit-services/pom.xml
index f6974a677..291125845 100644
--- a/pass-deposit-services/pom.xml
+++ b/pass-deposit-services/pom.xml
@@ -39,6 +39,7 @@
     <awsspring.version>3.2.1</awsspring.version>
     <commons-compress.version>1.27.1</commons-compress.version>
     <commons-io.version>2.17.0</commons-io.version>
+    <commons-lang3.version>3.18.0</commons-lang3.version>
     <okhttp.version>4.12.0</okhttp.version>
     <xmlunit.version>2.10.0</xmlunit.version>
     <commons-codec.version>1.17.1</commons-codec.version>
@@ -206,6 +207,11 @@
         <artifactId>netty-common</artifactId>
         <version>4.1.118.Final</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+        <version>${commons-lang3.version}</version>
+      </dependency>
       <!-- End of transitive deps with CVE issues. -->
     </dependencies>
   </dependencyManagement>
diff --git a/pass-grant-loader/pom.xml b/pass-grant-loader/pom.xml
index 9b04e7aad..2197695a7 100644
--- a/pass-grant-loader/pom.xml
+++ b/pass-grant-loader/pom.xml
@@ -34,6 +34,7 @@
     <commons.csv.version>1.12.0</commons.csv.version>
     <mysql.jdbc.version>9.4.0</mysql.jdbc.version>
     <maven-model.version>3.9.9</maven-model.version>
+    <commons-lang3.version>3.18.0</commons-lang3.version>
   </properties>
 
   <dependencyManagement>
@@ -66,6 +67,11 @@
         <artifactId>netty-common</artifactId>
         <version>4.1.118.Final</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+        <version>${commons-lang3.version}</version>
+      </dependency>
       <!-- End of transitive deps with CVE issues. -->
     </dependencies>
   </dependencyManagement>
diff --git a/pass-journal-loader/pom.xml b/pass-journal-loader/pom.xml
index b204577c5..71d7a1b65 100644
--- a/pass-journal-loader/pom.xml
+++ b/pass-journal-loader/pom.xml
@@ -18,7 +18,7 @@
   <properties>
     <spring-boot-maven-plugin.version>3.3.5</spring-boot-maven-plugin.version>
     <commons.csv.version>1.12.0</commons.csv.version>
-    <commons-lang.version>3.14.0</commons-lang.version>
+    <commons-lang3.version>3.18.0</commons-lang3.version>
     <slf4j.version>2.0.16</slf4j.version>
     <logback.version>1.5.16</logback.version>
     <junit.jupiter.version>5.10.5</junit.jupiter.version>
@@ -42,7 +42,7 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
-        <version>${commons-lang.version}</version>
+        <version>${commons-lang3.version}</version>
       </dependency>
 
       <dependency>
diff --git a/pass-nihms-loader/pom.xml b/pass-nihms-loader/pom.xml
index 6b79cc690..7e7be8f0c 100644
--- a/pass-nihms-loader/pom.xml
+++ b/pass-nihms-loader/pom.xml
@@ -30,6 +30,7 @@
         <okhttp.version>4.12.0</okhttp.version>
         <commons-collections4.version>4.4</commons-collections4.version>
         <joda-time.version>2.13.0</joda-time.version>
+        <commons-lang3.version>3.18.0</commons-lang3.version>
     </properties>
 
     <dependencyManagement>
@@ -87,6 +88,11 @@
                 <artifactId>netty-common</artifactId>
                 <version>4.1.118.Final</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>${commons-lang3.version}</version>
+            </dependency>
             <!-- End of transitive deps with CVE issues. -->
 
         </dependencies>
diff --git a/pass-notification-service/pom.xml b/pass-notification-service/pom.xml
index 4b82900b0..a5025d522 100644
--- a/pass-notification-service/pom.xml
+++ b/pass-notification-service/pom.xml
@@ -37,6 +37,7 @@
         <greenmail-junit5.version>2.1.0</greenmail-junit5.version>
         <jakarta-json.version>2.0.1</jakarta-json.version>
         <maven-model.version>3.9.9</maven-model.version>
+        <commons-lang3.version>3.18.0</commons-lang3.version>
     </properties>
 
     <dependencyManagement>
@@ -69,6 +70,11 @@
                 <artifactId>netty-common</artifactId>
                 <version>4.1.118.Final</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>${commons-lang3.version}</version>
+            </dependency>
             <!-- End of transitive deps with CVE issues. -->
         </dependencies>
     </dependencyManagement>