Commit Graph
10728 Commits
Author SHA1 Message Date
Phillip Webb 36c1db0223 Merge branch '1.5.x' 2017-01-31 13:27:09 -08:00
Phillip Webb 21234b36de Ensure JmxEndpoint beans get context object IDs
Update `EndpointMBeanExporter` to ensure that `JmxEndpoint` as well
as regular `Endpoint` beans are considered when searching the parent
context.

Prior to this commit if the same `JmxEndpoint` was registered in the
both the child and parent context then the `context=` element of the
name wasn't added.

Fixes gh-8152
2017-01-31 13:25:59 -08:00
Brian Clozel 1709a3ad96 Adapt to Assert.instanceOf changes
Since SPR-15196, the behavior of `Assert` methods changed and some were
deprecated. This commit adapts to the new error mechanism implemented in
`Assert.instanceOf`.

Fixes gh-8140
2017-01-31 11:42:20 +01:00
Brian Clozel 7f39d5a865 Remove usage of Assert.notNull(Object)
This commit updates the Spring Boot codebase to adapt to the removal of
`Assert.notNull(Object)` in SPR-15196.

See gh-8140
2017-01-31 00:46:40 +01:00
Madhura Bhave 29dc6a973c Merge branch '1.5.x' 2017-01-30 15:30:06 -08:00
Madhura Bhave 5dafa3ae9c Fixup version numbers following release 2017-01-30 15:27:42 -08:00
Andy Wilkinson 95f659f4f9 Add new WebApplicationType enum to pave the way for Web Flux support
Closes gh-8077
2017-01-30 20:26:24 +00:00
Spring Buildmaster 5c12500366 Next Development Version 2017-01-30 20:10:13 +00:00
Andy Wilkinson 4e3d606fad Merge pull request #7744 from Artem Bilan
* gh-7744:
  Make use of new extensions point in IntegrationComponentScanRegistrar
2017-01-30 14:37:18 +00:00
Artem Bilan eccefd1343 Make use of new extensions point in IntegrationComponentScanRegistrar
SI 5 has made IntegrationComponentScanRegistrar more extensible by
offering a method for getting the back packages that can be
overridden.

This commit takes advantage of that change by removing our creation
of "fake" annotation metadata and overriding getBackPackages to return
the auto-configuration packages instead.

Closes gh-7744
2017-01-30 14:36:51 +00:00
Andy Wilkinson c00638fee3 Remove Thymeleaf's layout dialect from its starter and update samples
Closes gh-7557
2017-01-30 14:20:50 +00:00
Andy Wilkinson 9a7e5caea7 Merge branch '1.5.x' 2017-01-30 13:17:17 +00:00
Andy Wilkinson 20c1370107 Correct the scope of the spring-boot-test-support dependency
Closes gh-8136
2017-01-30 13:15:49 +00:00
Andy Wilkinson d9f4f51e5b Merge branch '1.5.x' 2017-01-30 12:27:57 +00:00
Andy Wilkinson a9656145de Fix up version numbers following release 2017-01-30 12:27:04 +00:00
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