Commit Graph

34134 Commits

Author SHA1 Message Date
Andy Wilkinson
6a6d3d224a Merge branch '2.5.x'
Closes gh-28118
2021-09-23 13:19:12 +01:00
Andy Wilkinson
4e5da6a6ed Merge branch '2.4.x' into 2.5.x
Closes gh-28117
2021-09-23 13:18:50 +01:00
Andy Wilkinson
46b47b80aa Upgrade to NoHTTP 0.0.10
Closes gh-28112
2021-09-23 13:18:41 +01:00
Andy Wilkinson
ea2548793a Merge branch '2.5.x'
Closes gh-28116
2021-09-23 11:38:11 +01:00
Andy Wilkinson
84d332e527 Merge branch '2.4.x' into 2.5.x
Closes gh-28115
2021-09-23 11:26:37 +01:00
Andy Wilkinson
b18a56f451 Upgrade CI to github-release resource 1.5.5
Closes gh-28114
2021-09-23 11:26:30 +01:00
Andy Wilkinson
ec08a6c733 Merge branch '2.4.x' into 2.5.x 2021-09-23 11:22:51 +01:00
Spring Builds
21aea2f752 Next development version (v2.5.6-SNAPSHOT) 2021-09-23 07:43:12 +00:00
Spring Builds
ea92fced9f Next development version (v2.4.12-SNAPSHOT) 2021-09-23 05:55:14 +00:00
Stephane Nicoll
6f07416222 Merge branch '2.5.x' 2021-09-23 07:40:58 +02:00
Stephane Nicoll
ca4e1c6393 Upgrade to SendGrid 4.7.5
Closes gh-28111
2021-09-23 07:40:49 +02:00
Stephane Nicoll
573f6a1fe8 Upgrade to Byte Buddy 1.11.18
Closes gh-28110
2021-09-23 07:40:48 +02:00
Stephane Nicoll
4652bb7adf Upgrade to SendGrid 4.7.5
Closes gh-28109
2021-09-23 07:34:55 +02:00
Stephane Nicoll
6ba3af1454 Upgrade to JUnit Jupiter 5.8.1
Closes gh-28052
2021-09-23 06:48:03 +02:00
Andy Wilkinson
342c749784 Polish 2021-09-22 20:28:31 +01:00
Andy Wilkinson
4fa61cbc60 Merge branch '2.5.x' 2021-09-22 18:37:11 +01:00
Andy Wilkinson
2ba593328f Order detector for AbstractDataSourceInitializers
Previously, the detector for AbstractDataSourceInitializers used the
default detector order. This resulted in the initializers detected
initializers running before Flyway. Constrastingly, the detector for
DataSourceScriptDatabaseInitializers uses a custom order so its
detected initializers would run after Flyway.

This commit aligns the order of the detector for
AbstractDataSourceInitializers with the order of the detector for
DataSourceScriptDatabaseInitializers. This ensures that script-based
initialization runs in the same order with respect to Flyway,
irrespective of which initializer implementation is driving it.

Fixes gh-28079
2021-09-22 18:30:44 +01:00
Stephane Nicoll
3e21ae12dc Merge branch '2.5.x' 2021-09-22 12:47:10 +02:00
Stephane Nicoll
162697d683 Upgrade Java 17 version in CI image
Closes gh-28106
2021-09-22 12:46:53 +02:00
Stephane Nicoll
90a5e34ba5 Upgrade Java 17 version in CI image
Closes gh-28105
2021-09-22 12:45:30 +02:00
Stephane Nicoll
34fbf854e0 Merge branch '2.5.x'
Closes gh-28104
2021-09-22 12:41:39 +02:00
Stephane Nicoll
2f8371cb67 Merge pull request #28102 from dreis2211
* pr/28102:
  Detect JDK 17 GA builds

Closes gh-28102
2021-09-22 12:41:31 +02:00
dreis2211
2546c28960 Detect JDK 17 GA builds
See gh-28102
2021-09-22 12:41:17 +02:00
Stephane Nicoll
8b828a49d5 Merge pull request #27891 from weixsun
* pr/27891:
  Polish "Clarify pooling is implicitly enabled in Sentinel mode"
  Clarify pooling is implicitly enabled in Sentinel mode

