chore: [DevOps] bump the production-minor-patch group across 1 directory with 15 updates (#929)

dependabot[bot] · rpanackal · web-flow · commit 8747e511206f · 2025-09-09T12:19:20.000+02:00
Signed-off-by: dependabot[bot] &lt;support@github.com&gt;
Co-authored-by: dependabot[bot] &lt;49699333+dependabot[bot]@users.noreply.github.com&gt;
Co-authored-by: Roshin Rajan Panackal &lt;roshin.rajan.panackal@sap.com&gt;
diff --git a/datamodel/odata-v4/odata-v4-core/src/test/java/com/sap/cloud/sdk/datamodel/odatav4/adapter/SerializerAdapterTest.java b/datamodel/odata-v4/odata-v4-core/src/test/java/com/sap/cloud/sdk/datamodel/odatav4/adapter/SerializerAdapterTest.java
@@ -51,7 +51,7 @@ void testCompatibleNonNullGsonAndJackson()
 
         // Jackson
         final ObjectMapper mapper = new ObjectMapper();
-        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        mapper.setDefaultPropertyInclusion(JsonInclude.Include.NON_NULL);
         final String jsonJackson = mapper.writeValueAsString(PERSON);
         final Person personJackson = mapper.readValue(jsonJackson, Person.class);
 
diff --git a/datamodel/openapi/openapi-api-sample/src/main/java/com/sap/cloud/sdk/datamodel/openapi/sample/model/OneOfWithDiscriminatorAndMapping.java b/datamodel/openapi/openapi-api-sample/src/main/java/com/sap/cloud/sdk/datamodel/openapi/sample/model/OneOfWithDiscriminatorAndMapping.java
@@ -24,9 +24,7 @@
 @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, property = "sodaType", visible = true )
 @JsonSubTypes( {
     @JsonSubTypes.Type( value = Cola.class, name = "cool_cola" ),
-    @JsonSubTypes.Type( value = Fanta.class, name = "fancy_fanta" ),
-    @JsonSubTypes.Type( value = Cola.class, name = "Cola" ),
-    @JsonSubTypes.Type( value = Fanta.class, name = "Fanta" ), } )
+    @JsonSubTypes.Type( value = Fanta.class, name = "fancy_fanta" ), } )
 
 public interface OneOfWithDiscriminatorAndMapping
 {
diff --git a/datamodel/openapi/openapi-api-sample/src/main/java/com/sap/cloud/sdk/datamodel/openapi/sample/model/OneOfWithEnumDiscriminator.java b/datamodel/openapi/openapi-api-sample/src/main/java/com/sap/cloud/sdk/datamodel/openapi/sample/model/OneOfWithEnumDiscriminator.java
@@ -24,9 +24,7 @@
 @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, property = "disc", visible = true )
 @JsonSubTypes( {
     @JsonSubTypes.Type( value = Bar.class, name = "disc_bar" ),
-    @JsonSubTypes.Type( value = Foo.class, name = "disc_foo" ),
-    @JsonSubTypes.Type( value = Bar.class, name = "Bar" ),
-    @JsonSubTypes.Type( value = Foo.class, name = "Foo" ), } )
+    @JsonSubTypes.Type( value = Foo.class, name = "disc_foo" ), } )
 
 public interface OneOfWithEnumDiscriminator
 {
diff --git a/datamodel/openapi/openapi-api-sample/src/test/java/com/sap/cloud/sdk/datamodel/openapi/sample/api/OneOfDeserializationTest.java b/datamodel/openapi/openapi-api-sample/src/test/java/com/sap/cloud/sdk/datamodel/openapi/sample/api/OneOfDeserializationTest.java
@@ -152,15 +152,20 @@ void oneOfWithDiscriminatorAndMapping()
 
     static Stream<Class<?>> oneOfStrategiesProvider()
     {
-        return Stream.of(OneOf.class, OneOfWithDiscriminator.class, OneOfWithDiscriminatorAndMapping.class);
+        return Stream.of(OneOf.class, OneOfWithDiscriminator.class);
     }
 
     @ParameterizedTest( name = "Deserialization with strategy: {0}" )
     @MethodSource( "oneOfStrategiesProvider" )
     void oneOfWithNestedArrayOfObjects( Class<?> strategy )
         throws JsonProcessingException
     {
-        Object actual = objectMapper.readValue(FANTA_FLAVOR_ARRAY_JSON, strategy);
+        var payload = FANTA_FLAVOR_ARRAY_JSON;
+        if( strategy == OneOfWithDiscriminatorAndMapping.class ) {
+            payload.replace("Fanta", "fancy_fanta").replace("Cola", "cool_cola");
+        }
+
+        Object actual = objectMapper.readValue(payload, strategy);
 
         assertThat(actual)
             .describedAs("Object should automatically be deserialized as Fanta with JSON subtype deduction")
diff --git a/datamodel/openapi/openapi-generator/src/main/resources/openapi-generator/mustache-templates/licenseInfo.mustache b/datamodel/openapi/openapi-generator/src/main/resources/openapi-generator/mustache-templates/licenseInfo.mustache
@@ -7,4 +7,4 @@
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  * Do not edit the class manually.
- */
+ */
diff --git a/datamodel/openapi/openapi-generator/src/main/resources/openapi-generator/mustache-templates/modelInnerEnum.mustache b/datamodel/openapi/openapi-generator/src/main/resources/openapi-generator/mustache-templates/modelInnerEnum.mustache
@@ -109,3 +109,4 @@
     }
 {{/jsonb}}
   }
