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 2021/09/27 02:27:32 UTC
[cxf] branch 3.3.x-fixes updated (9f1841a -> a25bc89)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 9f1841a [CXF-8596]:Fix infinite loop in WebFaultOutInterceptor (#850) (#853)
new 395aae4 CXF-8600: Swagger2Feature : Upgrade SwaggerUiConfig to add more configs (tryItOutEnabled) (#856)
new a25bc89 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 | 4 ++++
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
.../org/apache/cxf/jaxrs/swagger/ui/SwaggerUiConfig.java | 16 ++++++++++++++++
4 files changed, 22 insertions(+), 2 deletions(-)
[cxf] 01/02: CXF-8600: Swagger2Feature : Upgrade SwaggerUiConfig to
add more configs (tryItOutEnabled) (#856)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 395aae4462d0141dbe9767fa0d9f48267ececce9
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Sep 26 20:37:31 2021 -0400
CXF-8600: Swagger2Feature : Upgrade SwaggerUiConfig to add more configs (tryItOutEnabled) (#856)
---
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
.../org/apache/cxf/jaxrs/swagger/ui/SwaggerUiConfig.java | 16 ++++++++++++++++
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 20a1c26..d6f39ad 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -34,7 +34,7 @@
<spring.cloud.eureka.version>2.0.2.RELEASE</spring.cloud.eureka.version>
<cxf.jetty9.version>9.4.43.v20210629</cxf.jetty9.version>
<cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
- <cxf.swagger.ui.version>3.24.3</cxf.swagger.ui.version>
+ <cxf.swagger.ui.version>3.52.1</cxf.swagger.ui.version>
<cxf.tika.version>1.27</cxf.tika.version>
<cxf.tomcat.version>8.5.71</cxf.tomcat.version>
</properties>
diff --git a/parent/pom.xml b/parent/pom.xml
index 1bbb5e1..f0e719f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -200,7 +200,7 @@
<cxf.spring.security.version>5.1.13.RELEASE</cxf.spring.security.version>
<cxf.spring.version>5.1.20.RELEASE</cxf.spring.version>
<cxf.stax-ex.version>1.7.6</cxf.stax-ex.version>
- <cxf.swagger.ui.version>3.37.0</cxf.swagger.ui.version>
+ <cxf.swagger.ui.version>3.52.1</cxf.swagger.ui.version>
<cxf.swagger.v3.version>2.0.10</cxf.swagger.v3.version>
<cxf.swagger2.version>1.5.24</cxf.swagger2.version>
<cxf.swagger2.guava.version>27.0-jre</cxf.swagger2.guava.version>
diff --git a/rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/ui/SwaggerUiConfig.java b/rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/ui/SwaggerUiConfig.java
index 10d802a..940bdbd 100644
--- a/rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/ui/SwaggerUiConfig.java
+++ b/rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/ui/SwaggerUiConfig.java
@@ -61,6 +61,8 @@ public class SwaggerUiConfig {
private Boolean showCommonExtensions;
// Set a different validator URL, for example for locally deployed validators
private String validatorUrl;
+ // Controls whether the "Try it out" section should be enabled by default.
+ private Boolean tryItOutEnabled;
public String getConfigUrl() {
return configUrl;
@@ -245,6 +247,11 @@ public class SwaggerUiConfig {
return this;
}
+ public SwaggerUiConfig tryItOutEnabled(boolean tryItOut) {
+ setTryItOutEnabled(tryItOut);
+ return this;
+ }
+
public Map<String, String> getConfigParameters() {
final Map<String, String> params = new TreeMap<>();
@@ -262,6 +269,7 @@ public class SwaggerUiConfig {
put("showExtensions", getShowExtensions(), params);
put("showCommonExtensions", getShowCommonExtensions(), params);
put("validatorUrl", getValidatorUrl(), params);
+ put("tryItOutEnabled", isTryItOutEnabled(), params);
return params;
}
@@ -283,4 +291,12 @@ public class SwaggerUiConfig {
params.put(name, value);
}
}
+
+ public Boolean isTryItOutEnabled() {
+ return tryItOutEnabled;
+ }
+
+ public void setTryItOutEnabled(Boolean tryItOutEnabled) {
+ this.tryItOutEnabled = tryItOutEnabled;
+ }
}
[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.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit a25bc89c9b157a87799de224e815a978b2df3ddf
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Sep 26 22:26:41 2021 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 048b0d1..faab8d0 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -110,6 +110,7 @@ B 26212d8581b27825fd9ccaf2894c1ce3c8854743
B 2634ed5bcfb6001c1a72788a1152bedc6315585e
B 2688801d65067af47f1b51751cb156d20d0c69bc
B 268b4ccb23d4286334ce55e167088838e8ed7150
+B 26ccb4107dc9f8e26d4bbc3089cd78494261e301
B 27092895f73a6611190634a6d04a1e83e6c6fdd5
B 277430f6673140643a5593b979316ff981839b2b
B 27ad3c89dee2280c2c19955696603b8411af0c10
@@ -595,6 +596,7 @@ B d8c4e429fb5c003d63bd2f28ce376cdc9e06f5ef
B d90136089fa3a3018528d9bdd9610a269b680a99
B d9a7680ec5978fe9f4338bede5de4e0d020acdb3
B d9fd7f1a0439d93db7d89f1ae1bc87e7b12c05ec
+B da0ebaeea836a291945fef63dc69d267f0369f62
B da4dfeed6867ed628dc05c9a2dbedbebdf33db21
B da5a3db259572196de7514d5ff807cb249d90971
B dac7d2f053b59723641bbceb7889595e8a1d586c
@@ -722,9 +724,11 @@ M 025d8bdb47aa3127cd975be5eb91fcaa20f39d2c
M 02de4c435f4de72fc93291bebd953dc11d53c02d
M 0320ad320ba88a123a5296a8060d3ac1794009f6
M 043794e29cc5ec5435787e266d7dad6ff762018e
+M 04cce94cfd9835f789016d79a905896027a68a30
M 04fe61b2a9931d23eaad336192fe2c3dc429c2aa
M 061104df8a9435ea618b1cba9f78b76793a7db57
M 067f1afd5e29c0b6601a6df0e44862f52e548476
+M 07c15ddcbbc8c9443d3ca2ef296bceda28fb24f3
M 09ddfdeaef6f32537dba23fa6d7ef36992b3217b
M 0ac822f9f66e8f721c4668bf8ccd42a2b37d5eb8
M 0b69090f97e262d8c107d82781dcba49fa15626d