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 01:40:55 UTC
[cxf] branch 3.4.x-fixes updated (26ccb41 -> da0ebae)
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 26ccb41 Recording .gitmergeinfo Changes
new 07c15dd CXF-8600: Swagger2Feature : Upgrade SwaggerUiConfig to add more configs (tryItOutEnabled) (#856)
new da0ebae 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 | 3 +++
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
.../org/apache/cxf/jaxrs/swagger/ui/SwaggerUiConfig.java | 16 ++++++++++++++++
4 files changed, 21 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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 07c15ddcbbc8c9443d3ca2ef296bceda28fb24f3
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)
(cherry picked from commit 840666d155ce5593801d1b9228e5bcf7f720eb7f)
# Conflicts:
# parent/pom.xml
---
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 f8718de..ce426f0 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.2.3.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.38.0</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>9.0.53</cxf.tomcat.version>
<graalvm.version>21.1.0</graalvm.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index f68db89..3c60cce 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -202,7 +202,7 @@
<cxf.spring.security.version>5.3.11.RELEASE</cxf.spring.security.version>
<cxf.spring.version>5.2.17.RELEASE</cxf.spring.version>
<cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
- <cxf.swagger.ui.version>3.38.0</cxf.swagger.ui.version>
+ <cxf.swagger.ui.version>3.52.1</cxf.swagger.ui.version>
<cxf.swagger.v3.version>2.1.6</cxf.swagger.v3.version>
<cxf.swagger2.version>1.6.2</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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit da0ebaeea836a291945fef63dc69d267f0369f62
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Sep 26 20:51:57 2021 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 1987b22..9a211e7 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -149,7 +149,9 @@ M 72abe7416755fcba5943a64299d5e687661cb4c1
M 73c22d0a0c0f98a6def324f28c4eee10bda917ea
M 752a8a2dafff76ed8098cd73f1e071ffa0514754
M 7a05e4fb0b67a89b86ed6eee68b9416005d6f631
+M 80bfaa1fbb9302ca257db211b36c3f0622356d56
M 81d82da19ed43bbeaae12a7eda052a64890ec970
+M 840666d155ce5593801d1b9228e5bcf7f720eb7f
M 866c6b91e3690672b2955ee190bff317fb75084b
M 88907f141ee80792627da3cc7846d1562f6c0238
M 8ae6440a00f066652c37e6f1d122b52c5a6c7b49
@@ -198,6 +200,7 @@ M ca5d02bf9581a28971c8b8d021732972dce5377e
M cc4f758e89da58b2f47c95fb68df186e0533ca74
M ccb76b7c2c02b0f295405fd9bb0b585544c40869
M cf2f79a5de150773b8dd1c4975de7e679a6d4d17
+M d0f02089f26246a61d77277aa18e291ad704dd53
M d2f8db651c418c82b08bc69900d9b90c5d9625bc
M d4c2a7e561db2871c41008ffe617f200a9c7e2b4
M d6a299217dd943a3872da9b0afb7f966ab289cc0