c642f6d268
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41613
2024-07-25 16:16:35 +01:00
de3b14f2b4
Refine structured logging
...
Refine structured logging to support `Environment`, `ApplicationPid` and
`ElasticCommonSchemaService` injection. With these updates we are able
to remove the `ApplicationMetadata` class and simplify the parameters
passed to the layout/encoder classes.
Closes gh-41491
2024-07-24 19:06:07 +01:00
bf2950c045
Add support for structured logging
...
Update Logback and Log4j2 integrations to support structured logging.
Support for the ECS and Logstash JSON formats is provided out-of-the-box
and the `StructuredLogFormatter` interface may be used to if further
custom formats need to be supported.
Closes gh-5479
Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2024-07-15 11:45:41 +01:00
5d4a777d27
Align test with upstream Spring Security change
...
Closes gh-41488
2024-07-15 06:53:09 +01:00
cddf92e047
Polish "Deprecate @MockBean and @SpyBean"
...
See gh-39864
2024-07-12 13:49:11 +01:00
24763940a0
Deprecate @MockBean and @SpyBean
...
- Deprecate Deprecate @MockBean and @SpyBean in favor of Spring
Framework 6.2's @MockitoBean and @MockitoSpy
- Migrate usages of @MockBean and @SpyBean to @MockitoBean and
@MockitoSpy
Signed-off-by: Jakob Wanger <jakobwanger@gmail.com>
See gh-39864
2024-07-12 12:18:01 +01:00
c3ad8b0521
Add `APPLICATION_NAME` and `APPLICATION_GROUP` logging properties
...
Add `APPLICATION_NAME` and `APPLICATION_GROUP` properties that contain
verbatim values rather than formatted strings. Formatting of the values
is now handled by new `EnclosedInSquareBracketsConverter` classes for
both Logback and Log4J2.
The existing `LOGGED_APPLICATION_NAME` variable is now considered
deprecated. The `LOGGED_APPLICATION_GROUP` variable and related
logback converter have been removed since they never made it to a GA
release.
Closes gh-41444
2024-07-11 10:25:01 -07:00
d07fe47102
Merge branch '3.3.x'
...
Closes gh-41447
2024-07-11 13:09:26 +01:00
784c8d2df4
Avoid duplicate junit-platform.properties files caused by Kafka
...
Gradle doesn't support excluding a dependency that's declared with a
classifier. Instead, this commit replaces the test-qualified
kafka-server-common dependency with the plain dependency. The plain
dependency was already present so this is equivalent to excluding
the test-qualified dependency.
Closes gh-41446
2024-07-11 13:08:58 +01:00
156237227c
Migrate MockMvc tests to MockMvcTester
...
See gh-41198
2024-07-03 15:09:10 +02:00
de001f5af1
Polish "Add standardized property to distinguish a group of applications"
...
See gh-39957
2024-07-03 11:54:49 +02:00
8ddb77f628
Add standardized property to distinguish a group of applications
...
This adds a property to provide some indicator that a set of
applications are part of a larger "business application" so that they
can be viewed in metrics, portals, traces and more.
See gh-39957
2024-07-03 11:06:46 +02:00
5b7365b63b
Merge branch '3.3.x'
...
Closes gh-41258
2024-06-27 10:25:32 +01:00
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
fda6f19c5b
Update spring-boot-smoke-test-session-webflux-redis to use docker-test plugin
...
See gh-41228
2024-06-26 19:47:32 +01:00
5e332b8785
Update spring-boot-smoke-test-session-webflux-mongo to use docker-test plugin
...
See gh-41228
2024-06-26 19:47:28 +01:00
2890067e3a
Update spring-boot-smoke-test-session-redis to use docker-test plugin
...
See gh-41228
2024-06-26 19:47:25 +01:00
b3f3501e2b
Update spring-boot-smoke-test-session-mongo to use docker-test plugin
...
See gh-41228
2024-06-26 19:47:22 +01:00
da28e03670
Update spring-boot-smoke-test-pulsar to use docker-test plugin
...
See gh-41228
2024-06-26 19:47:19 +01:00
bc57d30a1f
Update spring-boot-smoke-test-kafka to use docker-test plugin
...
See gh-41228
2024-06-26 19:47:15 +01:00
957e73044b
Update spring-boot-smoke-test-data-redis to use docker-test plugin
...
See gh-41228
2024-06-26 19:47:12 +01:00
9662bec9c7
Update spring-boot-smoke-test-data-r2dbc-liquibase to use docker-test plugin
...
See gh-41228
2024-06-26 19:47:08 +01:00
b52023966b
Update spring-boot-smoke-test-data-r2dbc-flyway to use docker-test plugin
...
See gh-41228
2024-06-26 19:47:04 +01:00
0d2d3e7d71
Update spring-boot-smoke-test-data-mongo to use docker-test plugin
...
See gh-41228
2024-06-26 19:47:01 +01:00
28396b1ff3
Update spring-boot-smoke-test-data-couchbase to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:58 +01:00
a9be2e50e3
Update spring-boot-smoke-test-data-cassandra to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:54 +01:00
ccb0b2910f
Update spring-boot-smoke-test-cache to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:51 +01:00
24e797f8c2
Update spring-boot-smoke-test-amqp to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:47 +01:00
0579126c5f
Update spring-boot-smoke-test-activemq to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:44 +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
17ca0421e7
Upgrade to HtmlUnit 4.2.0 and Selenium HtmlUnit 4.20
...
Closes gh-41178
Closes gh-41179
2024-06-20 20:18:23 +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
3188d084ea
Merge branch '3.2.x'
...
Closes gh-41104
2024-06-14 17:06:07 +01:00
31f967723d
Fix Mongo health indicators when using the strict V1 API
...
Closes gh-41101
2024-06-14 17:05:09 +01:00
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
Andy Wilkinson
Phillip Webb
Moritz Halbritter
Jakob Wanger
Stéphane Nicoll
Ahmed Ashour
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