Commit Graph

10971 Commits

Author SHA1 Message Date
Stephane Nicoll
661940033a Start building against Spring Framework 4.3.7.BUILD-SNAPSHOT
See gh-8248
2017-02-12 14:01:18 +01:00
Stephane Nicoll
6c4013249b Merge branch '1.4.x' into 1.5.x 2017-02-12 13:59:19 +01:00
Stephane Nicoll
58a4f04962 Fix typo in documentation
Closes gh-8259
2017-02-12 13:59:04 +01:00
Madhura Bhave
77e5c585f4 Validate kid in Cloud Foundry token header
Instead of validating the signature against all the public keys,
we can validate it only against the public key with the kid that
matches the one in the token header.

Closes gh-8126
2017-02-09 16:47:44 -08:00
Andy Wilkinson
601c6aa305 Tidy up code formatting and address some compiler warnings 2017-02-09 13:48:55 +00:00
Andy Wilkinson
7dd8e8c4b8 Honour spring.profiles.include even when .active has not been set
393cfe50 expanded the scope of spring.profiles.include so that it
could be used in any property source, and not just in a configuration
file. However, it did so in such a way that it would only take effect
when used outside of a configuration file if spring.profiles.active
was also set.

This commit updates ConfigFileApplicationListener so that included
profiles are activated when spring.profiles.active has not be set.

Closes gh-8244
2017-02-09 11:44:16 +00:00
Stephane Nicoll
9a2793356b Merge pull request #8215 from davinkevin:master
* pr/8215:
  Allow property expansion for *.yaml
2017-02-09 10:52:38 +01:00
Davin Kevin
ff40854653 Allow property expansion for *.yaml
Closes gh-8215
2017-02-09 10:51:01 +01:00
Stephane Nicoll
aa49468171 Allow to define a custom MessageRecoverer
This commit improves `SimpleRabbitListenerContainerFactoryConfigurer` to
use a custom `MessageConverter`. If such a bean is present, it is used
for the default factory that is auto-configured.

Closes gh-8194
2017-02-09 10:43:03 +01:00
Andy Wilkinson
b931f564e6 Work around Gradle 3.3's overzealous deprecation warning
In Gradle 3.3, when an API that will be removed in 4.0 is called, a
deprecation warning is output as part of the build. Users have noticed
his warning and, quite reasonably, complained about it. Unfortunately,
avoiding the warning requires the use of an API that was introduced in
Gradle 3.x which we can't use directly as we want to remain compatible
with Gradle 2.x.

This commit introduces the use of reflection to call
ProjectDependency.getTargetConfiguration() via reflection when it's
available (Gradle 3) and ProjectDependency.getProjectConfiguration()
when it's not (Gradle 2).

Closes gh-8154
2017-02-08 22:03:55 +00:00
Andy Wilkinson
ab192d01cc Merge branch '1.4.x' into 1.5.x 2017-02-08 20:51:30 +00:00
Andy Wilkinson
7e030d2068 Polish 2017-02-08 20:51:23 +00:00
Andy Wilkinson
25982ecf69 Merge branch '1.4.x' into 1.5.x 2017-02-08 20:50:24 +00:00
Andy Wilkinson
04c8b912ee Fall back to standard LiveBeansView behaviour when MBean is in use
Closes gh-8146
2017-02-08 20:49:16 +00:00
Andy Wilkinson
d02a9c1058 Merge branch '1.4.x' into 1.5.x 2017-02-08 17:29:15 +00:00
Andy Wilkinson
f27bb39af9 Sanitize configuration properties that are nested beneath a List
Closes gh-8197
2017-02-08 17:21:41 +00:00
Andy Wilkinson
7d247a71e4 Resolve placeholders against the env in active/include profiles values
The changes made in 919d0c61 meant that the value of
spring.profiles.active or spring.profiles.include was only processed
when a single property source, the property source for the config file
being read, was available. This meant that any placeholders in those
values would only be resolved against properties in the configuration
file rather than against the entire environment.

This commit updates the binding process so that placeholder resolution
is not performed during binding against a single configuration file.
Once binding has completed, the bounds values are post-processed to
resolve and placeholders that they may contain.

The two-step process described above is used in preference to binding
against the whole environment. This avoids a problem with profiles
that are active or included by property sources in the environment
being processed repeatedly.

Closes gh-8234
2017-02-08 15:00:25 +00:00
Stephane Nicoll
da8362a2da Merge pull request #8153 from izeye:patch-22
* pr/8153:
  Fix an assertion in SkipPatternJarScanner
2017-02-08 14:59:53 +01:00
Johnny Lim
b3203058be Fix an assertion in SkipPatternJarScanner
Closes gh-8153
2017-02-08 14:59:33 +01:00
Stephane Nicoll
95e7fbeb1d Make sure spring-boot-test-support is not public
The `spring-boot-test-support` module is internal and is not deployed so
we should not offer public dependency management for it.

Closes gh-8165
2017-02-08 14:38:45 +01:00
Stephane Nicoll
aff50f6787 Merge branch '1.4.x' into 1.5.x 2017-02-08 14:32:45 +01:00
Stephane Nicoll
05dbc15a9d Merge pull request #8226 from kamwo:master
* pr/8226:
  Fix link in doc to Spring Test
2017-02-08 14:32:19 +01:00
Kamil Wozniak
f46e3dc9f3 Fix link in doc to Spring Test
Closes gh-8226
2017-02-08 14:31:42 +01:00
Stephane Nicoll
8a59e88a9d Fix MongoDB CustomConversions bean name
This commit qualifies the `CustomConversions` bean name that the Mongo
auto-configuration might create. `CustomConversions` is a common pattern
in Spring Data and other stores are using the same name.

See https://jira.spring.io/browse/DATASOLR-362

Closes gh-8225
2017-02-08 14:29:33 +01:00
Stephane Nicoll
c48f45e755 Merge branch '1.4.x' into 1.5.x 2017-02-08 14:05:30 +01:00
Stephane Nicoll
3a15287c07 Fix detection for Microsoft SQL Server
Closes gh-8222
2017-02-08 14:04:46 +01:00
Andy Wilkinson
c2f4d027b4 Merge branch '1.4.x' into 1.5.x 2017-02-08 12:00:28 +00:00
Andy Wilkinson
9247cd9c36 Don't let standalone Tomcat render its error page after redirect
Previously, if the configured error controller responded with a
redirect to an error caused by an exception, standalone Tomcat would
render its default error page for the original exception. This
occurred because ErrorPageFilter sets the
javax.servlet.error.exception request attribute prior to dispatching
to the error controller and then does not clear it. As the request
unwinds, Tomcat's ErrorReportValve notices that the attribute is set
and renders an error page for the exception that is the attribute's
value.

This commit updates ErrorPageFilter to remove the
javax.servlet.error.exception and javax.servlet.error.exception_type
attributes upon successful completion of a forward to the error
controller. This prevents Tomcat from rendering an error page for
an exception that has already been handled by the error controller.

Closes gh-7920
2017-02-08 12:00:02 +00:00
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