Skip to content

Commit 41c38ef

Browse files
committed
Merge remote-tracking branch 'origin/4.3.x' into 4.3.x
# Conflicts: # pom.xml # spring-cloud-netflix-dependencies/pom.xml
2 parents a1569a6 + fe385b6 commit 41c38ef

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.github/workflows/maven.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ name: Build
55

66
on:
77
push:
8-
branches: [ main, 4.1.x ]
8+
branches: [ main, 4.3.x, 4.2.x ]
99
pull_request:
10-
branches: [ main, 4.1.x ]
10+
branches: [ main, 4.3.x, 4.2.x ]
1111

1212
jobs:
1313
build:

docs/modules/ROOT/partials/_configprops.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
|eureka.server.e-i-p-binding-retry-interval-ms-when-unbound | `+++60000+++` |
120120
|eureka.server.enable-replicated-request-compression | `+++false+++` |
121121
|eureka.server.enable-self-preservation | `+++true+++` |
122-
|eureka.server.eviction-interval-timer-in-ms | `+++0+++` |
122+
|eureka.server.eviction-interval-timer-in-ms | |
123123
|eureka.server.expected-client-renewal-interval-seconds | `+++30+++` |
124124
|eureka.server.g-zip-content-from-remote-region | `+++true+++` |
125125
|eureka.server.initial-capacity-of-response-cache | `+++1000+++` |
@@ -140,7 +140,7 @@
140140
|eureka.server.my-url | |
141141
|eureka.server.number-of-replication-retries | `+++5+++` |
142142
|eureka.server.peer-eureka-nodes-update-interval-ms | `+++600000+++` |
143-
|eureka.server.peer-eureka-status-refresh-time-interval-ms | `+++0+++` |
143+
|eureka.server.peer-eureka-status-refresh-time-interval-ms | |
144144
|eureka.server.peer-node-connect-timeout-ms | `+++200+++` |
145145
|eureka.server.peer-node-connection-idle-timeout-seconds | `+++30+++` |
146146
|eureka.server.peer-node-read-timeout-ms | `+++200+++` |
@@ -155,7 +155,7 @@
155155
|eureka.server.rate-limiter-registry-fetch-average-rate | `+++500+++` |
156156
|eureka.server.rate-limiter-throttle-standard-clients | `+++false+++` |
157157
|eureka.server.registry-sync-retries | `+++0+++` |
158-
|eureka.server.registry-sync-retry-wait-ms | `+++0+++` |
158+
|eureka.server.registry-sync-retry-wait-ms | |
159159
|eureka.server.remote-region-app-whitelist | |
160160
|eureka.server.remote-region-connect-timeout-ms | `+++1000+++` |
161161
|eureka.server.remote-region-connection-idle-timeout-seconds | `+++30+++` |

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.springframework.cloud</groupId>
1313
<artifactId>spring-cloud-build</artifactId>
14-
<version>4.3.1-SNAPSHOT</version>
14+
<version>4.3.2-SNAPSHOT</version>
1515
<relativePath />
1616
</parent>
1717
<scm>
@@ -82,7 +82,7 @@
8282
<bintray.package>netflix</bintray.package>
8383
<spring-cloud-commons.version>4.3.1-SNAPSHOT</spring-cloud-commons.version>
8484
<spring-cloud-config.version>4.3.1-SNAPSHOT</spring-cloud-config.version>
85-
<testcontainers.version>1.21.0</testcontainers.version>
85+
<testcontainers.version>1.21.3</testcontainers.version>
8686
<mockserverclient.version>5.15.0</mockserverclient.version>
8787

8888
<!-- Sonar -->

spring-cloud-netflix-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-dependencies-parent</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>4.3.1-SNAPSHOT</version>
8+
<version>4.3.2-SNAPSHOT</version>
99
<relativePath/>
1010
</parent>
1111
<artifactId>spring-cloud-netflix-dependencies</artifactId>

0 commit comments

Comments
 (0)