From 713b3484ce0d4354718415c8d667dd66b9a291f6 Mon Sep 17 00:00:00 2001 From: Aaron Wirick Date: Tue, 3 Nov 2026 09:45:33 -0800 Subject: [PATCH 1/4] Run on Jackson 2.21 and refresh dependencies Changes: - Switched JacksonJson to PropertyNamingStrategies, since jackson-databind 2.20 removed the PropertyNamingStrategy constants - Imported jackson-bom 2.21.8 so Jersey's transitive Jackson matches brain-backend - Bumped Jersey 3.1.1 to 3.1.12, RESTEasy client 6.2.3 to 6.2.19, OkHttp 4.9.3 to 4.12.0 and jakarta.activation 2.1.1 to 2.1.4 - Bumped JUnit 5.8.2 to 5.14.4 and Mockito 4.4.0 to 4.11.0 - Bumped maven-enforcer-plugin to 3.6.2 and extra-enforcer-rules to 1.12.1, since 1.3 crashes on multi-release jars - Bumped the version to 6.0.5 Co-Authored-By: Claude Opus 5.5 --- pom.xml | 28 ++++++++++++------- .../org/gitlab4j/api/utils/JacksonJson.java | 6 ++-- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 1c8d985e0..ed0a974cf 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.gitlab4j gitlab4j-api-cortex jar - 6.0.4 + 6.0.5 GitLab4J-API - GitLab API Java Client GitLab4J-API (gitlab4j-api) provides a full featured Java client library for working with GitLab repositories and servers via the GitLab REST API. https://github.com/gitlab4j/gitlab4j-api @@ -52,14 +52,14 @@ UTF-8 UTF-8 - 3.1.1 - 2.14.1 + 3.1.12 + 2.21.8 6.0.0 - 2.1.1 + 2.1.4 - 5.8.2 + 5.14.4 1.15.3 - 4.4.0 + 4.11.0 1.3 1.19.0 @@ -259,7 +259,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M2 + 3.6.2 @@ -282,7 +282,7 @@ org.codehaus.mojo extra-enforcer-rules - 1.3 + 1.12.1 @@ -395,7 +395,7 @@ org.jboss.resteasy resteasy-client - 6.2.3.Final + 6.2.19.Final net.ltgt.jaxrs @@ -411,12 +411,20 @@ com.squareup.okhttp3 okhttp - 4.9.3 + 4.12.0 + + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + org.codehaus.mojo.signature diff --git a/src/main/java/org/gitlab4j/api/utils/JacksonJson.java b/src/main/java/org/gitlab4j/api/utils/JacksonJson.java index e30463bb7..2b6328c2d 100644 --- a/src/main/java/org/gitlab4j/api/utils/JacksonJson.java +++ b/src/main/java/org/gitlab4j/api/utils/JacksonJson.java @@ -33,7 +33,7 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.module.SimpleModule; @@ -59,7 +59,7 @@ public JacksonJson() { objectMapper = new ObjectMapper(); objectMapper.setSerializationInclusion(Include.NON_NULL); - objectMapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE); + objectMapper.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE); objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false); objectMapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true); @@ -349,7 +349,7 @@ public List deserialize(JsonParser jsonParser, DeserializationContext cont private static class JacksonJsonSingletonHelper { private static final JacksonJson JACKSON_JSON = new JacksonJson(); static { - JACKSON_JSON.objectMapper.setPropertyNamingStrategy(PropertyNamingStrategy.LOWER_CAMEL_CASE); + JACKSON_JSON.objectMapper.setPropertyNamingStrategy(PropertyNamingStrategies.LOWER_CAMEL_CASE); JACKSON_JSON.objectMapper.setSerializationInclusion(Include.ALWAYS); } } From ae02d84ffea649076a796417ba0126ff97fdc116 Mon Sep 17 00:00:00 2001 From: Aaron Wirick Date: Tue, 3 Nov 2026 09:46:13 -0800 Subject: [PATCH 2/4] Move CI and publish workflows off retired action versions Changes: - Bumped actions/checkout, setup-java and cache to v4, since GitHub now fails any job using actions/cache v2 - Switched the JDK distribution to temurin and the date output to GITHUB_OUTPUT Co-Authored-By: Claude Opus 5.5 --- .github/workflows/ci-build.yml | 10 +++++----- .github/workflows/ci-publish.yml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 8088eb05f..3ecd0c09f 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -20,22 +20,22 @@ jobs: ports: - 8090:80 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: - distribution: adopt-hotspot + distribution: temurin java-version: 11 - name: Get Date id: get-date run: | - echo "::set-output name=date::$(/bin/date -u "+%Y-%m")" + echo "date=$(/bin/date -u "+%Y-%m")" >> "$GITHUB_OUTPUT" shell: bash - name: Cache Maven Repository id: cache-maven - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2/repository # refresh cache every month to avoid unlimited growth diff --git a/.github/workflows/ci-publish.yml b/.github/workflows/ci-publish.yml index db768c53f..b1841267b 100644 --- a/.github/workflows/ci-publish.yml +++ b/.github/workflows/ci-publish.yml @@ -15,22 +15,22 @@ jobs: ports: - 8090:80 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: - distribution: adopt-hotspot + distribution: temurin java-version: 11 - name: Get Date id: get-date run: | - echo "::set-output name=date::$(/bin/date -u "+%Y-%m")" + echo "date=$(/bin/date -u "+%Y-%m")" >> "$GITHUB_OUTPUT" shell: bash - name: Cache Maven Repository id: cache-maven - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2/repository # refresh cache every month to avoid unlimited growth From 5e5376550d73edb9689fb1663cff3f70979990b4 Mon Sep 17 00:00:00 2001 From: Aaron Wirick Date: Tue, 3 Nov 2026 09:50:04 -0800 Subject: [PATCH 3/4] Run the Maven wrapper on Maven 3.9.16 Changes: - Moved the wrapper from Maven 3.6.1 to 3.9.16, since maven-enforcer-plugin 3.6.2 requires Maven 3.6.3 or later Co-Authored-By: Claude Opus 5.5 --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index cc8a8a76a..a6fa87956 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip From e67fb75d268b5872f86345021bb8b8dfb0796462 Mon Sep 17 00:00:00 2001 From: Aaron Wirick Date: Tue, 3 Nov 2026 09:57:32 -0800 Subject: [PATCH 4/4] Bump system-stubs-jupiter for JUnit 5.14 Changes: - Bumped system-stubs-jupiter 1.2.0 to 2.1.8, since 1.2.0 calls a JUnit ReflectionUtils method that 5.14 removed Co-Authored-By: Claude Opus 5.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ed0a974cf..62e209c22 100644 --- a/pom.xml +++ b/pom.xml @@ -389,7 +389,7 @@ uk.org.webcompere system-stubs-jupiter - 1.2.0 + 2.1.8 test