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 }}" }] diff --git a/pom.xml b/pom.xml index f35190e..5c8f3a6 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.commonjava commonjava - 18 + 21 org.commonjava.util @@ -43,10 +43,11 @@ Red Hat, Inc. https://github.com/Commonjava/jhttpc 11 - 4.4.15 - 4.5.13 + + 4.4.16 + 4.5.14 - 1.76 + 1.82 Setting LogLevel for all modules to trace6 docker.io/commonjava/ssl-dojo:1.1 @@ -78,7 +79,7 @@ org.commonjava.boms web-commons-bom - 29 + 30 pom import @@ -103,15 +104,10 @@ bcpkix-jdk18on ${bouncycastleVersion} - - commons-codec - commons-codec - 1.15 - org.commonjava.util http-testserver-junit4 - 2.2.1 + 2.3.3 @@ -182,11 +178,6 @@ hamcrest-core test - - commons-lang - commons-lang - test - 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;