Skip to content

Commit 06c4f64

Browse files
OlgaMaciaszekOlgaMaciaszek
committed
Merge remote-tracking branch 'origin/4.2.x' into 4.2.x
2 parents eb330e1 + 8344cbb commit 06c4f64

File tree

480 files changed

+699
-518
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

480 files changed

+699
-518
lines changed

‎.github/workflows/deploy-docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
# if: github.repository_owner == 'spring-projects'
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2121
with:
2222
ref: docs-build
2323
fetch-depth: 1

‎.github/workflows/maven.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v5
1919
- name: Set up JDK
20-
uses: actions/setup-java@v4
20+
uses: actions/setup-java@v5
2121
with:
2222
distribution: 'temurin'
2323
java-version: '17'

‎README.adoc‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ build succeed, please raise a ticket to get the settings added to
3838
source control.
3939

4040
The projects that require middleware (i.e. Redis) for testing generally
41-
require that a local instance of [Docker](https://www.docker.com/get-started) is installed and running.
41+
require that a local instance of https://www.docker.com/get-started[Docker] is installed and running.
4242

4343
[[documentation]]
4444
== Documentation
@@ -57,7 +57,7 @@ a modified file in the correct place. Just commit it and push the change.
5757
[[working-with-the-code]]
5858
== Working with the code
5959
If you don't have an IDE preference we would recommend that you use
60-
https://www.springsource.com/developer/sts[Spring Tools Suite] or
60+
https://spring.io/tools[Spring Tools Suite] or
6161
https://eclipse.org[Eclipse] when working with the code. We use the
6262
https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools
6363
should also work without issue as long as they use Maven 3.3.3 or better.
@@ -212,7 +212,7 @@ Checkstyle rules are *disabled by default*. To add checkstyle to your project ju
212212

213213
If you need to suppress some rules (e.g. line length needs to be longer), then it's enough for you to define a file under `${project.root}/src/checkstyle/checkstyle-suppressions.xml` with your suppressions. Example:
214214

215-
.projectRoot/src/checkstyle/checkstyle-suppresions.xml
215+
.projectRoot/src/checkstyle/checkstyle-suppressions.xml
216216
----
217217
<?xml version="1.0"?>
218218
<!DOCTYPE suppressions PUBLIC
@@ -226,10 +226,11 @@ If you need to suppress some rules (e.g. line length needs to be longer), then i
226226

227227
It's advisable to copy the `${spring-cloud-build.rootFolder}/.editorconfig` and `${spring-cloud-build.rootFolder}/.springformat` to your project. That way, some default formatting rules will be applied. You can do so by running this script:
228228

229-
```bash
229+
[source,bash]
230+
----
230231
$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/.editorconfig -o .editorconfig
231232
$ touch .springformat
232-
```
233+
----
233234

234235
[[ide-setup]]
235236
== IDE setup

‎docs/modules/ROOT/pages/intro.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[[introduction]]
22
= Introduction
33

4-
https://pivotal.io/platform-as-a-service/migrating-to-cloud-native-application-architectures-ebook[Cloud Native] is a style of application development that encourages easy adoption of best practices in the areas of continuous delivery and value-driven development.
4+
Cloud Native is a style of application development that encourages easy adoption of best practices in the areas of continuous delivery and value-driven development.
55
A related discipline is that of building https://12factor.net/[12-factor Applications], in which development practices are aligned with delivery and operations goals -- for instance, by using declarative programming and management and monitoring.
66
Spring Cloud facilitates these styles of development in a number of specific ways.
77
The starting point is a set of features to which all components in a distributed system need easy access.

‎docs/modules/ROOT/pages/spring-cloud-commons/common-abstractions.adoc‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -708,16 +708,6 @@ spring:
708708

709709
See https://docs.oracle.com/javase/8/docs/api/java/net/Inet4Address.html#isSiteLocalAddress--[Inet4Address.html.isSiteLocalAddress()] for more details about what constitutes a site-local address.
710710

711-
[[http-clients]]
712-
== HTTP Client Factories
713-
714-
Spring Cloud Commons provides beans for creating both Apache HTTP clients (`ApacheHttpClientFactory`) and OK HTTP clients (`OkHttpClientFactory`).
715-
The `OkHttpClientFactory` bean is created only if the OK HTTP jar is on the classpath.
716-
In addition, Spring Cloud Commons provides beans for creating the connection managers used by both clients: `ApacheHttpClientConnectionManagerFactory` for the Apache HTTP client and `OkHttpClientConnectionPoolFactory` for the OK HTTP client.
717-
If you would like to customize how the HTTP clients are created in downstream projects, you can provide your own implementation of these beans.
718-
In addition, if you provide a bean of type `HttpClientBuilder` or `OkHttpClient.Builder`, the default factories use these builders as the basis for the builders returned to downstream projects.
719-
You can also disable the creation of these beans by setting `spring.cloud.httpclientfactories.apache.enabled` or `spring.cloud.httpclientfactories.ok.enabled` to `false`.
720-
721711
[[enabled-features]]
722712
== Enabled Features
723713

‎docs/modules/ROOT/partials/_configprops.adoc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
|spring.cloud.loadbalancer.enabled | `+++true+++` | Enables Spring Cloud LoadBalancer.
4545
|spring.cloud.loadbalancer.health-check.initial-delay | `+++0+++` | Initial delay value for the HealthCheck scheduler.
4646
|spring.cloud.loadbalancer.health-check.interval | `+++25s+++` | Interval for rerunning the HealthCheck scheduler.
47-
|spring.cloud.loadbalancer.health-check.interval | `+++25s+++` | Interval for rerunning the HealthCheck scheduler.
4847
|spring.cloud.loadbalancer.health-check.path | | Path at which the health-check request should be made. Can be set up per `serviceId`. A `default` value can be set up as well. If none is set up, `/actuator/health` will be used.
4948
|spring.cloud.loadbalancer.health-check.port | | Path at which the health-check request should be made. If none is set, the port under which the requested service is available at the service instance.
5049
|spring.cloud.loadbalancer.health-check.refetch-instances | `+++false+++` | Indicates whether the instances should be refetched by the `HealthCheckServiceInstanceListSupplier`. This can be used if the instances can be updated and the underlying delegate does not provide an ongoing flux.

‎docs/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"dependencies": {
3-
"antora": "3.2.0-alpha.8",
4-
"@antora/atlas-extension": "1.0.0-alpha.2",
5-
"@antora/collector-extension": "1.0.1",
3+
"antora": "3.2.0-alpha.9",
4+
"@antora/atlas-extension": "1.0.0-alpha.5",
5+
"@antora/collector-extension": "1.0.2",
66
"@asciidoctor/tabs": "1.0.0-beta.6",
7-
"@springio/antora-extensions": "1.14.4",
7+
"@springio/antora-extensions": "1.14.7",
88
"@springio/asciidoctor-extensions": "1.0.0-alpha.17"
99
}
1010
}

