You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by de...@apache.org on 2017/06/25 13:02:02 UTC
cxf git commit: polishing of Swagger samples,
some now use UI 2.x and 3.x
Repository: cxf
Updated Branches:
refs/heads/master 2828cbab4 -> 782cd8247
polishing of Swagger samples, some now use UI 2.x and 3.x
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/782cd824
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/782cd824
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/782cd824
Branch: refs/heads/master
Commit: 782cd824775c353c034d10821b271da2ecf50e13
Parents: 2828cba
Author: Dennis Kieselhorst <de...@apache.org>
Authored: Sun Jun 25 15:01:52 2017 +0200
Committer: Dennis Kieselhorst <de...@apache.org>
Committed: Sun Jun 25 15:01:52 2017 +0200
----------------------------------------------------------------------
.../samples/jax_rs/description_swagger2/pom.xml | 9 ++++-----
.../samples/jax_rs/description_swagger2_osgi/pom.xml | 2 +-
.../jax_rs/description_swagger2_spring/pom.xml | 2 +-
.../samples/jax_rs/description_swagger2_web/pom.xml | 14 ++++++++------
.../src/main/release/samples/jax_rs/spark/pom.xml | 1 -
.../main/release/samples/jax_rs/spring_boot/pom.xml | 4 ++--
.../jax_rs/spring_boot_scan/application/pom.xml | 2 +-
.../jax_rs/spring_boot_scan/eureka-registry/pom.xml | 2 +-
distribution/src/main/release/samples/pom.xml | 2 +-
9 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/782cd824/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
----------------------------------------------------------------------
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 a8b3223..6549962 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
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>jax_rs_description_swagger2</artifactId>
<name>JAX-RS Swagger2 Demo</name>
- <description>JAX-RS Basic Demo</description>
+ <description>JAX-RS Swagger2 Basic Demo using Jetty</description>
<parent>
<groupId>org.apache.cxf.samples</groupId>
<artifactId>cxf-samples</artifactId>
@@ -31,7 +31,6 @@
<properties>
<cxf.version>${project.version}</cxf.version>
- <httpclient.version>3.1</httpclient.version>
</properties>
<profiles>
@@ -62,9 +61,9 @@
<dependencies>
<dependency>
- <groupId>org.webjars</groupId>
- <artifactId>swagger-ui</artifactId>
- <version>2.2.6</version>
+ <groupId>org.webjars</groupId>
+ <artifactId>swagger-ui</artifactId>
+ <version>3.0.14</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
http://git-wip-us.apache.org/repos/asf/cxf/blob/782cd824/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
index 8820ea4..405ad58 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
@@ -22,7 +22,7 @@ under the License.
<artifactId>jax_rs_description_swagger2_osgi</artifactId>
<packaging>bundle</packaging>
<name>CXF JAX-RS Swagger2 Blueprint Demo</name>
- <description>JAX-RS Basic Demo</description>
+ <description>JAX-RS Swagger2 Basic Demo for OSGi using Blueprint</description>
<parent>
<groupId>org.apache.cxf.samples</groupId>
<artifactId>cxf-samples</artifactId>
http://git-wip-us.apache.org/repos/asf/cxf/blob/782cd824/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
index 9644bae..96a99a0 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>jax_rs_description_swagger2_spring</artifactId>
<name>JAX-RS Swagger2 Spring Demo</name>
- <description>JAX-RS Basic Demo</description>
+ <description>JAX-RS Swagger2 Basic Demo using Spring</description>
<parent>
<groupId>org.apache.cxf.samples</groupId>
<artifactId>cxf-samples</artifactId>
http://git-wip-us.apache.org/repos/asf/cxf/blob/782cd824/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
----------------------------------------------------------------------
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 f404b29..6c5000c 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
@@ -22,7 +22,7 @@ under the License.
<artifactId>jax_rs_description_swagger2_web</artifactId>
<packaging>war</packaging>
<name>JAX-RS Swagger2 WebApp Demo</name>
- <description>JAX-RS Basic Demo</description>
+ <description>JAX-RS Swagger2 Basic Demo using WebApp with Spring</description>
<parent>
<groupId>org.apache.cxf.samples</groupId>
<artifactId>cxf-samples</artifactId>
@@ -39,9 +39,11 @@ under the License.
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.4.0.v20161208</version>
+ <version>9.4.6.v20170531</version>
<configuration>
- <contextPath>/</contextPath>
+ <webApp>
+ <contextPath>/</contextPath>
+ </webApp>
<httpConnector>
<port>9000</port>
</httpConnector>
@@ -54,7 +56,7 @@ under the License.
<dependency>
<groupId>org.webjars</groupId>
<artifactId>swagger-ui</artifactId>
- <version>2.2.6</version>
+ <version>2.2.10-1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -89,8 +91,8 @@ under the License.
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/782cd824/distribution/src/main/release/samples/jax_rs/spark/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/pom.xml b/distribution/src/main/release/samples/jax_rs/spark/pom.xml
index e504d67..fb520ef 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spark/pom.xml
@@ -30,7 +30,6 @@
</parent>
<properties>
<cxf.version>${project.version}</cxf.version>
- <httpclient.version>3.1</httpclient.version>
</properties>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/782cd824/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
index f8d8562..b4c43c1 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
@@ -10,7 +10,7 @@
</parent>
<artifactId>spring-boot-sample-rs-cxf</artifactId>
<name>Spring Boot CXF REST Application</name>
- <description>Spring Boot CXF REST Application</description>
+ <description>Spring Boot CXF REST Application with Swagger UI</description>
<dependencyManagement>
<dependencies>
<dependency>
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>swagger-ui</artifactId>
- <version>2.2.6</version>
+ <version>2.2.10-1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
http://git-wip-us.apache.org/repos/asf/cxf/blob/782cd824/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
index 3b023d5..44aa897 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>swagger-ui</artifactId>
- <version>2.2.6</version>
+ <version>3.0.14</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
http://git-wip-us.apache.org/repos/asf/cxf/blob/782cd824/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
index 36830d6..d61b31b 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
@@ -19,7 +19,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix</artifactId>
- <version>1.2.1.RELEASE</version>
+ <version>1.3.1.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/782cd824/distribution/src/main/release/samples/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 72e85fc..667348e 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -31,7 +31,7 @@
<maven.deploy.skip>true</maven.deploy.skip>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.boot.version>1.5.4.RELEASE</spring.boot.version>
- <spring.cloud.eureka.version>1.1.3.RELEASE</spring.cloud.eureka.version>
+ <spring.cloud.eureka.version>1.3.1.RELEASE</spring.cloud.eureka.version>
</properties>
<dependencies>
<dependency>