cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject cxf git commit: Upgrade swagger2 to 1.5.4 and adjust the tests and samples
Date Tue, 20 Oct 2015 12:57:05 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 19c2a9d22 -> 14fcfdfba


Upgrade swagger2 to 1.5.4 and adjust the tests and samples


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/14fcfdfb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/14fcfdfb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/14fcfdfb

Branch: refs/heads/3.0.x-fixes
Commit: 14fcfdfba181dbbdf0fbe167edae5400dbd3ccb0
Parents: 19c2a9d
Author: Akitoshi Yoshida <ay@apache.org>
Authored: Tue Oct 20 14:37:18 2015 +0200
Committer: Akitoshi Yoshida <ay@apache.org>
Committed: Tue Oct 20 14:38:52 2015 +0200

----------------------------------------------------------------------
 .../src/test/resources/features/features.xml    |  8 +--
 parent/pom.xml                                  |  2 +-
 .../systest/jaxrs/description/swagger2-json.txt | 54 +-------------------
 .../jaxrs/description/swagger2-noano-json.txt   |  2 +-
 4 files changed, 7 insertions(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/14fcfdfb/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/test/resources/features/features.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/test/resources/features/features.xml
b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/test/resources/features/features.xml
index 98d97ea..0c78bba 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/test/resources/features/features.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/test/resources/features/features.xml
@@ -15,9 +15,9 @@
         <bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.4.6</bundle>
 
         <!-- swagger -->
-        <bundle dependency="true">mvn:io.swagger/swagger-annotations/1.5.4-SNAPSHOT</bundle>
-        <bundle dependency="true">mvn:io.swagger/swagger-models/1.5.4-SNAPSHOT</bundle>
-        <bundle dependency="true">mvn:io.swagger/swagger-core/1.5.4-SNAPSHOT</bundle>
+        <bundle dependency="true">mvn:io.swagger/swagger-annotations/1.5.4</bundle>
+        <bundle dependency="true">mvn:io.swagger/swagger-models/1.5.4</bundle>
+        <bundle dependency="true">mvn:io.swagger/swagger-core/1.5.4</bundle>
     </feature>
 
     <feature name="demo-swagger-jaxrs" version="1.0.0" resolver="(obr)">
@@ -33,7 +33,7 @@
 
         <!-- swagger -->
         <feature version='1.0.0'>demo-swagger-core</feature>
-        <bundle dependency="true">mvn:io.swagger/swagger-jaxrs/1.5.4-SNAPSHOT</bundle>
+        <bundle dependency="true">mvn:io.swagger/swagger-jaxrs/1.5.4</bundle>
     </feature>
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/14fcfdfb/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 381ec3a..3b610da 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -156,7 +156,7 @@
         <cxf.spring.ldap.version>1.3.1.RELEASE</cxf.spring.ldap.version>
         <cxf.spring.mock>spring-test</cxf.spring.mock>
         <cxf.swagger.version>1.3.12</cxf.swagger.version>
-        <cxf.swagger2.version>1.5.3</cxf.swagger2.version>
+        <cxf.swagger2.version>1.5.4</cxf.swagger2.version>
         <cxf.velocity.version>1.7</cxf.velocity.version>
         <cxf.woodstox.core.version>4.4.1</cxf.woodstox.core.version>
         <cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version>

http://git-wip-us.apache.org/repos/asf/cxf/blob/14fcfdfb/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-json.txt
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-json.txt
b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-json.txt
index 0cc21d4..a1317de 100644
--- a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-json.txt
+++ b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-json.txt
@@ -1,53 +1 @@
-{"swagger":"2.0",
- "info":{"description":"The Application",
-         "version":"1.0.0",
-         "title":"Sample REST Application",
-         "contact":{"name":"users@cxf.apache.org"},
-         "license":{"name":"Apache 2.0 License",
-                    "url":"http://www.apache.org/licenses/LICENSE-2.0.html"}},
- "host":"localhost:%s",
- "basePath":"/",
- "tags":[{"name":"bookstore"}],
- "paths":{"/bookstore":{"get":{"tags":["bookstore"],
-                               "summary":"Get books",
-                               "description":"Get books",
-                               "operationId":"getBooks",
-                               "produces":["application/json"],
-                               "parameters":[{"name":"page",
-                                              "in":"query",
-                                              "description":"Page to fetch",
-                                              "required":true,
-                                              "type":"integer",
-                                              "default":"1",
-                                              "format":"int32"}],
-                               "responses":{"200":{"description":"successful operation",
-                                                   "schema":{"type":"array",
-                                                             "items":{"$ref":"#/definitions/Book"}}}}}},
-          "/bookstore/{id}":{"get":{"tags":["bookstore"],
-                                    "summary":"Get book by Id",
-                                    "description":"Get book by Id",
-                                    "operationId":"getBook",
-                                    "produces":["application/json"],
-                                    "parameters":[{"name":"id",
-                                                   "in":"path",
-                                                   "description":"id",
-                                                   "required":true,
-                                                   "type":"integer",
-                                                   "format":"int64"}],
-                                    "responses":{"200":{"description":"successful operation",
-                                                        "schema":{"$ref":"#/definitions/Book"}}}},
-                             "delete":{"tags":["bookstore"],
-                                       "summary":"Delete book",
-                                       "description":"Delete book",
-                                       "operationId":"delete",
-                                       "parameters":[{"name":"id",
-                                                      "in":"path",
-                                                      "description":"id",
-                                                      "required":true,
-                                                      "type":"string"}],
-                                       "responses":{"default":{"description":"successful
operation"}}}}},
- "definitions":{"Book":{"type":"object",
-                        "properties":{"name":{"type":"string"},
-                                      "id":{"type":"integer",
-                                            "format":"int64"}},
-                        "xml":{"name":"Book"}}}}
+{"swagger":"2.0","info":{"description":"The Application","version":"1.0.0","title":"Sample
REST Application","contact":{"name":"users@cxf.apache.org"},"license":{"name":"Apache 2.0
License","url":"http://www.apache.org/licenses/LICENSE-2.0.html"}},"host":"localhost:%s","basePath":"/","tags":[{"name":"bookstore"}],"paths":{"/bookstore":{"get":{"tags":["bookstore"],"summary":"Get
books","description":"Get books","operationId":"getBooks","produces":["application/json"],"parameters":[{"name":"page","in":"query","description":"Page
to fetch","required":true,"type":"integer","default":1,"format":"int32"}],"responses":{"200":{"description":"successful
operation","schema":{"type":"array","items":{"$ref":"#/definitions/Book"}}}}}},"/bookstore/{id}":{"get":{"tags":["bookstore"],"summary":"Get
book by Id","description":"Get book by Id","operationId":"getBook","produces":["application/json"],"parameters":[{"name":"id","in":"path","description":"id","required":true,"type":"integer","format":"int
 64"}],"responses":{"200":{"description":"successful operation","schema":{"$ref":"#/definitions/Book"}}}},"delete":{"tags":["bookstore"],"summary":"Delete
book","description":"Delete book","operationId":"delete","parameters":[{"name":"id","in":"path","description":"id","required":true,"type":"string"}],"responses":{"default":{"description":"successful
operation"}}}}},"definitions":{"Book":{"type":"object","properties":{"name":{"type":"string"},"id":{"type":"integer","format":"int64"}},"xml":{"name":"Book"}}}}

http://git-wip-us.apache.org/repos/asf/cxf/blob/14fcfdfb/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-noano-json.txt
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-noano-json.txt
b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-noano-json.txt
index 75214ce..1a92fcf 100644
--- a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-noano-json.txt
+++ b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-noano-json.txt
@@ -1 +1 @@
-{"swagger":"2.0","info":{"description":"The Application","version":"1.0.0","title":"Sample
REST Application","contact":{"name":"users@cxf.apache.org"},"license":{"name":"Apache 2.0
License","url":"http://www.apache.org/licenses/LICENSE-2.0.html"}},"host":"localhost:%s","basePath":"/","paths":{"/bookstore/name/{id}":{"get":{"operationId":"getBookName","parameters":[{"name":"id","in":"path","required":true,"type":"string"}],"responses":{"200":{"description":"successful
operation","schema":{"type":"string"},"headers":{}}}}},"/bookstore/names":{"get":{"operationId":"getBookNames","parameters":[{"name":"page","in":"query","required":false,"type":"integer","default":"1","format":"int32"}],"responses":{"default":{"description":"successful
operation"}}}},"/bookstore/{id}":{"delete":{"operationId":"delete","parameters":[{"name":"id","in":"path","required":true,"type":"string"}],"responses":{"default":{"description":"successful
operation"}}}}}}
+{"swagger":"2.0","info":{"description":"The Application","version":"1.0.0","title":"Sample
REST Application","contact":{"name":"users@cxf.apache.org"},"license":{"name":"Apache 2.0
License","url":"http://www.apache.org/licenses/LICENSE-2.0.html"}},"host":"localhost:%s","basePath":"/","paths":{"/bookstore/name/{id}":{"get":{"operationId":"getBookName","parameters":[{"name":"id","in":"path","required":true,"type":"string"}],"responses":{"200":{"description":"successful
operation","schema":{"type":"string"},"headers":{}}}}},"/bookstore/names":{"get":{"operationId":"getBookNames","parameters":[{"name":"page","in":"query","required":false,"type":"integer","default":1,"format":"int32"}],"responses":{"default":{"description":"successful
operation"}}}},"/bookstore/{id}":{"delete":{"operationId":"delete","parameters":[{"name":"id","in":"path","required":true,"type":"string"}],"responses":{"default":{"description":"successful
operation"}}}}}}


Mime
View raw message