Skip to content

Commit 9692f33

Browse files
committed
#23560 Update gradle template for generated samples to use correct libraries and add path to samples-java-client-jdk11.yaml
1 parent 1a674d6 commit 9692f33

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

.github/workflows/samples-java-client-jdk11.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ jobs:
7373
- samples/client/petstore/java/webclient-swagger2
7474
- samples/client/petstore/java/webclient-useSingleRequestParameter
7575
- samples/client/petstore/java/vertx
76+
- samples/client/petstore/java/vertx5
7677
- samples/client/petstore/java/vertx-no-nullable
7778
- samples/client/petstore/java/vertx-supportVertxFuture
7879
- samples/client/petstore/java/jersey2-java8-localdatetime

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ext {
3232
swagger_annotations_version = "1.5.21"
3333
jackson_version = "2.19.2"
3434
jackson_databind_version = "2.19.2"
35-
vertx_version = "{{#supportVertxFuture}}4.0.0{{/supportVertxFuture}}{{^supportVertxFuture}}3.5.2{{/supportVertxFuture}}"
35+
vertx_version = "{{#useVertx5}}5.0.11{{/useVertx5}}{{#supportVertxFuture}}4.0.0{{/supportVertxFuture}}{{^supportVertxFuture}}{{^useVertx5}}3.5.2{{/useVertx5}}{{/supportVertxFuture}}"
3636
junit_version = "5.10.3"
3737
{{#openApiNullable}}
3838
jackson_databind_nullable_version = "0.2.10"
@@ -44,7 +44,7 @@ dependencies {
4444
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
4545
implementation "com.google.code.findbugs:jsr305:3.0.2"
4646
implementation "io.vertx:vertx-web-client:$vertx_version"
47-
implementation "io.vertx:vertx-rx-java:$vertx_version"
47+
implementation "io.vertx:{{#useRxJava3}}vertx-rx-java3{{/useRxJava3}}{{#useRxJava2}}vertx-rx-java2{{/useRxJava2}}{{^useRxJava3}}{{^useRxJava2}}vertx-rx-java{{/useRxJava2}}{{/useRxJava3}}:$vertx_version"
4848
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
4949
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
5050
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"

samples/client/petstore/java/vertx5/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ext {
3232
swagger_annotations_version = "1.5.21"
3333
jackson_version = "2.19.2"
3434
jackson_databind_version = "2.19.2"
35-
vertx_version = "3.5.2"
35+
vertx_version = "5.0.11"
3636
junit_version = "5.10.3"
3737
jackson_databind_nullable_version = "0.2.10"
3838
jakarta_annotation_version = "1.3.5"
@@ -42,7 +42,7 @@ dependencies {
4242
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
4343
implementation "com.google.code.findbugs:jsr305:3.0.2"
4444
implementation "io.vertx:vertx-web-client:$vertx_version"
45-
implementation "io.vertx:vertx-rx-java:$vertx_version"
45+
implementation "io.vertx:vertx-rx-java3:$vertx_version"
4646
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
4747
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
4848
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"

0 commit comments

Comments
 (0)