b0d4f1d356
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41257
2024-06-27 10:16:36 +01:00
654016af7f
Move Docker-related test support into a separate module
...
See gh-41228
2024-06-26 19:47:35 +01:00
7e4d60e07f
Update spring-boot-launch-script-tests to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:21 +01:00
6564abb12a
Update spring-boot-loader-classic-tests to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:17 +01:00
edc582800b
Update spring-boot-loader-tests to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:12 +01:00
9dda006a18
Merge branch '3.2.x'
2024-06-19 22:55:00 -07:00
2a4582b084
Update copyright year of changed files
2024-06-19 22:54:40 -07:00
905d6b96d0
Merge branch '3.2.x'
...
Closes gh-41166
2024-06-19 22:30:58 -07:00
491f34d25c
Improve container test code
...
Replace `DockerImageNames` with a enum and relocate it from the
`testcontainers` to `container` package. The enum now also
becomes a common location that we can use to apply container
configuration such as timeouts.
Closes gh-41164
Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2024-06-19 20:10:03 -07:00
4517c43cc7
Remove Concourse CI configuration
...
Closes gh-40569
2024-05-22 19:20:14 +01:00
9bb981be11
Merge branch '3.2.x'
...
Closes gh-40625
2024-05-06 10:25:08 +02:00
c47cdda824
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40624
2024-05-06 09:51:39 +02:00
e8df704ebb
Extend expiry of SNI integration test certificates
...
See gh-26022 and gh-40589
2024-05-02 11:38:22 -05:00
f6b431eb4f
Merge branch '3.2.x'
2024-05-02 14:07:55 +02:00
516d3b1294
Test ANSI disabled in logging tests instead of integration tests
...
See gh-40172
2024-05-02 13:59:48 +02:00
16291b0fcf
Merge branch '3.2.x'
...
Closes gh-40609
2024-05-02 11:30:09 +02:00
713f4f2292
Polish "Fix broken AnsiOutput.detectIfAnsiCapable on JDK22"
...
See gh-40172
2024-05-02 11:27:55 +02:00
1f9b62b122
Fix broken AnsiOutput.detectIfAnsiCapable on JDK22
...
See gh-40172
2024-05-02 11:03:06 +02:00
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
f70a270ec8
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40568
2024-04-29 12:06:20 +01:00
15913441c4
Remove Concourse CI configuration
...
Closes gh-40566
2024-04-29 12:05:34 +01:00
cb9d7817ac
Merge branch '3.2.x'
...
Closes gh-40417
2024-04-19 09:25:01 +02:00
01c26ef84e
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40416
2024-04-19 09:24:35 +02:00
7b96941fb9
Update Java in SDKman and CI image to 17.0.11-librca
...
Closes gh-40414
2024-04-19 09:23:06 +02:00
ebf816f056
Make Tomcat and Undertow starters locally available to SNI test apps
...
See gh-26022
2024-04-18 11:18:07 +01:00
b705a63c8e
Make WebFlux starter locally available to SNI test apps
...
See gh-26022
2024-04-18 11:07:09 +01:00
07f82744f1
Merge branch '3.2.x'
...
Closes gh-40415
2024-04-17 16:40:46 -05:00
0724014645
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40412
2024-04-17 16:40:21 -05:00
bc5777d0cc
Upgrade CI images to ubuntu:jammy-20240405
...
Closes gh-40410
2024-04-17 16:40:09 -05:00
aefe6e8bc0
Make actuator starter locally available to SNI test apps
...
See gh-26022
2024-04-16 09:40:16 +01:00
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
736f712ba9
Merge branch '3.2.x'
...
Closes gh-39845
2024-03-13 15:21:24 -05:00
f324994065
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39846
2024-03-13 15:20:55 -05:00
c83f7017c8
Upgrade CI images to ubuntu:jammy-20240227
...
Closes gh-39844
2024-03-13 15:20:41 -05:00
2c4fb5baaa
Merge branch '3.2.x'
2024-03-04 11:21:45 +00:00
0f6b3514db
Update LoaderIntegrationTests to cover Java 22
...
See gh-39746
2024-03-04 11:21:19 +00:00
b4e8b57dac
Merge branch '3.2.x'
...
Closes gh-39656
2024-02-21 17:59:32 -06:00
428ddb710b
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39658
2024-02-21 17:59:03 -06:00
39304147a7
Upgrade CI images to ubuntu:jammy-20240212
...
Closes gh-39657
2024-02-21 17:58:39 -06:00
f8a1dae835
Merge branch '3.2.x'
2024-02-21 15:27:57 -08:00
12de6aa46a
Merge branch '3.1.x' into 3.2.x
2024-02-21 15:27:27 -08:00
7f55cae90f
Merge branch '3.2.x'
2024-02-12 10:19:46 +01:00
4387b79831
Merge branch '3.1.x' into 3.2.x
2024-02-12 10:18:46 +01:00
8ffcfc9b77
Harmonize style of igored exceptions across the codebase
2024-02-12 10:14:20 +01:00
3a87a9f29b
Merge branch '3.2.x'
...
Closes gh-39434
2024-02-07 15:44:15 -06:00
7b34a44f4d
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39433
2024-02-07 15:43:46 -06:00
d616568324
Upgrade CI images to ubuntu:jammy-20240125
...
Closes gh-39426
2024-02-07 15:43:35 -06:00
8f1a330dd5
Update copyright header of cleaned up code
...
See gh-39259
2024-01-23 10:18:50 -08:00
def7523398
Inline redundant if statements
...
See gh-39259
2024-01-23 09:07:35 -08:00
eafd48df0c
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39221
2024-01-19 17:29:24 -06:00
302087176a
Upgrade to Java 17.0.10+13
...
Closes gh-39216
2024-01-19 17:29:12 -06:00
f173416825
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39229
2024-01-17 17:35:17 -06:00
c2ca6bfaf1
Upgrade RedHat UBI to 9.3-1476
...
Closes gh-39228
2024-01-17 17:34:55 -06:00
c0a820bc57
Merge branch '3.1.x' into 3.2.x
2024-01-17 17:18:14 -06:00
35b45450f8
Upgrade test images to ubuntu:jammy-20240111
...
See gh-39217
2024-01-17 17:18:01 -06:00
17819c02b7
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39139
2024-01-15 19:45:20 +00:00
c8a7a04da4
Retry JDK downloads
...
Closes gh-39138
2024-01-15 19:45:06 +00:00
3222458007
Merge branch '3.1.x'
...
Closes gh-38893
2023-12-20 18:22:15 -08:00
66e9c777af
Upgrade Ubuntu version in CI images
...
Closes gh-38894
2023-12-20 18:20:09 -08:00
062b544447
Upgrade to Ubuntu Jammy 20231004
...
Closes gh-37957
2023-10-18 21:19:51 -07:00
55968ef995
Upgrade to Ubuntu Jammy 20231004
...
Closes gh-37949
2023-10-18 21:17:24 -07:00
3c62defb9d
Support java.nio.file Paths and FileSystems with nested jars
...
Add a `NestedFileSystemProvider` implementation so that the JDK's
`ZipFileSystem` can load content from nested jars and nested
directory entries.
Creating a `ZipFileSystem` may be a relatively expensive operation as
zip structures need to be parsed and in the case of directory entries
a virtual datablock nees to be generated on the fly. As such, we
install the `ZipFileSystem` as late as possible since in a typical
application it may never be needed.
This commit also tweaks Gradle and Maven plugins to ensure that the
service loader file is written to repackaged jars.
Closes gh-7161
2023-10-18 20:46:36 -07:00
33c5e1269a
Write signature files to uber jars to for Oracle Java 17 verification
...
Update Gradle and Maven plugins to write an empty `META-INF/BOOT.SF`
file whenever there is a nested signed jar.
This update allows Oracle Java 17 to correctly verify the nested JARs.
The file is required because `JarVerifier` has code roughly equivalent
to:
if (!jarManifestNameChecked && SharedSecrets
.getJavaUtilZipFileAccess().getManifestName(jf, true) == null) {
throw new JarException("The JCE Provider " + jarURL.toString() +
" is not signed.");
}
The `SharedSecrets.getJavaUtilZipFileAccess().getManifestName(jf, true)`
call ends up in `ZipFile.getManifestName(onlyIfSignatureRelatedFiles)`
which is a private method that we cannot override in our `NestedJarFile`
subclass. By writing an empty `.SF` file we ensure that the `Manifest`
is always returned because there are always "signature related files".
Fixes gh-28837
2023-10-16 16:19:16 -07:00
927ece3bfc
Merge branch '3.1.x'
2023-10-10 12:31:44 -07:00
885189a1b4
Merge branch '2.7.x' into 3.0.x
2023-10-10 12:30:11 -07:00
f04d354c29
Attempt to fix download cache on CI
...
See gh-37450
2023-10-10 11:46:20 -07:00
6c24ea01f1
Add BouncyCastle nested jar verification test including on Oracle JDK
...
Update `spring-boot-loader-tests` with a test that checks verified
BouncyCastle jars can be loaded. Currently the Oracle JDK only supports
verification if the jar is unpacked.
See gh-28837
2023-10-05 22:13:31 -07:00
79d2208908
Merge branch '3.1.x'
2023-10-05 22:10:34 -07:00
3c31a6fc3b
Merge branch '2.7.x' into 3.0.x
2023-10-05 22:10:14 -07:00
c37290bc6c
Fix Oracle JDK download URL
...
See gh-37450
2023-10-05 22:09:45 -07:00
b0b3adb1b7
Merge branch '3.1.x'
...
Closes gh-37741
2023-10-05 21:30:43 -07:00
30af19acc2
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37739
2023-10-05 20:54:09 -07:00
a33ce9d405
Cache JDK downloads for tests that use ImageFromDockerfile
...
Update `spring-boot-launch-script-tests` and `spring-boot-loader-tests`
so that JDK archives are now downloaded by Gradle and cached across
builds.
Closes gh-37450
2023-10-05 20:49:02 -07:00
55b5610dd9
Add Maven and Gradle option for the loader implementation to use
...
Add properties to the Maven and Gradle plugins so that users can
switch between the two loader modules.
See gh-37669
2023-10-03 15:40:42 -07:00
a89057b7c7
Reintroduce spring-boot-loader modules
...
Restore the `spring-boot-loader` with the previous loader code so
that we can develop it further.
See gh-37669
2023-10-03 15:40:25 -07:00
aeb6537f57
Rename spring-boot-loader to spring-boot-loader-classic
...
Rename the `spring-boot-loader` module to `spring-boot-loader-classic`
so that we can introduce an alternative loader implementation.
See gh-37669
2023-10-03 15:40:04 -07:00
c22548982a
Relocate launcher classes
...
Create alternative launcher classes under the package
`org.springframework.boot.loader.launch` and use them in favor
of the previous location.
This update is designed to improve compatibility with future
changes in the loader.
Closes gh-37667
2023-10-03 14:53:04 -07:00
3d6859e80f
Use the term "uber jar" in reference documentation and javadoc
...
Update reference documentation and javadoc to use the term "uber jar"
rather than "fat jar".
Closes gh-37653
2023-10-02 23:01:34 -07:00
780f75d5a2
Polish
2023-10-02 23:01:21 -07:00
e3036dcb99
Merge branch '3.1.x'
...
Closes gh-37658
2023-10-02 23:00:15 -07:00
7bb60fc7c7
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37656
2023-10-02 22:59:45 -07:00
ed4ab667a1
Enable LoaderIntegrationTests on aarch64
...
Closes gh-37654
2023-10-02 22:42:21 -07:00
a7373c182a
Merge branch '3.1.x'
...
Closes gh-37523
2023-09-22 08:42:18 +02:00
58941d85f2
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37521
2023-09-22 08:41:58 +02:00
f96690348f
Use Bellsoft JDK 21 in LoaderIntegrationTests
...
Closes gh-35900
2023-09-22 08:35:22 +02:00
3eb89343d0
Merge branch '2.7.x' into 3.0.x
2023-09-13 13:37:31 +01:00
c4368bc934
Run LoaderIntegrationTests on Java 21
...
See gh-37359
2023-09-13 13:36:04 +01:00
a84e2db285
Merge branch '3.1.x'
2023-09-08 11:47:42 +01:00
b29b35905c
Merge branch '2.7.x' into 3.0.x
2023-09-08 11:45:46 +01:00
2656f02001
Fix launch script integration tests on Intel Macs
...
Closes gh-36799
2023-09-08 11:45:25 +01:00
ed5d16de84
Upgrade to Jetty 12
...
Closes gh-36073
2023-09-07 13:59:15 +01:00
e532b3b830
Merge branch '3.1.x'
...
Closes gh-37141
2023-08-30 14:16:32 +02:00
c749fcb478
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37139
2023-08-30 14:15:27 +02:00
0f6342a882
Make JarLaunchScript and SysVinit integration tests ARM64 compatible
...
Closes gh-36799
2023-08-30 14:01:32 +02:00
bc88a133d3
Merge branch '3.1.x'
...
Closes gh-36869
2023-08-09 13:44:14 +01:00
1b7467adc3
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36867
2023-08-09 13:43:51 +01:00
1765f4e9cf
Ensure that server tests run when test apps have changed
...
Closes gh-19858
2023-08-09 13:43:24 +01:00
c600be74ff
Merge branch '3.1.x'
...
Closes gh-36542
2023-07-24 16:06:13 -05:00
c5d2415834
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36540
2023-07-24 16:04:28 -05:00
90be62bc7a
Update Docker images used for launch script tests
...
Closes gh-24349
2023-07-24 15:46:30 -05:00
Andy Wilkinson
Phillip Webb
Moritz Halbritter
Scott Frederick
facewise
Tobias Lippert
Phillip Webb
Moritz Halbritter
Andy Wilkinson
Scott Frederick