Commit Graph

1106 Commits

Author SHA1 Message Date
Andy Wilkinson
592571c16e Merge branch '3.2.x'
Closes gh-40528
2024-04-26 09:34:00 +01:00
Andy Wilkinson
087e467387 Merge branch '3.1.x' into 3.2.x
Closes gh-40527
2024-04-26 09:33:12 +01:00
Andy Wilkinson
83f692237d Migrate to com.gradle.develocity plugin
Closes gh-40153
2024-04-26 09:30:48 +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
Phillip Webb
6963bd884b Merge branch '3.2.x' 2024-04-18 12:53:26 -07: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
Brian Clozel
647a5ec6be Deprecate framework-specific @*Endpoint annotations
Prior to this commit, applications could declare Actuator Endpoints
using web framework-specific annotations, such as `@ServletEndpoint`,
@ControllerEndpoint and @RestControllerEndpoint.

Such annotations are closely tied to the programming model of specific
web technologies, such as Servlet or Spring MVC. Unlike other
`@Endpoint` support, they are not portable and will not work
transparently over blocking/reactive and transports.

Because of the strong adherence of this support with the underlying
infrastructure, it makes it impossible to evolve the implementation of
Actuator support without breaking this use case. The reference
documentation has been advocating for using `@Endpoint` and
`@*Operation` for custom endpoints for a long time now.

This commit deprecates this specific support in favor of the recommended
approach.

Closes gh-31768
2024-04-15 18:58:52 +02:00
Phillip Webb
3ed77ae5f3 Polish 2024-04-04 23:45:21 -07: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
Andy Wilkinson
270f9d5913 Add Flway's PostgreSQL module to R2DBC and Flyway smoke test
See gh-40022
2024-03-19 13:10:49 +00:00
Andy Wilkinson
c2adcd7be8 Upgrade to Infinispan 15.0.0.Final
Closes gh-40017
2024-03-19 10:21:50 +00: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
ff182d8480 Merge branch '3.2.x'
Closes gh-39772
2024-02-27 13:29:32 -06:00
Scott Frederick
83efe763f3 Merge branch '3.1.x' into 3.2.x
Closes gh-39771
2024-02-27 13:29:23 -06:00
Christoph Dreis
3d47c949a6 Remove obsolete JDK 9 check in spring-boot-smoke-test-jersey
See gh-39750
2024-02-27 13:28:02 -06: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
Phillip Webb
2c4909a89a Update copyright year of changed files 2024-02-21 13:58:53 -08:00
Moritz Halbritter
b449acf4ca Merge branch '3.2.x'
Closes gh-39595
2024-02-16 09:20:37 +01:00
Moritz Halbritter
ceae967c58 Merge branch '3.1.x' into 3.2.x
Closes gh-39594
2024-02-16 09:20:27 +01:00
gdmrw
3befeb2d7e Add smoke test for InfoContributor
See gh-39544
2024-02-16 09:12:04 +01: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
Eddú Meléndez
f3e7325064 Add service connection for Docker Compose and Testcontainers ActiveMQ
See gh-39363
2024-02-02 09:05:37 +01:00
Phillip Webb
8f1a330dd5 Update copyright header of cleaned up code
See gh-39259
2024-01-23 10:18:50 -08:00
Tobias Lippert
0613034e19 Replace multiple ifs with switch
See gh-39259
2024-01-23 10:18:49 -08:00
Tobias Lippert
74a7fbea9d Remove redundant boxing
See gh-39259
2024-01-23 10:18:49 -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
Andy Wilkinson
7087897507 Merge branch '3.1.x' into 3.2.x
Closes gh-39091
2024-01-11 10:33:57 +00:00
Andy Wilkinson
45c32854a5 Fix Checkstyle upgrade
Closes gh-38746
2024-01-10 15:37:38 +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
5354ad15b3 Merge branch '3.1.x'
Closes gh-38877
2023-12-19 22:51:48 -08:00
Yanming Zhou
8599e5a986 Remove unnecessary toString() calls
See gh-38739
2023-12-19 22:38:34 -08:00
Brian Clozel
29016ef3d2 Fix authorization server smoke test
Change from spring-projects/spring-authorization-server#1468

See gh-38678
2023-12-19 12:28:25 +01:00
Brian Clozel
c4150dff09 Fix authorization server smoke test
Change from spring-projects/spring-authorization-server#1468

See gh-38696
2023-12-19 11:32:19 +01:00
Phillip Webb
65af35c1ac Revert "Temporarily disable failing test"
This reverts commit bb37a868b3.

