Commit Graph

416 Commits

Author SHA1 Message Date
Moritz Halbritter
9bb981be11 Merge branch '3.2.x'
Closes gh-40625
2024-05-06 10:25:08 +02:00
Moritz Halbritter
c47cdda824 Merge branch '3.1.x' into 3.2.x
Closes gh-40624
2024-05-06 09:51:39 +02:00
Scott Frederick
e8df704ebb Extend expiry of SNI integration test certificates
See gh-26022 and gh-40589
2024-05-02 11:38:22 -05:00
Moritz Halbritter
f6b431eb4f Merge branch '3.2.x' 2024-05-02 14:07:55 +02:00
Moritz Halbritter
516d3b1294 Test ANSI disabled in logging tests instead of integration tests
See gh-40172
2024-05-02 13:59:48 +02:00
Moritz Halbritter
16291b0fcf Merge branch '3.2.x'
Closes gh-40609
2024-05-02 11:30:09 +02:00
Moritz Halbritter
713f4f2292 Polish "Fix broken AnsiOutput.detectIfAnsiCapable on JDK22"
See gh-40172
2024-05-02 11:27:55 +02:00
facewise
1f9b62b122 Fix broken AnsiOutput.detectIfAnsiCapable on JDK22
See gh-40172
2024-05-02 11:03:06 +02:00
Andy Wilkinson
34e62bb4e2 Reinstate permissive alias check
Without the permissive check, unusually named static resources are
inaccessible. The need for this may be due to a Jetty bug. This change
restores the tests to their previous form for now.

See gh-40568
2024-04-29 12:50:42 +01:00
Andy Wilkinson
f70a270ec8 Merge branch '3.1.x' into 3.2.x
Closes gh-40568
2024-04-29 12:06:20 +01:00
Andy Wilkinson
15913441c4 Remove Concourse CI configuration
Closes gh-40566
2024-04-29 12:05:34 +01:00
Moritz Halbritter
cb9d7817ac Merge branch '3.2.x'
Closes gh-40417
2024-04-19 09:25:01 +02:00
Moritz Halbritter
01c26ef84e Merge branch '3.1.x' into 3.2.x
Closes gh-40416
2024-04-19 09:24:35 +02:00
Moritz Halbritter
7b96941fb9 Update Java in SDKman and CI image to 17.0.11-librca
Closes gh-40414
2024-04-19 09:23:06 +02:00
Andy Wilkinson
ebf816f056 Make Tomcat and Undertow starters locally available to SNI test apps
See gh-26022
2024-04-18 11:18:07 +01:00
Andy Wilkinson
b705a63c8e Make WebFlux starter locally available to SNI test apps
See gh-26022
2024-04-18 11:07:09 +01:00
Scott Frederick
07f82744f1 Merge branch '3.2.x'
Closes gh-40415
2024-04-17 16:40:46 -05:00
Scott Frederick
0724014645 Merge branch '3.1.x' into 3.2.x
Closes gh-40412
2024-04-17 16:40:21 -05:00
Scott Frederick
bc5777d0cc Upgrade CI images to ubuntu:jammy-20240405
Closes gh-40410
2024-04-17 16:40:09 -05:00
Andy Wilkinson
aefe6e8bc0 Make actuator starter locally available to SNI test apps
See gh-26022
2024-04-16 09:40:16 +01:00
Scott Frederick
ad79c373f8 Add SNI support to web server SSL auto-configuration
Properties under `server.ssl.server-name-bundles` and
`management.server.ssl.server-name-bundles` can be used to configure
mappings of host names to SSL bundles to support SNI in embedded web
servers.

