Commit Graph

22901 Commits (21783faede48cbd264b3610757f57d0de6881251)
 

Author SHA1 Message Date
Phillip Webb eddbfb34f7 Merge branch '2.1.x'
Closes gh-17258
6 years ago
Phillip Webb ffbb23bc6d Always use credentials in forward merge script
Closes gh-17257
6 years ago
Phillip Webb d85a69aa8e Merge branch 'spring-projects/2.1.x'
Closes gh-17256
6 years ago
Phillip Webb b0415c4044 Don't ignore images on CI build
Closes gh-17255
6 years ago
Phillip Webb cc1807608e Merge branch '2.1.x'
Closes gh-17249
6 years ago
Phillip Webb 718c1d7204 Upgrade Java 12 version in CI image
Closes gh-17246
6 years ago
Phillip Webb f4756e500d Merge '2.1.x'
Closes gh-17248
6 years ago
Phillip Webb 064240266f Upgrade Java 11 version in CI image
Closes gh-17244
6 years ago
Phillip Webb 43ef81cbb6 Merge branch '2.1.x'
Closes gh-17247
6 years ago
Phillip Webb 3869da88d4 Upgrade Java 8 version in CI image
Closes gh-17245
6 years ago
Phillip Webb 1513ed1b09 Merge branch '2.1.x' 6 years ago
Phillip Webb de037f55dc Fix detect JDK CI script 6 years ago
Brian Clozel 809a3965c9 Add missing outcome tag for WebClient metrics
On error cases, the "outcome" tag would be missing from recorded metrics
for the `WebClient`.

This commit fixes this issue and improves the reference documentation by
mentioning the tag values used for error cases, when the client response
is not received (I/O errors, client error, etc).

Fixes gh-17219
6 years ago
Phillip Webb 82949b9cc4 Upgrade to Mariadb 2.4.2
Closes gh-17237
6 years ago
Phillip Webb 1e0cf960f0 Reinstate single page HTML and PDF docs
Closes gh-16854
6 years ago
Phillip Webb e44caec60b Merge branch '2.1.x'
Closes gh-17236
6 years ago
Phillip Webb e65d1c777e Exclude Gradle bin folder 6 years ago
Phillip Webb 3eb7af1506 Upgrade to Infinispan 9.4.15.Final
Closes gh-17235
6 years ago
Phillip Webb 2c2b962204 Merge branch '2.1.x'
Closes gh-17232
6 years ago
Phillip Webb d82ccf1405 Ensure META-INF/MANIFEST.MF remains as first entry
Update Gradle archive tasks to ensure that `META-INF/` and
`META-INF/MANIFEST.MF` remain as the first entries of the archive.

Prior to this commit, rewritten archives would violate the implicit
specification of `JarInputStream` that these entries should be first.

Fixes gh-16698
6 years ago
Phillip Webb f4d9e1c650 Fix checkstyle violation 6 years ago
Phillip Webb 69fbd8f20c Merge branch '2.1.x'
Closes gh-17227
Closes gh-17228
6 years ago
Phillip Webb 5e3438f095 Merge pull request #16535 from ayudovin
* pr/16535:
  Polish "Fix connection timeout configuration for Netty"
  Fix connection timeout configuration for Netty
  Chain predicates in PropertyMapper when methods

Closes gh-16535
6 years ago
Phillip Webb 692bda1595 Polish "Fix connection timeout configuration for Netty"
See gh-16535
6 years ago
ayudovin b0e4c716d3 Fix connection timeout configuration for Netty
Update `NettyWebServerFactoryCustomizer` to deal with the fact that
Netty treats `0` and negative connection timeout values differently to
Tomcat, Undertow and Jetty.

See gh-16535
6 years ago
ayudovin c2d1cb2c70 Chain predicates in PropertyMapper when methods
Update `PropertyMapper` to correctly combine predicates when repeated
calls are made to `when` and `whenNot`. Prior to this commit, subsequent
invocations would replace the previous predicate.

Fixes gh-17225
6 years ago
Andy Wilkinson bd14050859 Merge branch '2.1.x'
Closes gh-17224
6 years ago
Andy Wilkinson 88fbc529e6 Upgrade to Micrometer 1.1.5
Closes gh-17222
6 years ago
Andy Wilkinson f07f030ba9 Merge branch '2.1.x'
Closes gh-17223
6 years ago
Andy Wilkinson fe9db792ee Complete dependency management for JavaBeans Activation Framework
Fixes gh-17062
6 years ago
Andy Wilkinson da897d691d Merge branch '2.1.x' 6 years ago
Andy Wilkinson ade4f32f96 Merge branch '2.0.x' into 2.1.x 6 years ago
Andy Wilkinson 5011338714 Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson 8589cf68ef Merge branch '2.1.x' 6 years ago
Andy Wilkinson e8e9ec93bb Merge branch '2.0.x' into 2.1.x 6 years ago
Andy Wilkinson a51d31b4d5 Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson 844873c18a Starting building against Spring Framework 4.3.25 snaphots
See gh-17221
6 years ago
Andy Wilkinson a189e4cf96 Merge branch '2.1.x'
Closes gh-17220
6 years ago
Andy Wilkinson ceace66a28 Merge pull request #16485 from lorenzodee
* gh-16485:
  Polish "Honour base path from @WebAppConfiguration in @WebMvcTest"
  Honour base path from @WebAppConfiguration in @WebMvcTest

Closes gh-16485
6 years ago
Andy Wilkinson 645514f848 Polish "Honour base path from @WebAppConfiguration in @WebMvcTest"
See gh-16485
6 years ago
Lorenzo Dee 7340d546b8 Honour base path from @WebAppConfiguration in @WebMvcTest
See gh-16485
6 years ago
Andy Wilkinson 9d355f00e1 Merge branch '2.1.x'
Closes gh-17218
6 years ago
Andy Wilkinson 6f4d598418 Merge pull request #16814 from deakandris
* gh-16814:
  Polish "Consider properties from @AutoConfigureTestDatabase"
  Consider properties from @AutoConfigureTestDatabase

Closes gh-16814
6 years ago
Andy Wilkinson 5dc2339ec2 Polish "Consider properties from @AutoConfigureTestDatabase"
See gh-16814
6 years ago
András Deák 92256c80d0 Consider properties from @AutoConfigureTestDatabase
Both Flyway and Liquibase makes use of DataSourceProperties to get
default properties. Previously, both used strictly the configuration
properties and failed to consider embedded datasource properties
autoconfigured by @AutoConfigureTestDatabase. In case a database layer
test e.g. @JdbcTest relies on the autoconfigured embedded datasource,
Flyway and Liquibase autoconfiguration fails as they are not aware of
the embedded datasource properties.

See gh-16814
6 years ago
Andy Wilkinson f36af7b16d Polish 6 years ago
Andy Wilkinson 78f51a490c Merge branch '2.1.x'
Closes gh-17213
6 years ago
Andy Wilkinson ba85394e83 Merge pull request #17066 from nosan
* gh-17066:
  Polish "Auto-configure caching in jOOQ sliced tests"
  Auto-configure caching in jOOQ sliced tests

Closes gh-17066
6 years ago
Andy Wilkinson c2a4a3f630 Polish "Auto-configure caching in jOOQ sliced tests"
See gh-17066
6 years ago
Dmytro Nosan 4701d8f82a Auto-configure caching in jOOQ sliced tests
See gh-17066
6 years ago