Closes gh-38659
2023-12-15 07:42:00 -08:00
Phillip Webb
bb37a868b3 Temporarily disable failing test
See gh-gh-38822
2023-12-14 20:33:28 -08:00
Moritz Halbritter
169070ea1b Merge branch '3.1.x' 2023-11-30 11:00:56 +01:00
Moritz Halbritter
f509c90c46 Try to fix flakiness of Jetty smoke test 2023-11-30 10:57:00 +01:00
Andy Wilkinson
ef67838f14 Merge branch '3.1.x'
Closes gh-38376
2023-11-16 14:40:39 +00:00
Andy Wilkinson
4a38d032af Restore use of avg in JPA smoke test
Closes gh-34895
2023-11-16 14:40:13 +00:00
Scott Frederick
586bb26eff Polish "Use KafkaContainer in smoke test for Kafka with SSL"
See gh-38359
2023-11-15 15:25:58 -06:00
Eddú Meléndez
51f13404a5 Use KafkaContainer in smoke test for Kafka with SSL
See gh-38359
2023-11-15 15:25:58 -06:00
Phillip Webb
0ef87f5102 Merge branch '3.1.x' 2023-11-13 10:42:56 -08:00
Claudio Nave
61aecdedd6 Remove Liquibase javax.activation excludes
Liquibse no longer declares a dependency on `javax.activation`
(see https://github.com/liquibase/liquibase/issues/4487) so we
can now remove our exclusions.

See gh-38274
2023-11-09 11:44:31 -08:00
Scott Frederick
759d096867 Disable Kafka SSL smoke test when Docker is not available
See gh-38260
2023-11-08 13:18:12 -06:00
Scott Frederick
f22c1ba7d6 Add smoke test for Kafka with SSL
Closes gh-38260
2023-11-07 11:21:20 -06:00
Moritz Halbritter
0621288544 Merge branch '3.1.x'
Closes gh-38224
2023-11-06 09:02:03 +01:00
Moritz Halbritter
9cbc686499 Merge branch '3.0.x' into 3.1.x
Closes gh-38223
2023-11-06 09:01:56 +01:00
Moritz Halbritter
a006b26437 Merge branch '2.7.x' into 3.0.x
Closes gh-38222
2023-11-06 09:01:46 +01:00
Christoph Dreis
3f7ece5418 Remove obsolete spring-boot-deployment-tests directory
See gh-38207
2023-11-06 09:00:39 +01:00
Phillip Webb
d638bbb0ba Merge branch '3.1.x'
Closes gh-37967
2023-10-19 21:25:44 -07:00
Phillip Webb
1d456e09d2 Merge branch '3.0.x' into 3.1.x
Closes gh-37966
2023-10-19 21:12:52 -07:00
Phillip Webb
a0b999c8b4 Merge branch '2.7.x' into 3.0.x
Closes gh-37965
2023-10-19 20:55:51 -07:00
Phillip Webb
abdad1cabe Constently use assertThatExceptionOf... assertions
Closes gh-37964
2023-10-19 20:17:26 -07:00
Phillip Webb
062b544447 Upgrade to Ubuntu Jammy 20231004
Closes gh-37957
2023-10-18 21:19:51 -07:00
Phillip Webb
55968ef995 Upgrade to Ubuntu Jammy 20231004
Closes gh-37949
2023-10-18 21:17:24 -07:00
Phillip Webb
812023a84b Upgrade to Ubuntu Jammy 20231004
Closes gh-37952
2023-10-18 21:13:42 -07:00
Phillip Webb
c7d6fbcb3a Upgrade to Ubuntu Jammy 20231004
See gh-37954
2023-10-18 21:10:00 -07:00
Phillip Webb
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
Phillip Webb
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
Scott Frederick
5556739c8c Add SSL bundle support to Rabbit auto-configuration 2023-10-11 15:39:51 -05:00
Phillip Webb
927ece3bfc Merge branch '3.1.x' 2023-10-10 12:31:44 -07:00
Phillip Webb
01128465ff Merge branch '3.0.x' into 3.1.x 2023-10-10 12:31:28 -07:00
Phillip Webb
885189a1b4 Merge branch '2.7.x' into 3.0.x 2023-10-10 12:30:11 -07:00
Phillip Webb
f04d354c29 Attempt to fix download cache on CI
See gh-37450
2023-10-10 11:46:20 -07:00
Andy Wilkinson
48059417b5 Upgrade to Kafka 3.6.0
Closes gh-37777
2023-10-09 13:46:52 +01:00
Phillip Webb
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
Phillip Webb
79d2208908 Merge branch '3.1.x' 2023-10-05 22:10:34 -07:00
Phillip Webb
1b1c1f1b64 Merge branch '3.0.x' into 3.1.x 2023-10-05 22:10:22 -07:00
Phillip Webb
3c31a6fc3b Merge branch '2.7.x' into 3.0.x 2023-10-05 22:10:14 -07:00
Phillip Webb
c37290bc6c Fix Oracle JDK download URL
See gh-37450
2023-10-05 22:09:45 -07:00
Phillip Webb
b0b3adb1b7 Merge branch '3.1.x'
Closes gh-37741
2023-10-05 21:30:43 -07:00