You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/04/12 15:51:37 UTC
[cxf] branch master updated: Upgrading Swagger UI and updating some
of the Swagger examples.
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 15d766e Upgrading Swagger UI and updating some of the Swagger examples.
15d766e is described below
commit 15d766e11f8f9e318b38819075b3b9e8f3478710
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Apr 12 15:50:14 2018 +0100
Upgrading Swagger UI and updating some of the Swagger examples.
---
.../release/samples/jax_rs/description_swagger2/pom.xml | 2 +-
.../src/main/java/demo/jaxrs/swagger/server/Sample.java | 16 +++++++++++++++-
.../samples/jax_rs/description_swagger2_web/README.txt | 2 +-
.../samples/jax_rs/description_swagger2_web/pom.xml | 2 +-
parent/pom.xml | 2 +-
5 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
index f52bf30..76dd459 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>swagger-ui</artifactId>
- <version>3.13.0</version>
+ <version>3.13.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java
index d68a2bd..a57ebbb 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -45,9 +45,23 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.Contact;
+import io.swagger.annotations.Info;
+import io.swagger.annotations.SwaggerDefinition;
@Path("/sample")
-@Api(value = "/sample", description = "Sample JAX-RS service with Swagger documentation")
+@Api(value = "/sample")
+@SwaggerDefinition(
+ info = @Info(
+ description = "Sample JAX-RS service with Swagger documentation",
+ version="1.0.0",
+ title = "Sample REST Application",
+ contact = @Contact(
+ name = "Apache CXF",
+ email = "users@cxf.apache.org"
+ )
+ )
+)
public class Sample {
private Map<String, Item> items;
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/README.txt b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/README.txt
index 3ff529b..e1a4166 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/README.txt
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/README.txt
@@ -17,7 +17,7 @@ Using either UNIX or Windows:
mvn jetty:run-war
-Two JAX-RS endpoints are availbale after the service has started.
+Two JAX-RS endpoints are available after the service has started.
Swagger API documents in JSON and YAML are available at
http://localhost:9000/app/swaggerSample/swagger.json
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
index e90de3a..283bf31 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
@@ -56,7 +56,7 @@ under the License.
<dependency>
<groupId>org.webjars</groupId>
<artifactId>swagger-ui</artifactId>
- <version>2.2.10-1</version>
+ <version>3.13.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 2c6c587..fb14bb3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -161,7 +161,7 @@
<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.ui.version>3.13.0</cxf.swagger.ui.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>
<cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version>
--
To stop receiving notification emails like this one, please contact
coheigea@apache.org.