Andy Wilkinson
a416f496c0
Clean up deprecation and unused code warnings
2016-10-18 20:43:05 +01:00
Andy Wilkinson
29d4a01b30
Merge branch '1.4.x' into 1.5.x
2016-10-13 12:30:05 +01:00
Andy Wilkinson
7968c6b548
Assign on order to OnPropertyCondition
...
Closes gh-7144
2016-10-13 12:29:35 +01:00
Andy Wilkinson
cc04621dc2
Assign an order to OnResourceCondition
...
Closes gh-7145
2016-10-13 12:27:47 +01:00
Madhura Bhave
90722a9bca
Add @ConditionalOnCloudPlatform
...
Add a @ConditionalOnCloudPlatform annotation that matches based on the
active ClouldPlatform.
Fixes gh-7155
2016-10-12 13:32:37 -07:00
Phillip Webb
d818a09ed8
Polish
2016-10-11 23:38:14 -07:00
Phillip Webb
d3e06c4627
Merge branch '1.4.x' into 1.5.x
2016-10-11 21:46:06 -07:00
Phillip Webb
db3f488d5a
Polish
2016-10-11 17:54:00 -07:00
Stephane Nicoll
6fb53f90e5
Polish contribution
...
Closes gh-6666
2016-10-11 17:03:10 +02:00
Maciej Walkowiak
47ec8630c8
Add Rabbit idleEventInterval property
...
This commit adds a property to configure how often idle container events
should be published.
See gh-6666
2016-10-11 15:49:10 +02:00
Andy Wilkinson
f0b235cbc5
Merge branch '1.4.x' into 1.5.x
2016-10-11 13:04:59 +01:00
Andy Wilkinson
0333416952
Update WelcomePageHandlerMapping to handle reqs with no Accept header
...
Closes gh-7138
2016-10-11 13:02:36 +01:00
Stephane Nicoll
ab2a2579c8
Polish contribution
...
Closes gh-6571
2016-10-10 11:37:21 +02:00
Aurélien Leboulanger
7efdb91641
Manage Tomcat queued connections
...
Adding two tomcat server properties:
- server.tomcat.accept-count
- server.tomcat.max-connections
Closes gh-6433
2016-10-10 11:37:12 +02:00
Stephane Nicoll
3e1425ebed
Polish contribution
...
Closes gh-6543
2016-10-10 10:43:12 +02:00
Vedran Pavic
286a928347
Improve database initializers
...
This commit improves database initializers for Spring Batch and Spring
Session by introducing `AbstractDatabaseInitializer` which eliminates
duplicated logic in existing initializers. Additionally, database
platform resolution now relies on `DatabaseDriver`.
See gh-6543
2016-10-10 09:53:40 +02:00
Stephane Nicoll
ed333a67b4
Expose Spring Data Rest RepositoryDetectionStrategy
...
Closes gh-7113
2016-10-07 10:35:48 +02:00
Stephane Nicoll
02b0e3955c
Merge branch '1.4.x' into 1.5.x
2016-10-07 09:46:21 +02:00
Johnny Lim
1c4c0c6119
Fix String.format() usages
...
Closes gh-7120
2016-10-07 09:45:43 +02:00
Andy Wilkinson
9b8f33df6d
Merge branch '1.4.x' into 1.5.x
2016-10-06 15:53:07 +01:00
Andy Wilkinson
20a2db79bd
Separate conditions that did and did not match in auto-config report
...
Closes gh-7098
2016-10-06 15:52:45 +01:00
Stephane Nicoll
f82e91df39
Merge branch '1.4.x' into 1.5.x
2016-10-06 13:29:53 +02:00
Stephane Nicoll
03961e6692
Polish contribution
...
Closes gh-7004
2016-10-06 13:28:23 +02:00
Rob Fletcher
7fcb197092
Allow configuration to specify randomly generated database name
...
See gh-7004
2016-10-06 11:40:19 +02:00
Stephane Nicoll
200e246238
Merge branch '1.4.x' into 1.5.x
2016-10-06 09:35:01 +02:00
Johnny Lim
91254f2110
Remove unused parameters in String.format()
...
Closes gh-7111
2016-10-06 09:34:32 +02:00
Stephane Nicoll
cf28663cd7
Deprecate commons-dbcp 1
...
Closes gh-6787
2016-10-05 15:21:09 +02:00
Stephane Nicoll
07690bab25
Allow customization of the auto-configured JmsTemplate
...
Closes gh-6825
2016-10-04 15:00:42 +02:00
Phillip Webb
a2315378d4
Formatting
2016-10-03 22:44:36 -07:00
Phillip Webb
f2b0fa284e
Merge branch '1.4.x' into 1.5.x
2016-10-03 22:38:22 -07:00
Phillip Webb
3326841a97
Formatting
2016-10-03 22:19:35 -07:00
Phillip Webb
39ed0d4dfb
Polish
2016-10-03 21:58:13 -07:00
Stephane Nicoll
8ad477537e
Fail fast if both uri and client attributes are set
...
Previously, an URI and individual client attributes can be set to
configure the mongo client. In such a scenario, the URI is ignored.
This commit changes the URI to be "null" and the creation of the client
to fail if both the uri and client attributes are set. If no client
attributes are set, the uri is used as before.
Closes gh-6739
2016-10-03 11:29:20 +02:00
Stephane Nicoll
e643fc5bd1
Merge branch '1.4.x' into 1.5.x
2016-10-02 11:08:33 +02:00
Johnny Lim
503d735fdd
Polish
...
Closes gh-7081
2016-10-02 11:07:04 +02:00
Stephane Nicoll
7ffa499949
Merge branch '1.4.x' into 1.5.x
2016-09-30 10:52:44 +02:00
Stephane Nicoll
e56119165e
Close JestClient on shutdown
...
Closes gh-7051
2016-09-30 10:51:48 +02:00
Stephane Nicoll
8ed20068ca
Fix list property to be mutable
...
Closes gh-7045
2016-09-30 10:34:25 +02:00
Andy Wilkinson
2a035d0748
Remove support for Velocity following its deprecation in 1.4
...
Closes gh-6971
2016-09-29 15:44:36 +01:00
Andy Wilkinson
464915d2cc
Remove support for HornetQ following its deprecation in 1.4
...
See gh-6971
2016-09-29 15:44:36 +01:00
Andy Wilkinson
0232e3b16c
Merge branch '1.4.x' into 1.5.x
2016-09-29 15:09:08 +01:00
Andy Wilkinson
d08c84af42
Ensure that JtaAutoConfiguration runs before ArtemisAutoConfiguration
...
Closes gh-7062
2016-09-29 15:08:24 +01:00
Andy Wilkinson
b4d052a7b3
Merge branch '1.4.x' into 1.5.x
2016-09-29 15:01:54 +01:00
Andy Wilkinson
33ea73996e
Make auto-config for Narayana back off when Transaction SPI not on classpath
...
Closes gh-7061
2016-09-29 14:56:05 +01:00
Vedran Pavic
c4aa78679a
Upgrade Hazelcast to 3.7.1
...
In addition, dependency management for `hazelcast-hibernate5` module has
been added, and a separate dependency version was introduced for
`hazelcast-hibernate4` module.
Closes gh-7023
2016-09-29 10:37:29 +02:00
Stephane Nicoll
cdd59707fc
Merge branch '1.4.x' into 1.5.x
2016-09-28 17:00:30 +02:00
Johnny Lim
30a677646f
Polish
...
Closes gh-7030
2016-09-28 16:45:19 +02:00
Vedran Pavic
f485660482
Upgrade Spring Session to 1.3.0.M2
...
Closes gh-6979
2016-09-28 11:07:11 +01:00
Stephane Nicoll
7dfa3a8c83
Harmonize Caffeine CacheManager bean name
...
Closes gh-6980
2016-09-26 10:47:09 +02:00
Andy Wilkinson
aaf435ff2a
Suppress Neo4J-related deprecation warnings
...
See gh-6976
2016-09-21 20:57:05 +01:00