You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by il...@apache.org on 2018/03/28 08:21:38 UTC
[cxf] branch master updated: Upgrading swagger-jaxrs2 to 2.0.0
stable
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new b703732 Upgrading swagger-jaxrs2 to 2.0.0 stable
b703732 is described below
commit b703732ce05ff8b204648fb36c90041814b349b9
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Wed Mar 28 10:21:16 2018 +0200
Upgrading swagger-jaxrs2 to 2.0.0 stable
---
parent/pom.xml | 2 +-
.../src/main/java/org/apache/cxf/jaxrs/openapi/JaxRs2Extension.java | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 020b86d..623a5b8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -160,7 +160,7 @@
<cxf.spring.ldap.version>2.3.2.RELEASE</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
<cxf.swagger2.version>1.5.17</cxf.swagger2.version><!-- updating to 1.5.18 will cause systest failures -->
- <cxf.swagger.v3.version>2.0.0-rc4</cxf.swagger.v3.version>
+ <cxf.swagger.v3.version>2.0.0</cxf.swagger.v3.version>
<cxf.swagger.ui.version>3.13.0</cxf.swagger.ui.version>
<cxf.velocity.version>2.0</cxf.velocity.version>
<cxf.woodstox.core.version>5.0.3</cxf.woodstox.core.version>
diff --git a/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/JaxRs2Extension.java b/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/JaxRs2Extension.java
index aa345d9..40deb00 100644
--- a/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/JaxRs2Extension.java
+++ b/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/JaxRs2Extension.java
@@ -38,6 +38,8 @@ import javax.validation.constraints.Size;
import javax.ws.rs.Consumes;
import javax.ws.rs.MatrixParam;
+import com.fasterxml.jackson.annotation.JsonView;
+
import io.swagger.v3.core.converter.ModelConverters;
import io.swagger.v3.core.converter.ResolvedSchema;
import io.swagger.v3.jaxrs2.ResolvedParameter;
@@ -62,6 +64,7 @@ public class JaxRs2Extension extends AbstractOpenAPIExtension {
final Consumes classConsumes,
final Consumes methodConsumes,
final boolean includeRequestBody,
+ final JsonView jsonViewAnnotation,
final Iterator<OpenAPIExtension> chain) {
if (shouldIgnoreType(type, typesToSkip)) {
@@ -88,7 +91,7 @@ public class JaxRs2Extension extends AbstractOpenAPIExtension {
if (parameters.isEmpty()) {
return super.extractParameters(
annotations, type, typesToSkip, components, classConsumes,
- methodConsumes, includeRequestBody, chain);
+ methodConsumes, includeRequestBody, jsonViewAnnotation, chain);
}
ResolvedParameter resolved = new ResolvedParameter();
--
To stop receiving notification emails like this one, please contact
ilgrosso@apache.org.