This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.3.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 6b121380f908030dd9829615deb507c2e0fa2a08 Author: Colm O hEigeartaigh <cohei...@apache.org> AuthorDate: Thu Jan 2 12:09:52 2020 +0000 Consolidating Swagger UI version in the samples (cherry picked from commit aefdc0759e30cb44d1729f08d1f31ff516a14e03) # Conflicts: # distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/pom.xml --- .../src/main/release/samples/jax_rs/description_openapi_v3/pom.xml | 2 +- .../src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml | 2 +- .../src/main/release/samples/jax_rs/description_swagger2/pom.xml | 2 +- .../src/main/release/samples/jax_rs/description_swagger2_web/pom.xml | 2 +- distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml | 2 +- .../main/release/samples/jax_rs/spring_boot_scan/application/pom.xml | 2 +- distribution/src/main/release/samples/pom.xml | 1 + 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3/pom.xml b/distribution/src/main/release/samples/jax_rs/description_openapi_v3/pom.xml index 1eb6ee3..628b2de 100644 --- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3/pom.xml @@ -63,7 +63,7 @@ <dependency> <groupId>org.webjars</groupId> <artifactId>swagger-ui</artifactId> - <version>3.24.3</version> + <version>${cxf.swagger.ui.version}</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml index 710522c..cb4279b 100644 --- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml @@ -56,7 +56,7 @@ under the License. <dependency> <groupId>org.webjars</groupId> <artifactId>swagger-ui</artifactId> - <version>3.24.3</version> + <version>${cxf.swagger.ui.version}</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> 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 b2fd1a1..a05c275 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.24.3</version> + <version>${cxf.swagger.ui.version}</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> 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 4092834..76f48f9 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>3.24.3</version> + <version>${cxf.swagger.ui.version}</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> 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 34ceb24..4adef5f 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 @@ -38,7 +38,7 @@ <dependency> <groupId>org.webjars</groupId> <artifactId>swagger-ui</artifactId> - <version>3.24.3</version> + <version>${cxf.swagger.ui.version}</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> 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 7bf106c..eda7b7a 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 @@ -37,7 +37,7 @@ <dependency> <groupId>org.webjars</groupId> <artifactId>swagger-ui</artifactId> - <version>3.24.3</version> + <version>${cxf.swagger.ui.version}</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index c1a5622..5895474 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -34,6 +34,7 @@ <spring.cloud.eureka.version>2.0.2.RELEASE</spring.cloud.eureka.version> <cxf.jetty9.version>9.4.24.v20191120</cxf.jetty9.version> <cxf.httpcomponents.client.version>4.5.8</cxf.httpcomponents.client.version> + <cxf.swagger.ui.version>3.24.3</cxf.swagger.ui.version> <cxf.tika.version>1.23</cxf.tika.version> </properties> <dependencies>