Commit Graph

33172 Commits

Author SHA1 Message Date
Andy Wilkinson
580b1b81ab Fix HTTP/2 over TLS with Jetty 10
Fixes gh-26988
2021-06-21 12:06:10 +01:00
Stephane Nicoll
d9a4d46908 Merge branch '2.5.x' 2021-06-21 09:53:32 +02:00
Stephane Nicoll
2c2ebfce1b Merge branch '2.4.x' into 2.5.x 2021-06-21 09:53:21 +02:00
Stephane Nicoll
66bf0866da Upgrade to Tomcat 9.0.48
Closes gh-26987
2021-06-21 08:46:28 +02:00
Stephane Nicoll
1374491305 Upgrade to SLF4J 1.7.31
Closes gh-26986
2021-06-21 08:46:27 +02:00
Stephane Nicoll
799f6b0bdd Upgrade to Postgresql 42.2.22
Closes gh-26985
2021-06-21 08:46:26 +02:00
Stephane Nicoll
c9a787c7ac Upgrade to Jetty EL 8.5.68
Closes gh-26984
2021-06-21 08:46:25 +02:00
Stephane Nicoll
ce24270271 Upgrade to Dropwizard Metrics 4.1.23
Closes gh-26983
2021-06-21 08:46:24 +02:00
Stephane Nicoll
abefd9d6d0 Merge branch '2.5.x' 2021-06-19 16:31:02 +02:00
Stephane Nicoll
485ce39610 Merge branch '2.4.x' into 2.5.x 2021-06-19 16:30:41 +02:00
Stephane Nicoll
cc6c53f040 Start building against Spring Integration 5.4.8 snapshots
See gh-26967
2021-06-18 18:22:42 +02:00
Stephane Nicoll
9477231c51 Start building against Spring AMQP 2.3.9 snapshots
See gh-26966
2021-06-18 18:21:36 +02:00
Stephane Nicoll
fa37fb0a69 Start building against Spring Security 5.4.7 snapshots
See gh-26965
2021-06-18 18:21:08 +02:00
Stephane Nicoll
2f30449d11 Start building against Spring Session 2020.0.5 snapshots
See gh-26964
2021-06-18 18:20:41 +02:00
Stephane Nicoll
b462feaa58 Start building against Spring Data 2020.0.10 snapshots
See gh-26963
2021-06-18 18:20:02 +02:00
Stephane Nicoll
22c4c6ea80 Start building against Reactor 2020.0.8 snapshots
See gh-26962
2021-06-18 18:19:01 +02:00
Stephane Nicoll
63fe89f641 Merge branch '2.5.x'
Closes gh-26957
2021-06-18 08:29:36 +02:00
Stephane Nicoll
28fce01b52 Merge pull request #26955 from quaff
* pr/26955:
  Add missing space for asciidoc ordered list

