Commit Graph

10604 Commits

Author SHA1 Message Date
Phillip Webb
4db4c81b9b Polish 2017-04-28 09:38:56 -07:00
Andy Wilkinson
df05aa4701 Merge branch '1.4.x' into 1.5.x 2017-04-28 15:41:53 +01:00
Andy Wilkinson
bd95ad6430 Upgrade to Spring Restdocs 1.1.3.RELEASE
Closes gh-9040
2017-04-28 15:33:43 +01:00
Andy Wilkinson
5291fb5ff7 Upgrade to Hsqldb 2.3.5
Closes gh-9039
2017-04-28 15:33:43 +01:00
Andy Wilkinson
344255807b Upgrade to Jaybird 2.2.13
Closes gh-9038
2017-04-28 15:33:42 +01:00
Andy Wilkinson
59d04d0679 Upgrade to Elasticsearch 2.4.5
Closes gh-9037
2017-04-28 15:33:42 +01:00
Andy Wilkinson
c3c2a91916 Upgrade to Groovy 2.4.11
Closes gh-9036
2017-04-28 15:33:41 +01:00
Andy Wilkinson
bc464adba3 Upgrade to Tomcat 8.5.14
Closes gh-9035
2017-04-28 15:33:41 +01:00
Andy Wilkinson
b5811986b0 Upgrade to Ehcache 2.10.4
Closes gh-9034
2017-04-28 15:33:41 +01:00
Andy Wilkinson
d0a85550d7 Upgrade to H2 1.4.195
Closes gh-9033
2017-04-28 15:33:40 +01:00
Stephane Nicoll
1de2316a0b Refine validator and MVC validator configuration
This commit ensures that a primary JSR 303 and Spring Validator will be
exposed if the auto-configuration kicks in. As `LocalValidatorFactoryBean`
exposes 3 contracts (JSR-303 `Validator` and `ValidatorFactory` as well as
the `Spring` validator one), this makes sure that those types can be
injected by type.

`LocalValidatorFactoryBean` exposes 3 contracts and we're only checking
for the absence of a `javax.validation.Validator` to auto-configure a
`LocalValidatorFactoryBean`. If no standard JSR validator exists but a
Spring's `Validator` exists and is primary, we shouldn't flag the
auto-configured one as `@Primary`. Previous iterations on this feature
have made sure that we'll auto-configure at most one
`javax.validation.Validator` so not flagging it `@Primary` is no problem.

This commit also restores and adds tests that validates
`ValidationAutoConfiguration` will configure a JSR validator even if a
Spring Validator is present.

This effectively fixes gh-8495 in a different way.

Closes gh-8979
Closes gh-8976
2017-04-28 11:41:42 +02:00
Stephane Nicoll
f42998f5ca Revert "Refine validator and MVC validator configuration"
This commit reverts c9561f0 and 69a8c0d and effectivly fixes gh-8979 but
reintroduces the issue reported in gh-8495.
2017-04-28 11:12:09 +02:00
Phillip Webb
4d8584eba8 Merge branch '1.4.x' into 1.5.x 2017-04-27 10:15:54 -07:00
Phillip Webb
df82060cad Formatting 2017-04-27 10:12:31 -07:00
Stephane Nicoll
3dc9b125d7 Merge branch '1.4.x' into 1.5.x 2017-04-27 14:30:40 +02:00
Stephane Nicoll
703a6dc056 Prevents BasicErrorControllerIntegrationTest to start another server
`BasicErrorControllerIntegrationTest` is handling the context in each test
and yet it starts a useless test via `@SpringBootTest`. This commit
removes the useless runner and associated annotations.
2017-04-27 14:26:50 +02:00
Stephane Nicoll
293ba6d522 Merge pull request #8758 from candrews:patch-4
* pr/8758:
  Add Log4jdbc Starter reference
2017-04-24 10:59:06 +02:00
Craig Andrews
a1452f674f Add Log4jdbc Starter reference
Clsoes gh-8758
2017-04-24 10:58:46 +02:00
Stephane Nicoll
9327b58304 Fixup version numbers following release 2017-04-21 11:26:45 +02:00
Spring Buildmaster
9768b0a8c2 Next Development Version 2017-04-21 08:32:01 +00:00
Phillip Webb
5f3d5fbec1 Remove public "skip path extension" constant
Remove the public constant to make it clearer that skipping path
extensions is really an internal Spring Boot concern.

See gh-8765
2017-04-20 13:31:04 -07:00
Phillip Webb
69a8c0d871 Fix MVC validator configuration warning
Replace the MVC validator post processor with an `@Import` so
that a "cannot enhance @Configuration bean definition"
warning does not occur.