Closes gh-27891
2021-09-22 11:54:47 +02:00
Stephane Nicoll
233b63199c Polish "Clarify pooling is implicitly enabled in Sentinel mode"
See gh-27891
2021-09-22 11:52:46 +02:00
weixsun
d39b7cc46d Clarify pooling is implicitly enabled in Sentinel mode
See gh-27891
2021-09-22 11:48:36 +02:00
Stephane Nicoll
842f3f0bd5 Merge branch '2.5.x'
Closes gh-28099
2021-09-22 09:14:09 +02:00
Stephane Nicoll
77b778ce95 Document support for Java 17
Closes gh-26767
2021-09-22 08:58:29 +02:00
Stephane Nicoll
6ac9887652 Upgrade to SQLite JDBC 3.36.0.3
Closes gh-28098
2021-09-22 08:48:24 +02:00
Stephane Nicoll
54f48383b5 Upgrade to Selenium HtmlUnit 2.53.0
Closes gh-28097
2021-09-22 08:48:23 +02:00
Stephane Nicoll
a7a545cefb Upgrade to Kotlin 1.5.31
Closes gh-28096
2021-09-22 08:48:22 +02:00
Stephane Nicoll
592ed9d06b Upgrade to Kafka 2.8.1
Closes gh-28095
2021-09-22 08:48:20 +02:00
Stephane Nicoll
5548aae440 Upgrade to jOOQ 3.14.15
Closes gh-28094
2021-09-22 08:48:19 +02:00
Stephane Nicoll
52822bbc4f Upgrade to Jolokia 1.7.1
Closes gh-28093
2021-09-22 08:48:17 +02:00
Stephane Nicoll
b864986712 Upgrade to HtmlUnit 2.53.0
Closes gh-28092
2021-09-22 08:48:16 +02:00
Stephane Nicoll
5d022df33a Upgrade to Byte Buddy 1.11.16
Closes gh-28091
2021-09-22 08:48:15 +02:00
Stephane Nicoll
a7bc36035d Upgrade to AssertJ 3.21.0
Closes gh-28090
2021-09-22 08:48:13 +02:00
Stephane Nicoll
f4d97c1d92 Merge branch '2.5.x' 2021-09-22 08:42:31 +02:00
Stephane Nicoll
b8fa2a9fdb Merge branch '2.4.x' into 2.5.x 2021-09-22 08:42:20 +02:00
Stephane Nicoll
1e3803e6ae Upgrade to Kotlin 1.5.31
Closes gh-28089
2021-09-22 08:31:06 +02:00
Stephane Nicoll
01809eccf3 Upgrade to jOOQ 3.14.15
Closes gh-28088
2021-09-22 08:31:04 +02:00
Stephane Nicoll
7a04966d5c Upgrade to jOOQ 3.14.15
Closes gh-28087
2021-09-22 08:29:24 +02:00
Madhura Bhave
ef2a5daa59 Polish 2021-09-21 16:56:47 -07:00
Phillip Webb
bc6b9be7cd Merge branch '2.5.x'
Closes gh-28084
2021-09-21 15:54:54 -07:00
Phillip Webb
8c3db23be3 Merge branch '2.4.x' into 2.5.x
Closes gh-28083
2021-09-21 15:53:37 -07:00
Phillip Webb
4674f07c5b Merge pull request #28071 from cdalexndr
* pr/28071:
  Document that devtools restart doesn't work with AspectJ weaving

Closes gh-28071
2021-09-21 15:52:31 -07:00
cdalexndr
798b282e58 Document that devtools restart doesn't work with AspectJ weaving
See gh-28071
2021-09-21 15:51:36 -07:00
Phillip Webb
61a84a4722 Polish asciidoctor links
Update `<<..>>` links to include the page.
2021-09-21 15:44:53 -07:00
Phillip Webb
143b820202 Merge pull request #28078 from dreis2211
* pr/28078:
  Fix link in caching docs

Closes gh-28078
2021-09-21 15:32:43 -07:00
dreis2211
3e831fe286 Fix link in caching docs
See gh-28078
2021-09-21 15:32:06 -07:00