Commit Graph

10143 Commits

Author SHA1 Message Date
Andy Wilkinson
64b65e1fe5 Merge branch '1.4.x' into 1.5.x 2017-02-08 09:44:04 +00:00
Andy Wilkinson
30074431a7 Improve documentation of static resource reloading with devtools
Closes gh-5133
Closes gh-7886
2017-02-08 09:43:31 +00:00
Stephane Nicoll
45a91fca31 Fix parsing of spring.autoconfigure.exclude property
This commits makes sure that `AutoConfigureImportSelector` properly
parses comma separated lists that contain additional spaces.

Closes gh-8220
2017-02-07 18:26:57 +01:00
Andy Wilkinson
e891fe0584 Merge branch '1.4.x' into 1.5.x 2017-02-07 17:06:33 +00:00
Andy Wilkinson
06017f688a Only auto-configure SpringSocialDialect for Thymeleaf 2
Previously, SocialWebAutoConfiguration would create a
SpringSocialDialect bean when SpringTemplateEngine was on the
classpath. This class exists in both Thymeleaf 2 and Thymeleaf 3 but
SpringSocialDialect is only compatible with Thymeleaf 2.

This commit updates the auto-configuration to require
SpringResourceResourceResolver to be on the classpath. This class
exists in Thymeleaf 2 but does not exist in Thymeleaf 3.

Closes gh-4858
2017-02-07 16:20:33 +00:00
Stephane Nicoll
d42a54e880 Add explicit note about Mockito 2 in the documentation
Closes gh-8217
2017-02-07 16:35:16 +01:00
Stephane Nicoll
130e0808d0 Merge branch '1.4.x' into 1.5.x 2017-02-07 16:31:02 +01:00
Stephane Nicoll
570b0593a6 Document SMTP timeout settings
Closes gh-8213
2017-02-07 16:22:03 +01:00
Stephane Nicoll
008aef6142 Document @LiquibaseDataSource feature
Closes gh-8214
2017-02-07 16:16:19 +01:00
Stephane Nicoll
e88bda4682 Avoid extra space if condition is empty
Previously, if a builder was created with an empty condition, an extra
space was added before the message. This commit checks for this
particular case and adds a space only when necessary.

Closes gh-8218
2017-02-07 11:59:49 +01:00
Andy Wilkinson
a1895336fb Merge pull request #8206 from Jack Stevenson
* gh-8206:
  Provide dependency management for HikariCP-java7
2017-02-07 09:11:27 +00:00
Jack Stevenson
549f90e996 Provide dependency management for HikariCP-java7
Closes gh-8206
2017-02-07 09:09:55 +00:00
Andy Wilkinson
4b0abc7afc Merge pull request #8199 from John Blum
* gh-8199:
  Upgrade to GemFire 8.2.2
2017-02-07 08:59:45 +00:00
John Blum
d83ed7f3b3 Upgrade to GemFire 8.2.2
Closes gh-8201
2017-02-07 08:59:10 +00:00
Stephane Nicoll
519a03ccda Polish 2017-02-06 14:08:10 +01:00
Stephane Nicoll
8c31000efa Merge pull request #8204 from izeye:fix-test-20170206
* pr/8204:
  Fix ImportAutoConfigurationImportSelectorTests.determineImportsWhenUsingNonMetaWithClassesShouldBeSame()
2017-02-06 14:06:08 +01:00
Johnny Lim
09998d1155 Fix ImportAutoConfigurationImportSelectorTests.determineImportsWhenUsingNonMetaWithClassesShouldBeSame()
Closes gh-8204
2017-02-06 14:05:26 +01:00
Stephane Nicoll
e9057354c2 Merge pull request #8198 from izeye:logical-and
* pr/8198:
  Use logical 'and' instead of bitwise 'and'
2017-02-06 10:35:34 +01:00
Johnny Lim
0adab8a2be Use logical 'and' instead of bitwise 'and'
Closes gh-8198
2017-02-06 10:35:13 +01:00
Stephane Nicoll
b4858882f3 Merge pull request #8202 from jxblum:spring-boot-sample-cache-ux-improvements
* pr/8202:
  Polish contribution
  Improve spring-boot-sample-cache UX by using Maven profiles
