Commit Graph

50613 Commits

Author SHA1 Message Date
Stephane Nicoll
3a30cbcd3d Merge branch '1.5.x' 2016-12-12 11:41:15 +01:00
Stephane Nicoll
95ee145281 Merge branch '1.4.x' into 1.5.x 2016-12-12 11:41:01 +01:00
Stephane Nicoll
b80ad2a212 Harmonize Caffeine CacheManager bean name
Closes gh-6980
2016-12-12 11:40:39 +01:00
Madhura Bhave
44cd625867 Merge branch '1.5.x' 2016-12-08 15:07:19 -08:00
Madhura Bhave
b29620f2ad Allow overriding case in SpringPhysicalNamingStrategy
Fixes gh-7410
2016-12-08 14:25:39 -08:00
Andy Wilkinson
2558f5c0e2 Merge branch '1.5.x' 2016-12-08 20:56:59 +00:00
Andy Wilkinson
5d7453a635 Merge branch '1.4.x' into 1.5.x 2016-12-08 20:56:34 +00:00
Andy Wilkinson
61f086591c Revert "Start building against Spring Framework 4.3.5 snapshots"
This reverts commit 47f1aeb589.
2016-12-08 20:55:57 +00:00
Andy Wilkinson
0d3daf4fd0 Merge branch '1.5.x' 2016-12-08 17:36:25 +00:00
Andy Wilkinson
671dea0d6b Merge branch '1.4.x' into 1.5.x 2016-12-08 17:36:21 +00:00
Andy Wilkinson
4a709ea86d Start building against snapshots for Spring Data Hopper SR6
See gh-7602
2016-12-08 17:35:53 +00:00
Andy Wilkinson
894b397d9e Merge branch '1.5.x' 2016-12-08 17:34:25 +00:00
Andy Wilkinson
a9f59d586d Merge branch '1.4.x' into 1.5.x 2016-12-08 17:33:57 +00:00
Andy Wilkinson
47f1aeb589 Start building against Spring Framework 4.3.5 snapshots
See gh-7601
2016-12-08 17:33:02 +00:00
Stephane Nicoll
fa492e3ac8 Merge branch '1.5.x' 2016-12-08 15:58:12 +01:00
Stephane Nicoll
8a50dae01a Add missing entry for server.tomcat.accesslog.buffered
See gh-7456
2016-12-08 15:57:44 +01:00
Andy Wilkinson
6eaa8d7c56 Merge branch '1.5.x' 2016-12-08 11:38:23 +00:00
Andy Wilkinson
53287eadf6 Merge branch '1.4.x' into 1.5.x 2016-12-08 11:38:13 +00:00
Andy Wilkinson
2d8344d46d Ensure that JarLauncher doesn't cause root jar to be on class path twice
Closes gh-7595
2016-12-08 11:34:22 +00:00
Madhura Bhave
6a1f3d2dab Merge branch '1.5.x' 2016-12-06 13:52:58 -08:00
Madhura Bhave
5d8e00cb56 Fix HealthMvcEndpointTests
See gh-7569
2016-12-06 13:18:10 -08:00
Madhura Bhave
1cd1054514 Merge branch '1.5.x' 2016-12-06 11:08:24 -08:00
Madhura Bhave
1be5812cf0 Require ACTUATOR role rather than ADMIN
Update management security to require an `ACTUATOR` role rather than
`ADMIN` by default. This should reduce the risk of users accidentally
exposing actuator endpoints because they happen to use a role named
`ADMIN`.

Fixes gh-7569
2016-12-05 17:58:16 -08:00
Madhura Bhave
95be208f0f Use IgnoredRequestCustomizer to ignore paths
Update `SpringBootWebSecurityConfiguration` to ignore requests by
delegating to `IgnoredRequestCustomizer` beans. This allows a single
Spring Boot `WebSecurityConfigurer<WebSecurity>` bean to be used which
prevents potential exceptions caused by duplicate `@Order` values.

