Commit Graph

37925 Commits

Author SHA1 Message Date
Stephane Nicoll 0457536d72 Polish "Avoid using JUnit 4 assertions"
See gh-32504
2022-09-27 08:24:03 +02:00
dreis2211 cee353fba6 Avoid using JUnit 4 assertions
See gh-32504
2022-09-27 08:11:47 +02:00
Scott Frederick 4ecc6656f3 Merge branch '2.6.x' into 2.7.x
Closes gh-32507
2022-09-26 14:18:47 -05:00
Scott Frederick 81598b51f9 Use task outputs in distZip Paketo system tests
Using the outputs from `distZip` and `bootDistZip` as input to the
`bootBuildImage` task instead of indirectly using the output file
path prevents Gradle warnings about implicit task dependencies.

Fixes gh-32506
2022-09-26 14:18:17 -05:00
Andy Wilkinson 5124ae94ae Merge branch '2.6.x' into 2.7.x
Closes gh-32499
2022-09-26 13:15:11 +01:00
Andy Wilkinson cfac7f55a4 Correct annotations on BootBuildImage's file-based inputs
Closes gh-32495
2022-09-26 13:13:16 +01:00
Andy Wilkinson 50040bd748 Merge branch '2.6.x' into 2.7.x 2022-09-22 13:23:49 +01:00
Spring Builds f1d7e21752 Next development version (v2.7.5-SNAPSHOT) 2022-09-22 11:07:36 +00:00
Spring Builds 33afbcc092 Next development version (v2.6.13-SNAPSHOT) 2022-09-22 09:10:06 +00:00
Stephane Nicoll 88723b784e Merge branch '2.6.x' into 2.7.x 2022-09-22 09:35:40 +02:00
Stephane Nicoll ca830240fa Upgrade to Spring Batch 4.3.7
Closes gh-32278
2022-09-22 09:35:29 +02:00
Stephane Nicoll 82763deb93 Upgrade to Spring Batch 4.3.7
Closes gh-32271
2022-09-22 09:26:07 +02:00
Brian Clozel 8f9323d66c Document "classpath:*" location for GraphQL Schemas
This commit mentions the `"classpath*:graphql/**` schema location in
case the application needs to find schemas across multiple classpath
roots, for example across multiple modules.

