Andy Wilkinson
bc4a11dd7b
Make argument ordering consistent across web server initialized events
2017-05-03 17:09:02 +01:00
Andy Wilkinson
328bbaf17f
Update port file writer to support reactive servers
...
Closes gh-8531
2017-05-03 17:06:42 +01:00
Andy Wilkinson
bdd8cb3468
Merge branch '1.5.x'
2017-05-03 16:49:21 +01:00
Andy Wilkinson
51970f81d2
Merge branch '1.4.x' into 1.5.x
2017-05-03 16:48:59 +01:00
Andy Wilkinson
dc8a34f324
Fix warnings caused by CLI's assembly configuration
...
Closes gh-9080
2017-05-03 16:47:38 +01:00
Andy Wilkinson
2d6bb9b507
Revert "Exclude commons-logging from Spring Security"
...
This reverts commit ec57c3d92a .
Closes gh-8985
2017-05-03 15:04:05 +01:00
Stephane Nicoll
91ac9440ff
Merge pull request #9049 from eddumelendez:polish-lambdas
...
* pr/9049:
Replace lambdas with method references
2017-05-03 15:09:10 +02:00
Eddú Meléndez
1d9fa8395c
Replace lambdas with method references
...
Closes gh-9049
2017-05-03 15:08:28 +02:00
Andy Wilkinson
d46591f141
Stop setting org.jboss.logging.provider when using Logback
...
This fix for gh-1928 to address a problemw with Log4j was to set
a system property that forces JBoss Logging to use SLF4J. This has the
unwanted side-effect of crashing Glassfish. We no longer support Log4j
so gh-1928 is no longer a concern. However, you can shoot yourself in
the foot by having Logback and Log4j2 on the classpath in that
particular order, but the latter has to be without its
log4j-slf4j-impl module. At this point you don't get any warnings or
error output at startup, but JBoss Logging uses Log4j2 while
everything else uses SLF4J and Logback. As a result, any logging
that's performed through JBoss Logging is silently lost.
Given the problems caused by setting the system property, and the
contrived nature of the arrangement that's necessary to cause a
problem when the property isn't set, this commit updates
LogbackLoggingSystem so that the system property is no longer set.
Closes gh-8669
2017-05-03 13:25:55 +01:00
Andy Wilkinson
abdc23905f
Drop ignoreNestedProperties attribute from @ConfigurationProperties
...
Closes gh-8657
2017-05-03 13:20:25 +01:00
Stephane Nicoll
12dda513f9
Merge branch '1.5.x'
2017-05-03 13:22:13 +02:00
Stephane Nicoll
2f4a1f9531
Merge branch '1.4.x' into 1.5.x
2017-05-03 13:21:59 +02:00
Stephane Nicoll
93bd1108bf
Fix maven warning
...
Closes gh-9075
2017-05-03 13:21:10 +02:00
Stephane Nicoll
b0ffe18e15
Merge branch '1.5.x'
2017-05-03 13:11:01 +02:00
Stephane Nicoll
ea33cc2f7d
Deprecated MustacheCompilerFactoryBean
...
Closes gh-8999
2017-05-03 13:09:52 +02:00
Stephane Nicoll
88b2fed37d
Merge branch '1.5.x'
2017-05-03 12:20:51 +02:00
Stephane Nicoll
61f88d0c90
Provide dependency management for missing jersey dependencies
...
Closes gh-9009
2017-05-03 12:19:32 +02:00
Stephane Nicoll
2b4f2c6aba
Making sure to stop embedded web servers in tests
...
Closes gh-9012
2017-05-03 12:04:57 +02:00
Stephane Nicoll
5121b848e1
Making sure to stop embedded web servers in tests
...
Closes gh-9012
2017-05-03 11:33:42 +02:00
Andy Wilkinson
d1ea4f8a8a
Start building against Spring REST Docs 1.2.1 snapshots
...
See gh-9071
2017-05-03 10:12:51 +01:00
Andy Wilkinson
4a00f90545
Stop throwing checked exception from @PostConstruct in ResourceServerProperties
...
Closes gh-8916
2017-05-03 10:12:51 +01:00
Stephane Nicoll
b1bb36db2b
Merge branch '1.5.x'
2017-05-03 11:06:51 +02:00
Stephane Nicoll
7b1fc01733
Fix checkstyle violations
2017-05-03 10:19:00 +02:00
Stephane Nicoll
41712c7061
Merge branch '1.5.x'
2017-05-03 09:18:40 +02:00
Stephane Nicoll
b4d55a2223
Merge pull request #9007 from Dichotomia:patch-6
...
* pr/9007:
Add dependency section for jersey multipart
2017-05-03 09:18:28 +02:00
Quentin Caillard
45e0912ecd
Add dependency section for jersey multipart
...
Closes gh-9007
2017-05-03 09:18:09 +02:00
Stephane Nicoll
76c76549b6
Merge branch '1.5.x'
2017-05-03 09:15:59 +02:00
Stephane Nicoll
063d301fd3
Make LayoutType public
...
Closes gh-9067
2017-05-03 09:15:34 +02:00
Stephane Nicoll
6a386c34d5
Merge branch '1.5.x'
2017-05-03 09:11:55 +02:00
Stephane Nicoll
54a8dc5b33
Merge branch '1.4.x' into 1.5.x
2017-05-03 09:11:37 +02:00
Stephane Nicoll
625a7668c9
Merge pull request #9065 from dsyer:cachedocs
...
* pr/9065:
Polish "Clarify and re-organize docs on caching"
Clarify and re-organize docs on caching
2017-05-03 09:11:05 +02:00
Stephane Nicoll
e2b209e409
Polish "Clarify and re-organize docs on caching"
...
Closes gh-9065
2017-05-03 09:10:47 +02:00
Dave Syer
11feb75752
Clarify and re-organize docs on caching
...
See gh-9065
2017-05-03 09:01:45 +02:00
Phillip Webb
cd27737e42
Polish configuration properties and binder
...
Fix a few issues and try a few more things to improve performance.
See gh-9000
2017-05-02 22:06:08 -07:00
Phillip Webb
97dc2165b7
Polish
2017-05-02 21:56:24 -07:00
Phillip Webb
8133b7f245
Merge branch '1.5.x'
2017-05-02 21:43:22 -07:00
Phillip Webb
4d4d03ab2c
Merge branch '1.4.x' into 1.5.x
2017-05-02 21:33:33 -07:00
Phillip Webb
4a95b2f174
Polish
2017-05-02 20:39:45 -07:00
Madhura Bhave
c04f28d9e5
Validate ResourceServerProperties in PostConstruct
...
Closes gh-8916
2017-05-02 17:25:06 -07:00
Madhura Bhave
9ef3a448e6
Restore BindFailureAnalyzer support
...
Closes gh-9026
2017-05-02 13:46:52 -07:00
Stephane Nicoll
291b0c5fa7
Merge pull request #5311 from mp911de:issue/sd-redis-lettuce-driver-autoconfiguration
...
* pr/5311:
Add missing tests
Polish "Add Lettuce Redis driver autoconfiguration"
Add Lettuce Redis driver autoconfiguration
2017-05-02 16:05:56 +02:00
Stephane Nicoll
47783e258a
Add missing tests
2017-05-02 15:57:51 +02:00
Stephane Nicoll
e7efa8f133
Polish "Add Lettuce Redis driver autoconfiguration"
...
Closes gh-5311
2017-05-02 15:40:40 +02:00
Mark Paluch
4563da9ac7
Add Lettuce Redis driver autoconfiguration
...
Introduce an alternative autoconfiguration if the lettuce Redis driver is
available. Add Lettuce-specific configuration property options
"spring.redis.lettuce.shutdown-timeout" to control the shutdown timeout
of the lettuce driver. Add documentation for the properties, the
supported drivers, and how to switch between drivers.
Split client-specific properties from spring.redis.pool to
spring.redis.jedis.pool and introduce spring.redis.lettuce namespace.
Deprecate spring.redis.pool property.
See gh-5311
2017-05-02 13:33:34 +02:00
Stephane Nicoll
64dae5ec3a
Merge branch '1.5.x'
2017-05-02 13:26:04 +02:00
Stephane Nicoll
035e27b1d1
Merge branch '1.4.x' into 1.5.x
2017-05-02 13:21:03 +02:00
Stephane Nicoll
8e5bf4b22a
Polish CachePublicMetrics
...
CachePublicMetrics wasn't explicitly tested and was still using field
injection. This commit improves the situation in preparation of the fix
for gh-8984
2017-05-02 13:15:31 +02:00
Stephane Nicoll
43fb99aafa
Merge branch '1.5.x'
2017-05-02 12:14:00 +02:00
Stephane Nicoll
652a5e7baa
Merge branch '1.4.x' into 1.5.x
2017-05-02 12:13:44 +02:00
Stephane Nicoll
f060922350
Fix cache example in the doc
...
Closes gh-8983
2017-05-02 11:58:50 +02:00