138b96cf5f
Use unique `testRestTemplate` bean name
...
Update `SpringBootTestContextCustomizer` to use the full qualified
TestRestTemplate as the registered bean name. Prior to this commit it
was possible that the customizer would replace the relatively common
bean name `testRestTemplate`.
Fixes gh-7711
2016-12-21 11:42:56 -08:00
c23d8fb375
Ignore unresolvable placeholder in log properties
...
Update the RelaxedPropertyResolver used to load log properties so that
`${...}` patterns are ignored when possible.
Fixes gh-7719
2016-12-21 11:42:56 -08:00
33a655791c
Merge branch '1.4.x' into 1.5.x
2016-12-21 18:49:34 +01:00
a2cf7bed63
Upgrade to Spring Integration 4.3.6.RELEASE
...
Closes gh-7710
2016-12-21 18:47:48 +01:00
8becbcd6af
Upgrade to Spring AMQP 1.6.6.RELEASE
...
Closes gh-7707
2016-12-21 18:47:36 +01:00
d87d3fde02
Merge branch '1.4.x' into 1.5.x
2016-12-21 13:29:15 +01:00
d4b8755a7d
Start building against Spring AMQP snapshots
...
See gh-7707
2016-12-21 13:25:33 +01:00
1673ce4a31
Start building against Spring Integration snapshots
...
See gh-7710
2016-12-21 13:24:46 +01:00
718ede943b
Upgrade to Spring Framework 4.3.5.RELEASE
...
Closes gh-7601
2016-12-21 13:18:53 +01:00
7a973cb4c4
Merge branch '1.4.x' into 1.5.x
2016-12-21 11:42:06 +01:00
ac9eb8a9a9
Fix Maven warning in samples
...
Closes gh-7716
2016-12-21 11:40:14 +01:00
faa03788a8
Merge pull request #7395 from maust/master
...
* pr/7395:
Polish `spring.redis.url` support
Add support for `spring.redis.url` property
2016-12-20 21:16:43 -08:00
8f7efbe12a
Polish `spring.redis.url` support
...
See gh-7395
2016-12-20 21:16:42 -08:00
90eb58252e
Add support for `spring.redis.url` property
...
Update `RedisAutoConfiguration` to optionally configure Redis using a
`spring.redis.url` property`.
Closes gh-7395
2016-12-20 21:16:42 -08:00
16ed59e92f
Merge pull request #7544 from jhrishikesh/gh-7478
...
* pr/7544:
Add more debug logging to DevTools
2016-12-20 21:16:41 -08:00
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
38f7389eab
Polish loggers
2016-12-20 21:16:40 -08:00
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
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
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
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
dba8ef2ba8
Polish CF management skip SSL opt-in
...
See gh-7629
See gh-7655
2016-12-20 18:25:32 -08:00
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
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
1f7b3cad45
Polish Kafka properties
...
Closes gh-7672
2016-12-20 18:15:11 -08:00
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
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
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
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
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
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
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
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
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
3f4c32fcdd
Polish
2016-12-20 14:54:04 -08:00
b084e1824c
Merge branch '1.4.x' into 1.5.x
2016-12-20 15:09:18 +01:00
bc63d5a918
Revert upgrade to Aspectj 1.8.10
...
See gh-7681
2016-12-20 15:06:55 +01:00
6ccd858fc0
Fix checkstyle violations
2016-12-20 12:59:51 +00:00
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
851ce2286f
Allow to override Couchbase's CustomConversions
...
Closes gh-7700
2016-12-20 11:59:16 +01:00
73a45797c0
Merge branch '1.4.x' into 1.5.x
2016-12-19 18:45:35 -08:00
616d230e72
Merge pull request #7639 from chaodhib/patch-1
...
* pr/7639:
Broaden LoggingApplicationListener ignores
2016-12-19 18:44:59 -08:00
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
f36ed673fd
Make Logback 1.1.8 upgrade back compatible
...
Update the fix committed in a2d46dc16c
2016-12-19 18:30:28 -08:00
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
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
d15f3548be
Polish
2016-12-19 13:12:03 -08:00
6121208cbb
Polish formatting
2016-12-19 12:47:03 -08:00
4b9cba351b
Merge branch '1.4.x' into 1.5.x
2016-12-19 12:36:57 -08:00
bd74c3d327
Polish formatting
2016-12-19 12:25:09 -08:00
Phillip Webb
Stephane Nicoll
Marco Aust
Hrishikesh Joshi
Madhura Bhave
Gary Russell
Kazuki Shimizu
Lucas Saldanha
Dave Syer
Chaouki Dhib