Closes gh-31772
2022-09-21 21:09:22 +02:00
Andy Wilkinson c5a4b1f71d Merge branch '2.6.x' into 2.7.x
Closes gh-32468
2022-09-21 19:53:22 +01:00
Andy Wilkinson 856bd84df9 Remove JDK 18 CI
Closes gh-32290
2022-09-21 19:52:15 +01:00
Andy Wilkinson 7566666304 Merge branch '2.6.x' into 2.7.x
Closes gh-32467
2022-09-21 19:46:38 +01:00
Andy Wilkinson 5affcecd24 Update Java 19 CI to use Bellsoft Liberica
Closes gh-32289
2022-09-21 19:44:16 +01:00
Andy Wilkinson 3620959dca Upgrade to Dependency Management Plugin 1.0.14.RELEASE
Closes gh-32459
2022-09-21 10:06:56 +01:00
Andy Wilkinson 0111988e1b Merge branch '2.6.x' into 2.7.x 2022-09-21 10:04:41 +01:00
Andy Wilkinson 9d30a0a5b6 Upgrade to Dependency Management Plugin 1.0.14.RELEASE
Closes gh-32458
2022-09-21 10:04:03 +01:00
Stephane Nicoll b607aca478 Merge branch '2.6.x' into 2.7.x 2022-09-21 08:24:38 +02:00
Stephane Nicoll 8bca178b83 Upgrade to Byte Buddy 1.12.17
Closes gh-32454
2022-09-21 08:24:27 +02:00
Stephane Nicoll d5debb1d3d Upgrade to Spring Integration 5.5.15
Closes gh-32453
2022-09-21 08:22:25 +02:00
Stephane Nicoll b3db0768c0 Upgrade to Spring GraphQL 1.0.2
Closes gh-32426
2022-09-21 08:21:56 +02:00
Stephane Nicoll 4e18da99a3 Upgrade to Spring Integration 5.5.15
Closes gh-32452
2022-09-21 08:18:15 +02:00
Phillip Webb 445dff0483 Upgrade to MariaDB 3.0.8
Closes gh-32445
2022-09-20 14:15:06 -07:00
Phillip Webb 0ff789415e Upgrade to Jetty 9.4.49.v20220914
Closes gh-32444
2022-09-20 14:15:03 -07:00
Phillip Webb f9b532d5aa Upgrade to Groovy 3.0.13
Closes gh-32443
2022-09-20 14:14:59 -07:00
Phillip Webb 8b9c0f2cb3 Merge branch '2.6.x' into 2.7.x 2022-09-20 14:10:46 -07:00
Phillip Webb c7254cfe25 Upgrade to Jetty 9.4.49.v20220914
Closes gh-32441
2022-09-20 14:06:08 -07:00
Phillip Webb 634799f887 Upgrade to Groovy 3.0.13
Closes gh-32440
2022-09-20 14:06:06 -07:00
Stephane Nicoll 4e82a69a0b Start building against Spring GraphQL 1.0.2 snapshots
See gh-32426
2022-09-20 03:36:08 +02:00
Stephane Nicoll 707ebfb2d8 Merge branch '2.6.x' into 2.7.x 2022-09-20 03:30:59 +02:00
Stephane Nicoll e616fb5d8b Upgrade to Spring Kafka 2.8.9
Closes gh-32277
2022-09-20 03:30:50 +02:00
Stephane Nicoll cddfa4b58c Upgrade to Spring AMQP 2.4.7
Closes gh-32276
2022-09-20 03:30:23 +02:00
Stephane Nicoll 6c37838f31 Upgrade to Spring Kafka 2.8.9
Closes gh-32270
2022-09-20 03:29:41 +02:00
Stephane Nicoll 033b6b5dbe Upgrade to Spring AMQP 2.4.7
Closes gh-32269
2022-09-20 03:29:16 +02:00
Stephane Nicoll 1132f983a9 Merge branch '2.6.x' into 2.7.x 2022-09-19 17:57:27 +02:00
Stephane Nicoll 85d73a1f62 Upgrade to Spring Data 2021.2.3
Closes gh-32275
2022-09-19 17:57:17 +02:00
Stephane Nicoll d72e0b39fc Upgrade to Spring Data 2021.1.7
Closes gh-32268
2022-09-19 17:56:19 +02:00
Stephane Nicoll 308e3535bd Merge branch '2.6.x' into 2.7.x
Closes gh-32417
2022-09-19 07:55:45 +02:00
Stephane Nicoll d2ad0b7f91 Merge pull request #32405 from jprinet
* pr/32405:
  Upgrade to Gradle Enterprise plugin 3.11.1

Closes gh-32405
2022-09-19 07:55:36 +02:00
Jerome Prinet 173b70c377 Upgrade to Gradle Enterprise plugin 3.11.1
See gh-32405
2022-09-19 07:51:55 +02:00
Scott Frederick 8d0ca4e640 Merge branch '2.6.x' into 2.7.x
Closes gh-32410
2022-09-16 15:27:17 -05:00
Scott Frederick 057ad72945 Enable Paketo builder system tests on Java 18
Closes gh-32296
2022-09-16 15:26:56 -05:00
Andy Wilkinson a800f7d77c Merge branch '2.6.x' into 2.7.x
Closes gh-32406
2022-09-16 17:03:13 +01:00
Andy Wilkinson 61e11cd361 Ensure that TCCL is clean when DataSource is accessed
Previously, when using Tomcat, its web app class loader was the thread
context class loader when H2ConsoleAutoConfiguration triggered
initialization of Hikari's pool. This was the case because it's done
in the bean method of a ServletRegistrationBean. Such Servlet-related
beans are intentionally created with Tomcat's web app classloader as
the TCCL. This arrangement results in the pool's threads using
Tomcat's web app class loader as their TCCL which is not desirable.
One consequence of this was that Tomcat could log a warning at
shutdown about the thread being left running when it will, in fact,
be stopped as part of the context being closed.

This commit updates H2ConsoleAutoConfiguration to set the TCCL to its
own ClassLoader while the DataSource information is being logged.

Closes gh-32382
2022-09-16 16:24:57 +01:00
Andy Wilkinson 7827e8166e Merge branch '2.6.x' into 2.7.x
Closes gh-32402
2022-09-16 11:38:07 +01:00
Andy Wilkinson ab26050fe7 Document support for Java 19
Closes gh-32259
2022-09-16 11:37:14 +01:00
Stephane Nicoll 93601611fd Merge branch '2.6.x' into 2.7.x 2022-09-16 07:41:31 +02:00