Skip to content

Commit eb5dc80

Browse files
committed
Bumped OpenAPI Generator, org.json and Spring versions, used Jackson 3
1 parent c6231e9 commit eb5dc80

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

.github/workflows/ci-spring-restclient.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
java-version: [ '17' ]
17-
spring-web-version: [ '6.2.0', '6.2.15', '7.0.2' ]
17+
spring-web-version: [ '6.2.0', '6.2.15', '7.0.3' ]
1818
name: spring-web v${{ matrix.spring-web-version }}
1919
env:
2020
OKHTTP: 'com.squareup.okhttp3:okhttp,com.squareup.okhttp3:logging-interceptor'

.github/workflows/ci-spring-webclient.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
java-version: [ '17' ]
17-
spring-webflux-version: [ '6.1.0', '6.1.21', '6.2.0', '6.2.15', '7.0.2' ]
17+
spring-webflux-version: [ '6.1.0', '6.1.21', '6.2.0', '6.2.15', '7.0.3' ]
1818
name: spring-webflux v${{ matrix.spring-webflux-version }}
1919
env:
2020
OKHTTP: 'com.squareup.okhttp3:okhttp,com.squareup.okhttp3:logging-interceptor'

library/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
<okhttp.version>5.3.2</okhttp.version>
4343
<httpclient.version>5.6</httpclient.version>
4444
<feign.version>13.6</feign.version>
45-
<spring-web.version>7.0.2</spring-web.version>
46-
<spring-webflux.version>7.0.2</spring-webflux.version>
45+
<spring-web.version>7.0.3</spring-web.version>
46+
<spring-webflux.version>7.0.3</spring-webflux.version>
4747
</properties>
4848

4949
<dependencies>
@@ -94,9 +94,9 @@
9494
</dependency>
9595
<dependency>
9696
<!-- JSON provider, option #1 -->
97-
<groupId>com.fasterxml.jackson.core</groupId>
97+
<groupId>tools.jackson.core</groupId>
9898
<artifactId>jackson-databind</artifactId>
99-
<version>2.20.1</version>
99+
<version>3.0.3</version>
100100
<scope>provided</scope>
101101
</dependency>
102102
<dependency>
@@ -110,7 +110,7 @@
110110
<!-- JSON provider, option #3 -->
111111
<groupId>org.json</groupId>
112112
<artifactId>json</artifactId>
113-
<version>20250517</version>
113+
<version>20251224</version>
114114
<scope>provided</scope>
115115
</dependency>
116116
<dependency>

library/src/main/java/com/mastercard/developer/oauth2/internal/json/JacksonJsonProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.mastercard.developer.oauth2.internal.json;
22

3-
import com.fasterxml.jackson.core.type.TypeReference;
4-
import com.fasterxml.jackson.databind.ObjectMapper;
53
import com.mastercard.developer.oauth2.internal.json.exception.OAuth2ClientJsonException;
64
import java.util.Map;
75
import java.util.Optional;
6+
import tools.jackson.core.type.TypeReference;
7+
import tools.jackson.databind.ObjectMapper;
88

99
public class JacksonJsonProvider implements JsonProvider {
1010

test-clients/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<packaging>jar</packaging>
1313

1414
<properties>
15-
<openapi.generator.version>7.18.0</openapi.generator.version>
15+
<openapi-generator.version>7.19.0</openapi-generator.version>
1616
<use-jakarta-ee>true</use-jakarta-ee>
1717
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
1818
<!-- OpenAPI Generator with "okhttp-gson" -->
@@ -208,7 +208,7 @@
208208
<plugin>
209209
<groupId>org.openapitools</groupId>
210210
<artifactId>openapi-generator-maven-plugin</artifactId>
211-
<version>${openapi.generator.version}</version>
211+
<version>${openapi-generator.version}</version>
212212
<configuration>
213213
<generatorName>java</generatorName>
214214
<generateApiTests>false</generateApiTests>

0 commit comments

Comments
 (0)