From d624bd0e71fe0973db3b82f2a96bb3ccd809d5cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 15:35:51 +0000 Subject: [PATCH 1/4] [DCJ-400-gradle]: Bump the minor-patch-dependencies group across 1 directory with 8 updates Bumps the minor-patch-dependencies group with 8 updates in the / directory: | Package | From | To | | --- | --- | --- | | [io.swagger.codegen.v3:swagger-codegen](https://github.com/swagger-api/swagger-codegen) | `3.0.52` | `3.0.60` | | io.swagger.core.v3:swagger-annotations | `2.1.12` | `2.2.22` | | io.swagger.codegen.v3:swagger-codegen-cli | `3.0.51` | `3.0.60` | | org.glassfish.jersey.core:jersey-client | `3.1.2` | `3.1.8` | | org.glassfish.jersey.media:jersey-media-json-jackson | `3.1.2` | `3.1.8` | | org.glassfish.jersey.media:jersey-media-multipart | `3.1.2` | `3.1.8` | | org.glassfish.jersey.inject:jersey-hk2 | `3.1.2` | `3.1.8` | | com.fasterxml.jackson.datatype:jackson-datatype-jsr310 | `2.16.0` | `2.17.2` | Updates `io.swagger.codegen.v3:swagger-codegen` from 3.0.52 to 3.0.60 - [Release notes](https://github.com/swagger-api/swagger-codegen/releases) - [Commits](https://github.com/swagger-api/swagger-codegen/compare/v3.0.52...v3.0.60) Updates `io.swagger.core.v3:swagger-annotations` from 2.1.12 to 2.2.22 Updates `io.swagger.codegen.v3:swagger-codegen-cli` from 3.0.51 to 3.0.60 Updates `org.glassfish.jersey.core:jersey-client` from 3.1.2 to 3.1.8 Updates `org.glassfish.jersey.media:jersey-media-json-jackson` from 3.1.2 to 3.1.8 Updates `org.glassfish.jersey.media:jersey-media-multipart` from 3.1.2 to 3.1.8 Updates `org.glassfish.jersey.inject:jersey-hk2` from 3.1.2 to 3.1.8 Updates `org.glassfish.jersey.media:jersey-media-json-jackson` from 3.1.2 to 3.1.8 Updates `org.glassfish.jersey.media:jersey-media-multipart` from 3.1.2 to 3.1.8 Updates `org.glassfish.jersey.inject:jersey-hk2` from 3.1.2 to 3.1.8 Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.16.0 to 2.17.2 --- updated-dependencies: - dependency-name: io.swagger.codegen.v3:swagger-codegen dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-dependencies - dependency-name: io.swagger.core.v3:swagger-annotations dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: io.swagger.codegen.v3:swagger-codegen-cli dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-dependencies - dependency-name: org.glassfish.jersey.core:jersey-client dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-dependencies - dependency-name: org.glassfish.jersey.media:jersey-media-json-jackson dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-dependencies - dependency-name: org.glassfish.jersey.media:jersey-media-multipart dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-dependencies - dependency-name: org.glassfish.jersey.inject:jersey-hk2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-dependencies - dependency-name: org.glassfish.jersey.media:jersey-media-json-jackson dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-dependencies - dependency-name: org.glassfish.jersey.media:jersey-media-multipart dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-dependencies - dependency-name: org.glassfish.jersey.inject:jersey-hk2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-dependencies - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies ... Signed-off-by: dependabot[bot] --- build.gradle | 6 +++--- datarepo-client/build.gradle | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index a8f7a46eb8..018674301a 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath('io.swagger.codegen.v3:swagger-codegen:3.0.52') + classpath('io.swagger.codegen.v3:swagger-codegen:3.0.60') // Required for gradle liquibase plugin classpath ('org.liquibase:liquibase-core:4.29.1') } @@ -60,8 +60,8 @@ allprojects { mavenBom SpringBootPlugin.BOM_COORDINATES } dependencies { - dependency 'io.swagger.core.v3:swagger-annotations:2.2.20' - dependency 'io.swagger.codegen.v3:swagger-codegen-cli:3.0.51' + dependency 'io.swagger.core.v3:swagger-annotations:2.2.22' + dependency 'io.swagger.codegen.v3:swagger-codegen-cli:3.0.60' } } } diff --git a/datarepo-client/build.gradle b/datarepo-client/build.gradle index d3cf1ea46a..53df2a9990 100644 --- a/datarepo-client/build.gradle +++ b/datarepo-client/build.gradle @@ -29,9 +29,9 @@ repositories { dependencies { ext { - jersey = "3.1.2" - jackson = "2.16.0" - swaggerAnnotations = "2.1.12" + jersey = "3.1.8" + jackson = "2.17.2" + swaggerAnnotations = "2.2.22" } From d3fd4b13f0226a9d2400cecf7315ed430bed1545 Mon Sep 17 00:00:00 2001 From: Olivia Kotsopoulos Date: Thu, 8 Aug 2024 12:10:05 -0400 Subject: [PATCH 2/4] Downgrade swagger codegen 3.0.60 -> 3.0.56 Instruct Dependabot to ignore 3.0.x changes in the hopes that the next minor or major version upgrade might include a fix to the logged issue. --- .github/dependabot.yml | 6 ++++++ build.gradle | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1beeac2244..e5434c1d34 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -41,3 +41,9 @@ updates: # (outside of semver major, minor, and patch designations) and will attempt to update # to the latest published version. - dependency-name: "io.kubernetes:client-java" + # Version 3.0.57 of the Swagger codegen plugin pulls in the newest version of the Java + # generator which adds @NotNull unless nullable is set to true in the Swagger spec, even if + # the field is not required. + # Issue: https://github.com/swagger-api/swagger-codegen-generators/issues/1295 + - dependency-name: "io.swagger.codegen.v3:swagger-codegen*" + update-types: [ "3.0.x" ] diff --git a/build.gradle b/build.gradle index 018674301a..dbfeee11c5 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath('io.swagger.codegen.v3:swagger-codegen:3.0.60') + classpath('io.swagger.codegen.v3:swagger-codegen:3.0.56') // Required for gradle liquibase plugin classpath ('org.liquibase:liquibase-core:4.29.1') } @@ -61,7 +61,7 @@ allprojects { } dependencies { dependency 'io.swagger.core.v3:swagger-annotations:2.2.22' - dependency 'io.swagger.codegen.v3:swagger-codegen-cli:3.0.60' + dependency 'io.swagger.codegen.v3:swagger-codegen-cli:3.0.56' } } } From 1bd96af96c939362f5007bef3f2910d9d059de63 Mon Sep 17 00:00:00 2001 From: Olivia Kotsopoulos Date: Thu, 8 Aug 2024 12:12:18 -0400 Subject: [PATCH 3/4] Fix invalid Dependabot configuration --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e5434c1d34..c70d355d40 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -46,4 +46,4 @@ updates: # the field is not required. # Issue: https://github.com/swagger-api/swagger-codegen-generators/issues/1295 - dependency-name: "io.swagger.codegen.v3:swagger-codegen*" - update-types: [ "3.0.x" ] + versions: [ "3.0.x" ] From 524fa0c01dd033d6aed785ba84df91701185ba50 Mon Sep 17 00:00:00 2001 From: Olivia Kotsopoulos Date: Thu, 8 Aug 2024 13:01:01 -0400 Subject: [PATCH 4/4] Upgrade Swagger codegen back to 3.0.60 From looking at the issue comment, we can revert to the old @Nullable behavior by setting useNullableForNotNull=false. I also removed the Dependabot ignore condition for Swagger codegen. --- .github/dependabot.yml | 6 ------ build.gradle | 8 +++++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index c70d355d40..1beeac2244 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -41,9 +41,3 @@ updates: # (outside of semver major, minor, and patch designations) and will attempt to update # to the latest published version. - dependency-name: "io.kubernetes:client-java" - # Version 3.0.57 of the Swagger codegen plugin pulls in the newest version of the Java - # generator which adds @NotNull unless nullable is set to true in the Swagger spec, even if - # the field is not required. - # Issue: https://github.com/swagger-api/swagger-codegen-generators/issues/1295 - - dependency-name: "io.swagger.codegen.v3:swagger-codegen*" - versions: [ "3.0.x" ] diff --git a/build.gradle b/build.gradle index dbfeee11c5..d26d0623fe 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath('io.swagger.codegen.v3:swagger-codegen:3.0.56') + classpath('io.swagger.codegen.v3:swagger-codegen:3.0.60') // Required for gradle liquibase plugin classpath ('org.liquibase:liquibase-core:4.29.1') } @@ -61,7 +61,7 @@ allprojects { } dependencies { dependency 'io.swagger.core.v3:swagger-annotations:2.2.22' - dependency 'io.swagger.codegen.v3:swagger-codegen-cli:3.0.56' + dependency 'io.swagger.codegen.v3:swagger-codegen-cli:3.0.60' } } } @@ -310,7 +310,9 @@ swaggerSources { "-D", "interfaceOnly=true," + "useTags=true," + "dateLibrary=java8," + - "jakarta=true" + "jakarta=true," + + // https://github.com/swagger-api/swagger-codegen-generators/issues/1295#issuecomment-2203238201 + "useNullableForNotNull=false" ] } }