Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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

30 changes: 19 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>org.gitlab4j</groupId>
<artifactId>gitlab4j-api-cortex</artifactId>
<packaging>jar</packaging>
<version>6.0.4</version>
<version>6.0.5</version>
<name>GitLab4J-API - GitLab API Java Client</name>
<description>GitLab4J-API (gitlab4j-api) provides a full featured Java client library for working with GitLab repositories and servers via the GitLab REST API.</description>
<url>https://github.com/gitlab4j/gitlab4j-api</url>
Expand Down Expand Up @@ -52,14 +52,14 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<jersey.version>3.1.1</jersey.version>
<jackson.version>2.14.1</jackson.version>
<jersey.version>3.1.12</jersey.version>
<jackson.version>2.21.8</jackson.version>
<servlet.version>6.0.0</servlet.version>
<activation.version>2.1.1</activation.version>
<activation.version>2.1.4</activation.version>

<junit.version>5.8.2</junit.version>
<junit.version>5.14.4</junit.version>
<testcontainers.version>1.15.3</testcontainers.version>
<mockito.version>4.4.0</mockito.version>
<mockito.version>4.11.0</mockito.version>
<hamcrest.version>1.3</hamcrest.version>
<systemRules.version>1.19.0</systemRules.version>

Expand Down Expand Up @@ -259,7 +259,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
<version>3.6.2</version>
<configuration>
<rules>
<enforceBytecodeVersion>
Expand All @@ -282,7 +282,7 @@
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.3</version>
<version>1.12.1</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -389,13 +389,13 @@
<dependency>
<groupId>uk.org.webcompere</groupId>
<artifactId>system-stubs-jupiter</artifactId>
<version>1.2.0</version>
<version>2.1.8</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
<version>6.2.3.Final</version>
<version>6.2.19.Final</version>
</dependency>
<dependency>
<groupId>net.ltgt.jaxrs</groupId>
Expand All @@ -411,12 +411,20 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.9.3</version>
<version>4.12.0</version>
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<!-- Align Jersey's transitive Jackson with the version brain-backend runs -->
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Needed for animal-sniffer -->
<dependency>
<groupId>org.codehaus.mojo.signature</groupId>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/gitlab4j/api/utils/JacksonJson.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down Expand Up @@ -349,7 +349,7 @@ public List<User> 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);
}
}
Expand Down
Loading