Andy Wilkinson
24925c3dae
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17078
2019-06-07 10:50:34 +01:00
Andy Wilkinson
c6c139d980
Merge branch '1.5.x' into 2.0.x
2019-06-07 10:46:31 +01:00
Phillip Webb
0ef331018e
Merge branch '2.0.x' into 2.1.x
2019-06-04 14:30:52 -07:00
Phillip Webb
7fc01971ed
Merge branch '1.5.x' into 2.0.x
2019-06-04 14:20:25 -07:00
Phillip Webb
ccfbd03482
Merge branch '2.0.x' into 2.1.x
2019-06-04 02:07:14 -07:00
Phillip Webb
b442d3b906
Merge branch '1.5.x' into 2.0.x
2019-06-04 01:49:03 -07:00
Phillip Webb
5fba43aa31
Merge branch '1.5.x' into 2.0.x
2019-06-04 00:05:57 -07:00
Phillip Webb
8e268987ff
Improve thread safety in property source cache
...
Update `SpringIterableConfigurationPropertySource` so that they cache
and cache key are not stored in different fields. Prior to this commit
it was possible that the an incorrect cache could be returned from
because the key and cache were out of sync.
This commit also allows more lenient handling of ConcurrentModification
exceptions if they are thrown during cache retrieval.
Closes gh-17017
See gh-17013
2019-05-29 16:05:24 -07:00
Johnny Lim
f52ab0040f
Handle all getters first in JavaBeanBinder
...
Update `JavaBeanBinder.addProperties` to add both `get` and `is` methods
before `set`.
See gh-17005
2019-05-29 11:15:41 -07:00
Johnny Lim
765b66c599
Add a missing @Test in JavaBeanBinderTests
...
See gh-17002
2019-05-29 14:17:41 +01:00
Andy Wilkinson
6b199c84d7
Upgrade to Jackson 2.9.9
...
Closes gh-16910
2019-05-29 09:02:25 +01:00
Phillip Webb
f380ba63eb
Exclude Groovy MetaClass from property meta-data
...
Update `TypeExcludeFilter` to exclude `groovy.lang.MetaClass`.
Closes gh-16981
2019-05-28 16:42:42 -07:00
Phillip Webb
09373622ca
Polish "Allow Tomcat be destroyed regardless of exceptions"
...
See gh-16892
2019-05-28 16:15:26 -07:00
Joao Silva
2b33e31a7c
Allow Tomcat be destroyed regardless of exceptions
...
Update `TomcatWebServer` so that lifecycle exceptions are silently
swallowed when attempting shutdown. Prior to this commit it was
possible that a Tomcat instance might not be properly destroyed and
could leave non daemon threads running, which prevent the JVM from
exiting.
Fixes gh-16892
2019-05-28 16:10:37 -07:00
Steve Crow
e0e871c77b
Add Nexmo to list of third-party starters
...
Closes gh-16944
2019-05-28 16:01:33 -07:00
Phillip Verheyden
2149ba4051
Use a regex that captures numbers and qualifiers
...
Fix the regular expression used in the devtools documentation to
include a version number pattern.
Closes gh-16946
2019-05-28 15:55:00 -07:00
Phillip Webb
af1720aa2e
Fix checkstyle issue
2019-05-28 15:52:00 -07:00
Phillip Webb
6913ea24b0
Polish "Fix NoClassDefFound when missing Spring Security"
...
See gh-16889
2019-05-28 14:56:58 -07:00
Vedran Pavic
e9bd11ee83
Fix NoClassDefFound when missing Spring Security
...
Update Spring Session auto-configuration to ensure that the
`DefaultCookieSerializer` doesn't break when Spring Security is not
present on the classpath.
Closes gh-16889
2019-05-28 14:55:18 -07:00
Phillip Webb
5fc67c545c
Work around Framework regression in handling of null model values
...
See https://github.com/spring-projects/spring-framework/issues/23038 .
2019-05-28 14:33:08 -07:00
Phillip Webb
278a0866cd
Polish "Fix Spring Data Cassandra auto-configure condition"
...
See gh-16971
2019-05-28 13:47:45 -07:00
Dmytro Nosan
be435130e6
Fix Spring Data Cassandra auto-configure condition
...
Update `CassandraDataAutoConfiguration` do that it's only applied when
a `Cluster` bean is found.
Fixes gh-16971
2019-05-28 13:47:40 -07:00
Phillip Webb
07ebfc036b
Polish
2019-05-28 13:17:56 -07:00
Johnny Lim
e2f69d040a
Use actual resolvedType when checking Binder cache
...
Update `JavaBeanBinder` so that the `isOfDifferentType` method checks
both the actual type and the resolved type. Prior to this commit, it
was possible that when `canCallGetValue` is `true` the `resolvedType`
could be different from `type.resolve`.
Closes gh-16974
2019-05-28 13:13:08 -07:00
Stephane Nicoll
2c364ceb89
Fix wrong ApplicationContext import
...
Closes gh-16978
2019-05-27 16:59:12 +02:00
Robeatoz
9f248c6043
Correct name and description of spring-boot-project module
...
This commit corrects the Maven project name and description of spring-boot-project to
avoid the already used name "Spring Boot Build".
See gh-16938
2019-05-25 08:08:36 +01:00
Andy Wilkinson
d964357bfa
Start building against snapshots for Reactor Californium-SR9
...
See gh-16962
2019-05-25 07:49:15 +01:00
Andy Wilkinson
636113823c
Start building against Spring Framework 5.1.8 snapshots
...
See gh-16961
2019-05-25 07:48:19 +01:00
Andy Wilkinson
60d60a8304
Use basedir as forked JVM's working directory in Maven plugin
...
Fixes gh-16811
2019-05-24 20:49:03 +01:00
Andy Wilkinson
32e1d68d2f
Upgrade to Couchbase Client 2.7.6
...
Closes gh-16909
2019-05-23 10:22:28 +01:00
Andy Wilkinson
46ecf7a928
Only unwrap when DataSource is a wrapper for required type
...
Closes gh-16863
2019-05-22 12:52:10 +01:00
Andy Wilkinson
da12ad0ca5
Make ReactiveSecurityAutoConfiguration back off without spring-webflux
...
Closes gh-16934
2019-05-22 12:33:59 +01:00
Andy Wilkinson
6c7a6a6c3d
Revert "Upgrade to Jackson 2.9.9"
...
This reverts commit 66fba9387a .
See gh-16910
2019-05-21 17:00:16 +01:00
Andy Wilkinson
c8a02ed90a
Upgrade to Pooled Jms 1.0.5
...
Closes gh-16913
2019-05-21 09:29:07 +01:00
Andy Wilkinson
2ce650901f
Upgrade to Tomcat 9.0.20
...
Closes gh-16912
2019-05-21 09:29:07 +01:00
Andy Wilkinson
1af5fc7d62
Upgrade to Javax Cache 1.1.1
...
Closes gh-16911
2019-05-21 09:29:07 +01:00
Andy Wilkinson
66fba9387a
Upgrade to Jackson 2.9.9
...
Closes gh-16910
2019-05-21 09:29:07 +01:00
Phillip Webb
f790556f96
Polish 'Drop blocking RedisReactiveHealthIndicator calls'
...
See gh-16756
2019-05-14 21:28:30 -07:00
ayudovin
de857372a5
Drop blocking RedisReactiveHealthIndicator calls
...
Update `RedisReactiveHealthIndicator` so that `getReactiveConnection`
is not called directly since it blocks.
Fixed gh-16756
2019-05-14 21:23:40 -07:00
Phillip Webb
ed998ef0d3
Update copyright header of changed files
2019-05-14 21:04:50 -07:00
Phillip Webb
ab15b8e26d
Support overloaded setters when binding beans
...
Update `JavaBeanBinder` so that overloaded setters can be used when
binding. Prior to this commit the setter picked would depend on the
order that the JVM returned the declared methods. We now consistently
prefer using the setter with a parameter type that matches the getter.
Closes gh-16206
2019-05-14 21:02:16 -07:00
Phillip Webb
e2dc278cae
Use default SslContextFactory for JettyClient
...
Update the auto-configured Jetty `HttpClient` so that a default
`SslContextFactory` is used.
Prior to this commit connecting to https URLs would cause a
`NullPointerException`.
Fixed gh-16810
2019-05-14 20:04:02 -07:00
Phillip Webb
f665910cdb
Use generic type for binder cache comparisons
...
Update `JavaBeanBinder` so that previously cached beans are compared
using full generic type information. Prior to this commit binding would
fail if a class with the same resolved type, but different generics was
in the cache.
Fixes gh-16821
2019-05-14 18:42:16 -07:00
Stephane Nicoll
da96def966
Upgrade to Maven Jar Plugin 3.1.2
...
Closes gh-16842
2019-05-14 08:13:18 +02:00
Stephane Nicoll
eb6a2496e8
Upgrade to Spring Session Bom Bean-SR5
...
Closes gh-16841
2019-05-14 08:13:17 +02:00
Stephane Nicoll
6b0f1de5c8
Upgrade to Groovy 2.5.7
...
Closes gh-16840
2019-05-14 08:13:16 +02:00
Stephane Nicoll
870d31836b
Upgrade to Aspectj 1.9.4
...
Closes gh-16839
2019-05-14 08:13:15 +02:00
Stephane Nicoll
c4ab264bdb
Upgrade to Joda Time 2.10.2
...
Closes gh-16838
2019-05-14 08:13:14 +02:00
Stephane Nicoll
c2e077d9c1
Upgrade to Hazelcast 3.11.4
...
Closes gh-16837
2019-05-14 08:13:13 +02:00
Stephane Nicoll
424a6d21d8
Upgrade to Spring Data Lovelace-SR8
...
Closes gh-16724
2019-05-14 08:11:49 +02:00