From 40c84fe717b405863beaefa3cc1b2fd24113c648 Mon Sep 17 00:00:00 2001 From: nscuro Date: Mon, 26 Feb 2024 16:45:45 +0100 Subject: [PATCH 1/2] Build against Java 21 in CI Docker base image is already bumped to 21. Relates to https://github.com/DependencyTrack/hyades/issues/1070 Signed-off-by: nscuro --- .github/workflows/_meta-build.yaml | 2 +- .github/workflows/ci-release.yaml | 2 +- .github/workflows/ci-test.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/_meta-build.yaml b/.github/workflows/_meta-build.yaml index 63bdb74a5..7361e09c5 100644 --- a/.github/workflows/_meta-build.yaml +++ b/.github/workflows/_meta-build.yaml @@ -30,7 +30,7 @@ jobs: uses: actions/setup-java@v4.0.0 with: distribution: 'temurin' - java-version: '17' + java-version: '21' cache: 'maven' - name: Setup CycloneDX CLI diff --git a/.github/workflows/ci-release.yaml b/.github/workflows/ci-release.yaml index e2280f44c..9064ae573 100644 --- a/.github/workflows/ci-release.yaml +++ b/.github/workflows/ci-release.yaml @@ -57,7 +57,7 @@ jobs: uses: actions/setup-java@v4.0.0 with: distribution: 'temurin' - java-version: '17' + java-version: '21' cache: 'maven' - name: Set Version diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index 31624e79b..1488b1739 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -37,7 +37,7 @@ jobs: uses: actions/setup-java@v4.0.0 with: distribution: 'temurin' - java-version: '17' + java-version: '21' cache: 'maven' - name: Execute unit tests From e571dddf8f26fe941a5b495e8323e5c3ddcf15c3 Mon Sep 17 00:00:00 2001 From: nscuro Date: Tue, 27 Feb 2024 13:36:04 +0100 Subject: [PATCH 2/2] Fix missing URL encoding of `\` Looks like Java 21's URL validation got a bit stricter :) Signed-off-by: nscuro --- .../dependencytrack/common/ManagedHttpClientFactoryTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/dependencytrack/common/ManagedHttpClientFactoryTest.java b/src/test/java/org/dependencytrack/common/ManagedHttpClientFactoryTest.java index 80c9de6ad..c3bcef0cb 100644 --- a/src/test/java/org/dependencytrack/common/ManagedHttpClientFactoryTest.java +++ b/src/test/java/org/dependencytrack/common/ManagedHttpClientFactoryTest.java @@ -36,7 +36,7 @@ public class ManagedHttpClientFactoryTest { @Before public void before() { - environmentVariables.set("http_proxy", "http://acme\\username:password@127.0.0.1:1080"); + environmentVariables.set("http_proxy", "http://acme%5Cusername:password@127.0.0.1:1080"); environmentVariables.set("no_proxy", "localhost:443,127.0.0.1:8080,example.com,www.example.net"); }