2017-02-06 10:34:43 +01:00
Stephane Nicoll
4d7b03b002 Polish contribution
Closes gh-8202
2017-02-06 10:34:22 +01:00
John Blum
31ed70e1b8 Improve spring-boot-sample-cache UX by using Maven profiles
See gh-8202
2017-02-06 09:50:40 +01:00
Phillip Webb
87b8ce61de Fix Invalid target for Validator error
Update `PropertiesConfigurationFactory` so that the validator is only
set when it supports the target object.

Fixes gh-8149
2017-02-05 18:11:33 -08:00
Stephane Nicoll
dc75f13754 Remove deprecated metadata for spring.pidfile 2017-02-05 09:26:32 +01:00
Stephane Nicoll
3d1f8aa8d7 Merge branch '1.4.x' into 1.5.x 2017-02-05 09:25:48 +01:00
Stephane Nicoll
21e866535c Merge pull request #8196 from zhanhb:patch-1
* pr/8196:
  Polish pid metadata
  Fix pid properties link in documentation
2017-02-05 09:25:25 +01:00
Stephane Nicoll
a30461c5c7 Polish pid metadata
This commit moves the `spring.pid.*` metadata to the relevant project. It
also updates the doc to refer to the new `ApplicationPidFileWriter`
rather than the one in its deprecatred form.

Closes gh-8196
2017-02-05 09:23:56 +01:00
zhanhb
22ba7b93b2 Fix pid properties link in documentation
See gh-8196
2017-02-05 09:14:01 +01:00
Andy Wilkinson
b9b0cdb342 Merge branch '1.4.x' into 1.5.x 2017-02-02 13:48:19 +00:00
Andy Wilkinson
2f50d515a1 Apply root to URIs directly rather than relying on expansion
Previously, TestRestTemplate applied the root URI to URIs by
converting them to a String and then passing the String to the
RestTemplate delegate. Being a String, meant that the URI passed
through RestTemplate's standard URI template expansion processing
using the configured UriTemplateHandler. While this caused the root
URI to be applied, it also had the unwanted side-effect of
encoding the URI for a second time.

This commit updates TestRestTemplate so that, when configured with a
RootUriTemplateHandler, it applies the root URI directly and then
passes a modified URI to the RestTemplate delegate. Being a URI means
that no template expansion is performed and the possible double
encoding is avoided.

Closes gh-8163
2017-02-02 13:28:52 +00:00
Stephane Nicoll
9b952dd3a8 Merge pull request #8148 from izeye:polish-20170131
* pr/8148:
  Polish
2017-02-01 09:08:16 +01:00
Johnny Lim
846994e498 Polish
Closes gh-8148
2017-02-01 09:07:47 +01:00
Stephane Nicoll
8a0f8cf953 Merge branch '1.4.x' into 1.5.x 2017-02-01 08:57:07 +01:00
Stephane Nicoll
7e44029224 Merge pull request #8157 from rajadilipkolli:patch-1
* pr/8157:
  Polish contribution
  Update copyright header
2017-02-01 08:56:43 +01:00
Stephane Nicoll
b9ede6b281 Polish contribution
Closes gh-8157
2017-02-01 08:56:22 +01:00
Raja Kolli
a1c601ca28 Update copyright header
See gh-8157
2017-02-01 08:55:36 +01:00
Phillip Webb
4fa38aeba4 Consider hierarchy when searching for @Validated
Update `ConfigurationPropertiesBindingPostProcessor` to use a more
exhaustive hierarchy search when checking for `@Validated`.

Fixes gh-8150
2017-01-31 17:09:02 -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
Madhura Bhave
5dafa3ae9c Fixup version numbers following release 2017-01-30 15:27:42 -08:00
Spring Buildmaster
5c12500366 Next Development Version 2017-01-30 20:10:13 +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
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
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
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
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