Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 025fe4f

Browse files
committed
Merge branch '2.7.x'
2 parents 35b32bb + 69d1c36 commit 025fe4f

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/hazelcast.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<hazelcast
2-
xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-4.0.xsd"
2+
xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-5.0.xsd"
33
xmlns="http://www.hazelcast.com/schema/config"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
55
<map name="defaultCache" />

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/hazelcast/Hazelcast3HazelcastHealthIndicatorTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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.
@@ -40,7 +40,7 @@
4040
* @author Stephane Nicoll
4141
*/
4242
@ClassPathExclusions("hazelcast*.jar")
43-
@ClassPathOverrides("com.hazelcast:hazelcast:3.12.8")
43+
@ClassPathOverrides("com.hazelcast:hazelcast:3.12.12")
4444
class Hazelcast3HazelcastHealthIndicatorTests {
4545

4646
@Test

‎spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<hazelcast xmlns="http://www.hazelcast.com/schema/config"
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://www.hazelcast.com/schema/config
4-
http://www.hazelcast.com/schema/config/hazelcast-config-4.0.xsd">
4+
http://www.hazelcast.com/schema/config/hazelcast-config-5.0.xsd">
55
<instance-name>actuator-hazelcast</instance-name>
66
<map name="defaultCache" />
77
<network>

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/Hazelcast3AutoConfigurationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
* @author Stephane Nicoll
4141
*/
4242
@ClassPathExclusions("hazelcast*.jar")
43-
@ClassPathOverrides({ "com.hazelcast:hazelcast:3.12.8", "com.hazelcast:hazelcast-client:3.12.8",
44-
"com.hazelcast:hazelcast-spring:3.12.8" })
43+
@ClassPathOverrides({ "com.hazelcast:hazelcast:3.12.12", "com.hazelcast:hazelcast-client:3.12.12",
44+
"com.hazelcast:hazelcast-spring:3.12.12" })
4545
class Hazelcast3AutoConfigurationTests {
4646

4747
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<hazelcast
2-
xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-4.0.xsd"
2+
xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-5.0.xsd"
33
xmlns="http://www.hazelcast.com/schema/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
44
<instance-name>default-instance</instance-name>
55
<map name="defaultCache" />

‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-4.0.xsd"
1+
<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-5.0.xsd"
22
xmlns="http://www.hazelcast.com/schema/config"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
44

‎spring-boot-project/spring-boot-dependencies/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ bom {
304304
]
305305
}
306306
}
307-
library("Hazelcast", "5.0") {
307+
library("Hazelcast", "5.0.2") {
308308
group("com.hazelcast") {
309309
modules = [
310310
"hazelcast",

‎spring-boot-project/spring-boot-docs/src/docs/asciidoc/io/hazelcast.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ Spring Boot first attempts to create a client by checking the following configur
1010
* A `hazelcast-client.xml` in the working directory or at the root of the classpath.
1111
* A `hazelcast-client.yaml` in the working directory or at the root of the classpath.
1212

13-
NOTE: Spring Boot supports both Hazelcast 4 and Hazelcast 3.
14-
If you downgrade to Hazelcast 3, `hazelcast-client` should be added to the classpath to configure a client.
13+
WARNING: Hazelcast 3 support is deprecated.
14+
If you still need to downgrade to Hazelcast 3, `hazelcast-client` should be added to the classpath to configure a client.
1515

1616
If a client can not be created, Spring Boot attempts to configure an embedded server.
1717
If you define a `com.hazelcast.config.Config` bean, Spring Boot uses that.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /