You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2021/11/08 07:43:33 UTC
[syncope] branch master updated: Upgrading Spring Cloud Gateway,
Swagger UI and ANTLR
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 03403aa Upgrading Spring Cloud Gateway, Swagger UI and ANTLR
03403aa is described below
commit 03403aa75736c99a25f2d4fccd1adb91d2dcbb46
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Nov 8 08:10:59 2021 +0100
Upgrading Spring Cloud Gateway, Swagger UI and ANTLR
---
pom.xml | 10 ++++++----
.../cloud/gateway/config/HttpClientProperties.java | 23 +++++++++++++++++++---
2 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 023547c..39ee1cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -412,7 +412,7 @@ under the License.
<jackson.version>2.13.0</jackson.version>
<spring-boot.version>2.5.6</spring-boot.version>
- <spring-cloud-gateway.version>3.0.4</spring-cloud-gateway.version>
+ <spring-cloud-gateway.version>3.0.5</spring-cloud-gateway.version>
<openjpa.version>3.2.0</openjpa.version>
<hikaricp.version>5.0.0</hikaricp.version>
@@ -456,7 +456,7 @@ under the License.
<h2.version>1.4.200</h2.version>
<swagger-core.version>2.1.11</swagger-core.version>
- <swagger-ui.version>3.52.5</swagger-ui.version>
+ <swagger-ui.version>4.0.1</swagger-ui.version>
<jquery-slimscroll.version>1.3.8</jquery-slimscroll.version>
<jquery-cookie.version>1.4.1-1</jquery-cookie.version>
@@ -476,7 +476,7 @@ under the License.
<wicket-bootstrap.version>5.0.5</wicket-bootstrap.version>
<wicket-spring-boot.version>3.0.4</wicket-spring-boot.version>
- <antlr4.version>4.9.2</antlr4.version>
+ <antlr4.version>4.9.3</antlr4.version>
<curator.version>5.2.0</curator.version>
<zookeeper.version>3.7.0</zookeeper.version>
@@ -1890,7 +1890,9 @@ under the License.
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-wiremock</artifactId>
- <version>${spring-cloud-gateway.version}</version>
+ <version>3.0.4</version>
+ <!-- unfortunately, not always aligned with spring-cloud-gateway -->
+ <!--<version>${spring-cloud-gateway.version}</version>-->
<scope>test</scope>
</dependency>
diff --git a/sra/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java b/sra/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java
index eef444b..a3b095b 100644
--- a/sra/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java
+++ b/sra/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java
@@ -45,6 +45,9 @@ import org.springframework.util.unit.DataSize;
//import org.springframework.validation.annotation.Validated;
// CHECKSTYLE:OFF
+// Semi-blind copy from Spring Cloud Gateway sources, to keep until
+// https://github.com/spring-cloud/spring-cloud-gateway/issues/2303
+// is fixed.
/**
* Configuration properties for the Netty {@link reactor.netty.http.client.HttpClient}.
*/
@@ -198,7 +201,7 @@ public class HttpClientProperties {
*/
private Integer maxConnections = ConnectionProvider.DEFAULT_POOL_MAX_CONNECTIONS;
- /** Only for type FIXED, the maximum time in millis to wait for aquiring. */
+ /** Only for type FIXED, the maximum time in millis to wait for acquiring. */
private Long acquireTimeout = ConnectionProvider.DEFAULT_POOL_ACQUIRE_TIMEOUT;
/**
@@ -219,6 +222,12 @@ public class HttpClientProperties {
*/
private Duration evictionInterval = Duration.ZERO;
+ /**
+ * Enables channel pools metrics to be collected and registered in Micrometer.
+ * Disabled by default.
+ */
+ private boolean metrics = false;
+
public PoolType getType() {
return type;
}
@@ -275,11 +284,19 @@ public class HttpClientProperties {
this.evictionInterval = evictionInterval;
}
+ public boolean isMetrics() {
+ return metrics;
+ }
+
+ public void setMetrics(boolean metrics) {
+ this.metrics = metrics;
+ }
+
@Override
public String toString() {
return "Pool{" + "type=" + type + ", name='" + name + '\'' + ", maxConnections=" + maxConnections
+ ", acquireTimeout=" + acquireTimeout + ", maxIdleTime=" + maxIdleTime + ", maxLifeTime="
- + maxLifeTime + ", evictionInterval=" + evictionInterval + '}';
+ + maxLifeTime + ", evictionInterval=" + evictionInterval + ", metrics=" + metrics + '}';
}
public enum PoolType {
@@ -621,5 +638,5 @@ public class HttpClientProperties {
}
}
-// CHECKSTYLE:ON
+
}