Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
9e7478a1
Commit
9e7478a1
authored
Oct 25, 2018
by
Phillip Webb
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #14949 from vpavic
* pr/14949: Upgrade to Hazelcast 3.11
parents
acb5a902
6e967fe8
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
12 additions
and
12 deletions
+12
-12
test-hazelcast.xml
...autoconfigure/src/test/resources/cache/test-hazelcast.xml
+1
-1
hazelcast.xml
...t-actuator-autoconfigure/src/test/resources/hazelcast.xml
+1
-1
test-hazelcast.xml
...boot-actuator/src/test/resources/cache/test-hazelcast.xml
+1
-1
hazelcast.xml
...ect/spring-boot-actuator/src/test/resources/hazelcast.xml
+1
-1
HazelcastAutoConfigurationClientTests.java
...gure/hazelcast/HazelcastAutoConfigurationClientTests.java
+2
-2
hazelcast.xml
...pring-boot-autoconfigure/src/test/resources/hazelcast.xml
+1
-1
hazelcast-client-specific.xml
...oot/autoconfigure/hazelcast/hazelcast-client-specific.xml
+1
-1
hazelcast-specific.xml
...ework/boot/autoconfigure/hazelcast/hazelcast-specific.xml
+1
-1
pom.xml
spring-boot-project/spring-boot-dependencies/pom.xml
+1
-1
hazelcast.xml
...spring-boot-sample-cache/src/main/resources/hazelcast.xml
+1
-1
hazelcast.xml
...ring-boot-sample-session/src/main/resources/hazelcast.xml
+1
-1
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/cache/test-hazelcast.xml
View file @
9e7478a1
<hazelcast
xsi:schemaLocation=
"http://www.hazelcast.com/schema/config hazelcast-config-3.1
0
.xsd"
<hazelcast
xsi:schemaLocation=
"http://www.hazelcast.com/schema/config hazelcast-config-3.1
1
.xsd"
xmlns=
"http://www.hazelcast.com/schema/config"
xmlns=
"http://www.hazelcast.com/schema/config"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
>
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
>
<map
name=
"books"
/>
<map
name=
"books"
/>
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/hazelcast.xml
View file @
9e7478a1
<hazelcast
<hazelcast
xsi:schemaLocation=
"http://www.hazelcast.com/schema/config hazelcast-config-3.1
0
.xsd"
xsi:schemaLocation=
"http://www.hazelcast.com/schema/config hazelcast-config-3.1
1
.xsd"
xmlns=
"http://www.hazelcast.com/schema/config"
xmlns=
"http://www.hazelcast.com/schema/config"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
>
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
>
<map
name=
"defaultCache"
/>
<map
name=
"defaultCache"
/>
...
...
spring-boot-project/spring-boot-actuator/src/test/resources/cache/test-hazelcast.xml
View file @
9e7478a1
<hazelcast
xsi:schemaLocation=
"http://www.hazelcast.com/schema/config hazelcast-config-3.1
0
.xsd"
<hazelcast
xsi:schemaLocation=
"http://www.hazelcast.com/schema/config hazelcast-config-3.1
1
.xsd"
xmlns=
"http://www.hazelcast.com/schema/config"
xmlns=
"http://www.hazelcast.com/schema/config"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
>
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
>
<map
name=
"books"
/>
<map
name=
"books"
/>
...
...
spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast.xml
View file @
9e7478a1
<hazelcast
<hazelcast
xsi:schemaLocation=
"http://www.hazelcast.com/schema/config hazelcast-config-3.1
0
.xsd"
xsi:schemaLocation=
"http://www.hazelcast.com/schema/config hazelcast-config-3.1
1
.xsd"
xmlns=
"http://www.hazelcast.com/schema/config"
xmlns=
"http://www.hazelcast.com/schema/config"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
>
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
>
<map
name=
"defaultCache"
/>
<map
name=
"defaultCache"
/>
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java
View file @
9e7478a1
/*
/*
* Copyright 2012-201
7
the original author or authors.
* Copyright 2012-201
8
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
package
org
.
springframework
.
boot
.
autoconfigure
.
hazelcast
;
package
org
.
springframework
.
boot
.
autoconfigure
.
hazelcast
;
import
com.hazelcast.client.config.ClientConfig
;
import
com.hazelcast.client.config.ClientConfig
;
import
com.hazelcast.client.impl.HazelcastClientProxy
;
import
com.hazelcast.client.impl.
clientside.
HazelcastClientProxy
;
import
com.hazelcast.config.Config
;
import
com.hazelcast.config.Config
;
import
com.hazelcast.core.Hazelcast
;
import
com.hazelcast.core.Hazelcast
;
import
com.hazelcast.core.HazelcastInstance
;
import
com.hazelcast.core.HazelcastInstance
;
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.xml
View file @
9e7478a1
<hazelcast
<hazelcast
xsi:schemaLocation=
"http://www.hazelcast.com/schema/config hazelcast-config-3.1
0
.xsd"
xsi:schemaLocation=
"http://www.hazelcast.com/schema/config hazelcast-config-3.1
1
.xsd"
xmlns=
"http://www.hazelcast.com/schema/config"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
>
xmlns=
"http://www.hazelcast.com/schema/config"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
>
<instance-name>
default-instance
</instance-name>
<instance-name>
default-instance
</instance-name>
<map
name=
"defaultCache"
/>
<map
name=
"defaultCache"
/>
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.xml
View file @
9e7478a1
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<hazelcast-client
xmlns=
"http://www.hazelcast.com/schema/client-config"
<hazelcast-client
xmlns=
"http://www.hazelcast.com/schema/client-config"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://www.hazelcast.com/schema/client-config hazelcast-client-config-3.1
0
.xsd"
>
xsi:schemaLocation=
"http://www.hazelcast.com/schema/client-config hazelcast-client-config-3.1
1
.xsd"
>
</hazelcast-client>
</hazelcast-client>
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml
View file @
9e7478a1
<hazelcast
xsi:schemaLocation=
"http://www.hazelcast.com/schema/config hazelcast-config-3.1
0
.xsd"
<hazelcast
xsi:schemaLocation=
"http://www.hazelcast.com/schema/config hazelcast-config-3.1
1
.xsd"
xmlns=
"http://www.hazelcast.com/schema/config"
xmlns=
"http://www.hazelcast.com/schema/config"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
>
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
>
...
...
spring-boot-project/spring-boot-dependencies/pom.xml
View file @
9e7478a1
...
@@ -68,7 +68,7 @@
...
@@ -68,7 +68,7 @@
<gson.version>
2.8.5
</gson.version>
<gson.version>
2.8.5
</gson.version>
<h2.version>
1.4.197
</h2.version>
<h2.version>
1.4.197
</h2.version>
<hamcrest.version>
1.3
</hamcrest.version>
<hamcrest.version>
1.3
</hamcrest.version>
<hazelcast.version>
3.1
0.6
</hazelcast.version>
<hazelcast.version>
3.1
1
</hazelcast.version>
<hazelcast-hibernate5.version>
1.2.3
</hazelcast-hibernate5.version>
<hazelcast-hibernate5.version>
1.2.3
</hazelcast-hibernate5.version>
<hibernate.version>
5.3.7.Final
</hibernate.version>
<hibernate.version>
5.3.7.Final
</hibernate.version>
<hibernate-validator.version>
6.0.13.Final
</hibernate-validator.version>
<hibernate-validator.version>
6.0.13.Final
</hibernate-validator.version>
...
...
spring-boot-samples/spring-boot-sample-cache/src/main/resources/hazelcast.xml
View file @
9e7478a1
<hazelcast
xsi:schemaLocation=
"http://www.hazelcast.com/schema/config hazelcast-config-3.1
0
.xsd"
<hazelcast
xsi:schemaLocation=
"http://www.hazelcast.com/schema/config hazelcast-config-3.1
1
.xsd"
xmlns=
"http://www.hazelcast.com/schema/config"
xmlns=
"http://www.hazelcast.com/schema/config"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
>
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
>
...
...
spring-boot-samples/spring-boot-sample-session/src/main/resources/hazelcast.xml
View file @
9e7478a1
<hazelcast
xsi:schemaLocation=
"http://www.hazelcast.com/schema/config hazelcast-config-3.1
0
.xsd"
<hazelcast
xsi:schemaLocation=
"http://www.hazelcast.com/schema/config hazelcast-config-3.1
1
.xsd"
xmlns=
"http://www.hazelcast.com/schema/config"
xmlns=
"http://www.hazelcast.com/schema/config"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
>
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment