Skip to content

Commit a1569a6

Browse files
spencergibbspencergibb
committed
Merge branch '4.2.x' into 4.3.x
2 parents 5d79e60 + 8885663 commit a1569a6

File tree

149 files changed

+257
-208
lines changed

Some content is hidden

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

149 files changed

+257
-208
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
# if: github.repository_owner == 'spring-cloud'
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v6
2020
with:
2121
ref: docs-build
2222
fetch-depth: 1

‎.github/workflows/maven.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
java: ["17"]
2020

2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v6
2323
- name: Set up JDK ${{ matrix.java }}
24-
uses: actions/setup-java@v4
24+
uses: actions/setup-java@v5
2525
with:
2626
distribution: 'temurin'
2727
java-version: ${{ matrix.java }}

‎README.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ build succeed, please raise a ticket to get the settings added to
4949
source control.
5050

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

5454
[[documentation]]
5555
== Documentation
@@ -68,7 +68,7 @@ a modified file in the correct place. Just commit it and push the change.
6868
[[working-with-the-code]]
6969
== Working with the code
7070
If you don't have an IDE preference we would recommend that you use
71-
https://www.springsource.com/developer/sts[Spring Tools Suite] or
71+
https://spring.io/tools[Spring Tools Suite] or
7272
https://eclipse.org[Eclipse] when working with the code. We use the
7373
https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools
7474
should also work without issue as long as they use Maven 3.3.3 or better.

‎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.11",
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
}

‎pom.xml‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<packaging>pom</packaging>
88
<name>Spring Cloud Netflix</name>
99
<description>Spring Cloud Netflix</description>
10+
<url>https://github.com/spring-cloud/spring-cloud-netflix</url>
1011
<parent>
1112
<groupId>org.springframework.cloud</groupId>
1213
<artifactId>spring-cloud-build</artifactId>
@@ -19,6 +20,64 @@
1920
<developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-netflix.git</developerConnection>
2021
<tag>HEAD</tag>
2122
</scm>
23+
<licenses>
24+
<license>
25+
<name>Apache License, Version 2.0</name>
26+
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
27+
</license>
28+
</licenses>
29+
<developers>
30+
<developer>
31+
<id>dsyer</id>
32+
<name>Dave Syer</name>
33+
<email>david.syer at broadcom.com</email>
34+
<organization>Broadcom, Inc.</organization>
35+
<organizationUrl>https://www.spring.io</organizationUrl>
36+
<roles>
37+
<role>lead</role>
38+
</roles>
39+
</developer>
40+
<developer>
41+
<id>sgibb</id>
42+
<name>Spencer Gibb</name>
43+
<email>spencer.gibb at broadcom.com</email>
44+
<organization>Broadcom, Inc.</organization>
45+
<organizationUrl>https://www.spring.io</organizationUrl>
46+
<roles>
47+
<role>lead</role>
48+
</roles>
49+
</developer>
50+
<developer>
51+
<id>mgrzejszczak</id>
52+
<name>Marcin Grzejszczak</name>
53+
<email>>marcin.grzejszczak at broadcom.com</email>
54+
<organization>Broadcom, Inc.</organization>
55+
<organizationUrl>https://www.spring.io</organizationUrl>
56+
<roles>
57+
<role>developer</role>
58+
</roles>
59+
</developer>
60+
<developer>
61+
<id>rbaxter</id>
62+
<name>Ryan Baxter</name>
63+
<email>ryan.baxter at broadcom.com</email>
64+
<organization>Broadcom, Inc.</organization>
65+
<organizationUrl>https://www.spring.io</organizationUrl>
66+
<roles>
67+
<role>developer</role>
68+
</roles>
69+
</developer>
70+
<developer>
71+
<id>omaciaszeksharma</id>
72+
<name>Olga Maciaszek-Sharma</name>
73+
<email>olga.maciaszek-sharma at broadcom.com</email>
74+
<organization>Broadcom, Inc.</organization>
75+
<organizationUrl>https://www.spring.io</organizationUrl>
76+
<roles>
77+
<role>developer</role>
78+
</roles>
79+
</developer>
80+
</developers>
2281
<properties>
2382
<bintray.package>netflix</bintray.package>
2483
<spring-cloud-commons.version>4.3.1-SNAPSHOT</spring-cloud-commons.version>
@@ -157,6 +216,22 @@
157216
<module>docs</module>
158217
</modules>
159218
<profiles>
219+
<profile>
220+
<id>central</id>
221+
<build>
222+
<plugins>
223+
<plugin>
224+
<groupId>org.sonatype.central</groupId>
225+
<artifactId>central-publishing-maven-plugin</artifactId>
226+
<configuration>
227+
<excludeArtifacts>
228+
<artifact>spring-cloud-netflix-eureka-client-tls-tests</artifact>
229+
</excludeArtifacts>
230+
</configuration>
231+
</plugin>
232+
</plugins>
233+
</build>
234+
</profile>
160235
<profile>
161236
<id>spring</id>
162237
<repositories>

‎spring-cloud-netflix-eureka-client-tls-tests/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,6 @@
103103
<scope>test</scope>
104104
</dependency>
105105

106-
<dependency>
107-
<groupId>org.junit.vintage</groupId>
108-
<artifactId>junit-vintage-engine</artifactId>
109-
<scope>test</scope>
110-
</dependency>
111106
<dependency>
112107
<groupId>org.bouncycastle</groupId>
113108
<artifactId>bcpkix-jdk15on</artifactId>

‎spring-cloud-netflix-eureka-client-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/AppRunner.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018-2022 the original author or authors.
2+
* Copyright 2018-present the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎spring-cloud-netflix-eureka-client-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/BaseCertTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018-2025 the original author or authors.
2+
* Copyright 2018-present the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎spring-cloud-netflix-eureka-client-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientRunner.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018-2022 the original author or authors.
2+
* Copyright 2018-present the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎spring-cloud-netflix-eureka-client-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientSuite.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018-2024 the original author or authors.
2+
* Copyright 2018-present the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)