Commit Graph

9608 Commits

Author SHA1 Message Date
Hrishikesh Joshi c2992e3736 Add more debug logging to DevTools
Add debug logging for the included and excluded URL patterns and
matching URLs.

Fixes gh-7478
Closes gh-7544
2016-12-20 21:16:41 -08:00
Phillip Webb 38f7389eab Polish loggers 2016-12-20 21:16:40 -08:00
Phillip Webb e6097fb3e4 Merge pull request #7634 from mbhave/gh-7605
* pr/7634:
  Refine error message from Endpoint MVC security
  Send error with message from Endpoint MVC security
2016-12-20 18:49:56 -08:00
Phillip Webb c76bd2d81e Refine error message from Endpoint MVC security
Update the error message to return less information to the client.
Details of how to disable security are now written to the log instead.

See gh-7605
See gh-7634
2016-12-20 18:47:39 -08:00
Madhura Bhave 38eeae2166 Send error with message from Endpoint MVC security
Update `MvcEndpointSecurityInterceptor` to that it sends an error in the
same way as Spring Security. Prior to this commit the `ErrorController`
would not handle endpoint security errors.

Fixes gh-7605
Closes gh-7634
2016-12-20 18:27:25 -08:00
Phillip Webb 9aaae808a6 Merge pull request #7655 from mbhave/gh-7629
* pr/7655:
  Polish CF management skip SSL opt-in
  Switch CF management skip SSL to opt-in
2016-12-20 18:26:56 -08:00
Phillip Webb dba8ef2ba8 Polish CF management skip SSL opt-in
See gh-7629
See gh-7655
2016-12-20 18:25:32 -08:00
Madhura Bhave 34712cbf76 Switch CF management skip SSL to opt-in
Change CloudFoundryActuatorAutoConfiguration so that skipping of SSL
verification is now opt-in rather than enabled by default.

Fixes gh-7629
Closes gh-7655
2016-12-20 18:24:15 -08:00
Phillip Webb 85ed90282d Merge pull request #7672 from garyrussell/GH-7646
* pr/7672:
  Polish Kafka properties
  Support arbitrary Kafka properties
2016-12-20 18:16:50 -08:00
Phillip Webb 1f7b3cad45 Polish Kafka properties
Closes gh-7672
2016-12-20 18:15:11 -08:00
Gary Russell bdda470305 Support arbitrary Kafka properties
Add support for arbitrary Kafka properties via
`spring.kafka.properties.*` and also a `spring.kafka.max.poll.records`
property.

See gh-7672
2016-12-20 18:14:55 -08:00
Phillip Webb ef671e79e0 Merge pull request #7561 from kazuki43zoo/support-externalized-properties-on-tx
* pr/7561:
  Polish spring transaction manager properties
  Support spring transaction manager properties
2016-12-20 18:01:07 -08:00
Phillip Webb 99e72664d9 Polish spring transaction manager properties
Polish and update contribution so that TransactionManager properties can
be defined per technology, rather than globally.

Closes gh-7561
2016-12-20 17:59:19 -08:00
Kazuki Shimizu 80eee6b30f Support spring transaction manager properties
Add Spring TransactionManager properties to allow timeout and rollback
settings to be configured.

See gh-7561
2016-12-20 17:57:17 -08:00
Phillip Webb 30ea1338de Merge pull request #7171 from lucassaldanha/gh-7121
* pr/7171:
  Make stop wait time in the launch script configurable
2016-12-20 15:18:43 -08:00
Lucas Saldanha 534a9db6fd Make stop wait time in the launch script configurable
Create a parameter `STOP_WAIT_TIME` for the startup script
that configures the time in seconds to wait for a normal
shutdown. Because of #4941 we also send a shutdown half
way the countdown.

Fixes gh-7121
2016-12-20 15:15:12 -08:00
Phillip Webb 2e6749e916 Merge pull request #7105 from lucassaldanha/gh-5199
* pr/7105:
  Polish ReservoirFactory support
  Enable custom Reservoir with Dropwizard metrics
2016-12-20 15:13:15 -08:00
Phillip Webb 06a7ab0cd5 Polish ReservoirFactory support
Polish Dropwizrd reservoir support including a refactor of
`ReservoirFactory` to allow reservoirs to be created based on a
metric name.

See gh-5199
See gh-7105
2016-12-20 15:12:14 -08:00
Lucas Saldanha 1fc2e87053 Enable custom Reservoir with Dropwizard metrics
Uses the ReservoirFactory to customize the implementation of
the Reservoir that will be used when creating Timer and Histogram
in the DropwizardMetricServices.

