Skip to content

Commit e25ba6a

Browse files
committed
Fix and cleaned jackson dependencies in pom.xml and gradle.buid
1 parent a7dd50c commit e25ba6a

20 files changed

Lines changed: 30 additions & 59 deletions

File tree

modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,7 @@ ext {
143143
reactor_netty_version = "1.2.8"
144144
{{/useJakartaEe}}
145145
{{^useJakartaEe}}
146-
{{^useJackson3}}
147146
spring_boot_version = "2.7.17"
148-
{{/useJackson3}}
149-
{{#useJackson3}}
150-
spring_boot_version = "4.0.3"
151-
{{/useJackson3}}
152147
jakarta_annotation_version = "1.3.5"
153148
beanvalidation_version = "2.0.2"
154149
reactor_version = "3.4.34"
@@ -159,10 +154,8 @@ ext {
159154
{{/useJackson3}}
160155
{{#useJackson3}}
161156
jackson_version = "3.1.0"
162-
jackson_databind_version = "3.1.0"
163157
jackson_annotations_version = "2.19.2"
164158
{{/useJackson3}}
165-
jackson_databind_version = "2.19.2"
166159
{{#openApiNullable}}
167160
jackson_databind_nullable_version = "0.2.9"
168161
{{/openApiNullable}}
@@ -185,15 +178,15 @@ dependencies {
185178
implementation "io.projectreactor.netty:reactor-netty-http:$reactor_netty_version"
186179
{{^useJackson3}}
187180
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
188-
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
181+
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
189182
implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
190183
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
191184
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
192185
{{/useJackson3}}
193186
{{#useJackson3}}
194187
implementation "tools.jackson.core:jackson-core:$jackson_version"
195188
implementation "tools.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
196-
implementation "tools.jackson.core:jackson-databind:$jackson_databind_version"
189+
implementation "tools.jackson.core:jackson-databind:$jackson_version"
197190
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_annotations_version"
198191
{{/useJackson3}}
199192
{{#openApiNullable}}

modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,14 @@
118118
<dependency>
119119
<groupId>com.fasterxml.jackson.core</groupId>
120120
<artifactId>jackson-databind</artifactId>
121-
<version>${jackson-databind-version}</version>
121+
<version>${jackson-version}</version>
122122
</dependency>
123123
{{/useJackson3}}
124124
{{#useJackson3}}
125125
<dependency>
126126
<groupId>tools.jackson.core</groupId>
127127
<artifactId>jackson-databind</artifactId>
128-
<version>${jackson-databind-version}</version>
128+
<version>${jackson-version}</version>
129129
</dependency>
130130
{{/useJackson3}}
131131
{{#openApiNullable}}
@@ -144,16 +144,20 @@
144144
</dependency>
145145
{{/useJackson3}}
146146
{{#joda}}
147+
{{^useJackson3}}
147148
<dependency>
148-
{{^useJackson3}}
149149
<groupId>com.fasterxml.jackson.datatype</groupId>
150-
{{/useJackson3}}
151-
{{#useJackson3}}
150+
<artifactId>jackson-datatype-joda</artifactId>
151+
<version>${jackson-version}</version>
152+
</dependency>
153+
{{/useJackson3}}
154+
{{#useJackson3}}
155+
<dependency>
152156
<groupId>tools.jackson.datatype</groupId>
153-
{{/useJackson3}}
154157
<artifactId>jackson-datatype-joda</artifactId>
155158
<version>${jackson-version}</version>
156159
</dependency>
160+
{{/useJackson3}}
157161
<dependency>
158162
<groupId>joda-time</groupId>
159163
<artifactId>joda-time</artifactId>
@@ -185,11 +189,9 @@
185189
{{/swagger2AnnotationLibrary}}
186190
{{^useJackson3}}
187191
<jackson-version>2.19.2</jackson-version>
188-
<jackson-databind-version>2.19.2</jackson-databind-version>
189192
{{/useJackson3}}
190193
{{#useJackson3}}
191194
<jackson-version>3.1.0</jackson-version>
192-
<jackson-databind-version>3.1.0</jackson-databind-version>
193195
{{/useJackson3}}
194196
{{#openApiNullable}}
195197
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
@@ -206,12 +208,7 @@
206208
<reactor-netty-version>1.2.8</reactor-netty-version>
207209
{{/useJakartaEe}}
208210
{{^useJakartaEe}}
209-
{{^useJackson3}}
210211
<spring-boot-version>2.7.17</spring-boot-version>
211-
{{/useJackson3}}
212-
{{#useJackson3}}
213-
<spring-boot-version>4.0.3</spring-boot-version>
214-
{{/useJackson3}}
215212
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
216213
<reactor-version>3.4.34</reactor-version>
217214
<reactor-netty-version>1.2.8</reactor-netty-version>

samples/client/others/java/webclient-sealedInterface/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ ext {
118118
reactor_version = "3.4.34"
119119
reactor_netty_version = "1.2.8"
120120
jackson_version = "2.19.2"
121-
jackson_databind_version = "2.19.2"
122121
jackson_databind_nullable_version = "0.2.9"
123122
junit_version = "5.10.2"
124123
}
@@ -129,7 +128,7 @@ dependencies {
129128
implementation "org.springframework.boot:spring-boot-starter-webflux:$spring_boot_version"
130129
implementation "io.projectreactor.netty:reactor-netty-http:$reactor_netty_version"
131130
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
132-
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
131+
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
133132
implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
134133
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
135134
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"

samples/client/others/java/webclient-sealedInterface/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<dependency>
9191
<groupId>com.fasterxml.jackson.core</groupId>
9292
<artifactId>jackson-databind</artifactId>
93-
<version>${jackson-databind-version}</version>
93+
<version>${jackson-version}</version>
9494
</dependency>
9595
<dependency>
9696
<groupId>org.openapitools</groupId>
@@ -121,7 +121,6 @@
121121
<properties>
122122
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
123123
<jackson-version>2.19.2</jackson-version>
124-
<jackson-databind-version>2.19.2</jackson-databind-version>
125124
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
126125
<spring-boot-version>2.7.17</spring-boot-version>
127126
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>

samples/client/others/java/webclient-sealedInterface_3_1/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ ext {
118118
reactor_version = "3.4.34"
119119
reactor_netty_version = "1.2.8"
120120
jackson_version = "2.19.2"
121-
jackson_databind_version = "2.19.2"
122121
jackson_databind_nullable_version = "0.2.9"
123122
junit_version = "5.10.2"
124123
}
@@ -129,7 +128,7 @@ dependencies {
129128
implementation "org.springframework.boot:spring-boot-starter-webflux:$spring_boot_version"
130129
implementation "io.projectreactor.netty:reactor-netty-http:$reactor_netty_version"
131130
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
132-
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
131+
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
133132
implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
134133
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
135134
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"

samples/client/others/java/webclient-sealedInterface_3_1/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<dependency>
9191
<groupId>com.fasterxml.jackson.core</groupId>
9292
<artifactId>jackson-databind</artifactId>
93-
<version>${jackson-databind-version}</version>
93+
<version>${jackson-version}</version>
9494
</dependency>
9595
<dependency>
9696
<groupId>org.openapitools</groupId>
@@ -121,7 +121,6 @@
121121
<properties>
122122
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
123123
<jackson-version>2.19.2</jackson-version>
124-
<jackson-databind-version>2.19.2</jackson-databind-version>
125124
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
126125
<spring-boot-version>2.7.17</spring-boot-version>
127126
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>

samples/client/others/java/webclient-useAbstractionForFiles/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ ext {
118118
reactor_version = "3.4.34"
119119
reactor_netty_version = "1.2.8"
120120
jackson_version = "2.19.2"
121-
jackson_databind_version = "2.19.2"
122121
jackson_databind_nullable_version = "0.2.9"
123122
junit_version = "5.10.2"
124123
}
@@ -129,7 +128,7 @@ dependencies {
129128
implementation "org.springframework.boot:spring-boot-starter-webflux:$spring_boot_version"
130129
implementation "io.projectreactor.netty:reactor-netty-http:$reactor_netty_version"
131130
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
132-
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
131+
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
133132
implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
134133
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
135134
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"

samples/client/others/java/webclient-useAbstractionForFiles/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<dependency>
9191
<groupId>com.fasterxml.jackson.core</groupId>
9292
<artifactId>jackson-databind</artifactId>
93-
<version>${jackson-databind-version}</version>
93+
<version>${jackson-version}</version>
9494
</dependency>
9595
<dependency>
9696
<groupId>org.openapitools</groupId>
@@ -121,7 +121,6 @@
121121
<properties>
122122
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
123123
<jackson-version>2.19.2</jackson-version>
124-
<jackson-databind-version>2.19.2</jackson-databind-version>
125124
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
126125
<spring-boot-version>2.7.17</spring-boot-version>
127126
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>

samples/client/petstore/java/webclient-jackson3/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,7 @@ ext {
118118
reactor_version = "3.5.12"
119119
reactor_netty_version = "1.2.8"
120120
jackson_version = "3.1.0"
121-
jackson_databind_version = "3.1.0"
122121
jackson_annotations_version = "2.19.2"
123-
jackson_databind_version = "2.19.2"
124122
jackson_databind_nullable_version = "0.2.9"
125123
junit_version = "5.10.2"
126124
}
@@ -132,7 +130,7 @@ dependencies {
132130
implementation "io.projectreactor.netty:reactor-netty-http:$reactor_netty_version"
133131
implementation "tools.jackson.core:jackson-core:$jackson_version"
134132
implementation "tools.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
135-
implementation "tools.jackson.core:jackson-databind:$jackson_databind_version"
133+
implementation "tools.jackson.core:jackson-databind:$jackson_version"
136134
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_annotations_version"
137135
implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
138136
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"

samples/client/petstore/java/webclient-jackson3/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<dependency>
9191
<groupId>tools.jackson.core</groupId>
9292
<artifactId>jackson-databind</artifactId>
93-
<version>${jackson-databind-version}</version>
93+
<version>${jackson-version}</version>
9494
</dependency>
9595
<dependency>
9696
<groupId>org.openapitools</groupId>
@@ -116,7 +116,6 @@
116116
<properties>
117117
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
118118
<jackson-version>3.1.0</jackson-version>
119-
<jackson-databind-version>3.1.0</jackson-databind-version>
120119
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
121120
<spring-boot-version>4.0.3</spring-boot-version>
122121
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>

0 commit comments

Comments
 (0)