Closes gh-26022
2024-03-28 14:12:20 -05:00
Scott Frederick
736f712ba9 Merge branch '3.2.x'
Closes gh-39845
2024-03-13 15:21:24 -05:00
Scott Frederick
f324994065 Merge branch '3.1.x' into 3.2.x
Closes gh-39846
2024-03-13 15:20:55 -05:00
Scott Frederick
c83f7017c8 Upgrade CI images to ubuntu:jammy-20240227
Closes gh-39844
2024-03-13 15:20:41 -05:00
Andy Wilkinson
2c4fb5baaa Merge branch '3.2.x' 2024-03-04 11:21:45 +00:00
Andy Wilkinson
0f6b3514db Update LoaderIntegrationTests to cover Java 22
See gh-39746
2024-03-04 11:21:19 +00:00
Scott Frederick
b4e8b57dac Merge branch '3.2.x'
Closes gh-39656
2024-02-21 17:59:32 -06:00
Scott Frederick
428ddb710b Merge branch '3.1.x' into 3.2.x
Closes gh-39658
2024-02-21 17:59:03 -06:00
Scott Frederick
39304147a7 Upgrade CI images to ubuntu:jammy-20240212
Closes gh-39657
2024-02-21 17:58:39 -06:00
Phillip Webb
f8a1dae835 Merge branch '3.2.x' 2024-02-21 15:27:57 -08:00
Phillip Webb
12de6aa46a Merge branch '3.1.x' into 3.2.x 2024-02-21 15:27:27 -08:00
Moritz Halbritter
7f55cae90f Merge branch '3.2.x' 2024-02-12 10:19:46 +01:00
Moritz Halbritter
4387b79831 Merge branch '3.1.x' into 3.2.x 2024-02-12 10:18:46 +01:00
Moritz Halbritter
8ffcfc9b77 Harmonize style of igored exceptions across the codebase 2024-02-12 10:14:20 +01:00
Scott Frederick
3a87a9f29b Merge branch '3.2.x'
Closes gh-39434
2024-02-07 15:44:15 -06:00
Scott Frederick
7b34a44f4d Merge branch '3.1.x' into 3.2.x
Closes gh-39433
2024-02-07 15:43:46 -06:00
Scott Frederick
d616568324 Upgrade CI images to ubuntu:jammy-20240125
Closes gh-39426
2024-02-07 15:43:35 -06:00
Phillip Webb
8f1a330dd5 Update copyright header of cleaned up code
See gh-39259
2024-01-23 10:18:50 -08:00
Tobias Lippert
def7523398 Inline redundant if statements
See gh-39259
2024-01-23 09:07:35 -08:00
Scott Frederick
eafd48df0c Merge branch '3.1.x' into 3.2.x
Closes gh-39221
2024-01-19 17:29:24 -06:00
Scott Frederick
302087176a Upgrade to Java 17.0.10+13
Closes gh-39216
2024-01-19 17:29:12 -06:00
Scott Frederick
f173416825 Merge branch '3.1.x' into 3.2.x
Closes gh-39229
2024-01-17 17:35:17 -06:00
Scott Frederick
c2ca6bfaf1 Upgrade RedHat UBI to 9.3-1476
Closes gh-39228
2024-01-17 17:34:55 -06:00
Scott Frederick
c0a820bc57 Merge branch '3.1.x' into 3.2.x 2024-01-17 17:18:14 -06:00
Scott Frederick
35b45450f8 Upgrade test images to ubuntu:jammy-20240111
See gh-39217
2024-01-17 17:18:01 -06:00
Andy Wilkinson
17819c02b7 Merge branch '3.1.x' into 3.2.x
Closes gh-39139
2024-01-15 19:45:20 +00:00
Andy Wilkinson
c8a7a04da4 Retry JDK downloads
Closes gh-39138
2024-01-15 19:45:06 +00:00
Phillip Webb
3222458007 Merge branch '3.1.x'
Closes gh-38893
2023-12-20 18:22:15 -08:00
Phillip Webb
66e9c777af Upgrade Ubuntu version in CI images
Closes gh-38894
2023-12-20 18:20:09 -08:00
Phillip Webb
062b544447 Upgrade to Ubuntu Jammy 20231004
Closes gh-37957
2023-10-18 21:19:51 -07:00