147240aa0c
Merge branch '3.2.x'
...
Closes gh-41080
2024-06-11 13:32:30 -07:00
bcbcafaab2
Polish "Use method references when possible in test code"
...
See gh-40974
2024-06-11 12:58:04 -07:00
207327d97c
Use method references when possible in test code
...
See gh-40974
2024-06-11 12:58:00 -07:00
b09f28d04a
Add smoke test for Prometheus
...
See gh-40904
2024-06-11 14:38:24 +02: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
e471710fe6
Renew trust material for SSL tests
...
Closes gh-40602
2024-05-02 09:37:43 +02:00
72925e7a17
Merge branch '3.2.x'
...
Closes gh-40597
2024-05-01 17:56:45 -05:00
dcf97325d7
Renew trust material for SSL tests
...
Closes gh-40589
2024-05-01 17:56:01 -05: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
592571c16e
Merge branch '3.2.x'
...
Closes gh-40528
2024-04-26 09:34:00 +01:00
087e467387
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40527
2024-04-26 09:33:12 +01:00
83f692237d
Migrate to com.gradle.develocity plugin
...
Closes gh-40153
2024-04-26 09:30:48 +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
6963bd884b
Merge branch '3.2.x'
2024-04-18 12:53:26 -07: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
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
3ed77ae5f3
Polish
2024-04-04 23:45:21 -07: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
270f9d5913
Add Flway's PostgreSQL module to R2DBC and Flyway smoke test
...
See gh-40022
2024-03-19 13:10:49 +00:00
c2adcd7be8
Upgrade to Infinispan 15.0.0.Final
...
Closes gh-40017
2024-03-19 10:21:50 +00: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
ff182d8480
Merge branch '3.2.x'
...
Closes gh-39772
2024-02-27 13:29:32 -06:00
83efe763f3
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39771
2024-02-27 13:29:23 -06:00
3d47c949a6
Remove obsolete JDK 9 check in spring-boot-smoke-test-jersey
...
See gh-39750
2024-02-27 13:28:02 -06: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
2c4909a89a
Update copyright year of changed files
2024-02-21 13:58:53 -08:00
b449acf4ca
Merge branch '3.2.x'
...
Closes gh-39595
2024-02-16 09:20:37 +01:00
ceae967c58
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39594
2024-02-16 09:20:27 +01:00
3befeb2d7e
Add smoke test for InfoContributor
...
See gh-39544
2024-02-16 09:12:04 +01: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
f3e7325064
Add service connection for Docker Compose and Testcontainers ActiveMQ
...
See gh-39363
2024-02-02 09:05:37 +01:00
8f1a330dd5
Update copyright header of cleaned up code
...
See gh-39259
2024-01-23 10:18:50 -08:00
0613034e19
Replace multiple ifs with switch
...
See gh-39259
2024-01-23 10:18:49 -08:00
74a7fbea9d
Remove redundant boxing
...
See gh-39259
2024-01-23 10:18:49 -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
7087897507
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39091
2024-01-11 10:33:57 +00:00
45c32854a5
Fix Checkstyle upgrade
...
Closes gh-38746
2024-01-10 15:37:38 +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
5354ad15b3
Merge branch '3.1.x'
...
Closes gh-38877
2023-12-19 22:51:48 -08:00
8599e5a986
Remove unnecessary `toString()` calls
...
See gh-38739
2023-12-19 22:38:34 -08:00
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
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
65af35c1ac
Revert "Temporarily disable failing test"
...
This reverts commit bb37a868b3
2023-12-15 07:42:00 -08:00
bb37a868b3
Temporarily disable failing test
...
See gh-gh-38822
2023-12-14 20:33:28 -08:00
169070ea1b
Merge branch '3.1.x'
2023-11-30 11:00:56 +01:00
f509c90c46
Try to fix flakiness of Jetty smoke test
2023-11-30 10:57:00 +01:00
ef67838f14
Merge branch '3.1.x'
...
Closes gh-38376
2023-11-16 14:40:39 +00:00
4a38d032af
Restore use of avg in JPA smoke test
...
Closes gh-34895
2023-11-16 14:40:13 +00:00
586bb26eff
Polish "Use KafkaContainer in smoke test for Kafka with SSL"
...
See gh-38359
2023-11-15 15:25:58 -06:00
51f13404a5
Use KafkaContainer in smoke test for Kafka with SSL
...
See gh-38359
2023-11-15 15:25:58 -06:00
0ef87f5102
Merge branch '3.1.x'
2023-11-13 10:42:56 -08:00
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
759d096867
Disable Kafka SSL smoke test when Docker is not available
...
See gh-38260
2023-11-08 13:18:12 -06:00
f22c1ba7d6
Add smoke test for Kafka with SSL
...
Closes gh-38260
2023-11-07 11:21:20 -06:00
0621288544
Merge branch '3.1.x'
...
Closes gh-38224
2023-11-06 09:02:03 +01:00
9cbc686499
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38223
2023-11-06 09:01:56 +01:00
a006b26437
Merge branch '2.7.x' into 3.0.x
...
Closes gh-38222
2023-11-06 09:01:46 +01:00
3f7ece5418
Remove obsolete spring-boot-deployment-tests directory
...
See gh-38207
2023-11-06 09:00:39 +01:00
d638bbb0ba
Merge branch '3.1.x'
...
Closes gh-37967
2023-10-19 21:25:44 -07:00
1d456e09d2
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37966
2023-10-19 21:12:52 -07:00
a0b999c8b4
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37965
2023-10-19 20:55:51 -07:00
abdad1cabe
Constently use assertThatExceptionOf... assertions
...
Closes gh-37964
2023-10-19 20:17:26 -07: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
812023a84b
Upgrade to Ubuntu Jammy 20231004
...
Closes gh-37952
2023-10-18 21:13:42 -07:00
c7d6fbcb3a
Upgrade to Ubuntu Jammy 20231004
...
See gh-37954
2023-10-18 21:10:00 -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
5556739c8c
Add SSL bundle support to Rabbit auto-configuration
2023-10-11 15:39:51 -05:00
927ece3bfc
Merge branch '3.1.x'
2023-10-10 12:31:44 -07:00
01128465ff
Merge branch '3.0.x' into 3.1.x
2023-10-10 12:31:28 -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
48059417b5
Upgrade to Kafka 3.6.0
...
Closes gh-37777
2023-10-09 13:46:52 +01: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
1b1c1f1b64
Merge branch '3.0.x' into 3.1.x
2023-10-05 22:10:22 -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
2a35667295
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37740
2023-10-05 21:30:10 -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
904bd52260
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37657
2023-10-02 22:59:57 -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
b5ec0c2f5d
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37522
2023-09-22 08:42:08 +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
dc9a48030c
Merge branch '3.0.x' into 3.1.x
2023-09-13 13:37:41 +01: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
c2b78830ff
Polish
...
See gh-37340
2023-09-13 10:26:54 +02:00
a84e2db285
Merge branch '3.1.x'
2023-09-08 11:47:42 +01:00
c5908811ab
Merge branch '3.0.x' into 3.1.x
2023-09-08 11:47:03 +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
750c597225
Polish 'Add Pulsar ConnectionDetails support'
...
See gh-37197
2023-09-06 12:18:09 -07:00
089fef0392
Add Pulsar ConnectionDetails support
...
Add `ConnectionDetails` support for Apache Pulsar and provide adapters
for Docker Compose and Testcontainers.
See gh-37197
2023-09-06 12:12:25 -07:00
9497f3d91c
Polish "Combine Pulsar smoke tests"
...
See gh-37196
2023-09-05 20:42:14 -07:00
eacf92b1b2
Combine Pulsar smoke tests
...
* Simplify produce/consume verify via OutputCapture
* Remove spring-boot-smoke-test-pulsar-reactive as
no other smoke tests split them out
See gh-37196
2023-09-05 20:41:43 -07:00
2ebcdb059a
Tweak Pulsar smoke test timeouts
...
See gh-34763
2023-09-05 18:46:58 -07:00
975cb27905
Protect against concurrent list updates in Pulsar samples
...
See gh-34763
2023-09-05 18:23:39 -07:00
6e7b845bdf
Add support for Apache Pulsar
...
Add support for Apache Pulsar using the Spring for Apache Pulsar
project.
See gh-34763
Co-authored-by: Phillip Webb <pwebb@vmware.com>
2023-09-05 17:01:51 -07:00
e532b3b830
Merge branch '3.1.x'
...
Closes gh-37141
2023-08-30 14:16:32 +02:00
4a88604a01
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37140
2023-08-30 14:16:07 +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
fc91a84219
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36868
2023-08-09 13:44:00 +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
7bb337aeb1
Polish tests
2023-08-08 13:12:47 +02:00
191ac10009
Deprecate support for OkHttp
...
Closes gh-36632
2023-08-01 16:45:13 +02:00
f85a7258a6
Polish SampleAmqpSimpleApplication
2023-07-27 16:32:53 +02:00
94d9148de6
Merge branch '3.1.x'
...
Closes gh-36613
2023-07-27 14:55:56 +02:00
6f22baa729
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36612
2023-07-27 14:55:29 +02:00
150526a6a0
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36611
2023-07-27 14:52:37 +02:00
87554fb4dc
Add test for RabbitMQ smoke test
...
Closes gh-36610
2023-07-27 14:51:50 +02:00
96c9915f12
Polish
...
See gh-36565
2023-07-26 10:00:56 +02:00
c600be74ff
Merge branch '3.1.x'
...
Closes gh-36542
2023-07-24 16:06:13 -05:00
bb4226397a
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36541
2023-07-24 16:05:57 -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
311fa6272d
Polish "Add service connection for Testcontainers ActiveMQ"
...
This also adds support for Docker Compose.
See gh-35080
2023-07-20 13:03:41 +02:00
63121dd08a
Add service connection for Testcontainers ActiveMQ
...
See gh-35080
2023-07-20 13:03:41 +02:00
ae6b1f91f6
Merge branch '3.1.x'
2023-07-18 10:32:06 +01:00
28b5b7a218
Merge branch '3.0.x' into 3.1.x
2023-07-18 10:32:01 +01:00
9d91dbc4e5
Use explicit matchers following Spring Security 6.0.5 upgrade
...
See gh-36293
2023-07-18 10:31:41 +01:00
49f82717d1
Merge branch '3.1.x'
2023-07-18 10:17:17 +01:00
30cc2a48c7
Merge branch '3.0.x' into 3.1.x
2023-07-18 10:16:56 +01:00
0233178855
Use explicit matchers following Spring Security 6.0.5 upgrade
...
See gh-36293
2023-07-18 09:49:11 +01:00
c3e2c9d684
Polish "Support Jetty in ClientHttpRequestFactories"
...
See gh-36116
2023-07-04 17:49:07 +01:00
7c77e1bb85
Polish 'Log correlation IDs when Micrometer tracing is being used'
...
See gh-36158
2023-07-02 20:08:45 +01:00
6d8ca7286a
Merge branch '3.1.x'
...
Closes gh-36128
2023-06-30 08:26:26 +01:00
a268c6433e
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36127
2023-06-30 08:26:12 +01:00
93f8bd2170
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36126
2023-06-30 08:25:53 +01:00
996252f929
Stop using deprecated classifier property
...
Closes gh-36125
2023-06-30 08:22:14 +01:00
e8cbb9ae1b
Stop using deprecated JavaExec property in spring-boot-smoke-test-ant
...
Closes gh-36086
2023-06-27 11:17:50 +01:00
dbb24286ff
Separate stopping and destruction so web server can be restarted
...
Previously, when a Servlet-based WebServer was stopped it would also
stop the ServletContext. This led to problems as Tomcat and Undertow
would then not allow a restart. Jetty would allow a restart but
duplicate servlet registrations would then be attempted.
This commit modifies the WebServer lifecycle to separate stopping
and destruction for both servlet and reactive web servers. This
allows a WebServer's stop() implementation to leave some components
running so that they can be restarted. To completely shut down a
WebServer destroy() must now be called.
Both Tomcat and Jetty WebServers have been updated to stop their
network connections when stop() is called but leave other components
running. This works with both servlet and reactive web servers.
Note that an Undertow-based Servlet web server does not support
stop and restart. Once stopped, a Servlet Deployment cannot be
restarted and it does not appear to be possible to separate the
lifecycle of its network connections and a Servlet deployment.
Reactor Netty and Undertow-based reactive web servers can now also
be stopped and then restarted. Calling stop() stops the whole server
but this does not cause a problem as there's no (application-exposed)
ServletContext involved. There may be room to optimize this in the
future if the need arises.
Closes gh-34955
2023-06-26 20:58:59 +01:00
47cc65d912
Merge branch '3.1.x'
...
Closes gh-36056
2023-06-23 16:12:58 -06:00
c277517953
Polish "Add SslAutoConfiguration to slice test annotations"
...
See gh-36038
2023-06-23 16:11:49 -06:00
321c526bf7
Add SslAutoConfiguration to slice test annotations
...
`SslAutoConfiguration` has been added to `cassandra`, `couchbase`,
`elasticsearch`, `mongo` and `redis` slice test annotations.
See gh-36038
2023-06-23 15:51:42 -06:00
357c67a999
Merge branch '3.1.x'
2023-06-23 15:58:51 +01:00
3f7fe25cb9
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36044
2023-06-23 15:58:36 +01:00
2fae5de245
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36043
2023-06-23 15:50:02 +01:00
d2966e1cbf
Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
...
See gh-35915
2023-06-23 12:38:12 +01:00
f9da30faf1
Replace calls to verifyComplete() to avoid indefinite blocking
...
See gh-35915
2023-06-23 12:16:26 +01:00
228b8eb8e4
Polish log correlation docs
...
Docs related to gh-33280 (log correlation) and
gh-35593 (application name in each log line) need some polishing:
- Fix project names
- Show how to avoid having the application name duplicated in logs
- Call out that a trailing space is needed in the correlation pattern
Closes gh-36035
See gh-33280
See gh-35593
2023-06-22 14:51:02 -07:00
493777d3c9
Include the application name on each log line when it is available
...
Update Logback and Log4J2 so that they include the application name on
each log line. If `spring.application.name` had not been set, or if
`logging.include-application-name` is `false` then the name is not
logged.
Closes gh-35593
2023-06-22 00:40:51 -07:00
23979e6ccf
Enable LoaderIntegrationTests on Java 21
2023-06-15 10:13:19 +02:00
9b88128e3b
Merge branch '3.0.x' into 3.1.x
2023-06-14 18:19:53 +01:00
Phillip Webb
Ahmed Ashour
Moritz Halbritter
Andy Wilkinson
Scott Frederick
facewise
Brian Clozel
Christoph Dreis
gdmrw
Eddú Meléndez
Tobias Lippert
Yanming Zhou
Andy Wilkinson
Scott Frederick
Phillip Webb
Claudio Nave
Moritz Halbritter
Johnny Lim
Chris Bono
Stephane Nicoll
ThomazPassarelli
Jonatan Ivanov