Fixes gh-8951
See gh-8495
2017-04-20 11:57:18 -07:00
Andy Wilkinson
6dd6897361 Upgrade to Narayana 5.5.7.Final
Closes gh-8961
2017-04-20 17:16:39 +01:00
Andy Wilkinson
a7830a8669 Upgrade to Jaybird 2.2.13
Closes gh-8960
2017-04-20 17:16:39 +01:00
Andy Wilkinson
efdd9d9b01 Upgrade to Jetty 9.4.4.v20170414
Closes gh-8959
2017-04-20 17:16:38 +01:00
Andy Wilkinson
0ff6b705d6 Upgrade to Tomcat 8.5.14
Closes gh-8958
2017-04-20 17:16:38 +01:00
Andy Wilkinson
edf6759e2d Upgrade to Activemq 5.14.5
Closes gh-8957
2017-04-20 17:16:37 +01:00
Andy Wilkinson
6b167f1f12 Upgrade to Ehcache 2.10.4
Closes gh-8956
2017-04-20 17:16:37 +01:00
Andy Wilkinson
3442a24f8a Upgrade to Undertow 1.4.13.Final
Closes gh-8955
2017-04-20 17:16:37 +01:00
Stephane Nicoll
7fbce192b4 Fixup version numbers following release 2017-04-20 15:58:32 +02:00
Spring Buildmaster
d719d2cbbc Next Development Version 2017-04-20 12:46:19 +00:00
Andy Wilkinson
07c5590813 Upgrade to GemFire 8.2.4
Closes gh-8948
2017-04-20 11:03:15 +01:00
Stephane Nicoll
d8967afff6 Upgrade to Spring Data Hopper-SR10
Closes gh-8938
2017-04-20 08:53:51 +02:00
Phillip Webb
bddc190848 Suppress "resolving dependencies" when --quiet
Update Spring CLI so that the "resolving dependencies" message is
suppressed when `run --quiet` is used.

Fixes gh-8946
2017-04-19 22:18:12 -07:00
Phillip Webb
cde5793240 Upgrade to Spring Data Ingalls-SR3
Closes gh-8939
2017-04-19 22:18:12 -07:00
Dave Syer
14638e67bc Extended PropertiesLauncher class location logic
Update `PropertiesLauncher` so that classes can be loaded outside of
`BOOT-INF/classes`. You can use a subdirectory, or the root directory
of an external jar (but not the parent archive to avoid issues
with agents and awkward delegation models).

Fixes gh-8480
Closes gh-8486
2017-04-19 22:18:12 -07:00
Phillip Webb
5abc050a96 Support detection and with test initializers
Relax `SpringBootTestContextBootstrapper` rules so that a test can
specify an `ApplicationContextInitializer` and still have
`@SpringBootConfiguration` detected.

Prior to this commit detection would not occur because it's possible
that an initializer _could_ register configuration. This scenario is
actually quite unlikely to occur, certainly less likely than wanting to
use an initializer in combination with auto-detection.

Fixes gh-8483
2017-04-19 22:18:12 -07:00
Phillip Webb
c9561f031c Refine validator and MVC validator configuration
Update `ValidationAutoConfiguration` and `WebMvcAutoConfiguration` to
ensure as much as possible that only a single Validator bean of each
type is registered.

Validation auto-configuration now does the following:
- If no validator is found: Registers a `LocalValidatorFactoryBean`
  (providing both Spring and JSR validation)
- If the user defines a Spring & JSR validator: Backs off
- If the user defines only a JSR validator: Adapts it to a Spring
  validator (without exposing another JSR implementation)

WebMvcAutoConfiguration auto-configuration has been updated to make
MVC validation follow common Spring Boot patterns:
- If not validator beans are found (due to the user excluding
  ValidationAutoConfiguration) a new `mvcValidator` bean will be
  registered.
- If a single validator bean is found it will be used for MVC
  validation.
- If multiple validator beans are defined it will either use the one
  named `mvcValidator` or it will register a new `mvcValidator` bean

Any automatically registered `mvcValidator` bean will not implement
the JSR validator interface.

Finally, it is no longer possible to provide an MVC validator via a
`WebMvcConfigurer`.

Fixes gh-8495
2017-04-19 22:18:12 -07:00
Madhura Bhave
2a7fd5011d Clarify docs on actuator security
Closes gh-8646
2017-04-19 15:32:02 -07:00
Stephane Nicoll
294f880fa3 Start build against Spring Data Ingalls snapshots
See gh-8939
2017-04-19 17:32:46 +02:00
Stephane Nicoll
382044c5aa Merge branch '1.4.x' into 1.5.x 2017-04-19 17:24:52 +02:00
Stephane Nicoll
3f3bb92690 Start building against Spring Data Hopper snapshots
See gh-8938
2017-04-19 17:24:01 +02:00
Stephane Nicoll
ad616ea4a7 Revert "Upgrade to Spring Data Ingalls-SR2"
This commit reverts 65a8257 as the Couchbase driver must be upgraded from
2.3.x to 2.4.x

See gh-8939
2017-04-19 15:04:59 +02:00
Stephane Nicoll
bc0016ade0 Merge branch '1.4.x' into 1.5.x 2017-04-19 15:00:16 +02:00
Stephane Nicoll
47d2756692 Revert "Upgrade to Spring Data Hopper-SR9"
This commit reverts 2deab52 as the Couchbase driver must be upgraded from
2.2.x to 2.4.x

See gh-8938
2017-04-19 14:59:57 +02:00
Stephane Nicoll
65a8257697 Upgrade to Spring Data Ingalls-SR2
Closes gh-8939
2017-04-19 14:35:15 +02:00
Stephane Nicoll
e273fbbb6f Merge branch '1.4.x' into 1.5.x 2017-04-19 14:29:38 +02:00
Stephane Nicoll
2deab52ad0 Upgrade to Spring Data Hopper-SR9
Closes gh-8938
2017-04-19 14:28:52 +02:00
Stephane Nicoll
598beeea9d Merge branch '1.4.x' into 1.5.x 2017-04-19 09:33:04 +02:00
Stephane Nicoll
041c5957ae Merge pull request #8935 from garyrussell:si14
* pr/8935:
  Upgrade to Spring Integration 4.3.9.RELEASE
2017-04-19 09:31:36 +02:00