Commit Graph

22118 Commits (859b088bca19a4f1ec19cc399f6a68fa3841eabc)
 

Author SHA1 Message Date
Stephane Nicoll 2d70daf5e0 Merge pull request #17100 from ielatif
* pr/17100:
  Polish "Add JUnit 4 and the Vintage Engine sample"
  Add JUnit 4 and the Vintage Engine sample

Closes gh-17100
5 years ago
Stephane Nicoll 900c325070 Polish "Add JUnit 4 and the Vintage Engine sample"
See gh-17100
5 years ago
Issam El-atif 9fafcda929 Add JUnit 4 and the Vintage Engine sample
This commit adds a sample to verify the use of JUnit 4 and the Vintage
Engine.

See gh-17100
5 years ago
Stephane Nicoll dfa5480c59 Remove useless @RegisterExtension on CliTester
Closes gh-17266
5 years ago
Stephane Nicoll 45d2f1d7d1 Merge branch '2.1.x'
Closes gh-17269
5 years ago
Stephane Nicoll 7e5ca6d280 Merge branch '2.0.x' into 2.1.x
Closes gh-17268
5 years ago
Stephane Nicoll 11dee3c0d8 Merge branch '1.5.x' into 2.0.x 5 years ago
Stephane Nicoll 29de792148 Merge pull request #17068 from ielatif
* pr/17068:
  Fix javadoc of management server port

Closes gh-17068
5 years ago
Issam El-atif fca97ff86c Fix javadoc of management server port
See gh-17068
5 years ago
Stephane Nicoll c9b8d98bcf Upgrade to JUnit Jupiter 5.5.0-RC1
This commit also removes the workaround that required to exclude junit 4
explicitly now that a related issue in JUnit Jupiter has been fixed.

Closes gh-17266
5 years ago
Phillip Webb 59ca46ed54 Remove FIXME 5 years ago
Phillip Webb 0233cc3c94 Merge branch '2.1.x' 5 years ago
Phillip Webb 6e5ba8077a Fix sync-to-maven-central script 5 years ago
Phillip Webb 527a3b5395 Merge branch '2.1.x' 5 years ago
Phillip Webb 11b8e7c2de Don't exit script on error
Update CI scripts so that command failures do not cause an immediate
exit. Prior to this commit, some of our looping logic would never run
because the entire script would exit.
5 years ago
Phillip Webb 83112237f7 Merge branch '2.1.x' 5 years ago
Spring Buildmaster fb90803dbf Next development version (v2.1.7.BUILD-SNAPSHOT) 5 years ago
Phillip Webb eddbfb34f7 Merge branch '2.1.x'
Closes gh-17258
5 years ago
Phillip Webb ffbb23bc6d Always use credentials in forward merge script
Closes gh-17257
5 years ago
Phillip Webb d85a69aa8e Merge branch 'spring-projects/2.1.x'
Closes gh-17256
5 years ago
Phillip Webb b0415c4044 Don't ignore images on CI build
Closes gh-17255
5 years ago
Phillip Webb cc1807608e Merge branch '2.1.x'
Closes gh-17249
5 years ago
Phillip Webb 718c1d7204 Upgrade Java 12 version in CI image
Closes gh-17246
5 years ago
Phillip Webb f4756e500d Merge '2.1.x'
Closes gh-17248
5 years ago
Phillip Webb 064240266f Upgrade Java 11 version in CI image
Closes gh-17244
5 years ago
Phillip Webb 43ef81cbb6 Merge branch '2.1.x'
Closes gh-17247
5 years ago
Phillip Webb 3869da88d4 Upgrade Java 8 version in CI image
Closes gh-17245
5 years ago
Phillip Webb 1513ed1b09 Merge branch '2.1.x' 5 years ago
Phillip Webb de037f55dc Fix detect JDK CI script 5 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
5 years ago
Phillip Webb 82949b9cc4 Upgrade to Mariadb 2.4.2
Closes gh-17237
5 years ago
Phillip Webb 1e0cf960f0 Reinstate single page HTML and PDF docs
Closes gh-16854
5 years ago
Phillip Webb e44caec60b Merge branch '2.1.x'
Closes gh-17236
5 years ago
Phillip Webb e65d1c777e Exclude Gradle bin folder 5 years ago
Phillip Webb 3eb7af1506 Upgrade to Infinispan 9.4.15.Final
Closes gh-17235
5 years ago
Phillip Webb 2c2b962204 Merge branch '2.1.x'
Closes gh-17232
5 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
5 years ago
Phillip Webb f4d9e1c650 Fix checkstyle violation 5 years ago
Phillip Webb 69fbd8f20c Merge branch '2.1.x'
Closes gh-17227
Closes gh-17228
5 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
5 years ago
Phillip Webb 692bda1595 Polish "Fix connection timeout configuration for Netty"
See gh-16535
5 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
5 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
5 years ago
Andy Wilkinson bd14050859 Merge branch '2.1.x'
Closes gh-17224
5 years ago
Andy Wilkinson 88fbc529e6 Upgrade to Micrometer 1.1.5
Closes gh-17222
5 years ago
Andy Wilkinson f07f030ba9 Merge branch '2.1.x'
Closes gh-17223
5 years ago
Andy Wilkinson fe9db792ee Complete dependency management for JavaBeans Activation Framework
Fixes gh-17062
5 years ago
Andy Wilkinson da897d691d Merge branch '2.1.x' 5 years ago
Andy Wilkinson ade4f32f96 Merge branch '2.0.x' into 2.1.x 5 years ago
Andy Wilkinson 5011338714 Merge branch '1.5.x' into 2.0.x 5 years ago