‎docs/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>org.springframework.cloud</groupId>
1010
<artifactId>spring-cloud-commons-parent</artifactId>
11-
<version>4.2.2-SNAPSHOT</version>
11+
<version>4.2.3-SNAPSHOT</version>
1212
</parent>
1313
<packaging>jar</packaging>
1414
<name>Spring Cloud Commons Docs</name>

‎pom.xml‎

Lines changed: 60 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>org.springframework.cloud</groupId>
77
<artifactId>spring-cloud-commons-parent</artifactId>
8-
<version>4.2.2-SNAPSHOT</version>
8+
<version>4.2.3-SNAPSHOT</version>
99
<packaging>pom</packaging>
1010
<name>Spring Cloud Commons Parent</name>
1111
<description>Spring Cloud Commons Parent</description>
1212
<url>https://projects.spring.io/spring-cloud/</url>
1313
<parent>
1414
<groupId>org.springframework.cloud</groupId>
1515
<artifactId>spring-cloud-build</artifactId>
16-
<version>4.2.2-SNAPSHOT</version>
16+
<version>4.2.3-SNAPSHOT</version>
1717
<relativePath/> <!-- lookup parent from repository -->
1818
</parent>
1919
<scm>
@@ -25,6 +25,64 @@
2525
</developerConnection>
2626
<tag>HEAD</tag>
2727
</scm>
28+
<licenses>
29+
<license>
30+
<name>Apache License, Version 2.0</name>
31+
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
32+
</license>
33+
</licenses>
34+
<developers>
35+
<developer>
36+
<id>dsyer</id>
37+
<name>Dave Syer</name>
38+
<email>david.syer at broadcom.com</email>
39+
<organization>Broadcom, Inc.</organization>
40+
<organizationUrl>https://www.spring.io</organizationUrl>
41+
<roles>
42+
<role>lead</role>
43+
</roles>
44+
</developer>
45+
<developer>
46+
<id>sgibb</id>
47+
<name>Spencer Gibb</name>
48+
<email>spencer.gibb at broadcom.com</email>
49+
<organization>Broadcom, Inc.</organization>
50+
<organizationUrl>https://www.spring.io</organizationUrl>
51+
<roles>
52+
<role>lead</role>
53+
</roles>
54+
</developer>
55+
<developer>
56+
<id>mgrzejszczak</id>
57+
<name>Marcin Grzejszczak</name>
58+
<email>>marcin.grzejszczak at broadcom.com</email>
59+
<organization>Broadcom, Inc.</organization>
60+
<organizationUrl>https://www.spring.io</organizationUrl>
61+
<roles>
62+
<role>developer</role>
63+
</roles>
64+
</developer>
65+
<developer>
66+
<id>rbaxter</id>
67+
<name>Ryan Baxter</name>
68+
<email>ryan.baxter at broadcom.com</email>
69+
<organization>Broadcom, Inc.</organization>
70+
<organizationUrl>https://www.spring.io</organizationUrl>
71+
<roles>
72+
<role>developer</role>
73+
</roles>
74+
</developer>
75+
<developer>
76+
<id>omaciaszeksharma</id>
77+
<name>Olga Maciaszek-Sharma</name>
78+
<email>olga.maciaszek-sharma at broadcom.com</email>
79+
<organization>Broadcom, Inc.</organization>
80+
<organizationUrl>https://www.spring.io</organizationUrl>
81+
<roles>
82+
<role>developer</role>
83+
</roles>
84+
</developer>
85+
</developers>
2886
<properties>
2987
<bintray.package>commons</bintray.package>
3088
<evictor.version>1.0.0</evictor.version>

‎spring-cloud-commons-dependencies/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<parent>
77
<artifactId>spring-cloud-dependencies-parent</artifactId>
88
<groupId>org.springframework.cloud</groupId>
9-
<version>4.2.2-SNAPSHOT</version>
9+
<version>4.2.3-SNAPSHOT</version>
1010
<relativePath/>
1111
</parent>
1212
<artifactId>spring-cloud-commons-dependencies</artifactId>
13-
<version>4.2.2-SNAPSHOT</version>
13+
<version>4.2.3-SNAPSHOT</version>
1414
<packaging>pom</packaging>
1515
<name>spring-cloud-commons-dependencies</name>
1616
<description>Spring Cloud Commons Dependencies</description>

0 commit comments

Comments
 (0)