Commit Graph

10388 Commits (f73714bdcc73114404bcc44f957c60dc872b7f66)
 

Author SHA1 Message Date
Stephane Nicoll d4d45a1009 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll abc9f7c1e1 Merge pull request #8300 from izeye:patch-22
* pr/8300:
  Fix a broken AsciiDoc attribute declaration
8 years ago
Johnny Lim 0f5fefd561 Fix a broken AsciiDoc attribute declaration
Closes gh-8300
8 years ago
Stephane Nicoll 7920543480 Add note regarding the detection of `spring.jpa.database`
Closes gh-8253
8 years ago
Stephane Nicoll 6993854c55 Explain how to downgrade to Jackson 2.6
Closes gh-8192
8 years ago
Andy Wilkinson e2a12e77b7 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 6f3b4db7b3 Merge pull request #8263 from Johnny Lim
* gh-8263:
  Tests that lists of lists are sanitized correctly
  Ensure that entries in a list of lists are not lost during sanitization
8 years ago
Andy Wilkinson bbe9394228 Tests that lists of lists are sanitized correctly
See gh-8263
8 years ago
Johnny Lim 88afc43d44 Ensure that entries in a list of lists are not lost during sanitization
Closes gh-8263
See gh-8197
8 years ago
Stephane Nicoll a0ef61a27d Enable proxy target class for `MethodValidationPostProcessor`
Closes gh-8277
8 years ago
Andy Wilkinson 4aecf19c92 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 9499658bc3 Revert "Start building against Spring Framework 4.3.7.BUILD-SNAPSHOT"
This reverts commit 661940033a.

See gh-8248
8 years ago
Andy Wilkinson e0b355d313 Avoid ClassNotFoundException caused by areturn verification
The verifier's type checker is required to check that a type returned
from a method (an areturn instruction) is assignable to the method's
declared return type. When the return type is an interface, the JLS
states that it should be treated as java.lang.Object. This means that
no analysis of the type being returned is required and verification
passes. When the return type is a class, the type being returned must
be analyzed to ensure that it is compatible. This analysis causes the
return type to be loaded during verification.

Prior to this commit, BasicBatchConfigurer's
createAppropriateTransactionManager method had a return type of
AbstractPlatformTransactionManager and a branch that could return
a JpaTransactionManager. This caused the verifier to attempt to load
JpaTransactionManager so that it could check that it was assignable
to AbstractPlatformTransactionManager. This would fail when
spring-orm is not on the classpath as JpaTransactionManager could not
be loaded.

This commit updates BasicBatchConfigurer to change the return type
of createAppropriateTransactionManager so that it returns a
PlatformTransactionManager which is an interface. As described above,
this relaxes the verification of any areturn instructions in the
method and, in this particular case stops the verifier from trying to
load JpaTransactionManager.

Closes gh-8181
8 years ago
Stephane Nicoll bd6d1b74c0 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll bcbcb9c00b Clarify use of `DataSource` for batch apps
Closes gh-8271
8 years ago
Stephane Nicoll 842170768d Polish cache sample readme
Closes gh-8272
8 years ago
Stephane Nicoll ff4a4cf33a Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 661940033a Start building against Spring Framework 4.3.7.BUILD-SNAPSHOT
See gh-8248
8 years ago
Stephane Nicoll 6c4013249b Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 58a4f04962 Fix typo in documentation
Closes gh-8259
8 years ago
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
8 years ago
Andy Wilkinson 601c6aa305 Tidy up code formatting and address some compiler warnings 8 years ago
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
8 years ago
Stephane Nicoll 9a2793356b Merge pull request #8215 from davinkevin:master
* pr/8215:
  Allow property expansion for *.yaml
8 years ago
Davin Kevin ff40854653 Allow property expansion for *.yaml
Closes gh-8215
8 years ago
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
8 years ago
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
8 years ago
Andy Wilkinson ab192d01cc Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 7e030d2068 Polish 8 years ago
Andy Wilkinson 25982ecf69 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 04c8b912ee Fall back to standard LiveBeansView behaviour when MBean is in use
Closes gh-8146
8 years ago
Andy Wilkinson d02a9c1058 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson f27bb39af9 Sanitize configuration properties that are nested beneath a List
Closes gh-8197
8 years ago
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
8 years ago
Stephane Nicoll da8362a2da Merge pull request #8153 from izeye:patch-22
* pr/8153:
  Fix an assertion in SkipPatternJarScanner
8 years ago
Johnny Lim b3203058be Fix an assertion in SkipPatternJarScanner
Closes gh-8153
8 years ago
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
8 years ago
Stephane Nicoll aff50f6787 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 05dbc15a9d Merge pull request #8226 from kamwo:master
* pr/8226:
  Fix link in doc to Spring Test
8 years ago
Kamil Wozniak f46e3dc9f3 Fix link in doc to Spring Test
Closes gh-8226
8 years ago
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
8 years ago
Stephane Nicoll c48f45e755 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 3a15287c07 Fix detection for Microsoft SQL Server
Closes gh-8222
8 years ago
Andy Wilkinson c2f4d027b4 Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
Andy Wilkinson 64b65e1fe5 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 30074431a7 Improve documentation of static resource reloading with devtools
Closes gh-5133
Closes gh-7886
8 years ago
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
8 years ago
Andy Wilkinson e891fe0584 Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago