Commit Graph

11684 Commits

Author SHA1 Message Date
Andy Wilkinson
ab7dad64f2 Upgrade to Cassandra Driver 3.2.0
Closes gh-8953
2017-04-20 15:50:11 +01:00
Stephane Nicoll
4b820acd15 Merge branch '1.5.x' 2017-04-20 15:59:27 +02:00
Stephane Nicoll
992caa2eb9 Merge branch '1.4.x' into 1.5.x 2017-04-20 15:58:57 +02:00
Stephane Nicoll
7fbce192b4 Fixup version numbers following release 2017-04-20 15:58:32 +02:00
Andy Wilkinson
ae0700efc1 Try to make RunningDocumentationTests platform independent
Windows seems unable to decide if the temp dir is in System32 or
system32 which breaks the comparison. This commit attempts to appease
the gods of case sensitity by reducing the portion of the path that we
check so that system32 vs System32 doesn't come into it.

See gh-8920
2017-04-20 13:47:58 +01:00
Spring Buildmaster
d719d2cbbc Next Development Version 2017-04-20 12:46:19 +00:00
Andy Wilkinson
079b324e21 Make RunningDocumentationTests platform independent
Closes gh-8920
2017-04-20 11:52:32 +01:00
Andy Wilkinson
d59bcb6ecd Merge branch '1.5.x' 2017-04-20 11:04:01 +01:00
Andy Wilkinson
07c5590813 Upgrade to GemFire 8.2.4
Closes gh-8948
2017-04-20 11:03:15 +01:00
Stephane Nicoll
f39dbdf474 Merge branch '1.5.x' 2017-04-20 08:55:27 +02:00
Stephane Nicoll
6919ee8250 Merge branch '1.4.x' into 1.5.x 2017-04-20 08:54:45 +02:00
Stephane Nicoll
d8967afff6 Upgrade to Spring Data Hopper-SR10
Closes gh-8938
2017-04-20 08:53:51 +02:00
Phillip Webb
81fef71fcb Merge branch '1.5.x' 2017-04-19 22:48:46 -07: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
359854eb85 Merge branch '1.5.x' 2017-04-19 15:44:28 -07:00
Madhura Bhave
2a7fd5011d Clarify docs on actuator security
Closes gh-8646
2017-04-19 15:32:02 -07:00
Madhura Bhave
115b369633 Update documentation with new default prefix for actuators
Closes gh-6886
2017-04-19 15:01:12 -07:00
Phillip Webb
9166bb5fae Polish 2017-04-19 12:00:36 -07:00
Phillip Webb
75f8e8a593 Fix actuator path used in tests
Fixup path changes that were missed during 1.5.x merge.
2017-04-19 11:58:07 -07:00
Phillip Webb
724be85b95 Polish 2017-04-19 11:57:48 -07:00
Stephane Nicoll
1eab67c30a Merge branch '1.5.x' 2017-04-19 17:33:45 +02: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
3cce3c9c2c Merge branch '1.5.x' 2017-04-19 15:05:15 +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
d09e4cf157 Merge branch '1.5.x' 2017-04-19 15:00:31 +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
ce02373f8f Merge branch '1.5.x' 2017-04-19 14:35:51 +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
b100caa041 Fix import 2017-04-19 11:18:57 +02:00
Stephane Nicoll
6da0f6a341 Merge branch '1.5.x' 2017-04-19 09:33:25 +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
Gary Russell
58279f356d Upgrade to Spring Integration 4.3.9.RELEASE
Closes gh-8935
2017-04-19 09:31:18 +02:00
Stephane Nicoll
485c0ad1b7 Upgrade to Spring Framework 4.3.8.RELEASE
Closes gh-8712
2017-04-19 09:30:38 +02:00
Stephane Nicoll
3be1ddddcc Merge branch '1.5.x' 2017-04-19 09:28:16 +02:00
Stephane Nicoll
43292a5e30 Merge pull request #8930 from garyrussell:amqp15
* pr/8930:
  Upgrade to Spring AMQP 1.7.2.RELEASE
2017-04-19 09:27:46 +02:00
Gary Russell
8a6bc65d86 Upgrade to Spring AMQP 1.7.2.RELEASE
Closes gh-8930
2017-04-19 09:26:55 +02:00
Stephane Nicoll
3da70e2a0e Merge branch '1.4.x' into 1.5.x 2017-04-19 09:26:31 +02:00
Stephane Nicoll
746978ac52 Merge pull request #8929 from garyrussell:amqp14
* pr/8929:
  Upgrade to Spring AMQP 1.6.9.RELEASE
2017-04-19 09:25:47 +02:00
Gary Russell
4344489328 Upgrade to Spring AMQP 1.6.9.RELEASE
Closes gh-8929
2017-04-19 09:25:28 +02:00
Phillip Webb
850517a8db Fix merge issue 2017-04-18 21:57:33 -07:00