Commit Graph

1032 Commits

Author SHA1 Message Date
Stephane Nicoll 4fe04178b7 Merge branch '1.5.x' 2017-01-20 16:43:21 +01:00
Stephane Nicoll 915c959a28 Polish contribution
Closes gh-7600
2017-01-20 16:40:48 +01:00
Phillip Webb 89f7ec054f Merge branch '1.5.x' 2017-01-19 12:45:26 -08:00
Phillip Webb f3cd0ad22c Polish 2017-01-19 12:44:57 -08:00
Phillip Webb 5502fa2936 Merge branch '1.5.x' 2017-01-18 21:05:22 -08:00
Phillip Webb 10dbf3c571 Use `@Validated` as trigger for JSR-330 validation
Update `ConfigurationPropertiesBindingPostProcessor` so that
`@Validated` is expected to be used to trigger JSR-330 validation.

Any existing configuration classes that use JSR-330 annotations but
don't have `@Validated` will currently still be validated, but will
now log a warning. This should give users a chance to add the requested
annotations before the next Spring Boot release where we will use them
as the exclusive signal that validation is required.

Closes gh-7579
2017-01-18 21:01:07 -08:00
Andy Wilkinson 5036fc50fc Merge branch '1.5.x' 2017-01-17 21:17:03 +00:00
Andy Wilkinson 29adf2d85e Ensure that test closes InputStream that reads contents of output files 2017-01-17 21:16:20 +00:00
Andy Wilkinson c2efae06f0 Merge branch '1.5.x' 2017-01-17 14:35:40 +00:00
Andy Wilkinson 2973d3ed4b Polishing 2017-01-17 14:35:30 +00:00
Andy Wilkinson 467350a65d Merge branch '1.5.x' 2017-01-17 14:27:02 +00:00
Andy Wilkinson ed18478054 Give FileWritingMessageHandler more time to sort itself out
See 3927dca3
2017-01-17 14:26:14 +00:00
Andy Wilkinson 3fd597481f Merge branch '1.5.x' 2017-01-17 13:19:31 +00:00
Andy Wilkinson 682d0f524f Test insecure, insensitive endpoint with property that's always available
The user property is only available on Unix-like platforms (due to
the USER environment variable). This commit updates the test to
explicitly set a specific property and then check that it's accessible
via the env endpoint rather than using one that is OS-specific.

See gh-7868
See gh-7881
2017-01-17 13:17:32 +00:00
Andy Wilkinson f87e8d1def Merge branch '1.5.x' 2017-01-17 12:25:12 +00:00
Andy Wilkinson 8666248d27 Polishing 2017-01-17 12:25:01 +00:00
Andy Wilkinson 1ad7a66f03 Merge branch '1.5.x' 2017-01-17 11:53:14 +00:00
Andy Wilkinson 3927dca3e0 Tolerate files being briefly left open by FileWritingMessageHandler
When the context is closed, FileWritingMessageHandler is stopped and
it closes its output files. However, it appears to do so in a manner
which means that they may be closed after the call to close the
context is completed. This causes problems on Windows as files that
are still open cannot be deleted.

This commit adds a workaround to SampleIntegrationApplicationTests
so that it makes up to 10 attempts each 0.5s apart to clean up the
input and output directories.
2017-01-17 11:48:57 +00:00
Stephane Nicoll f4f5a70cb2 Merge branch '1.5.x' 2017-01-17 09:57:53 +01:00
Johnny Lim acc36c076d Polish
See gh-8004
2017-01-17 09:53:50 +01:00
Stephane Nicoll 752a91c75b Merge branch '1.5.x' 2017-01-14 04:36:47 -05:00
Stephane Nicoll 7e557662a5 Polish contribution
Closes gh-7916
2017-01-14 04:35:58 -05:00
Praveendra Singh 36de58f0fe Polish samples list in readme
See gh-7916
2017-01-14 04:34:10 -05:00
Andy Wilkinson ae3434ba4c Merge branch '1.4.x' into 1.5.x 2017-01-13 18:45:50 -05:00
Andy Wilkinson d2201d5284 Correct copyright dates and enforce that starting year is 2012
Closes gh-7923
2017-01-13 18:43:30 -05:00
Phillip Webb b99c2daf31 Fixup broken version number 2017-01-06 00:05:25 -08:00
Phillip Webb c35454e5f4 Merge branch '1.5.x' 2017-01-05 23:40:58 -08:00
Phillip Webb f96294b63b Add LDAP sample
Add an LDAP sample application.