Closes gh-26955
2021-06-18 08:29:22 +02:00
Yanming Zhou
12a6e4c231 Add missing space for asciidoc ordered list
See gh-26955
2021-06-18 08:27:45 +02:00
Scott Frederick
fffe2e4f97 Include caller info in NoSuchMethodError failure analysis
Fixes gh-26895
2021-06-17 13:46:51 -05:00
Andy Wilkinson
b1c04e91d7 Merge branch '2.5.x'
Closes gh-26951
2021-06-17 19:43:57 +01:00
Andy Wilkinson
5d20edc666 Allow BFPP to modify database initialization ordering
Fixes gh-26899
2021-06-17 18:08:39 +01:00
Andy Wilkinson
897a7196c0 Merge branch '2.5.x'
Closes gh-26948
2021-06-17 17:28:07 +01:00
Andy Wilkinson
a2772e288a Merge branch '2.4.x' into 2.5.x
Closes gh-26947
2021-06-17 17:27:56 +01:00
Andy Wilkinson
cd808d2f18 Only get Kotlin plugin's version once we know we need it
Fixes gh-26946
2021-06-17 17:27:03 +01:00
Andy Wilkinson
69b730521a Merge branch '2.5.x'
See gh-26936
2021-06-17 11:55:26 +01:00
Andy Wilkinson
566a642ce7 Merge branch '2.4.x' into 2.5.x
See gh-26935
2021-06-17 11:54:54 +01:00
Andy Wilkinson
204dd29c51 Fix test on Windows
See gh-26821
2021-06-17 11:54:24 +01:00
Andy Wilkinson
2d44119894 Merge branch '2.5.x'
Closes gh-26943
2021-06-17 11:43:15 +01:00
Andy Wilkinson
7ee3b287e1 Catch isEmbedded failure and treat database as not embedded
Fixes gh-26926
2021-06-17 11:42:26 +01:00
Andy Wilkinson
fb8f7afce5 Merge branch '2.5.x'
Closes gh-26942
2021-06-17 11:24:28 +01:00
Andy Wilkinson
7cd2d6474c Only check database's type when there are scripts to apply
Fixes gh-26925
2021-06-17 09:55:33 +01:00
Phillip Webb
ad8ce2aa05 Merge branch '2.5.x' 2021-06-16 23:43:14 -07:00
Phillip Webb
5c65b1bcde Fix asciidoctor anchor references
See gh-26939
2021-06-16 23:42:29 -07:00
Phillip Webb
7bd6611e4c Merge branch '2.5.x'
Closes gh-26940
2021-06-16 22:43:52 -07:00
Phillip Webb
c3b873c11d Merge branch '2.4.x' into 2.5.x
Closes gh-26939
2021-06-16 22:43:13 -07:00
Phillip Webb
b5c92d5174 Allow indirect standard profile-specific imports
Effectively revert commit d1b256a169 so that profile-specific imports
can again be used with or without a parent import.

Fixes gh-26858
2021-06-16 22:30:29 -07:00
Scott Frederick
256a523e84 Merge branch '2.5.x'
Closes gh-26936
2021-06-16 16:00:09 -05:00
Scott Frederick
79f47b150a Merge branch '2.4.x' into 2.5.x
Closes gh-26935
2021-06-16 15:59:38 -05:00
Scott Frederick
5147fcacdf Improve BeanNotOfRequiredTypeFailureAnalyzer output
This commit modifies the output of BeanNotOfRequiredTypeFailureAnalyzer
to include type information for both the actual and the required types
and to remove ambiguity.

Fixes gh-26821
2021-06-16 14:44:11 -05:00
Andy Wilkinson
06778abb61 Merge branch '2.5.x'
See gh-26934
2021-06-16 20:37:21 +01:00
Andy Wilkinson
577c58b798 Merge branch '2.4.x' into 2.5.x
See gh-26933
2021-06-16 20:35:56 +01:00
Andy Wilkinson
ac8c6a6fb7 Tune config of source and target compatilility with toolchain
See gh-26932
2021-06-16 20:33:17 +01:00
Andy Wilkinson
81a2273856 Merge branch '2.5.x'
See gh-26929
2021-06-16 20:27:59 +01:00
Andy Wilkinson
4bf329e266 Correct directory names in Jetty 10 smoke tests
See gh-26847
2021-06-16 19:59:50 +01:00
Andy Wilkinson
2106114f64 Merge branch '2.5.x'
Closes gh-26934
2021-06-16 19:57:00 +01:00
Andy Wilkinson
560d272db3 Merge branch '2.4.x' into 2.5.x
Closes gh-26933
2021-06-16 19:56:41 +01:00
Andy Wilkinson
6e43dd879b Allow Eclipse to properly detect source and target compatibility
Previously, our conventions configured the source and target
compatibility on the project's JavaCompile tasks. This causes the
settings to be missed when importing the projects into Eclipse [1].

This commit updates the conventions to set the source and target
compatibility on the project-wide JavaPluginExtension. This allows
the Eclipse import to correctly detect and honour the settings.

Closes gh-26932

[1] https://github.com/eclipse/buildship/issues/978
2021-06-16 19:56:20 +01:00
Andy Wilkinson
76ac18f282 Merge branch '2.5.x'
Closes gh-26929
2021-06-16 13:06:44 +01:00
Andy Wilkinson
bc7004d9c6 Fix WebSocket support with Jetty 10.0.x
Fixes gh-26847
2021-06-16 12:38:33 +01:00