Commit Graph

50613 Commits

Author SHA1 Message Date
Spring Buildmaster
a2696bf873 Next Development Version 2017-01-30 11:40:24 +00:00
Andy Wilkinson
95ccd760ae Merge pull request #5344 from Eddú Meléndez
* gh-5344:
  Polish "Upgrade to Flyway 4.0"
  Upgrade to Flyway 4.0
2017-01-30 11:15:40 +00:00
Andy Wilkinson
4ea7dc6f31 Polish "Upgrade to Flyway 4.0"
See gh-5344
2017-01-30 10:48:36 +00:00
Eddú Meléndez
a270c13d6f Upgrade to Flyway 4.0
Closes gh-5344
2017-01-30 10:22:51 +00:00
Andy Wilkinson
15639d39b0 Merge branch '1.5.x' 2017-01-30 10:02:27 +00:00
Andy Wilkinson
dd4051686b Remove empty test
The caching behaviour when using ImportAutoConfiguration is covered
by tests in spring-boot-test-auto-configuration, specifically by
ImportsContextCustomizerFactoryWithAutoConfigurationTests.

See gh-7953
2017-01-30 09:59:11 +00:00
Stephane Nicoll
784c08514d Merge pull request #8132 from royclarkson:mobile-version
* pr/8132:
  Upgrade to Spring Mobile 2.0.0.M1
2017-01-30 09:11:13 +01:00
Roy Clarkson
868be078f1 Upgrade to Spring Mobile 2.0.0.M1
Closes gh-8132
2017-01-30 09:10:55 +01:00
Andy Wilkinson
74510bd844 Make GroovyBeanDefinitionSource accessible to the CLI again
It was made package-private in 31b0e817 but it needs to be protected
due to its use in the CLI's GroovyBeansTransformation.
2017-01-28 10:55:29 +00:00
Phillip Webb
8747e039ee Merge branch '1.5.x' 2017-01-27 17:50:01 -08:00
Phillip Webb
1c75d002c3 Merge pull request #7948 from szantopeter/master
* pull7948:
  Document AWS Elastic Beanstalk deployment
2017-01-27 17:48:58 -08:00
Peter Szanto
14bd404b71 Document AWS Elastic Beanstalk deployment
Update the reference documentation to include details of Amazon
Elastic Beanstalk.

Closes gh-7948
2017-01-27 17:47:59 -08:00
Phillip Webb
fa6a138598 Refine ImportsContextCustomizer cache logic
Update `ImportsContextCustomizer` so that whenever possible a more
specific cache key is used.

Prior to this commit the customizer would generate a key based on *all*
annotations on the test class. This has repeatedly caused issues where
test classes that should have the same cache key did not due to
unrelated annotations.

A new `DeterminableImports` interface has been added that can be
implemented by `ImportSelector` and `ImportBeanDefinitionRegistrar`
implementations that are able to determine their imports early. The
existing `ImportAutoConfigurationImportSelector` and
`AutoConfigurationPackages` classes have been retrofitted with
this interface.

Fixes gh-7953
2017-01-27 17:19:52 -08:00
Phillip Webb
aaf118c544 Fix TypeExcludeFiltersContextCustomer key
Update `TypeExcludeFiltersContextCustomer` to use filter instances
as part of the key, rather than class references. In order to be used
in tests, `TypeExcludeFilter` implementations must now implement valid
`hashCode` and `equals` methods.

Fixes gh-8125
2017-01-27 17:18:58 -08:00
Andy Wilkinson
f69c994df5 Merge pull request #6857 from Eddú Meléndez
* gh-6857:
  Add @FunctionalInterface to remaining public and protected interfaces
  Annotate interfaces with @FunctionaInterface
2017-01-27 16:41:44 +00:00
Andy Wilkinson
31b0e81765 Add @FunctionalInterface to remaining public and protected interfaces
See gh-6857
2017-01-27 16:41:09 +00:00
Eddú Meléndez
3d52c86a21 Annotate interfaces with @FunctionaInterface
Closes gh-6857
2017-01-27 16:41:01 +00:00
Andy Wilkinson
6d70c061de Merge branch '1.5.x' 2017-01-26 20:30:29 +00:00
Andy Wilkinson
180ab2da8b Merge branch '1.4.x' into 1.5.x 2017-01-26 20:30:20 +00:00
Andy Wilkinson
f3b9b14b8e Order ManagementContextConfiguration classes without loading them
Previously, ManagementContextConfiguration classes were loaded to
allow them to be ordered based on either @Order or implementing
Ordered. This had the unwanted side-effect of possibly logging
unwanted INFO messages if the reflection-based annotation
introspection failed. One cause of this was @ConditionalOnClass when
the referenced class was not on the classpath.