Fixes gh-7106
2016-12-05 17:57:18 -08:00
Madhura Bhave
d09aafacda Add a security interceptor for actuator endpoints
Update `AbstractEndpointHandlerMapping` to support a security
interceptor that can be used to enforce endpoint security.

Fixes gh-6889
2016-12-05 17:57:00 -08:00
Phillip Webb
263d444d4e Merge branch '1.5.x' 2016-12-05 11:20:24 -08:00
Phillip Webb
f6b0652369 Merge branch '1.4.x' into 1.5.x 2016-12-05 11:17:13 -08:00
Madhura Bhave
64da63aa96 Use empty message for Non-Spring Boot Condition
Update `AbstractNestedCondition` to use an empty message for non
Spring Boot nested conditions.

Fixes gh-7519
Closes gh-7529
2016-12-05 11:16:25 -08:00
Phillip Webb
e430583eaf Polish 2016-12-05 11:08:38 -08:00
Andy Wilkinson
d47d733019 Merge branch '1.5.x' 2016-12-05 13:17:48 +00:00
Andy Wilkinson
887a206b0c Remove redundant @ConfigurationProperties annotation
See gh-7397
2016-12-05 13:17:12 +00:00
Andy Wilkinson
4c7a8825b1 Merge branch '1.5.x' 2016-12-05 12:12:49 +00:00
Andy Wilkinson
3e9a4de869 Allow spring.profiles to be configured as a YAML list/array
Closes gh-7397
2016-12-05 12:11:24 +00:00
Andy Wilkinson
d0b1cad00f Merge branch '1.5.x' 2016-12-05 10:48:49 +00:00
Andy Wilkinson
967625db1e Replace field injection with constructor injection in config classes
Closes gh-7563
2016-12-05 10:48:01 +00:00
Andy Wilkinson
e5103a96f8 Correct the version of Spring Social Facebook
See gh-7521
2016-12-05 09:25:26 +00:00
Andy Wilkinson
73ba04f878 Merge branch '1.5.x' 2016-12-05 09:21:04 +00:00
Andy Wilkinson
5ac75c949c Increate timeout in Kafka tests as Windows CI agents are very slow 2016-12-05 09:20:43 +00:00
Andy Wilkinson
598eca7e0f Merge branch '1.5.x' 2016-12-02 17:58:36 +00:00
Andy Wilkinson
1464425d64 Remove use of @Component from classes that are not scanned
Closes gh-7549
2016-12-02 17:57:21 +00:00
Andy Wilkinson
665d82ab9b Merge branch '1.5.x' 2016-12-02 14:06:33 +00:00
Andy Wilkinson
b60150b05e Make Tomcat Access Log's buffering configurable via the environment
Closes gh-7456
2016-12-02 13:58:26 +00:00
Andy Wilkinson
3c873b08fc Merge branch '1.5.x' 2016-12-02 13:41:22 +00:00
Andy Wilkinson
b546fd1046 Merge branch '1.4.x' into 1.5.x 2016-12-02 13:41:15 +00:00
Andy Wilkinson
6061dd492e Increase timeout in DevTools integration tests and improve diagnostics 2016-12-02 13:40:22 +00:00
Andy Wilkinson
39c0f229c2 Merge branch '1.5.x' 2016-12-02 11:34:00 +00:00
Andy Wilkinson
0df03a95f0 Merge branch '1.4.x' into 1.5.x 2016-12-02 11:33:52 +00:00
Andy Wilkinson
c5af34bee4 Merge pull request #7535 from Pei-Tang Huang
* gh-7535:
  Quote $jarfile when creating arguments in launch script
2016-12-02 11:33:34 +00:00
Pei-Tang Huang
5a5e2db134 Quote $jarfile when creating arguments in launch script
Previously, if the pathname of fully executable contained any space
characters, the launch script would fail to locate the jar file

This commit fixes this issue by quoting the jarfile.

Closes gh-7535
2016-12-02 11:31:51 +00:00
Andy Wilkinson
2adb002275 Merge branch '1.5.x' 2016-12-02 11:21:10 +00:00