See gh-7733
2017-01-05 23:36:29 -08:00
Madhura Bhave 4ea47220e9 Match nested paths for insensitive actuators
Update `ManagementWebSecurityAutoConfiguration` to match nested path
for insensitive actuators.

Prior to this commit, when Spring Security was on the classpath
nested paths were considered sensitive (even if the actuator
endpoint was not sensitive). i.e. when setting
`endpoints.env.sensitive=false` `/env` could be accessed without
authentication but `/env/user` could not.

Fixes gh-7868
Closes gh-7881
2017-01-05 18:45:30 -08:00
Phillip Webb 18aa9be4fb Merge branch '1.4.x' into 1.5.x 2017-01-05 18:16:42 -08:00
Phillip Webb 21bfe52694 Add test to check class resources aren't exposed
Closes gh-7880
2017-01-05 18:15:50 -08:00
Phillip Webb 77f9bb09ca Further Polish Mockito 2 support
See gh-7770
2017-01-05 14:29:29 -08:00
Phillip Webb 7f99153daf Fixup parent POM version number 2017-01-05 13:57:30 -08:00
Phillip Webb 6776ec2704 Merge branch '1.5.x' 2017-01-05 11:04:37 -08:00
Phillip Webb 565f75438e Polish 2017-01-05 11:04:07 -08:00
Dave Syer 21be9ef666 Merge remote-tracking branch 'origin/1.5.x' 2017-01-05 11:59:49 +00:00
Dave Syer fe344df9c5 Change default order of OAuth2 resource server filter chain
The default is now SecurityProperties.ACCESS_OVERRIDE_ORDER-1
(instead of 3), and the user can set it with
security.oauth2.resource.filter-order (as opposed to being hard
coded). The filter is provided by Spring OAuth2 so this change is
a BeanPostProcessor to call a setter on that object.

Fixes gh-5072
2017-01-05 11:58:36 +00:00
Phillip Webb 53f1df86a2 Merge branch '1.5.x' 2016-12-30 12:17:28 -08:00
Phillip Webb aacf5d660f Update copyright year for changed files 2016-12-30 11:53:51 -08:00
Phillip Webb be3fe12cf0 Polish 2016-12-30 11:46:24 -08:00
Phillip Webb 273beaa3ce Polish 2016-12-30 11:10:44 -08:00
Stephane Nicoll 4604bb7e8a Merge branch '1.5.x' 2016-12-30 18:01:59 +01:00
Stephane Nicoll c903ff46a7 Polish samples 2016-12-30 17:57:14 +01:00
Stephane Nicoll a19a28062f Fix actuator security in samples
Closes gh-7637
2016-12-30 17:56:19 +01:00
Stephane Nicoll 9dfaf4de06 Merge branch '1.5.x' 2016-12-30 15:53:16 +01:00
Stephane Nicoll 3ed5a723bb Polish log4j2 sample 2016-12-30 15:50:45 +01:00
Phillip Webb 519f9c6c54 Merge branch '1.5.x' 2016-12-28 15:35:32 -08:00
Phillip Webb 97d7ffd8e8 Merge branch '1.4.x' into 1.5.x 2016-12-28 14:48:05 -08:00
Phillip Webb 61c931943f Fix Devtools PatternResolver Servlet support
Update ClassLoaderFilesResourcePatternResolver to support servlet
resources when it's being used with a WebApplicationContext.

Prior to commit 918e122ddc a `ResourceLoader` was not added to the
`ApplicationContext`, meaning that servlet resources could be found by
virtue of the protected `getResourceByPath()` method. Following commit
918e122ddc, the context `ResourceLoader` is set, meaning that all calls
to `getResource` delegate to the `ResourceLoader` and the
`ApplicationContext` methods are not invoked. Since the devtools
`ResourceLoader` wasn't Servlet aware, servlet resources could not
be found.

Fixes gh-7752
2016-12-28 14:25:11 -08:00
Phillip Webb 49fa702708 Merge branch '1.5.x' 2016-12-27 15:06:22 -08:00