Skip to content

Commit 3a649a3

Browse files
wing328wing328
committed
update annotation
1 parent a4d6865 commit 3a649a3

File tree

77 files changed

+234
-170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+234
-170
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ if(hasProperty('target') && target == 'android') {
115115
ext {
116116
swagger_annotations_version = "1.6.3"
117117
jackson_version = "2.21.1"
118+
jackson_annotations_version = "2.21"
118119
jackson_databind_version = "2.21.1"
119120
{{#openApiNullable}}
120121
jackson_databind_nullable_version = "0.2.9"
@@ -137,7 +138,7 @@ dependencies {
137138
implementation "com.sun.jersey:jersey-client:$jersey_version"
138139
implementation "com.sun.jersey.contribs:jersey-multipart:$jersey_version"
139140
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
140-
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
141+
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_annotations_version"
141142
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
142143
implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
143144
{{#openApiNullable}}

‎modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/build.gradle.mustache‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ if(hasProperty('target') && target == 'android') {
115115
ext {
116116
swagger_annotations_version = "1.6.6"
117117
jackson_version = "2.21.1"
118+
jackson_annotations_version = "2.21"
118119
jackson_databind_version = "2.21.1"
119120
{{#openApiNullable}}
120121
jackson_databind_nullable_version = "0.2.9"
@@ -130,7 +131,7 @@ dependencies {
130131
implementation "com.google.code.findbugs:jsr305:3.0.2"
131132
implementation "org.apache.httpcomponents.client5:httpclient5:$httpclient_version"
132133
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
133-
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
134+
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_annotations_version"
134135
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
135136
implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
136137
{{#openApiNullable}}

‎modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@
252252
<dependency>
253253
<groupId>com.fasterxml.jackson.core</groupId>
254254
<artifactId>jackson-annotations</artifactId>
255-
<version>${jackson-version}</version>
255+
<version>${jackson-annotations-version}</version>
256256
</dependency>
257257
<dependency>
258258
<groupId>com.fasterxml.jackson.core</groupId>
@@ -352,6 +352,7 @@
352352
{{/swagger2AnnotationLibrary}}
353353
<httpclient-version>5.2.1</httpclient-version>
354354
<jackson-version>2.21.1</jackson-version>
355+
<jackson-annotations-version>2.21</jackson-annotations-version>
355356
<jackson-databind-version>2.21.1</jackson-databind-version>
356357
{{#openApiNullable}}
357358
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,9 @@ ext {
104104
{{#swagger2AnnotationLibrary}}
105105
swagger_annotations_version = "2.2.15"
106106
{{/swagger2AnnotationLibrary}}
107-
jackson_version = "2.19.2"
108-
jackson_databind_version = "2.19.2"
107+
jackson_version = "2.21.1"
108+
jackson_annotations_version = "2.21"
109+
jackson_databind_version = "2.21.1"
109110
{{#openApiNullable}}
110111
jackson_databind_nullable_version = "0.2.9"
111112
{{/openApiNullable}}
@@ -140,7 +141,7 @@ dependencies {
140141
implementation "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version"
141142
implementation "org.glassfish.jersey.connectors:jersey-apache-connector:$jersey_version"
142143
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
143-
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
144+
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_annotations_version"
144145
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
145146
{{#openApiNullable}}
146147
implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"

‎modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ lazy val root = (project in file(".")).
1616
"org.glassfish.jersey.media" % "jersey-media-multipart" % "2.35",
1717
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.35",
1818
"org.glassfish.jersey.connectors" % "jersey-apache-connector" % "2.35",
19-
"com.fasterxml.jackson.core" % "jackson-core" % "2.19.2" % "compile",
20-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.19.2" % "compile",
21-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.19.2" % "compile",
19+
"com.fasterxml.jackson.core" % "jackson-core" % "2.21.1" % "compile",
20+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.21" % "compile",
21+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.21.1" % "compile",
2222
{{#joda}}
23-
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.19.2" % "compile",
23+
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.21.1" % "compile",
2424
{{/joda}}
25-
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.19.2" % "compile",
25+
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.21.1" % "compile",
2626
{{#openApiNullable}}
2727
"org.openapitools" % "jackson-databind-nullable" % "0.2.9" % "compile",
2828
{{/openApiNullable}}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@
311311
<dependency>
312312
<groupId>com.fasterxml.jackson.core</groupId>
313313
<artifactId>jackson-annotations</artifactId>
314-
<version>${jackson-version}</version>
314+
<version>${jackson-annotations-version}</version>
315315
</dependency>
316316
<dependency>
317317
<groupId>com.fasterxml.jackson.core</groupId>
@@ -405,8 +405,9 @@
405405
<swagger-annotations-version>2.2.15</swagger-annotations-version>
406406
{{/swagger2AnnotationLibrary}}
407407
<jersey-version>2.37</jersey-version>
408-
<jackson-version>2.19.2</jackson-version>
409-
<jackson-databind-version>2.19.2</jackson-databind-version>
408+
<jackson-version>2.21.1</jackson-version>
409+
<jackson-annotations-version>2.21</jackson-annotations-version>
410+
<jackson-databind-version>2.21.1</jackson-databind-version>
410411
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
411412
{{#useJakartaEe}}
412413
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,9 @@ if(hasProperty('target') && target == 'android') {
9999

100100
ext {
101101
swagger_annotations_version = "1.6.5"
102-
jackson_version = "2.19.2"
103-
jackson_databind_version = "2.19.2"
102+
jackson_version = "2.21.1"
103+
jackson_annotations_version = "2.21"
104+
jackson_databind_version = "2.21.1"
104105
{{#openApiNullable}}
105106
jackson_databind_nullable_version = "0.2.9"
106107
{{/openApiNullable}}
@@ -130,7 +131,7 @@ dependencies {
130131
implementation "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version"
131132
implementation "org.glassfish.jersey.connectors:jersey-apache-connector:$jersey_version"
132133
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
133-
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
134+
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_annotations_version"
134135
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
135136
{{#openApiNullable}}
136137
implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"

‎modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.sbt.mustache‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ lazy val root = (project in file(".")).
1616
"org.glassfish.jersey.media" % "jersey-media-multipart" % "3.0.4",
1717
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "3.0.4",
1818
"org.glassfish.jersey.connectors" % "jersey-apache-connector" % "3.0.4",
19-
"com.fasterxml.jackson.core" % "jackson-core" % "2.19.2" % "compile",
20-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.19.2" % "compile",
21-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.19.2" % "compile",
19+
"com.fasterxml.jackson.core" % "jackson-core" % "2.21.1" % "compile",
20+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.21" % "compile",
21+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.21.1" % "compile",
2222
{{#joda}}
23-
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.19.2" % "compile",
23+
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.21.1" % "compile",
2424
{{/joda}}
25-
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.19.2" % "compile",
25+
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.21.1" % "compile",
2626
{{#openApiNullable}}
2727
"org.openapitools" % "jackson-databind-nullable" % "0.2.9" % "compile",
2828
{{/openApiNullable}}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@
311311
<dependency>
312312
<groupId>com.fasterxml.jackson.core</groupId>
313313
<artifactId>jackson-annotations</artifactId>
314-
<version>${jackson-version}</version>
314+
<version>${jackson-annotations-version}</version>
315315
</dependency>
316316
<dependency>
317317
<groupId>com.fasterxml.jackson.core</groupId>
@@ -405,8 +405,9 @@
405405
<swagger-annotations-version>2.2.15</swagger-annotations-version>
406406
{{/swagger2AnnotationLibrary}}
407407
<jersey-version>3.1.11</jersey-version>
408-
<jackson-version>2.19.2</jackson-version>
409-
<jackson-databind-version>2.19.2</jackson-databind-version>
408+
<jackson-version>2.21.1</jackson-version>
409+
<jackson-annotations-version>2.21</jackson-annotations-version>
410+
<jackson-databind-version>2.21.1</jackson-databind-version>
410411
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
411412
{{#useJakartaEe}}
412413
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ ext {
7373
swagger_annotations_version = "2.2.9"
7474
{{/swagger2AnnotationLibrary}}
7575
jackson_version = "2.21.1"
76+
jackson_annotations_version = "2.21"
7677
{{#useJakartaEe}}
7778
jakarta_annotation_version = "2.1.1"
7879
beanvalidation_version = "3.0.2"
@@ -99,7 +100,7 @@ dependencies {
99100
{{/swagger2AnnotationLibrary}}
100101
implementation "com.google.code.findbugs:jsr305:3.0.2"
101102
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
102-
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
103+
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_annotations_version"
103104
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
104105
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
105106
implementation "org.openapitools:jackson-databind-nullable:0.2.9"

0 commit comments

Comments
 (0)