This commit uses the ASM-based annotation metadata reading to
determine the order of a management context configuration class based
on the @Order annotation. The classes are then sorted using a standard
OrderComparator. Note that Ordering via implemented Ordered is not
supported as it cannot be determine without loading the class.
2017-01-26 20:25:23 +00:00
Andy Wilkinson
bed727ae8c Merge branch '1.5.x' 2017-01-26 15:05:02 +00:00
Andy Wilkinson
f34d309548 Formatting 2017-01-26 15:03:02 +00:00
Stephane Nicoll
f65fe4826f Merge branch '1.5.x' 2017-01-26 15:55:47 +01:00
Stephane Nicoll
c0c575c94a Merge branch '1.4.x' into 1.5.x 2017-01-26 15:55:33 +01:00
Stephane Nicoll
bd0c1cb9c3 Fixup version numbers following release 2017-01-26 15:55:14 +01:00
Spring Buildmaster
ed1ce140c0 Next Development Version 2017-01-26 14:20:39 +00:00
Stephane Nicoll
1df3fb6ecb Merge branch '1.5.x' 2017-01-26 14:01:45 +01:00
Stephane Nicoll
b575be339e Fix endpoint id
See gh-7579
2017-01-26 14:00:48 +01:00
Stephane Nicoll
506fb89ec7 Merge branch '1.5.x' 2017-01-26 12:59:40 +01:00
Stephane Nicoll
74ac585117 Upgrade to Spring Data Ingalls.RELEASE
Closes gh-8113
2017-01-26 12:59:00 +01:00
Stephane Nicoll
303df9a744 Merge branch '1.4.x' into 1.5.x 2017-01-26 12:58:14 +01:00
Stephane Nicoll
a26ccb17f7 Upgrade to Spring Data Hopper.SR7
Closes gh-8112
2017-01-26 12:57:28 +01:00
Andy Wilkinson
2e2d38b651 Merge branch '1.5.x' 2017-01-26 10:52:56 +00:00
Andy Wilkinson
f2b643dcb1 Correct full build as spring-boot-test-support is now part of tools 2017-01-26 10:52:38 +00:00
Andy Wilkinson
5d24c9c589 Merge branch '1.5.x' 2017-01-26 10:52:08 +00:00
Andy Wilkinson
f5445ba5ff Remove OnValidatorAvailableCondition as it is now redundant
Previously, Hibernate Validator would fail to initialize if it was
on the classpath but an EL implementation was not.
OnValidatorAvailableCondition protected against this scenario by
initializing the validator.

The Hibernate Validator shortcoming was addressed in eb222209
(gh-7598). As a result, checking for the precences of the
ValidationProvider META-INF/services resource is now sufficient to
auto-configure validation. This commit removes
OnValidatorAvailableCondition as it is no longer necessary.

Closes gh-8110
2017-01-26 10:42:46 +00:00
Andy Wilkinson
f049fea00d Merge branch '1.5.x' 2017-01-26 10:24:36 +00:00
Andy Wilkinson
6b353fb005 Move spring-boot-test-support into spring-boot-tools
Closes gh-8114
2017-01-26 10:17:20 +00:00
Andy Wilkinson
4993f32da8 Merge branch '1.5.x' 2017-01-26 09:40:33 +00:00
Brian Clozel
de98c4b3ff Provide Reactor 3 auto-configuration
This commit provides auto-configuration for the Reactor Core 3 library.
A new configuration namespace, "spring.reactor" allows to configure
hooks on operators, like "spring.reactor.stacktrace-mode.enabled".

This property is enabled automatically by devtools, since it improves
the developer experience and provides full stacktrace information when
exceptions occur (but at a performance cost).

Fixes gh-7302
2017-01-26 10:35:12 +01:00
Andy Wilkinson
f823599d1f Replace @PostConstruct validation with setter validation
Closes gh-7579
2017-01-26 09:32:07 +00:00
Stephane Nicoll
ebfaac95c0 Merge branch '1.5.x' 2017-01-26 09:33:44 +01:00
Brian Clozel
b804d27a0c Add Netty and RxJava dependency management 2017-01-26 09:29:13 +01:00
Stephane Nicoll
9a044d1577 Remove unused classes 2017-01-26 09:22:41 +01:00
Stephane Nicoll
219acc6b58 Merge branch '1.5.x' 2017-01-26 09:15:45 +01:00
Stephane Nicoll
265ebe784c Merge branch '1.4.x' into 1.5.x 2017-01-26 09:15:23 +01:00
Stephane Nicoll
8a3e82734e Start building against snapshots for Spring Data Hopper SR7
See gh-8112
2017-01-26 09:14:14 +01:00
Stephane Nicoll
ad29a6ec07 Upgrade to Spring Integration 4.3.7.RELEASE
Closes gh-8032
2017-01-26 09:12:57 +01:00
Phillip Webb
17451c5e7a Merge branch '1.5.x' 2017-01-25 22:24:07 -08:00
Phillip Webb
6f19538028 Update CLI open_source_licenses.txt for json
Update the open_source_licenses file to reflect the fact that the
org.json library is no longer used.

See gh-5929
2017-01-25 22:12:37 -08:00