Merge pull request #74 from Sholto/main

java-jaxrs-common: replace deprecated required with new requiredMode on Schema

Author: karlvr

.changeset/red-badgers-agree.md

@@ -0,0 +1,7 @@
+---
+"@openapi-generator-plus/java-jaxrs-generator-common": minor
+---
+
+Migrate deprecated `required` to `requiredMode` on `Schema` annotation.
+
+Note that this will require a Swagger version of at least 2.2.5

packages/java-cxf-cdi-server/templates/pom.hbs

@@ -10,7 +10,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>{{lookup maven.versions 'java' '1.8'}}</java.version>
-		<swagger.version>{{lookup maven.versions 'swagger' '2.1.10'}}</swagger.version>
+		<swagger.version>{{lookup maven.versions 'swagger' '2.2.5'}}</swagger.version>
 		<cxf.version>{{lookup maven.versions 'cxf' '3.4.7'}}</cxf.version>
 		{{#if useJakarta}}
 		<jakarta.ws.version>{{lookup maven.versions 'jakarta_ws' '3.1.0'}}</jakarta.ws.version>

packages/java-cxf-spring-server/templates/pom.hbs

@@ -11,7 +11,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>{{lookup maven.versions 'java' '1.8'}}</java.version>
 		<spring.version>{{lookup maven.versions 'spring' '5.2.5.RELEASE'}}</spring.version>
-		<swagger.version>{{lookup maven.versions 'swagger' '2.1.10'}}</swagger.version>
+		<swagger.version>{{lookup maven.versions 'swagger' '2.2.5'}}</swagger.version>
 		<cxf.version>{{lookup maven.versions 'cxf' '3.4.7'}}</cxf.version>
 		{{#if useJakarta}}
 		<jakarta.ws.version>{{lookup maven.versions 'jakarta_ws' '3.1.0'}}</jakarta.ws.version>

packages/java-jaxrs-client/templates/pom.hbs

@@ -10,7 +10,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>{{lookup maven.versions 'java' '1.8'}}</java.version>
-		<swagger.version>{{lookup maven.versions 'swagger' '2.1.10'}}</swagger.version>
+		<swagger.version>{{lookup maven.versions 'swagger' '2.2.5'}}</swagger.version>
 		{{#if useJakarta}}
 		<jakarta.ws.version>{{lookup maven.versions 'jakarta_ws' '3.1.0'}}</jakarta.ws.version>
 		{{/if}}

packages/java-jaxrs-common/templates/frag/propertyAnnotations.hbs

@@ -3,9 +3,7 @@ name = {{{stringLiteral serializedName}}}
 {{#if description}}
 description = {{{stringLiteral description}}}
 {{/if}}
-{{#if required}}
-required = {{required}}
-{{/if}}
+requiredMode = io.swagger.v3.oas.annotations.media.Schema.RequiredMode.{{#if required}}REQUIRED{{else}}NOT_REQUIRED{{/if}}
 {{#if deprecated}}
 deprecated = true
 {{/if}}

packages/java-jaxrs-server/templates/pom.hbs

@@ -10,7 +10,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>{{lookup maven.versions 'java' '1.8'}}</java.version>
-		<swagger.version>{{lookup maven.versions 'swagger' '2.1.10'}}</swagger.version>
+		<swagger.version>{{lookup maven.versions 'swagger' '2.2.5'}}</swagger.version>
 		{{#if useJakarta}}
 		<jakarta.ws.version>{{lookup maven.versions 'jakarta_ws' '3.1.0'}}</jakarta.ws.version>
 		{{/if}}