diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/apiService.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/apiService.mustache index 16b7bfacbab..a057e4c9726 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/apiService.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/apiService.mustache @@ -13,6 +13,11 @@ import java.util.List; import java.io.InputStream; +{{#useBeanValidation}} +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; +{{/useBeanValidation}} + import {{javaxPackage}}.ws.rs.core.Response; import {{javaxPackage}}.ws.rs.core.SecurityContext; diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/apiServiceImpl.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/apiServiceImpl.mustache index d096e5e8fc7..45b7aa79db3 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/apiServiceImpl.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/apiServiceImpl.mustache @@ -12,6 +12,11 @@ import java.util.List; import java.io.InputStream; +{{#useBeanValidation}} +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; +{{/useBeanValidation}} + import {{javaxPackage}}.enterprise.context.RequestScoped; import {{javaxPackage}}.ws.rs.core.Response; import {{javaxPackage}}.ws.rs.core.SecurityContext; diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache index 4b8f2e18658..e997bacf015 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache @@ -72,7 +72,7 @@ javax javaee-api - 7.0 + 8.0 provided diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache index 4b5fc3c30f1..f08cf3a743a 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache @@ -105,6 +105,14 @@ swagger-jaxrs compile ${swagger-core-version} + + + + javax.validation + validation-api + + ch.qos.logback diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache index 83606b6e414..5e6c879857c 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache @@ -126,6 +126,12 @@ javax.ws.rs jsr311-api + + + javax.validation + validation-api + diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache index 125409b2bcb..dc79d9d4560 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache @@ -105,6 +105,14 @@ swagger-jaxrs compile ${swagger-core-version} + + + + javax.validation + validation-api + + ch.qos.logback diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache index 090663700d4..c7c04ac176a 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache @@ -114,6 +114,14 @@ swagger-jaxrs compile ${swagger-core-version} + + + + javax.validation + validation-api + + ch.qos.logback diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache index 1f3a602e79f..eddab3b1569 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache @@ -116,6 +116,14 @@ swagger-jersey2-jaxrs compile ${swagger-core-version} + + + + javax.validation + validation-api + + ch.qos.logback diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/apiService.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/apiService.mustache index e2b60f723d4..e94f6ddd52a 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/apiService.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/apiService.mustache @@ -13,6 +13,10 @@ import {{package}}.NotFoundException; import java.io.InputStream; +{{#useBeanValidation}} +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; +{{/useBeanValidation}} import {{javaxPackage}}.ws.rs.core.Response; import {{javaxPackage}}.ws.rs.core.SecurityContext; diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache index 9b037aa7cc3..d26efc06cd6 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache @@ -10,7 +10,9 @@ repositories { dependencies { providedCompile 'org.jboss.resteasy:resteasy-jaxrs:3.0.11.Final' providedCompile 'org.jboss.resteasy:jaxrs-api:3.0.11.Final' - providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final' + providedCompile('org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final') { + exclude group: "javax.validation", module: "validation-api" + } providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final' providedCompile 'jakarta.annotation:jakarta.annotation-api:1.3.5' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache index c9c74f3224b..bc5c66425f8 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache @@ -96,6 +96,14 @@ resteasy-validator-provider-11 ${resteasy-version} provided + + + + javax.validation + validation-api + + org.jboss.resteasy @@ -120,6 +128,14 @@ io.swagger swagger-jaxrs ${swagger-core-version} + + + + javax.validation + validation-api + + junit diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/gradle.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/gradle.mustache index a1943a2f9b8..db988226d43 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/gradle.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/gradle.mustache @@ -10,10 +10,12 @@ repositories { dependencies { providedCompile 'org.jboss.resteasy:resteasy-jaxrs:3.0.11.Final' providedCompile 'org.jboss.resteasy:jaxrs-api:3.0.11.Final' - providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final' + providedCompile('org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final') { + exclude group: "javax.validation", module: "validation-api" + } providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final' providedCompile 'jakarta.annotation:jakarta.annotation-api:1.3.5' - providedCompile 'javax:javaee-api:7.0' + providedCompile 'javax:javaee-api:8.0' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'io.swagger:swagger-annotations:1.5.22' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' @@ -23,7 +25,9 @@ dependencies { compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9' compile 'joda-time:joda-time:2.7' //TODO: swaggerFeature - compile 'io.swagger:swagger-jaxrs:1.5.12' + compile('io.swagger:swagger-jaxrs:1.5.12') { + exclude group: "javax.validation", module: "validation-api" + } testCompile 'junit:junit:4.13.2', 'org.hamcrest:hamcrest-core:1.3' diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache index c564afa4877..5d41db46781 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache @@ -70,7 +70,7 @@ javax javaee-api - 7.0 + 8.0 provided @@ -114,6 +114,14 @@ resteasy-validator-provider-11 3.6.3.SP1 provided + + + + javax.validation + validation-api + + org.jboss.resteasy @@ -142,6 +150,14 @@ io.swagger swagger-jaxrs ${swagger-core-version} + + + + javax.validation + validation-api + + junit diff --git a/samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml b/samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml index f726e5cc679..9f9b7a96fad 100644 --- a/samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml +++ b/samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml @@ -87,6 +87,14 @@ swagger-jaxrs compile ${swagger-core-version} + + + + javax.validation + validation-api + + ch.qos.logback diff --git a/samples/client/petstore/jaxrs-cxf-client/pom.xml b/samples/client/petstore/jaxrs-cxf-client/pom.xml index 23feb071169..283b696df7f 100644 --- a/samples/client/petstore/jaxrs-cxf-client/pom.xml +++ b/samples/client/petstore/jaxrs-cxf-client/pom.xml @@ -87,6 +87,14 @@ swagger-jaxrs compile ${swagger-core-version} + + + + javax.validation + validation-api + + ch.qos.logback diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml index a57dcd11a6d..94301277015 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml @@ -103,6 +103,14 @@ swagger-jaxrs compile ${swagger-core-version} + + + + javax.validation + validation-api + + ch.qos.logback diff --git a/samples/server/petstore/jaxrs-cxf-cdi/pom.xml b/samples/server/petstore/jaxrs-cxf-cdi/pom.xml index e7e5910ef3c..39c1a81cd42 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/pom.xml +++ b/samples/server/petstore/jaxrs-cxf-cdi/pom.xml @@ -65,7 +65,7 @@ javax javaee-api - 7.0 + 8.0 provided diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java index 4767577be24..ad1146edb89 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java @@ -13,6 +13,9 @@ import java.util.List; import java.io.InputStream; +import javax.validation.constraints.*; +import javax.validation.Valid; + import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java index e8c6f2e2ad0..989854df0ca 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java @@ -13,6 +13,9 @@ import java.util.List; import java.io.InputStream; +import javax.validation.constraints.*; +import javax.validation.Valid; + import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/TestApiService.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/TestApiService.java index a350d5be4bf..b947eb9d06a 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/TestApiService.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/TestApiService.java @@ -11,6 +11,9 @@ import java.util.List; import java.io.InputStream; +import javax.validation.constraints.*; +import javax.validation.Valid; + import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/UserApiService.java index 6050a39251b..78c66c155fd 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/UserApiService.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/UserApiService.java @@ -12,6 +12,9 @@ import java.util.List; import java.io.InputStream; +import javax.validation.constraints.*; +import javax.validation.Valid; + import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 687f684ffb7..eb7d8aab1f2 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -12,6 +12,9 @@ import java.util.List; import java.io.InputStream; +import javax.validation.constraints.*; +import javax.validation.Valid; + import javax.enterprise.context.RequestScoped; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 3fd4ebe823e..63332da1163 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -12,6 +12,9 @@ import java.util.List; import java.io.InputStream; +import javax.validation.constraints.*; +import javax.validation.Valid; + import javax.enterprise.context.RequestScoped; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/TestApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/TestApiServiceImpl.java index 5b8432c4717..5a044826f37 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/TestApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/TestApiServiceImpl.java @@ -10,6 +10,9 @@ import java.util.List; import java.io.InputStream; +import javax.validation.constraints.*; +import javax.validation.Valid; + import javax.enterprise.context.RequestScoped; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java index 18cead47b76..e54b81552c4 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java @@ -11,6 +11,9 @@ import java.util.List; import java.io.InputStream; +import javax.validation.constraints.*; +import javax.validation.Valid; + import javax.enterprise.context.RequestScoped; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml index e429e717956..3b93fa95040 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml @@ -103,6 +103,14 @@ swagger-jaxrs compile ${swagger-core-version} + + + + javax.validation + validation-api + + ch.qos.logback diff --git a/samples/server/petstore/jaxrs-cxf-test-data/pom.xml b/samples/server/petstore/jaxrs-cxf-test-data/pom.xml index 69e591fb987..7ce4ace8ece 100644 --- a/samples/server/petstore/jaxrs-cxf-test-data/pom.xml +++ b/samples/server/petstore/jaxrs-cxf-test-data/pom.xml @@ -108,6 +108,12 @@ javax.ws.rs jsr311-api + + + javax.validation + validation-api + diff --git a/samples/server/petstore/jaxrs-cxf/pom.xml b/samples/server/petstore/jaxrs-cxf/pom.xml index 0882ce002ef..338e801642d 100644 --- a/samples/server/petstore/jaxrs-cxf/pom.xml +++ b/samples/server/petstore/jaxrs-cxf/pom.xml @@ -103,6 +103,14 @@ swagger-jaxrs compile ${swagger-core-version} + + + + javax.validation + validation-api + + ch.qos.logback diff --git a/samples/server/petstore/jaxrs-datelib-j8/pom.xml b/samples/server/petstore/jaxrs-datelib-j8/pom.xml index 9108d6bfe20..acda23ce006 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/pom.xml +++ b/samples/server/petstore/jaxrs-datelib-j8/pom.xml @@ -107,6 +107,14 @@ swagger-jersey2-jaxrs compile ${swagger-core-version} + + + + javax.validation + validation-api + + ch.qos.logback diff --git a/samples/server/petstore/jaxrs-jersey/pom.xml b/samples/server/petstore/jaxrs-jersey/pom.xml index ca2d65706c5..4f38605a7c9 100644 --- a/samples/server/petstore/jaxrs-jersey/pom.xml +++ b/samples/server/petstore/jaxrs-jersey/pom.xml @@ -107,6 +107,14 @@ swagger-jersey2-jaxrs compile ${swagger-core-version} + + + + javax.validation + validation-api + + ch.qos.logback diff --git a/samples/server/petstore/jaxrs-resteasy/default-value/pom.xml b/samples/server/petstore/jaxrs-resteasy/default-value/pom.xml index f7345246670..3676cdf3204 100644 --- a/samples/server/petstore/jaxrs-resteasy/default-value/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/default-value/pom.xml @@ -107,6 +107,14 @@ resteasy-validator-provider-11 3.6.3.SP1 provided + + + + javax.validation + validation-api + + org.jboss.resteasy @@ -141,6 +149,14 @@ io.swagger swagger-jaxrs ${swagger-core-version} + + + + javax.validation + validation-api + + junit diff --git a/samples/server/petstore/jaxrs-resteasy/default/build.gradle b/samples/server/petstore/jaxrs-resteasy/default/build.gradle index 623f1efab48..adaf0cce95a 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/default/build.gradle @@ -10,10 +10,12 @@ repositories { dependencies { providedCompile 'org.jboss.resteasy:resteasy-jaxrs:3.0.11.Final' providedCompile 'org.jboss.resteasy:jaxrs-api:3.0.11.Final' - providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final' + providedCompile('org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final') { + exclude group: "javax.validation", module: "validation-api" + } providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final' providedCompile 'jakarta.annotation:jakarta.annotation-api:1.3.5' - providedCompile 'javax:javaee-api:7.0' + providedCompile 'javax:javaee-api:8.0' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'io.swagger:swagger-annotations:1.5.22' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' @@ -21,7 +23,9 @@ dependencies { compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9' compile 'joda-time:joda-time:2.7' //TODO: swaggerFeature - compile 'io.swagger:swagger-jaxrs:1.5.12' + compile('io.swagger:swagger-jaxrs:1.5.12') { + exclude group: "javax.validation", module: "validation-api" + } testCompile 'junit:junit:4.13.2', 'org.hamcrest:hamcrest-core:1.3' diff --git a/samples/server/petstore/jaxrs-resteasy/default/pom.xml b/samples/server/petstore/jaxrs-resteasy/default/pom.xml index 640fdc4dba2..cb7d71acdfd 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/default/pom.xml @@ -63,7 +63,7 @@ javax javaee-api - 7.0 + 8.0 provided @@ -107,6 +107,14 @@ resteasy-validator-provider-11 3.6.3.SP1 provided + + + + javax.validation + validation-api + + org.jboss.resteasy @@ -135,6 +143,14 @@ io.swagger swagger-jaxrs ${swagger-core-version} + + + + javax.validation + validation-api + + junit diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java index b357a638a01..4b90ffa4d13 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java @@ -14,6 +14,8 @@ import org.openapitools.api.NotFoundException; import java.io.InputStream; +import javax.validation.constraints.*; +import javax.validation.Valid; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java index ed4c8338a60..02b9a047736 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java @@ -12,6 +12,8 @@ import org.openapitools.api.NotFoundException; import java.io.InputStream; +import javax.validation.constraints.*; +import javax.validation.Valid; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/UserApiService.java index cdb7f934f64..527b3335433 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/UserApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/UserApiService.java @@ -12,6 +12,8 @@ import org.openapitools.api.NotFoundException; import java.io.InputStream; +import javax.validation.constraints.*; +import javax.validation.Valid; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/build.gradle b/samples/server/petstore/jaxrs-resteasy/eap-java8/build.gradle index faea35dd726..34ec45796e6 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/build.gradle @@ -10,7 +10,9 @@ repositories { dependencies { providedCompile 'org.jboss.resteasy:resteasy-jaxrs:3.0.11.Final' providedCompile 'org.jboss.resteasy:jaxrs-api:3.0.11.Final' - providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final' + providedCompile('org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final') { + exclude group: "javax.validation", module: "validation-api" + } providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final' providedCompile 'jakarta.annotation:jakarta.annotation-api:1.3.5' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml index c01897f1b69..99c9881b888 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml @@ -89,6 +89,14 @@ resteasy-validator-provider-11 ${resteasy-version} provided + + + + javax.validation + validation-api + + org.jboss.resteasy @@ -113,6 +121,14 @@ io.swagger swagger-jaxrs ${swagger-core-version} + + + + javax.validation + validation-api + + junit diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle b/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle index faea35dd726..34ec45796e6 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle @@ -10,7 +10,9 @@ repositories { dependencies { providedCompile 'org.jboss.resteasy:resteasy-jaxrs:3.0.11.Final' providedCompile 'org.jboss.resteasy:jaxrs-api:3.0.11.Final' - providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final' + providedCompile('org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final') { + exclude group: "javax.validation", module: "validation-api" + } providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final' providedCompile 'jakarta.annotation:jakarta.annotation-api:1.3.5' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml index ff8599c0aab..2c9e53d49f9 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml @@ -89,6 +89,14 @@ resteasy-validator-provider-11 ${resteasy-version} provided + + + + javax.validation + validation-api + + org.jboss.resteasy @@ -113,6 +121,14 @@ io.swagger swagger-jaxrs ${swagger-core-version} + + + + javax.validation + validation-api + + junit diff --git a/samples/server/petstore/jaxrs-resteasy/eap/build.gradle b/samples/server/petstore/jaxrs-resteasy/eap/build.gradle index faea35dd726..34ec45796e6 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/eap/build.gradle @@ -10,7 +10,9 @@ repositories { dependencies { providedCompile 'org.jboss.resteasy:resteasy-jaxrs:3.0.11.Final' providedCompile 'org.jboss.resteasy:jaxrs-api:3.0.11.Final' - providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final' + providedCompile('org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final') { + exclude group: "javax.validation", module: "validation-api" + } providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final' providedCompile 'jakarta.annotation:jakarta.annotation-api:1.3.5' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' diff --git a/samples/server/petstore/jaxrs-resteasy/eap/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap/pom.xml index ab704408339..13bcbc03e35 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap/pom.xml @@ -89,6 +89,14 @@ resteasy-validator-provider-11 ${resteasy-version} provided + + + + javax.validation + validation-api + + org.jboss.resteasy @@ -113,6 +121,14 @@ io.swagger swagger-jaxrs ${swagger-core-version} + + + + javax.validation + validation-api + + junit diff --git a/samples/server/petstore/jaxrs-resteasy/java8/build.gradle b/samples/server/petstore/jaxrs-resteasy/java8/build.gradle index 623f1efab48..adaf0cce95a 100644 --- a/samples/server/petstore/jaxrs-resteasy/java8/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/java8/build.gradle @@ -10,10 +10,12 @@ repositories { dependencies { providedCompile 'org.jboss.resteasy:resteasy-jaxrs:3.0.11.Final' providedCompile 'org.jboss.resteasy:jaxrs-api:3.0.11.Final' - providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final' + providedCompile('org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final') { + exclude group: "javax.validation", module: "validation-api" + } providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final' providedCompile 'jakarta.annotation:jakarta.annotation-api:1.3.5' - providedCompile 'javax:javaee-api:7.0' + providedCompile 'javax:javaee-api:8.0' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'io.swagger:swagger-annotations:1.5.22' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' @@ -21,7 +23,9 @@ dependencies { compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9' compile 'joda-time:joda-time:2.7' //TODO: swaggerFeature - compile 'io.swagger:swagger-jaxrs:1.5.12' + compile('io.swagger:swagger-jaxrs:1.5.12') { + exclude group: "javax.validation", module: "validation-api" + } testCompile 'junit:junit:4.13.2', 'org.hamcrest:hamcrest-core:1.3' diff --git a/samples/server/petstore/jaxrs-resteasy/java8/pom.xml b/samples/server/petstore/jaxrs-resteasy/java8/pom.xml index 64b584dd9fb..88e39654293 100644 --- a/samples/server/petstore/jaxrs-resteasy/java8/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/java8/pom.xml @@ -63,7 +63,7 @@ javax javaee-api - 7.0 + 8.0 provided @@ -107,6 +107,14 @@ resteasy-validator-provider-11 3.6.3.SP1 provided + + + + javax.validation + validation-api + + org.jboss.resteasy @@ -135,6 +143,14 @@ io.swagger swagger-jaxrs ${swagger-core-version} + + + + javax.validation + validation-api + + junit diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/PetApiService.java index 5415004bc63..3b211fadb8d 100644 --- a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/PetApiService.java @@ -14,6 +14,8 @@ import org.openapitools.api.NotFoundException; import java.io.InputStream; +import javax.validation.constraints.*; +import javax.validation.Valid; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/StoreApiService.java index ed4c8338a60..02b9a047736 100644 --- a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/StoreApiService.java @@ -12,6 +12,8 @@ import org.openapitools.api.NotFoundException; import java.io.InputStream; +import javax.validation.constraints.*; +import javax.validation.Valid; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/UserApiService.java index 0c46a13e06a..224be3a1a50 100644 --- a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/UserApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/UserApiService.java @@ -12,6 +12,8 @@ import org.openapitools.api.NotFoundException; import java.io.InputStream; +import javax.validation.constraints.*; +import javax.validation.Valid; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/build.gradle b/samples/server/petstore/jaxrs-resteasy/joda/build.gradle index 623f1efab48..adaf0cce95a 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/joda/build.gradle @@ -10,10 +10,12 @@ repositories { dependencies { providedCompile 'org.jboss.resteasy:resteasy-jaxrs:3.0.11.Final' providedCompile 'org.jboss.resteasy:jaxrs-api:3.0.11.Final' - providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final' + providedCompile('org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final') { + exclude group: "javax.validation", module: "validation-api" + } providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final' providedCompile 'jakarta.annotation:jakarta.annotation-api:1.3.5' - providedCompile 'javax:javaee-api:7.0' + providedCompile 'javax:javaee-api:8.0' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'io.swagger:swagger-annotations:1.5.22' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' @@ -21,7 +23,9 @@ dependencies { compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9' compile 'joda-time:joda-time:2.7' //TODO: swaggerFeature - compile 'io.swagger:swagger-jaxrs:1.5.12' + compile('io.swagger:swagger-jaxrs:1.5.12') { + exclude group: "javax.validation", module: "validation-api" + } testCompile 'junit:junit:4.13.2', 'org.hamcrest:hamcrest-core:1.3' diff --git a/samples/server/petstore/jaxrs-resteasy/joda/pom.xml b/samples/server/petstore/jaxrs-resteasy/joda/pom.xml index 37aeeef8546..ad8ca97ed48 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/joda/pom.xml @@ -63,7 +63,7 @@ javax javaee-api - 7.0 + 8.0 provided @@ -107,6 +107,14 @@ resteasy-validator-provider-11 3.6.3.SP1 provided + + + + javax.validation + validation-api + + org.jboss.resteasy @@ -135,6 +143,14 @@ io.swagger swagger-jaxrs ${swagger-core-version} + + + + javax.validation + validation-api + + junit diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java index 5415004bc63..3b211fadb8d 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java @@ -14,6 +14,8 @@ import org.openapitools.api.NotFoundException; import java.io.InputStream; +import javax.validation.constraints.*; +import javax.validation.Valid; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java index ed4c8338a60..02b9a047736 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java @@ -12,6 +12,8 @@ import org.openapitools.api.NotFoundException; import java.io.InputStream; +import javax.validation.constraints.*; +import javax.validation.Valid; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/UserApiService.java index 4efe0e50a61..9bb36a882b7 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/UserApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/UserApiService.java @@ -12,6 +12,8 @@ import org.openapitools.api.NotFoundException; import java.io.InputStream; +import javax.validation.constraints.*; +import javax.validation.Valid; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml b/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml index 770fe840b57..e159ebf7ec1 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml +++ b/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml @@ -107,6 +107,14 @@ swagger-jersey2-jaxrs compile ${swagger-core-version} + + + + javax.validation + validation-api + + ch.qos.logback diff --git a/samples/server/petstore/jaxrs/jersey2/pom.xml b/samples/server/petstore/jaxrs/jersey2/pom.xml index a5ad3cafe22..b6b5755dc5d 100644 --- a/samples/server/petstore/jaxrs/jersey2/pom.xml +++ b/samples/server/petstore/jaxrs/jersey2/pom.xml @@ -107,6 +107,14 @@ swagger-jersey2-jaxrs compile ${swagger-core-version} + + + + javax.validation + validation-api + + ch.qos.logback