Skip to content

Update Bouncycastle, web-commons-bom, http-test-server, jackson and c… #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sswguo merged 3 commits into from
Oct 20, 2025
Merged

Update Bouncycastle, web-commons-bom, http-test-server, jackson and c… #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
061864b
Update Bouncycastle, web-commons-bom, http-test-server, jackson and c…
rnc Oct 20, 2025
b5e910e
Fix imports
rnc Oct 20, 2025
2d121a7
Fix deployment server
rnc Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/maven-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
}]
Expand Down
23 changes: 7 additions & 16 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.commonjava</groupId>
<artifactId>commonjava</artifactId>
<version>18</version>
<version>21</version>
</parent>

<groupId>org.commonjava.util</groupId>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/commonjava/util/jhttpc/it/AbstractIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/org/commonjava/util/jhttpc/unit/ResourceCleanupLoadTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down