From 6408abf473062ba86e9215d7358cd11678ca06b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 19:12:58 +0000 Subject: [PATCH 1/2] Bump the dependencies group with 5 updates Bumps the dependencies group with 5 updates: | Package | From | To | | --- | --- | --- | | [io.avaje:avaje-jsonb](https://github.com/avaje/avaje-jsonb) | `2.1` | `2.2` | | [io.avaje:avaje-prisms](https://github.com/avaje/avaje-prisms) | `1.31` | `1.32` | | io.swagger.core.v3:swagger-annotations | `2.2.23` | `2.2.24` | | io.swagger.core.v3:swagger-models | `2.2.23` | `2.2.24` | | io.avaje:avaje-jsonb-generator | `2.1` | `2.2` | Updates `io.avaje:avaje-jsonb` from 2.1 to 2.2 - [Release notes](https://github.com/avaje/avaje-jsonb/releases) - [Commits](https://github.com/avaje/avaje-jsonb/compare/2.1...2.2) Updates `io.avaje:avaje-prisms` from 1.31 to 1.32 - [Release notes](https://github.com/avaje/avaje-prisms/releases) - [Commits](https://github.com/avaje/avaje-prisms/compare/1.31...1.32) Updates `io.swagger.core.v3:swagger-annotations` from 2.2.23 to 2.2.24 Updates `io.swagger.core.v3:swagger-models` from 2.2.23 to 2.2.24 Updates `io.swagger.core.v3:swagger-models` from 2.2.23 to 2.2.24 Updates `io.avaje:avaje-jsonb-generator` from 2.1 to 2.2 --- updated-dependencies: - dependency-name: io.avaje:avaje-jsonb dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: io.avaje:avaje-prisms dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: io.swagger.core.v3:swagger-annotations dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: io.swagger.core.v3:swagger-models dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: io.swagger.core.v3:swagger-models dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: io.avaje:avaje-jsonb-generator dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- http-client/pom.xml | 2 +- pom.xml | 4 ++-- tests/test-javalin-jsonb/pom.xml | 6 +++--- tests/test-javalin/pom.xml | 2 +- tests/test-jex/pom.xml | 2 +- tests/test-nima-htmx/pom.xml | 2 +- tests/test-nima-jsonb/pom.xml | 4 ++-- tests/test-sigma/pom.xml | 6 +++--- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/http-client/pom.xml b/http-client/pom.xml index ee23fa52c..7631b2a5f 100644 --- a/http-client/pom.xml +++ b/http-client/pom.xml @@ -36,7 +36,7 @@ io.avaje avaje-jsonb - 2.1 + 2.2 true diff --git a/pom.xml b/pom.xml index 5e228d5de..eec04c814 100644 --- a/pom.xml +++ b/pom.xml @@ -19,9 +19,9 @@ true - 2.2.23 + 2.2.24 2.14.2 - 1.31 + 1.32 ${project.build.directory}${file.separator}module-info.shade diff --git a/tests/test-javalin-jsonb/pom.xml b/tests/test-javalin-jsonb/pom.xml index e64da19fe..1809b8896 100644 --- a/tests/test-javalin-jsonb/pom.xml +++ b/tests/test-javalin-jsonb/pom.xml @@ -13,7 +13,7 @@ true org.example.myapp.Main - 2.2.23 + 2.2.24 1.3.71 @@ -80,13 +80,13 @@ io.avaje avaje-jsonb - 2.1 + 2.2 io.avaje avaje-jsonb-generator - 2.1 + 2.2 provided diff --git a/tests/test-javalin/pom.xml b/tests/test-javalin/pom.xml index fa0ca5f64..21473a52d 100644 --- a/tests/test-javalin/pom.xml +++ b/tests/test-javalin/pom.xml @@ -12,7 +12,7 @@ true org.example.myapp.Main - 2.2.23 + 2.2.24 1.3.71 diff --git a/tests/test-jex/pom.xml b/tests/test-jex/pom.xml index 0d380e41d..541960dd3 100644 --- a/tests/test-jex/pom.xml +++ b/tests/test-jex/pom.xml @@ -13,7 +13,7 @@ true org.example.myapp.Main 2.5 - 2.2.23 + 2.2.24 diff --git a/tests/test-nima-htmx/pom.xml b/tests/test-nima-htmx/pom.xml index b632f7d6d..a7f609ce0 100644 --- a/tests/test-nima-htmx/pom.xml +++ b/tests/test-nima-htmx/pom.xml @@ -82,7 +82,7 @@ io.avaje avaje-jsonb-generator - 2.1 + 2.2 io.jstach diff --git a/tests/test-nima-jsonb/pom.xml b/tests/test-nima-jsonb/pom.xml index b8d4c4c2f..a743861d3 100644 --- a/tests/test-nima-jsonb/pom.xml +++ b/tests/test-nima-jsonb/pom.xml @@ -31,7 +31,7 @@ io.avaje avaje-jsonb - 2.1 + 2.2 io.avaje @@ -90,7 +90,7 @@ io.avaje avaje-jsonb-generator - 2.1 + 2.2 diff --git a/tests/test-sigma/pom.xml b/tests/test-sigma/pom.xml index e1e81eb35..e641f13c3 100644 --- a/tests/test-sigma/pom.xml +++ b/tests/test-sigma/pom.xml @@ -13,7 +13,7 @@ 17 true - 2.2.23 + 2.2.24 1.3.71 @@ -73,12 +73,12 @@ io.avaje avaje-jsonb - 2.1 + 2.2 io.avaje avaje-jsonb-generator - 2.1 + 2.2 provided From 6810fe29d3d7ccb0bd6fff26940d7c7062c73cc5 Mon Sep 17 00:00:00 2001 From: Josiah Noel <32279667+SentryMan@users.noreply.github.com> Date: Mon, 23 Sep 2024 18:47:51 -0400 Subject: [PATCH 2/2] fix serializer --- .../avaje/http/generator/core/openapi/OpenAPISerializer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/OpenAPISerializer.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/OpenAPISerializer.java index 7f57bc00a..9b24d6037 100644 --- a/http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/OpenAPISerializer.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/OpenAPISerializer.java @@ -65,7 +65,8 @@ static String serialize(Object obj) throws IllegalAccessException { for (final Field field : fields) { // skip JsonIgnored fields - if ("BIND_TYPE_AND_TYPES".equals(field.getName()) + if ("SCHEMA_RESOLUTION_PROPERTY".equals(field.getName()) + || "BIND_TYPE_AND_TYPES".equals(field.getName()) || "BINARY_STRING_CONVERSION_PROPERTY".equals(field.getName()) || "COMPONENTS_SCHEMAS_REF".equals(field.getName()) || "exampleSetFlag".equals(field.getName())