42c1eb894e
Merge branch '1.5.x'
2017-04-14 13:58:03 +02:00
8c21e16cf1
Add reference to Infinispan starter
...
Closes gh-8592
2017-04-14 13:57:47 +02:00
c2b2be9940
Merge pull request #8536 from eddumelendez:dataldaptest
...
* pr/8536:
Polish "Add slice test annotation for LDAP"
Add slice test annotation for LDAP
2017-04-14 10:52:01 +02:00
04ee374e7f
Polish "Add slice test annotation for LDAP"
...
Closes gh-8536
2017-04-14 10:51:43 +02:00
2830bef95c
Add slice test annotation for LDAP
...
This commit adds new annotation `@DataLdapTest` which provides test
infrastructure for LDAP. By default, embedded ldap server is initialized
if available.
See gh-8536
2017-04-14 10:39:03 +02:00
209ecf95f0
Merge branch '1.5.x'
2017-04-14 09:29:19 +02:00
9d0340a5ae
Merge pull request #8889 from rajadilipkolli:patch-3
...
* pr/8889:
Upgrade to Apache Maven 3.5.0
2017-04-14 09:29:00 +02:00
01da13cfe3
Upgrade to Apache Maven 3.5.0
...
Closes gh-8889
2017-04-14 09:28:16 +02:00
b9d1f5e097
Harmonize Solr status health details
...
This commit renames the `solrStatus` property of the Solr health indicator
to `status` and its type. This is now an integer corresponding to the
status Solr sent rather than a String that can be "OK" when all is well.
Closes gh-8878
2017-04-13 18:40:47 +02:00
23360d11a2
Change codec auto-configuration in HandlerStrategies
...
Since SPR-15415 and SPR-15435, the HandlerStrategies and its companion
builder are now using the new CodecConfigurer infrastructure to
configure codecs in a cross-cutting way.
This commit looks for a custom instance of `HandlerStrategies.Builder`
provided by the user, or create a default one if none was found.
Fixes gh-8897
2017-04-13 12:39:16 +02:00
50331102b7
Review configuration properties appendix
2017-04-13 10:36:41 +02:00
8cd4f13464
Merge branch '1.5.x'
2017-04-13 10:25:14 +02:00
b3c8511fb6
Merge branch '1.4.x' into 1.5.x
2017-04-13 10:24:07 +02:00
4fd9a8c468
Add missing spring.datasource.xa properties in the appendix
...
Closes gh-8895
2017-04-13 10:23:44 +02:00
e9b7c7afd2
Merge branch '1.5.x'
2017-04-12 16:17:58 +02:00
584b61ecc1
Remove deprecated property
2017-04-12 16:16:19 +02:00
eeed3a841c
Review configuration properties appendix
2017-04-12 16:03:35 +02:00
2aa68aaf55
Merge pull request #8128 from tinexw:master
...
* pr/8128:
Polish "Handle null value in OnExpressionCondition"
Handle null value in OnExpressionCondition
2017-04-12 15:41:42 +02:00
5114c9d651
Polish "Handle null value in OnExpressionCondition"
...
Closes gh-8128
2017-04-12 15:39:45 +02:00
ccf1800116
Handle null value in OnExpressionCondition
...
Closes gh-2886
2017-04-12 15:36:58 +02:00
70f5728212
Merge pull request #8768 from dreis2211:hashcode-cleanup-new
...
* pr/8768:
Polish "Use JDK hashCode() variants for primitives"
Use JDK hashCode() variants for primitives
2017-04-12 15:23:13 +02:00
036157aeae
Polish "Use JDK hashCode() variants for primitives"
...
Closes gh-8768
2017-04-12 15:22:59 +02:00
f3bbbc4530
Use JDK hashCode() variants for primitives
...
See gh-8768
2017-04-12 15:22:14 +02:00
aa4051727b
Merge branch '1.5.x'
2017-04-12 14:37:08 +02:00
6567018b70
Merge branch '1.4.x' into 1.5.x
2017-04-12 14:36:48 +02:00
2579023035
Fix javadoc
...
Closes gh-8892
2017-04-12 14:36:02 +02:00
d4251125fc
Make sure Admin MBean works also with webflux
...
This commit improves `SpringApplicationAdminMXBeanRegistrar` so that it
work with traditional Servlet-based app but also with Spring WebFlux.
Closes gh-8533
2017-04-12 14:30:42 +02:00
abe3dba4b9
Merge branch '1.5.x'
2017-04-12 11:46:59 +02:00
f4ab574ea1
Merge branch '1.4.x' into 1.5.x
2017-04-12 11:46:43 +02:00
072160863a
Add a note about transactional tests and `webEnvironment`
...
Closes gh-8232
2017-04-12 11:46:06 +02:00
12170f53e2
Restore DataMongoTestReactiveIntegrationTests
...
Closes gh-8885
2017-04-12 11:23:30 +02:00
01089c5f7a
Merge branch '1.5.x'
2017-04-12 11:16:10 +02:00
68c90b24c2
Merge branch '1.4.x' into 1.5.x
2017-04-12 11:15:51 +02:00
40f4c89602
Document list merge restrictions with YAML
...
Closes gh-6911
2017-04-12 11:15:24 +02:00
d3f180b664
Merge branch '1.5.x'
2017-04-12 10:55:58 +02:00
715cf7da75
Do not enable cglib if spring.aop.proxy-target-class is configured
...
This commit makes sure to honour the `spring.aop.proxy-target-class`
property if set by the user. Previously, the
`PersistenceExceptionTranslationPostProcessor` was always configured to
use cglib, regardless of the value of that property.
Closes gh-8887
2017-04-12 10:55:43 +02:00
7f270356ed
Merge branch '1.5.x'
2017-04-12 10:28:48 +02:00
0affa3af3a
Merge branch '1.4.x' into 1.5.x
2017-04-12 10:28:32 +02:00
be3b5a9dc2
Only apply editorconfig for certain files
...
Closes gh-8497
2017-04-12 10:28:00 +02:00
2f2b1a0e8f
Polish
2017-04-12 10:15:39 +02:00
bcb13bea63
Split JPA-specific bits of Batch auto-config
...
This commit separates the JPA-specific bits of the batch
auto-configuration so that it is possible to reuse most of the logic if
JPA isn't available at all.
Closes gh-8877
2017-04-12 10:04:42 +02:00
c4cba6b0ea
Merge branch '1.5.x'
2017-04-11 21:07:51 -07:00
c97268981a
Polish
2017-04-11 20:59:03 -07:00
d301d0f4c3
Merge branch '1.4.x' into 1.5.x
2017-04-11 20:42:48 -07:00
758ddcd420
Polish
2017-04-11 20:17:23 -07:00
971057705d
Merge branch '1.5.x'
2017-04-11 15:57:10 -07:00
535451f9e5
Merge branch '1.4.x' into 1.5.x
2017-04-11 15:54:01 -07:00
b2f0ebfcb8
Prevent empty json for parameters in trace endpoint
...
Fixes gh-8883
2017-04-11 15:30:39 -07:00
d21a5076fe
Upgrade to Reactor BOM Bismuth SNAPSHOT
...
See gh-8884
2017-04-11 14:53:46 -07:00
bd28de09b0
Merge branch '1.5.x'
2017-04-11 15:30:18 +02:00
Stephane Nicoll
Eddú Meléndez
Raja Kolli
Brian Clozel
tinexw
dreis
Phillip Webb
Madhura Bhave