Commit Graph

11011 Commits (7346a644910906d00da8f50bc7268e490104bd1b)
 

Author SHA1 Message Date
Andy Wilkinson 95db8d2a31 Upgrade to Appengine 1.9.49
Closes gh-8356
8 years ago
Andy Wilkinson 55dd975c77 Upgrade to Jackson 2.8.7
Closes gh-8355
8 years ago
Andy Wilkinson 05113d059d Upgrade to Logback 1.1.10
Closes gh-8354
8 years ago
Andy Wilkinson 8318177b0d Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 70e802fba5 Use name from @SpyBean to disambiguate multiple candidates
Previously, @SpyBean's name attribute was not used when determining
the name of the bean to spy upon. When there were multiple candidates,
none of which were primary, this would lead to a failure to find the
bean to spy upon. This behaviour is also inconsistent with @MockBean
which does use the name attribute to identify the bean to mock.

This commit updates MockitoPostProcessor to use the name attribute,
when set, to identify the bean that should be spied upon. For
consistency with @MockBean it is always used when set. When not set
the previous logic will continue to be used.

Closes gh-8315
8 years ago
Madhura Bhave 67810abd9e Match ResourceServerCondition if JWK config present
Closes gh-8350
8 years ago
Andy Wilkinson 98a2ae3b91 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 1abd91dc23 Start building against Spring Framework 4.3.7 snapshots
See gh-8248
8 years ago
Stephane Nicoll 3b886094cb Merge pull request #8195 from mouellet:gh-8171
* pr/8195:
  Polish contribution
  Add schema validation options for embedded LDAP
8 years ago
Stephane Nicoll 43a534f4ca Polish contribution
Closes gh-8195
8 years ago
Mathieu Ouellet fa8f0a6136 Add schema validation options for embedded LDAP
See gh-8195
8 years ago
Stephane Nicoll 4b0c64ed88 Upgrade to Unboundid LDAP SDK 3.2.1
Closes gh-8333
8 years ago
Andy Wilkinson 4f29bc9c14 Make mvn verify work without install of spring-boot-dependencies
Previously, the custom layout sample could only be built successfully
if spring-boot-dependencies had be installed locally, making its
effective pom available in the local Maven cache.

This commit updates the sample's tests to look at its own pom to
determine the version of Spring Boot that should be used in the
Gradle tests.

Closes gh-8330
8 years ago
Stephane Nicoll 9260608195 Merge pull request #8273 from rajadilipkolli:patch-1
* pr/8273:
  Fix version of `gradle-git-properties` in doc
8 years ago
Raja Kolli a5a2c04d23 Fix version of `gradle-git-properties` in doc
Closes gh-8273
8 years ago
Stephane Nicoll 121ab0a71e Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 461d5613ab Merge pull request #8319 from vpavic:fix-docs
* pr/8319:
  Fix audit events related documentation
8 years ago
Vedran Pavic 1c8f1c709c Fix audit events related documentation
Closes gh-8319
8 years ago
Andy Wilkinson f67dd957b1 Ignore excludeDevtools on extension when it has been set on bootRepackage
Previously, bootRepackage's excludeDevtools property would be
overridden by the springBoot extension's excludeDevtools property.
This prevented devtools from being included by configuring it on the
repackaging task.

This commit corrects the logic so that the setting on the repackaging
task takes priority. It also adds some tests to verify the behaviour.

Closes gh-8308
8 years ago
Stephane Nicoll f57ddff478 Remove dead code
Closes gh-8305
8 years ago
Madhura Bhave b4134e239e Add autoconfiguration for JWKTokenStore
If `jwk.key-set-uri` is present.

Closes gh-4437
8 years ago
Andy Wilkinson 01729cc1d2 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 9e1238e286 Consider resource loader path when checking Groovy template availability
Closes gh-8304
8 years ago
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