+
diff --git a/datamodel/openapi/openapi-generator/src/main/resources/openapi-generator/mustache-templates/pojo.mustache b/datamodel/openapi/openapi-generator/src/main/resources/openapi-generator/mustache-templates/pojo.mustache
@@ -636,4 +636,5 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   };
 {{/parcelableModel}}
 {{>pojoBuilder}}
+
 }
diff --git a/datamodel/openapi/openapi-generator/src/test/resources/DataModelGeneratorIntegrationTest/oneof-interfaces-enabled/output/test/OneOfWithDiscriminatorAndMapping.java b/datamodel/openapi/openapi-generator/src/test/resources/DataModelGeneratorIntegrationTest/oneof-interfaces-enabled/output/test/OneOfWithDiscriminatorAndMapping.java
@@ -48,8 +48,6 @@
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Cola.class, name = "cool_cola"),
   @JsonSubTypes.Type(value = Fanta.class, name = "fancy_fanta"),
-  @JsonSubTypes.Type(value = Cola.class, name = "Cola"),
-  @JsonSubTypes.Type(value = Fanta.class, name = "Fanta"),
 })
 
 public interface OneOfWithDiscriminatorAndMapping  {
diff --git a/dependency-bundles/bom/pom.xml b/dependency-bundles/bom/pom.xml
@@ -59,7 +59,7 @@
 		<java-jwt.version>4.5.0</java-jwt.version>
 		<!-- Utility stuff -->
 		<slf4j.version>2.0.17</slf4j.version>
-		<lombok.version>1.18.38</lombok.version>
+		<lombok.version>1.18.40</lombok.version>
 		<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
 		<!-- @Nonnull/@Nullable annotations -->
 		<vavr.version>0.10.7</vavr.version>
@@ -77,7 +77,8 @@
 		<resilience4j.version>2.3.0</resilience4j.version>
 		<!-- JSON & XML stuff -->
 		<gson.version>2.13.1</gson.version>
-		<jackson.version>2.19.2</jackson.version>
+		<jackson.version>2.20.0</jackson.version>
+		<jackson.annotations.version>2.20</jackson.annotations.version>
 		<owasp-json-sanitizer.version>1.2.3</owasp-json-sanitizer.version>
 		<!-- end of essential versions -->
 	</properties>
@@ -160,7 +161,7 @@
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
 				<artifactId>jackson-annotations</artifactId>
-				<version>${jackson.version}</version>
+				<version>${jackson.annotations.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.datatype</groupId>
@@ -273,7 +274,7 @@
 			<dependency>
 				<groupId>org.checkerframework</groupId>
 				<artifactId>checker-qual</artifactId>
-				<version>3.49.5</version>
+				<version>3.50.0</version>
 			</dependency>
 			<!--  2.10 by Caffeine and 2.11 by Guava  -->
 			<dependency>
@@ -329,7 +330,7 @@
 								<dependency>
 									<groupId>org.projectlombok</groupId>
 									<artifactId>lombok</artifactId>
-									<version>1.18.38</version>
+									<version>1.18.40</version>
 								</dependency>
 							</dependencies>
 							<configuration>
diff --git a/dependency-bundles/modules-bom/pom.xml b/dependency-bundles/modules-bom/pom.xml
@@ -262,7 +262,7 @@
 								<dependency>
 									<groupId>org.projectlombok</groupId>
 									<artifactId>lombok</artifactId>
-									<version>1.18.38</version>
+									<version>1.18.40</version>
 								</dependency>
 							</dependencies>
 							<configuration>
diff --git a/pom.xml b/pom.xml
@@ -88,7 +88,8 @@
 		<codeAnalysisExclusions>**/testclasses/**</codeAnalysisExclusions>
 		<!--  Non-essential dependencies  -->
 		<jco-api.version>4.87.9</jco-api.version>
-		<jackson.version>2.19.2</jackson.version>
+		<jackson.version>2.20.0</jackson.version>
+		<jackson.annotations.version>2.20</jackson.annotations.version>
 		<!--  WordUtils used twice in OData generator  -->
 		<json.version>20250517</json.version>
 		<!--  XML used once in SOAP payload deserialisation  -->
@@ -112,19 +113,19 @@
 		<maven-plugin-annotations.version>3.15.1</maven-plugin-annotations.version>
 		<maven-plugin-testing.version>3.3.0</maven-plugin-testing.version>
 		<caffeine.version>3.2.2</caffeine.version>
-		<openapi-generator.version>7.14.0</openapi-generator.version>
+		<openapi-generator.version>7.15.0</openapi-generator.version>
 		<io-swagger-core-v3.version>2.2.36</io-swagger-core-v3.version>
-		<io-swagger-parser-v3.version>2.1.32</io-swagger-parser-v3.version>
+		<io-swagger-parser-v3.version>2.1.33</io-swagger-parser-v3.version>
 		<io-swagger-core.version>1.6.11</io-swagger-core.version>
 		<!--  sync plexus version with transitive dependency coming from "org.twadata.maven:mojo-executor"  -->
 		<stax2-api.version>4.2.2</stax2-api.version>
 		<bouncycastle.version>1.81</bouncycastle.version>
 		<jakarta-activation.version>2.1.0</jakarta-activation.version>
 		<qdox.version>2.2.0</qdox.version>
 		<wiremock.version>3.13.1</wiremock.version>
-		<checkstyle.version>11.0.0</checkstyle.version>
+		<checkstyle.version>11.0.1</checkstyle.version>
 		<byte-buddy.version>1.17.7</byte-buddy.version>
-		<snakeyaml.version>2.4</snakeyaml.version>
+		<snakeyaml.version>2.5</snakeyaml.version>
 		<commons-codec.version>1.19.0</commons-codec.version>
 		<commons-beanutils.version>1.11.0</commons-beanutils.version>
 		<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
@@ -270,7 +271,7 @@
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
 				<artifactId>jackson-annotations</artifactId>
-				<version>${jackson.version}</version>
+				<version>${jackson.annotations.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
@@ -973,7 +974,7 @@
 								<dependency>
 									<groupId>org.projectlombok</groupId>
 									<artifactId>lombok</artifactId>
-									<version>1.18.38</version>
+									<version>1.18.40</version>
 								</dependency>
 							</dependencies>
 							<executions>

Original file line number	Diff line number	Diff line change
`@@ -109,3 +109,4 @@`
`109`	`109`	`}`
`110`	`110`	`{{/jsonb}}`
`111`	`111`	`}`
	`112`	`+`
Original file line number	Diff line number	Diff line change
`@@ -636,4 +636,5 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens`
`636`	`636`	`};`
`637`	`637`	`{{/parcelableModel}}`
`638`	`638`	`{{>pojoBuilder}}`
	`639`	`+`
`639`	`640`	`}`