Build #1,635

Spring Boot on Windows

Build: #1635 failed Scheduled with changes by Phil Webb and Andy Wilkinson

Code commits

Git

  • Phil Webb

    Phil Webb 82949b9cc432979d1610b648eecf19c398cdf077

    Upgrade to Mariadb 2.4.2
    Closes gh-17237

    • spring-boot-project/spring-boot-dependencies/pom.xml (version 82949b9cc432979d1610b648eecf19c398cdf077)
  • Phil Webb

    Phil Webb 1e0cf960f0bf7a9527825abbfbf77351fe954482

    Reinstate single page HTML and PDF docs
    Closes gh-16854

    • spring-boot-project/spring-boot-docs/pom.xml (version 1e0cf960f0bf7a9527825abbfbf77351fe954482)
    • spring-boot-project/spring-boot-docs/src/main/asciidoc/documentation-overview.adoc (version 1e0cf960f0bf7a9527825abbfbf77351fe954482)
    • spring-boot-project/spring-boot-docs/src/main/asciidoc/images/epub-cover.png (version 1e0cf960f0bf7a9527825abbfbf77351fe954482)
    • spring-boot-project/spring-boot-docs/src/main/asciidoc/images/epub-cover.svg (version 1e0cf960f0bf7a9527825abbfbf77351fe954482)
    • spring-boot-project/spring-boot-docs/src/main/asciidoc/index.htmladoc (version 1e0cf960f0bf7a9527825abbfbf77351fe954482)
    • spring-boot-project/spring-boot-docs/src/main/asciidoc/index.htmlsingleadoc (version 1e0cf960f0bf7a9527825abbfbf77351fe954482)
    • spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-reference.pdfadoc (version 1e0cf960f0bf7a9527825abbfbf77351fe954482)
    • spring-boot-project/spring-boot-parent/pom.xml (version 1e0cf960f0bf7a9527825abbfbf77351fe954482)
    • spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml (version 1e0cf960f0bf7a9527825abbfbf77351fe954482)
  • Phil Webb

    Phil Webb e44caec60b3649b63d8ab30e9ae764835cdeb466

    Merge branch '2.1.x'
    Closes gh-17236

  • Phil Webb

    Phil Webb e65d1c777e8f8fd1d3f1826e830b9c4cdc9c7a32

    Exclude Gradle bin folder

    • pom.xml (version e65d1c777e8f8fd1d3f1826e830b9c4cdc9c7a32)
  • Phil Webb

    Phil Webb 3eb7af1506f698faaacb7ea829d76fdd9da07053 m

    Upgrade to Infinispan 9.4.15.Final
    Closes gh-17235

    • spring-boot-project/spring-boot-dependencies/pom.xml (version 3eb7af1506f698faaacb7ea829d76fdd9da07053)
  • Phil Webb

    Phil Webb 2c2b96220496e8becc0ba708007c53f7c4c7bff8

    Merge branch '2.1.x'
    Closes gh-17232

  • Phil Webb

    Phil Webb d82ccf14059e2dcf25334018a00833fa8cbd29ab m

    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

    • spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootZipCopyAction.java (version d82ccf14059e2dcf25334018a00833fa8cbd29ab)
    • spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/LoaderZipEntries.java (version d82ccf14059e2dcf25334018a00833fa8cbd29ab)
    • spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveTests.java (version d82ccf14059e2dcf25334018a00833fa8cbd29ab)
  • Phil Webb

    Phil Webb f4d9e1c650ee6988bcd1807aaf02b74e3779358b

    Fix checkstyle violation

    • spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/PropertyMapperTests.java (version f4d9e1c650ee6988bcd1807aaf02b74e3779358b)
  • Phil Webb

    Phil Webb 69fbd8f20c7c7650faf8656acf0857baeb45b8fc

    Merge branch '2.1.x'
    Closes gh-17227
    Closes gh-17228

  • Phil Webb

    Phil Webb 5e3438f095b2bb7a23f65c9c388798a693edad3e m

    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

  • Phil Webb

    Phil Webb 692bda1595a0d6a16697629eaedb5b0b1ae4727e m

    Polish "Fix connection timeout configuration for Netty"
    See gh-16535

    • spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/NettyWebServerFactoryCustomizer.java (version 692bda1595a0d6a16697629eaedb5b0b1ae4727e)
    • spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/NettyWebServerFactoryCustomizerTests.java (version 692bda1595a0d6a16697629eaedb5b0b1ae4727e)
  • ayudovin <a.yudovin6695@gmail.com>

    ayudovin <a.yudovin6695@gmail.com> b0e4c716d396077dbe606489b9c430aee0151e4e m

    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

    • spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/NettyWebServerFactoryCustomizer.java (version b0e4c716d396077dbe606489b9c430aee0151e4e)
    • spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/NettyWebServerFactoryCustomizerTests.java (version b0e4c716d396077dbe606489b9c430aee0151e4e)
  • ayudovin <a.yudovin6695@gmail.com>

    ayudovin <a.yudovin6695@gmail.com> c2d1cb2c701f3c0dd06a6db298cd78e06d039c8f m

    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

    • spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/PropertyMapper.java (version c2d1cb2c701f3c0dd06a6db298cd78e06d039c8f)
    • spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/PropertyMapperTests.java (version c2d1cb2c701f3c0dd06a6db298cd78e06d039c8f)
  • Andy Wilkinson

    Andy Wilkinson bd14050859eb49b8137a789d045e5fc94c0401bf

    Merge branch '2.1.x'
    Closes gh-17224

  • Andy Wilkinson

    Andy Wilkinson 88fbc529e6f471f3deae13f936bec7dd3c5e7874 m

    Upgrade to Micrometer 1.1.5
    Closes gh-17222

    • spring-boot-project/spring-boot-dependencies/pom.xml (version 88fbc529e6f471f3deae13f936bec7dd3c5e7874)
  • Andy Wilkinson

    Andy Wilkinson f07f030ba9cebba61cce73ba302da2f506175f97

    Merge branch '2.1.x'
    Closes gh-17223

  • Andy Wilkinson

    Andy Wilkinson fe9db792ee1cf969bde80b64e5d77a97d732fcf5 m

    Complete dependency management for JavaBeans Activation Framework
    Fixes gh-17062

    • spring-boot-project/spring-boot-dependencies/pom.xml (version fe9db792ee1cf969bde80b64e5d77a97d732fcf5)
  • Andy Wilkinson

    Andy Wilkinson da897d691d3397d45bf57715bfe5ebfdb8e4807d

    Merge branch '2.1.x'

  • Andy Wilkinson

    Andy Wilkinson ade4f32f966d756c4719a3d3ac9651267015a593 m

    Merge branch '2.0.x' into 2.1.x

  • Andy Wilkinson

    Andy Wilkinson 5011338714f94c1bcdc4650ae2e33d30857e6e8f m

    Merge branch '1.5.x' into 2.0.x

  • Andy Wilkinson

    Andy Wilkinson 8589cf68ef296537548a6c1461662d3c44f366a2

    Merge branch '2.1.x'

  • Andy Wilkinson

    Andy Wilkinson e8e9ec93bb4d448edd0ff77d4c6cab95f1e3f285 m

    Merge branch '2.0.x' into 2.1.x

  • Andy Wilkinson

    Andy Wilkinson a51d31b4d57eb556a4a6adaa4321ebabe9f644f1 m

    Merge branch '1.5.x' into 2.0.x

  • Andy Wilkinson

    Andy Wilkinson 844873c18a0380552a4895eb3949a955e5405050 m

    Starting building against Spring Framework 4.3.25 snaphots
    See gh-17221

    • spring-boot-dependencies/pom.xml (version 844873c18a0380552a4895eb3949a955e5405050)
  • Andy Wilkinson

    Andy Wilkinson a189e4cf96335ae8b12eceb1ad70ab816a8968c0

    Merge branch '2.1.x'
    Closes gh-17220

  • Andy Wilkinson

    Andy Wilkinson ceace66a28e1734fe31d0cef11b8435d8ea77f30 m

    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

  • Andy Wilkinson

    Andy Wilkinson 645514f84821ba1a15033467c6ce474aa6690bf1 m

    Polish "Honour base path from @WebAppConfiguration in @WebMvcTest"
    See gh-16485

    • spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestContextBootstrapper.java (version 645514f84821ba1a15033467c6ce474aa6690bf1)
    • spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWithWebAppConfigurationTests.java (version 645514f84821ba1a15033467c6ce474aa6690bf1)
    • spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java (version 645514f84821ba1a15033467c6ce474aa6690bf1)
  • Lorenzo Dee <lorenzo.dee@orangeandbronze.com>

    Lorenzo Dee <lorenzo.dee@orangeandbronze.com> 7340d546b86e63aa7526f7a7e65e9e7f1358e042 m

    Honour base path from @WebAppConfiguration in @WebMvcTest
    See gh-16485

    • spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestContextBootstrapper.java (version 7340d546b86e63aa7526f7a7e65e9e7f1358e042)
    • spring-boot-project/spring-boot-test-autoconfigure/src/main/webapp/inwebapp (version 7340d546b86e63aa7526f7a7e65e9e7f1358e042)
    • spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestServletContextResourceTests.java (version 7340d546b86e63aa7526f7a7e65e9e7f1358e042)
    • spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWithWebAppConfigurationTests.java (version 7340d546b86e63aa7526f7a7e65e9e7f1358e042)
    • spring-boot-project/spring-boot-test-autoconfigure/src/test/resources/META-INF/resources/inmetainfresources (version 7340d546b86e63aa7526f7a7e65e9e7f1358e042)
    • spring-boot-project/spring-boot-test-autoconfigure/src/test/resources/public/inpublic (version 7340d546b86e63aa7526f7a7e65e9e7f1358e042)
    • spring-boot-project/spring-boot-test-autoconfigure/src/test/resources/resources/inresources (version 7340d546b86e63aa7526f7a7e65e9e7f1358e042)
    • spring-boot-project/spring-boot-test-autoconfigure/src/test/resources/static/instatic (version 7340d546b86e63aa7526f7a7e65e9e7f1358e042)
    • spring-boot-project/spring-boot-test-autoconfigure/src/test/webapp/inwebapp (version 7340d546b86e63aa7526f7a7e65e9e7f1358e042)
    • spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java (version 7340d546b86e63aa7526f7a7e65e9e7f1358e042)
  • Andy Wilkinson

    Andy Wilkinson 9d355f00e18092e0a113f9228454cd027d842c87

    Merge branch '2.1.x'
    Closes gh-17218

  • Andy Wilkinson

    Andy Wilkinson 6f4d59841820fb1c633266c581ad1e4cfba26fea m

    Merge pull request #16814 from deakandris
    * gh-16814:
      Polish "Consider properties from @AutoConfigureTestDatabase"
      Consider properties from @AutoConfigureTestDatabase

    Closes gh-16814

  • Andy Wilkinson

    Andy Wilkinson 5dc2339ec2a7e12437a955970f15ccf6705dec92 m

    Polish "Consider properties from @AutoConfigureTestDatabase"
    See gh-16814

    • spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java (version 5dc2339ec2a7e12437a955970f15ccf6705dec92)
    • src/checkstyle/checkstyle-suppressions.xml (version 5dc2339ec2a7e12437a955970f15ccf6705dec92)
  • András Deák <andras.deak@transferwise.com>

    András Deák <andras.deak@transferwise.com> 92256c80d01e9b71a63d982feafaa82afa0cdebe m

    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

    • spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java (version 92256c80d01e9b71a63d982feafaa82afa0cdebe)
    • spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java (version 92256c80d01e9b71a63d982feafaa82afa0cdebe)
    • spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java (version 92256c80d01e9b71a63d982feafaa82afa0cdebe)
    • spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java (version 92256c80d01e9b71a63d982feafaa82afa0cdebe)
    • src/checkstyle/checkstyle-suppressions.xml (version 92256c80d01e9b71a63d982feafaa82afa0cdebe)
  • Andy Wilkinson

    Andy Wilkinson f36af7b16d0a73b775f14a2ad080fd8cec79f8c3

    Polish

    • spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/HandlerTests.java (version f36af7b16d0a73b775f14a2ad080fd8cec79f8c3)
  • Andy Wilkinson

    Andy Wilkinson 78f51a490c173a0eb4cd4303ce311f628012ff23

    Merge branch '2.1.x'
    Closes gh-17213

  • Andy Wilkinson

    Andy Wilkinson ba85394e83b1e1886a26b829e521a24e36ae5a66 m

    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

  • Dmytro Nosan <dimanosan@gmail.com>

    Dmytro Nosan <dimanosan@gmail.com> 4701d8f82a48bca7d703626bac815b1df6a9b5ee m

    Auto-configure caching in jOOQ sliced tests
    See gh-17066

    • spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jooq/JooqTest.java (version 4701d8f82a48bca7d703626bac815b1df6a9b5ee)
    • spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jooq/JooqTestIntegrationTests.java (version 4701d8f82a48bca7d703626bac815b1df6a9b5ee)
  • Andy Wilkinson

    Andy Wilkinson c2a4a3f630d64a966c2c6ae28257bdbd15fdbc96 m

    Polish "Auto-configure caching in jOOQ sliced tests"
    See gh-17066

    • spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jooq/JooqTest.java (version c2a4a3f630d64a966c2c6ae28257bdbd15fdbc96)
  • Andy Wilkinson

    Andy Wilkinson c62543b514fb945ccbb0d35f16cf3393369795c0

    Merge branch '2.1.x'
    Closes gh-17212

  • Andy Wilkinson

    Andy Wilkinson 13a7a52c717e8b0570aada5ba6c4058b51394b21 m

    Revert "Work around Framework regression in handling of null model values"
    This reverts commit 5fc67c545c7b7f6440bb0743feb15d5fc2c5d28a.

    Closes gh-16991

    • spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java (version 13a7a52c717e8b0570aada5ba6c4058b51394b21)
  • Andy Wilkinson

    Andy Wilkinson ece87032787a15a7511f66cc0a1ad1f14ad6c66b

    Merge branch '2.1.x'
    Closes gh-17211

  • Andy Wilkinson

    Andy Wilkinson 7d59b788295f77dbd1e1025c190c772fa3a6d1ff m

    Fix handling of jar files with + chars in their path
    Closes gh-17208

    • spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/Handler.java (version 7d59b788295f77dbd1e1025c190c772fa3a6d1ff)
    • spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/HandlerTests.java (version 7d59b788295f77dbd1e1025c190c772fa3a6d1ff)