root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
49,634 Commits 24 Branches 372 Tags 283 MiB
Commit Graph

1113 Commits

Author SHA1 Message Date
Moritz Halbritter 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
Phillip Webb 5d4a777d27 Align test with upstream Spring Security change 
Closes gh-41488
 2024-07-15 06:53:09 +01:00
Andy Wilkinson cddf92e047 Polish "Deprecate @MockBean and @SpyBean" 
See gh-39864
 2024-07-12 13:49:11 +01:00
Jakob Wanger 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
Phillip Webb 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
Andy Wilkinson d07fe47102 Merge branch '3.3.x' 
Closes gh-41447
 2024-07-11 13:09:26 +01:00
Andy Wilkinson 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
Stéphane Nicoll 156237227c Migrate MockMvc tests to MockMvcTester 
See gh-41198
 2024-07-03 15:09:10 +02:00
Moritz Halbritter de001f5af1 Polish "Add standardized property to distinguish a group of applications" 
See gh-39957
 2024-07-03 11:54:49 +02:00
Jakob Wanger 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
Andy Wilkinson 5b7365b63b Merge branch '3.3.x' 
Closes gh-41258
 2024-06-27 10:25:32 +01:00
Andy Wilkinson b0d4f1d356 Merge branch '3.2.x' into 3.3.x 
Closes gh-41257
 2024-06-27 10:16:36 +01:00
Andy Wilkinson 654016af7f Move Docker-related test support into a separate module 
See gh-41228
 2024-06-26 19:47:35 +01:00
Andy Wilkinson 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
Andy Wilkinson 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
Andy Wilkinson 2890067e3a Update spring-boot-smoke-test-session-redis to use docker-test plugin 
See gh-41228
 2024-06-26 19:47:25 +01:00
Andy Wilkinson b3f3501e2b Update spring-boot-smoke-test-session-mongo to use docker-test plugin 
See gh-41228
 2024-06-26 19:47:22 +01:00
Andy Wilkinson da28e03670 Update spring-boot-smoke-test-pulsar to use docker-test plugin 
See gh-41228
 2024-06-26 19:47:19 +01:00
Andy Wilkinson bc57d30a1f Update spring-boot-smoke-test-kafka to use docker-test plugin 
See gh-41228
 2024-06-26 19:47:15 +01:00
Andy Wilkinson 957e73044b Update spring-boot-smoke-test-data-redis to use docker-test plugin 
See gh-41228
 2024-06-26 19:47:12 +01:00
Andy Wilkinson 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
Andy Wilkinson 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
Andy Wilkinson 0d2d3e7d71 Update spring-boot-smoke-test-data-mongo to use docker-test plugin 
See gh-41228
 2024-06-26 19:47:01 +01:00
Andy Wilkinson 28396b1ff3 Update spring-boot-smoke-test-data-couchbase to use docker-test plugin 
See gh-41228
 2024-06-26 19:46:58 +01:00
Andy Wilkinson a9be2e50e3 Update spring-boot-smoke-test-data-cassandra to use docker-test plugin 
See gh-41228
 2024-06-26 19:46:54 +01:00
Andy Wilkinson ccb0b2910f Update spring-boot-smoke-test-cache to use docker-test plugin 
See gh-41228
 2024-06-26 19:46:51 +01:00
Andy Wilkinson 24e797f8c2 Update spring-boot-smoke-test-amqp to use docker-test plugin 
See gh-41228
 2024-06-26 19:46:47 +01:00
Andy Wilkinson 0579126c5f Update spring-boot-smoke-test-activemq to use docker-test plugin 
See gh-41228
 2024-06-26 19:46:44 +01:00
Andy Wilkinson 7e4d60e07f Update spring-boot-launch-script-tests to use docker-test plugin 
See gh-41228
 2024-06-26 19:46:21 +01:00
Andy Wilkinson 6564abb12a Update spring-boot-loader-classic-tests to use docker-test plugin 
See gh-41228
 2024-06-26 19:46:17 +01:00
Andy Wilkinson edc582800b Update spring-boot-loader-tests to use docker-test plugin 
See gh-41228
 2024-06-26 19:46:12 +01:00
Stéphane Nicoll 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
Phillip Webb 9dda006a18 Merge branch '3.2.x' 2024-06-19 22:55:00 -07:00
Phillip Webb 2a4582b084 Update copyright year of changed files 2024-06-19 22:54:40 -07:00
Phillip Webb 905d6b96d0 Merge branch '3.2.x' 
Closes gh-41166
 2024-06-19 22:30:58 -07:00
Andy Wilkinson 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
Andy Wilkinson 3188d084ea Merge branch '3.2.x' 
Closes gh-41104
 2024-06-14 17:06:07 +01:00
Andy Wilkinson 31f967723d Fix Mongo health indicators when using the strict V1 API 
Closes gh-41101
 2024-06-14 17:05:09 +01:00
Phillip Webb 147240aa0c Merge branch '3.2.x' 
Closes gh-41080
 2024-06-11 13:32:30 -07:00
Phillip Webb bcbcafaab2 Polish "Use method references when possible in test code" 
See gh-40974
 2024-06-11 12:58:04 -07:00
Ahmed Ashour 207327d97c Use method references when possible in test code 
See gh-40974
 2024-06-11 12:58:00 -07:00
Moritz Halbritter b09f28d04a Add smoke test for Prometheus 
See gh-40904
 2024-06-11 14:38:24 +02:00
Andy Wilkinson 4517c43cc7 Remove Concourse CI configuration 
Closes gh-40569
 2024-05-22 19:20:14 +01:00
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