Commit Graph

10973 Commits (8317977e1bf7430c95c9b42b39006f35b6454960)
 

Author SHA1 Message Date
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 fcd1eb79fc Fix forward merge of new SpyBean test to use correct Mockito 2 API 8 years ago
Andy Wilkinson 1e806bbbd2 Merge branch '1.5.x' 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 b8a38d60b7 Merge branch '1.5.x' 8 years ago
Madhura Bhave 67810abd9e Match ResourceServerCondition if JWK config present
Closes gh-8350
8 years ago
Andy Wilkinson 923393d5af Merge branch '1.5.x' 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 91009cfc01 Merge branch '1.5.x' 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 8181870900 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 4b0c64ed88 Upgrade to Unboundid LDAP SDK 3.2.1
Closes gh-8333
8 years ago
Andy Wilkinson ad30ad808b Merge branch '1.5.x' 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 ef8846770b Merge branch '1.5.x' 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 3c956441b5 Merge branch '1.5.x' 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 ff9788c625 Merge branch '1.5.x' 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 4304cdb91a Merge branch '1.5.x' 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 04a87ee4c1 Merge branch '1.5.x' 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 4301265dba Merge branch '1.5.x' 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
Andy Wilkinson e9c3568fa3 Upgrade to Hibernate 5.2.7.Final
This commit also removes the exclusion of cdi-api. It is no longer
required as https://hibernate.atlassian.net/browse/HHH-11370 has been
fixed in 5.2.7.

Closes gh-8111
8 years ago
Andy Wilkinson 6e6d9e4edd Move RandomValuePropertySource into org.springframework.boot.env
Closes gh-8249
8 years ago
Andy Wilkinson 57fe8b966e Use Spring Session's defaults for its filter's dispatcher types
Closes gh-8288
8 years ago
Andy Wilkinson fe6320db42 Align Security filter dispatcher types with Spring Security's defaults
Closes gh-8289
8 years ago
Andy Wilkinson f57dae639d Align default Filter dispatcher types with the Servlet spec
The Servlet spec states that the default is REQUEST. This commit
aligns Spring Boot with that default.

Closes gh-7467
8 years ago
Andy Wilkinson d1a77b6489 Add dependency management for Lettuce
Closes gh-8287
8 years ago
Stephane Nicoll 7cb451b934 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 7920543480 Add note regarding the detection of `spring.jpa.database`
Closes gh-8253
8 years ago
Brian Clozel a5bdbd0dc2 Introduce EmbeddedWebServerInitializedEvent
This commit adds `EmbeddedWebServerInitializedEvent`, which holds the
`EmbeddedWebServer` information when the application context starts.
The `EmbeddedServletContainerInitializedEvent` now inherits from that
type and holds additional information, the
`EmbeddedWebApplicationContext`.

Closes gh-8208
8 years ago
Stephane Nicoll 924397ff94 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 6993854c55 Explain how to downgrade to Jackson 2.6
Closes gh-8192
8 years ago
Andy Wilkinson 54b95973bb Merge branch '1.5.x' 8 years ago