From 061864bfc3a1c6d1666c5150a5092301be71c93b Mon Sep 17 00:00:00 2001
From: Nick Cross <ncross@redhat.com>
Date: Mon, 20 Oct 2025 10:44:40 +0100
Subject: [PATCH 1/3] Update Bouncycastle, web-commons-bom, http-test-server,
 jackson and commonsjava parent

---
 pom.xml | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index f35190e..5c8f3a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.commonjava</groupId>
     <artifactId>commonjava</artifactId>
-    <version>18</version>
+    <version>21</version>
   </parent>
 
   <groupId>org.commonjava.util</groupId>
@@ -43,10 +43,11 @@
     <projectOwner>Red Hat, Inc.</projectOwner>
     <projectEmail>https://github.com/Commonjava/jhttpc</projectEmail>
     <javaVersion>11</javaVersion>
-    <httpcoreVersion>4.4.15</httpcoreVersion>
-    <httpclientVersion>4.5.13</httpclientVersion>
+    <!-- Match versions from web-commons-bom -->
+    <httpcoreVersion>4.4.16</httpcoreVersion>
+    <httpclientVersion>4.5.14</httpclientVersion>
 
-    <bouncycastleVersion>1.76</bouncycastleVersion>
+    <bouncycastleVersion>1.82</bouncycastleVersion>
     <dockerWaitFor>Setting LogLevel for all modules to trace6</dockerWaitFor>
 
     <dockerImage>docker.io/commonjava/ssl-dojo:1.1</dockerImage>
@@ -78,7 +79,7 @@
       <dependency>
         <groupId>org.commonjava.boms</groupId>
         <artifactId>web-commons-bom</artifactId>
-        <version>29</version>
+        <version>30</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -103,15 +104,10 @@
         <artifactId>bcpkix-jdk18on</artifactId>
         <version>${bouncycastleVersion}</version>
       </dependency>
-      <dependency>
-        <groupId>commons-codec</groupId>
-        <artifactId>commons-codec</artifactId>
-        <version>1.15</version>
-      </dependency>
       <dependency>
         <groupId>org.commonjava.util</groupId>
         <artifactId>http-testserver-junit4</artifactId>
-        <version>2.2.1</version>
+        <version>2.3.3</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -182,11 +178,6 @@
       <artifactId>hamcrest-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

From b5e910e0e552ca794b03cfce6e3eb43f5b1a6a95 Mon Sep 17 00:00:00 2001
From: Nick Cross <ncross@redhat.com>
Date: Mon, 20 Oct 2025 10:51:09 +0100
Subject: [PATCH 2/3] Fix imports

---
 src/test/java/org/commonjava/util/jhttpc/it/AbstractIT.java | 2 +-
 .../util/jhttpc/unit/ResourceCleanupLoadTest.java           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/commonjava/util/jhttpc/it/AbstractIT.java b/src/test/java/org/commonjava/util/jhttpc/it/AbstractIT.java
index dadc352..37975f8 100644
--- a/src/test/java/org/commonjava/util/jhttpc/it/AbstractIT.java
+++ b/src/test/java/org/commonjava/util/jhttpc/it/AbstractIT.java
@@ -16,7 +16,7 @@
 package org.commonjava.util.jhttpc.it;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpDelete;
 import org.apache.http.client.methods.HttpGet;
diff --git a/src/test/java/org/commonjava/util/jhttpc/unit/ResourceCleanupLoadTest.java b/src/test/java/org/commonjava/util/jhttpc/unit/ResourceCleanupLoadTest.java
index c827cf2..110437a 100644
--- a/src/test/java/org/commonjava/util/jhttpc/unit/ResourceCleanupLoadTest.java
+++ b/src/test/java/org/commonjava/util/jhttpc/unit/ResourceCleanupLoadTest.java
@@ -33,9 +33,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.concurrent.CountDownLatch;

From 2d121a77bbd050bf4092e41b8793d8c62544b8c0 Mon Sep 17 00:00:00 2001
From: Nick Cross <ncross@redhat.com>
Date: Mon, 20 Oct 2025 11:09:12 +0100
Subject: [PATCH 3/3] Fix deployment server

---
 .github/workflows/maven-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index 3c3e80d..fdad7e1 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -57,7 +57,7 @@ jobs:
       with:
         servers: |
           [{
-              "id": "sonatype-nexus-snapshots",
+              "id": "central-portal-snapshots",
               "username": "${{ secrets.SONATYPE_BOT_USERNAME }}",
               "password": "${{ secrets.SONATYPE_BOT_TOKEN }}"
           }]