Fixes gh-5199
Closes gh-7105
2016-12-20 14:56:29 -08:00
Phillip Webb 3f4c32fcdd Polish 2016-12-20 14:54:04 -08:00
Stephane Nicoll b084e1824c Merge branch '1.4.x' into 1.5.x 2016-12-20 15:09:18 +01:00
Stephane Nicoll bc63d5a918 Revert upgrade to Aspectj 1.8.10
See gh-7681
2016-12-20 15:06:55 +01:00
Dave Syer 6ccd858fc0 Fix checkstyle violations 2016-12-20 12:59:51 +00:00
Dave Syer 77a1a3b3c0 Allow user to signal that OAuth2 client is using client_credentials
By configuring security.oauth2.client.grantType=client_credentials the
user signals that (even in a web application) he doesn't want to use
the auth code grant (and hence session and request scoped beans for
client context).
2016-12-20 12:55:45 +00:00
Stephane Nicoll 851ce2286f Allow to override Couchbase's CustomConversions
Closes gh-7700
2016-12-20 11:59:16 +01:00
Phillip Webb 73a45797c0 Merge branch '1.4.x' into 1.5.x 2016-12-19 18:45:35 -08:00
Phillip Webb 616d230e72 Merge pull request #7639 from chaodhib/patch-1
* pr/7639:
  Broaden LoggingApplicationListener ignores
2016-12-19 18:44:59 -08:00
Chaouki Dhib 2ea4d4b1d9 Broaden LoggingApplicationListener ignores
Update `LoggingApplicationListener` to ignore all `-D` prefixed
property values. As well as catching the Azure use-case, this update
now means Spring Boot application can start when Tomcat is missing
`CATALINA_BASE\conf\logging.properties` and sets the value `-Dnop`.

Closes gh-7639
2016-12-19 18:44:48 -08:00
Phillip Webb f36ed673fd Make Logback 1.1.8 upgrade back compatible
Update the fix committed in a2d46dc16c to fallback to reflection based
invocation in case earlier versions of Logback are being used.

Closes gh-7638
2016-12-19 18:30:28 -08:00
Phillip Webb 7824171413 Allow @SpyBean to work with @Primary beans
Update `MockitoPostProcessor` so that `@SpyBean` will automatically
pick the `@Primary` bean when multiple candidates exist.

Fixes gh-7621
2016-12-19 18:14:51 -08:00
Phillip Webb 87547f208a Add test for @SpyBean for generic bean definition
Add an integration test to check that @SpyBean can be used with on a
bean definition that returns a generic type.

Closes gh-7625
2016-12-19 15:58:25 -08:00
Phillip Webb d15f3548be Polish 2016-12-19 13:12:03 -08:00
Phillip Webb 6121208cbb Polish formatting 2016-12-19 12:47:03 -08:00
Phillip Webb 4b9cba351b Merge branch '1.4.x' into 1.5.x 2016-12-19 12:36:57 -08:00
Phillip Webb bd74c3d327 Polish formatting 2016-12-19 12:25:09 -08:00
Phillip Webb e578ace7d7 Polish doc formatting 2016-12-19 10:29:42 -08:00
Stephane Nicoll 9668006aea Merge branch '1.4.x' into 1.5.x 2016-12-19 16:00:04 +01:00
Stephane Nicoll 3237e4ab3e Add link between reference and how-to
See gh-7652
2016-12-19 15:59:49 +01:00
Stephane Nicoll 9104ea81e8 Expose Validator bean
This commit improves ValidationAutoConfiguration so that a `Validator`
bean is exposed if JSR 303 is available. This has the side effect of
automatically enable Spring Data Couchbase's entity validation rather
than requiring to expose a `Validator` bean.

Closes gh-5178
2016-12-19 14:06:17 +01:00
Stephane Nicoll 28e86272e8 Merge branch '1.4.x' into 1.5.x 2016-12-19 11:30:56 +01:00
Stephane Nicoll 863f97dc11 Polish since version
Closes gh-7412
2016-12-19 11:30:38 +01:00
Andy Wilkinson 367de7bf71 Add support for new PATCH methods to TestRestTemplate
Closes gh-7412
2016-12-19 11:27:10 +01:00
Stephane Nicoll 053783abdd Merge branch '1.4.x' into 1.5.x 2016-12-19 11:06:25 +01:00
Stephane Nicoll baaf8e01b5 Start building against Spring Framework 4.3.5 snapshots
See gh-7601
2016-12-19 11:04:48 +01:00
Andy Wilkinson 647057403e Merge branch '1.4.x' into 1.5.x 2016-12-16 20:53:44 +00:00
Andy Wilkinson 80a6f42a04 Upgrade to Thymeleaf Extras Springsecurity4 2.1.3.RELEASE
Closes gh-7686
2016-12-16 20:20:27 +00:00
Andy Wilkinson b6a64c55e3 Upgrade to Slf4j 1.7.22
Closes gh-7685
2016-12-16 20:20:27 +00:00
Andy Wilkinson 3e9fdcc579 Upgrade to Jooq 3.8.6
Closes gh-7684
2016-12-16 20:20:27 +00:00
Andy Wilkinson dfb3493123 Upgrade to Infinispan 8.2.5.Final
Closes gh-7683
2016-12-16 20:20:26 +00:00
Andy Wilkinson 3ead8c03e8 Upgrade to Elasticsearch 2.4.3
Closes gh-7682
2016-12-16 20:20:26 +00:00