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/04/18 08:23:50 UTC

[cxf] branch master updated: Upgrade swagger-jaxrs2

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 96cf54c  Upgrade swagger-jaxrs2
96cf54c is described below

commit 96cf54c8577abb504113065c7c8f4e3d86b84bf9
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Wed Apr 18 10:23:31 2018 +0200

    Upgrade swagger-jaxrs2
---
 parent/pom.xml                                                       | 2 +-
 .../description/openapi/AbstractOpenApiServiceDescriptionTest.java   | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index d956a2b..1efd1f4 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</cxf.swagger.v3.version>
+        <cxf.swagger.v3.version>2.0.1</cxf.swagger.v3.version>
         <cxf.swagger.ui.version>3.13.3</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/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/AbstractOpenApiServiceDescriptionTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/AbstractOpenApiServiceDescriptionTest.java
index 0e8654f..d81ff8a 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/AbstractOpenApiServiceDescriptionTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/AbstractOpenApiServiceDescriptionTest.java
@@ -160,10 +160,7 @@ public abstract class AbstractOpenApiServiceDescriptionTest extends AbstractBusC
             UserOperation getBooksOp = map.get("getBooks");
             assertEquals(HttpMethod.GET, getBooksOp.getVerb());
             assertEquals(getApplicationPath() + "/bookstore", getBooksOp.getPath());
-            // see https://github.com/swagger-api/swagger-core/issues/2646
-            if (getBooksOp.getProduces() != null) {
-                assertEquals(MediaType.APPLICATION_JSON, getBooksOp.getProduces());
-            }
+            assertEquals(MediaType.APPLICATION_JSON, getBooksOp.getProduces());
             List<Parameter> getBooksOpParams = getBooksOp.getParameters();
             assertEquals(1, getBooksOpParams.size());
             assertEquals(ParameterType.QUERY, getBooksOpParams.get(0).getType());

-- 
To stop receiving notification emails like this one, please contact
ilgrosso@apache.org.