You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2022/06/01 12:39:46 UTC
[cxf] branch 3.4.x-fixes updated (f7ec9213bd -> 4c856dbbac)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from f7ec9213bd Updating Tika to 1.28.3
new 8c71f73307 CXF-8683: Support SwaggerUI 4.10.3+ (#952)
new 4c856dbbac Recording .gitmergeinfo Changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 2 ++
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
.../java/org/apache/cxf/jaxrs/swagger/ui/SwaggerUiService.java | 8 +++++---
.../jaxrs/description/SwaggerUiConfigurationQueryConfigTest.java | 1 -
.../cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java | 2 --
6 files changed, 9 insertions(+), 8 deletions(-)
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 4c856dbbacc469486c247a27b98a1ae9a9ee8b26
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Jun 1 08:33:33 2022 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 2172b017b4..a879e0bf42 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -144,6 +144,7 @@ M 0320ad320ba88a123a5296a8060d3ac1794009f6
M 04068cd8430c98ea5a4986c36353b1c22d2362dc
M 049ed3c49a05f9997111afd66ba583dc2b4630f2
M 04c73ab64486b3806c3cc78d5196d2c52280ca89
+M 08c49b245145c5e5d9954b0a17ca55920cf13908
M 0903bdd2f5f91de71425dedde8c5d7fbf44d297f
M 0b137e22f2213a06b5325a0ef9d52b8a94829161
M 0c609dc1e242e4156ad55e10fa0699636da02ee9
@@ -335,6 +336,7 @@ M b8a2f139f8a4f80a90ef49c2a0757395cb303be6
M b909e6dd478272d2c3e094922801a201ef94eeb5
M bb73cfaaebea3c74025c51da7b6478b91122a245
M bc03476635143bc867908996e6cf572b9340d786
+M bc5d02a1823de215646508b22976358b1905adab
M bd0cbb621f42899f64d4d769376c1c9218c9e3d4
M bfc509c206d67124d3f0ae46cea6963cabb8f3ca
M c02e932e97b8580eaa80e7152f633741bc49334f
[cxf] 01/02: CXF-8683: Support SwaggerUI 4.10.3+ (#952)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 8c71f7330761d4b49a45b2d8c07e4a772ea6c7f8
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue May 31 21:23:29 2022 -0400
CXF-8683: Support SwaggerUI 4.10.3+ (#952)
(cherry picked from commit df05725910b7e6b113faf214d787abd84c645bc7)
(cherry picked from commit bc5d02a1823de215646508b22976358b1905adab)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
# parent/pom.xml
---
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
.../java/org/apache/cxf/jaxrs/swagger/ui/SwaggerUiService.java | 8 +++++---
.../jaxrs/description/SwaggerUiConfigurationQueryConfigTest.java | 1 -
.../cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java | 2 --
5 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 6a5809156c..908d14734d 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -35,7 +35,7 @@
<cxf.jetty9.version>9.4.46.v20220331</cxf.jetty9.version>
<cxf.netty.version>4.1.77.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
- <cxf.swagger.ui.version>4.8.1</cxf.swagger.ui.version>
+ <cxf.swagger.ui.version>4.11.1</cxf.swagger.ui.version>
<cxf.tika.version>1.28.3</cxf.tika.version>
<cxf.tomcat.version>9.0.63</cxf.tomcat.version>
<graalvm.version>21.1.0</graalvm.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 9cdab6004b..90720e7660 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -210,7 +210,7 @@
<cxf.spring.security.version>5.3.13.RELEASE</cxf.spring.security.version>
<cxf.spring.version>5.2.22.RELEASE</cxf.spring.version>
<cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
- <cxf.swagger.ui.version>4.8.1</cxf.swagger.ui.version>
+ <cxf.swagger.ui.version>4.11.1</cxf.swagger.ui.version>
<cxf.swagger.v3.version>2.1.6</cxf.swagger.v3.version>
<cxf.swagger2.version>1.6.6</cxf.swagger2.version>
<cxf.swagger2.guava.version>31.0.1-jre</cxf.swagger2.guava.version>
diff --git a/rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/ui/SwaggerUiService.java b/rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/ui/SwaggerUiService.java
index bfccf12e4d..df4d1e4053 100644
--- a/rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/ui/SwaggerUiService.java
+++ b/rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/ui/SwaggerUiService.java
@@ -108,8 +108,8 @@ public class SwaggerUiService {
// http://localhost:8080/services/helloservice/api-docs?url=/services/helloservice/openapi.json
//
// in case the "url" configuration parameter is provided for Swagger UI.
- if (config != null && path.endsWith("/index.html")) {
- if (uriInfo.getQueryParameters().isEmpty()) {
+ if (config != null) {
+ if (path.endsWith("/index.html") && uriInfo.getQueryParameters().isEmpty()) {
final Map<String, String> params = config.getConfigParameters();
if (params != null && !params.isEmpty()) {
@@ -127,7 +127,9 @@ public class SwaggerUiService {
// Since Swagger UI 4.1.3, passing the default URL as query parameter,
// e.g. `?url=swagger.json` is disabled by default due to security concerns.
- if (config.isQueryConfigEnabled() == null || !config.isQueryConfigEnabled()) {
+ final boolean hasUrlPlaceholder = path.endsWith("/index.html")
+ || path.endsWith("/swagger-initializer.js");
+ if (hasUrlPlaceholder && config.isQueryConfigEnabled() == null || !config.isQueryConfigEnabled()) {
final String url = config.getUrl();
if (!StringUtils.isEmpty(url)) {
try (InputStream in = resourceURL.openStream()) {
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationQueryConfigTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationQueryConfigTest.java
index 57039d2363..ddb8175d68 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationQueryConfigTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationQueryConfigTest.java
@@ -94,7 +94,6 @@ public class SwaggerUiConfigurationQueryConfigTest extends AbstractBusClientServ
try (Response response = uiClient.get()) {
String html = response.readEntity(String.class);
assertThat(html, containsString("<!-- HTML"));
- assertThat(html, containsString("url: \"https://petstore.swagger.io/v2/swagger.json\","));
assertThat(response.getMediaType(), equalTo(MediaType.TEXT_HTML_TYPE));
}
}
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java
index 9e978ac1e9..f8f1131672 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java
@@ -112,7 +112,6 @@ public class SwaggerUiConfigurationTest extends AbstractBusClientServerTestBase
try (Response response = uiClient.get()) {
String html = response.readEntity(String.class);
assertThat(html, containsString("<!-- HTML"));
- assertThat(html, containsString("url: \"/swagger.json\","));
assertThat(response.getMediaType(), equalTo(MediaType.TEXT_HTML_TYPE));
}
}
@@ -129,7 +128,6 @@ public class SwaggerUiConfigurationTest extends AbstractBusClientServerTestBase
try (Response response = uiClient.get()) {
String html = response.readEntity(String.class);
assertThat(html, containsString("<!-- HTML"));
- assertThat(html, containsString("url: \"/swagger.json\","));
assertThat(response.getMediaType(), equalTo(MediaType.TEXT_HTML_TYPE));
}
}