a1a336ddd8
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36095
2023-06-27 20:08:39 +01:00
b2bc114d6f
Update javadoc to link to non-deprecated ConstructorBinding
...
Closes gh-36045
2023-06-27 20:08:03 +01:00
2011c95c75
Merge branch '3.1.x'
...
Closes gh-36093
2023-06-27 14:24:41 +01:00
29ebaab0cb
Use Selenium's bom
...
See gh-36077
2023-06-27 14:24:06 +01:00
98d459d76c
Revert "Merge branch '3.1.x'"
...
See gh-36092
2023-06-27 14:16:20 +01:00
6851904651
Merge branch '3.1.x'
...
Closes gh-36092
2023-06-27 14:03:09 +01:00
9a57611ef5
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36091
2023-06-27 14:02:57 +01:00
ffbef7bb80
Test server.max-http-request-header-size with Undertow
...
Closes gh-36047
2023-06-27 13:50:04 +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
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
c32877493c
Merge branch '3.1.x'
...
Closes gh-36055
2023-06-23 15:47:00 -06:00
b9b314622f
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36054
2023-06-23 15:46:44 -06:00
4a3abdd7c3
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36053
2023-06-23 15:46:27 -06:00
59d4bf97a1
Add Javadoc since to ImageReference.inTaglessForm()
...
See gh-36048
2023-06-23 15:45:29 -06:00
67725d4781
Merge branch '3.1.x'
...
Closes gh-36052
2023-06-23 15:26:53 -06:00
ea41a22284
Fix typo in docker compose service connections note
...
See gh-36016
2023-06-23 15:25:30 -06:00
90dd7449bb
Merge branch '3.1.x'
...
Closes gh-36051
2023-06-23 15:20:25 -06:00
92b2573a60
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36050
2023-06-23 15:20:06 -06:00
eeeb2ad72a
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36049
2023-06-23 15:19:44 -06:00
4a2c9d99dc
Remove redundant Files.delete() calls in tests
...
See gh-35986
2023-06-23 15:14:59 -06:00
493987fc1a
Allow key password to be set for a PemSslStoreBundle
...
Closes gh-35983
2023-06-23 14:40:42 -06:00
b645eb32ac
Remove deprecated code that was to be removed in 3.2
...
Closes gh-36034
2023-06-23 18:14:22 +01: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
8f7fdc507e
Polish CorrelationIdFormatter
2023-06-23 08:26:32 +02: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
c1b295fd71
Log correlation IDs when Micrometer tracing is being used
...
Add support for logging correlation IDs with Logback or Log4J2 whenever
Micrometer tracing is being used.
The `LoggingSystemProperties` class now accepts a defualt value resolver
which will be used whenever a value isn't in the environment. The
`AbstractLoggingSystem` provides a resolver that supports the
`logging.pattern.correlation` property and will return a value whenever
`LoggingSystem.EXPECT_CORRELATION_ID_PROPERTY` is set.
Using `LoggingSystem.EXPECT_CORRELATION_ID_PROPERTY` allows us to
provide a consistent width for the correlation ID, even when it's
missing from the MDC.
The exact correlation pattern returned will depend on the `LoggingSytem`
implementation. Currently Logback and Log4J2 are supported and both
make use of a custom converter which delegates to a new
`CorrelationIdFormatter` class.
Closes gh-33280
2023-06-22 00:28:45 -07:00
b6120d504a
Replace LoggingSystemProperties constants with an Enum
...
Extract contants from `LoggingSystemProperty` and
`LogbackLoggingSystemProperties` in enum classes.
Closes gh-36015
2023-06-22 00:28:22 -07:00
3a796aedea
Merge branch '3.1.x'
2023-06-22 00:28:01 -07:00
31f218c4e0
Merge branch '3.0.x' into 3.1.x
2023-06-22 00:27:51 -07:00
9db3c5a2f7
Polish
2023-06-22 00:24:39 -07:00
16265e925d
Merge branch '3.1.x'
2023-06-21 23:44:18 -07:00
8ac5dc7ea3
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36017
2023-06-21 23:44:06 -07:00
f7af1bab5b
Upgrade to Spring WS 4.0.5
...
Closes gh-36010
2023-06-21 23:40:28 -07:00
64525fb566
Merge branch '3.1.x'
2023-06-21 16:49:32 -07:00
eb72d7e9f1
Merge branch '3.0.x' into 3.1.x
2023-06-21 16:49:24 -07:00
5c8ed944ca
Start building against Spring WS 4.0.5 snapshots
...
See gh-36010
2023-06-21 16:49:12 -07:00
f6841c3c16
Revert "Start building against Spring WS 3.1.7 snapshots"
...
This reverts commit 5e963b02a7
2023-06-21 20:55:10 +01:00
212acf44f7
Merge branch '3.1.x'
2023-06-21 12:28:20 -07:00
7a2fc9e636
Fix checkstyle violation
...
See gh-35914
2023-06-21 12:27:56 -07:00
2ce36b15b3
Merge branch '3.1.x'
2023-06-21 12:11:07 -07:00
3c7fbf3423
Polish 'Apply SslConfigurer in addition to configured mappers'
...
See gh-35914
2023-06-21 12:10:36 -07:00
e6b5322f3e
Apply SslConfigurer in addition to configured mappers
...
Update `ReactorClientHttpConnectorFactory` to that SSL configuration
is applied in addition to any configured mappers.
Prior to this commit, SSL configuration would prevent configured
mappers from being applied.
See gh-35914
2023-06-21 12:10:36 -07:00
7f5351c7b0
Merge branch '3.1.x'
2023-06-21 19:06:32 +01:00
b770ffc160
Fully prepare connection when using SSL bundle
...
Fixes gh-36007
2023-06-21 19:05:44 +01:00
295702003d
Merge branch '3.1.x'
2023-06-21 15:29:38 +01:00
7266d4863b
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36009
2023-06-21 15:29:23 +01:00
39c382713b
Initialize WebSocket infrastructure when using WebFlux and Jetty
...
In Spring Framework 5.x with Jetty 9, the reactive
JettyRequestUpgradeStrategy was able to initialize Jetty's WebSocket
infrastructure itself. With Jetty 10 this is no longer possible and
Boot must perform the initialization as part of preparing the
reactive JettyWebServer.
This commit updates the reactive WebSocket auto-configuration to
initialize Jetty's WebSocket infrastructure as part of creating the
reactive JettyWebServer.
Fixes gh-33347
2023-06-21 14:59:50 +01:00
fc403f4f18
Merge branch '3.1.x'
2023-06-21 13:15:06 +01:00
d3522a78a8
Merge branch '3.0.x' into 3.1.x
2023-06-21 13:14:46 +01:00
641f00f24c
Disable test when Java version is too high
...
Gradle 7.3.3 does not support Java 20 so the test that verifies that
the plugin fails fast when running on a version of Gradle that it
does not support needs to be disabled on Java 20 and later.
See gh-35931
2023-06-21 13:12:20 +01:00
68aec97ee7
Merge branch '3.1.x'
2023-06-21 12:44:06 +01:00
5b69580d5d
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36004
2023-06-21 12:43:48 +01:00
f584d6dbd9
Replace `@EnableBatchProcessing` in slice test examples
...
Using `@EnableBatchProcessing` is no longer necessary to enable
Batch's auto-configuration so it's no longer a good example when
discussing sliced tests and user configuration.
This commit replaces `@EnableBatchProcessing` with an alternative
annotation, `@EnableMongoAuditing` and updates the accompanying
text.
Closes gh-33435
2023-06-21 12:41:28 +01:00
b394553b30
Merge branch '3.1.x'
2023-06-21 12:11:06 +01:00
660dbb9afd
Fix Maven-built native images with Docker Compose dependency
...
Previously, we tried to prevent spring-boot-docker-compose from
causing problems with AOT and native images by excluding it from
the AOT processing classpath. This allowed AOT processing to
succeed. We cannot apply the same exclusion to the native image
classpath so spring-boot-docker-compose was still included in the
native image. This results in a failure at runtime due to missing
reflection hints.
This commit reverts that changes that excluded
spring-boot-docker-compose from the AOT processing classpath. This
allows AOT processing to generate reflection hints but reintroduces
the failure caused by the connection details bean definitions using
an instance supplier callback. To overcome this problem we disable
DockerComposeLifecycleManager during AOT processing and in a native
image. This ensures that no attempt is made to call docker compose up
and no connection details beans are defined.
Fixes gh-35676
2023-06-21 11:44:30 +01:00
35ee52275e
Upgrade to Spring Integration 6.0.6
...
Closes gh-35740
2023-06-21 11:06:49 +01:00
e2b6384462
Merge branch '3.1.x'
2023-06-21 11:03:02 +01:00
5384872cbd
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36003
2023-06-21 11:02:47 +01:00
2fd5319eda
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36002
2023-06-21 11:02:34 +01:00
0fb4c9a095
Prohibit upgrades to RSocket 1.1.4
...
Closes gh-35798
2023-06-21 10:55:48 +01:00
5a70198880
Merge branch '3.1.x'
2023-06-21 10:52:45 +01:00
5cda56cc68
Upgrade to Spring Integration 6.1.1
...
Closes gh-35859
2023-06-21 10:51:42 +01:00
818f096890
Merge branch '3.1.x'
2023-06-21 10:46:35 +01:00
853caf9a59
Do not exclude DevTools from Maven AOT processing classpath
...
When excluded from the AOT processing classpath, a reflection hint
for DevTools' RestartScopeInitializer that's registered in
spring.factories is not generated. When the native image is compiled
we have no control over its classpath so DevTools is included. This
causes a failure at runtime as RestartScopeInitializer cannot be
loaded due to the missing reflection hint.
Until we have control over the native image classpath, we need to
include DevTools on the AOT processing classpath and then rely on
DevTools disabling itself in a native image which it already does.
Fixes gh-35853
2023-06-21 10:36:38 +01:00
16e993f3ca
Merge branch '3.1.x'
2023-06-20 17:47:21 +02:00
75ca6030a8
Upgrade to Spring Session 3.1.1
...
Closes gh-35755
2023-06-20 17:29:28 +02:00
424e8e6924
Upgrade to Spring Security 6.1.1
...
Closes gh-35754
2023-06-20 17:29:28 +02:00
da6cbfd5fe
Upgrade to Spring Kafka 3.0.8
...
Closes gh-36000
2023-06-20 17:29:27 +02:00
81f1961e27
Upgrade to Spring GraphQL 1.2.1
...
Closes gh-35752
2023-06-20 17:29:22 +02:00
a2b7fc8661
Upgrade to Spring Authorization Server 1.1.1
...
Closes gh-35749
2023-06-20 17:29:21 +02:00
8d351ffb1f
Upgrade to Spring AMQP 3.0.5
...
Closes gh-35748
2023-06-20 17:29:21 +02:00
0c32ce4214
Upgrade to REST Assured 5.3.1
...
Closes gh-35999
2023-06-20 17:29:20 +02:00
a7f8b82905
Upgrade to Netty 4.1.94.Final
...
Closes gh-35998
2023-06-20 17:29:15 +02:00
264c01c8db
Upgrade to Infinispan 14.0.11.Final
...
Closes gh-35996
2023-06-20 17:29:04 +02:00
2815e83096
Upgrade to HttpCore5 5.2.2
...
Closes gh-35995
2023-06-20 17:28:58 +02:00
21046c0611
Upgrade to Hibernate 6.2.5.Final
...
Closes gh-35994
2023-06-20 17:28:53 +02:00
4c06dc49b3
Upgrade to Spring Session 3.0.2
...
Closes gh-35744
2023-06-20 16:59:47 +02:00
cf955671d8
Upgrade to Spring Security 6.0.4
...
Closes gh-35743
2023-06-20 16:59:46 +02:00
6066fb53ed
Upgrade to Spring Kafka 3.0.8
...
Closes gh-35993
2023-06-20 16:59:46 +02:00
0b582651b3
Upgrade to Spring GraphQL 1.1.5
...
Closes gh-35775
2023-06-20 16:59:41 +02:00
1940d876c3
Upgrade to Spring AMQP 3.0.5
...
Closes gh-35737
2023-06-20 16:59:40 +02:00
a7d71a3921
Upgrade to Netty 4.1.94.Final
...
Closes gh-35992
2023-06-20 16:59:40 +02:00
3e3428af95
Upgrade to Infinispan 14.0.11.Final
...
Closes gh-35990
2023-06-20 16:59:29 +02:00
e7f6faf6ae
Upgrade to Hazelcast 5.1.7
...
Closes gh-35989
2023-06-20 16:59:23 +02:00
cb5330fd11
Upgrade to Spring Session Bom 2021.2.2
...
Closes gh-35731
2023-06-20 16:57:04 +02:00
b0af370038
Upgrade to Spring Security 5.7.9
...
Closes gh-35730
2023-06-20 16:57:03 +02:00
f206f1807f
Upgrade to Netty 4.1.94.Final
...
Closes gh-35988
2023-06-20 16:57:03 +02:00
0dd93de05d
Upgrade to Hazelcast 5.1.7
...
Closes gh-35987
2023-06-20 16:56:56 +02:00
f7abf926a9
Merge branch '3.1.x'
2023-06-19 21:04:26 +02:00
cbbbecce37
Merge branch '3.0.x' into 3.1.x
2023-06-19 21:04:09 +02:00
975e2d110c
Polish CompositePropagationFactory
...
Remove shaded Guava import
2023-06-19 21:03:05 +02:00
d9aac063a2
Prohibit upgrades to Oracle Database 23.2.0.0
...
Closes gh-35970
2023-06-19 18:18:32 +01:00
1f9ce508f7
Upgrade to SnakeYAML 2.0
...
Closes gh-35982
2023-06-19 18:18:31 +01:00
a94ac2fb44
Upgrade to Rabbit AMQP Client 5.18.0
...
Closes gh-35981
2023-06-19 18:18:31 +01:00
962445ea6c
Upgrade to Versions Maven Plugin 2.16.0
...
Closes gh-35979
2023-06-19 18:18:31 +01:00
5cd18a05fc
Upgrade to SQLite JDBC 3.42.0.0
...
Closes gh-35978
2023-06-19 18:18:31 +01:00
ca5bd37e81
Upgrade to Spring Framework 6.1.0-M1
...
Closes gh-35977
Closes gh-35980
2023-06-19 18:12:16 +01:00
4dc0b26eea
Upgrade to Spring AMQP 3.0.5
...
Closes gh-35976
2023-06-19 16:30:59 +01:00
9ab94ef8a3
Upgrade to Selenium HtmlUnit 4.10.0
...
Closes gh-35975
2023-06-19 16:30:59 +01:00
7053c3e0fc
Upgrade to Selenium 4.10.0
...
Closes gh-35974
2023-06-19 16:30:58 +01:00
a63cf9dd7f
Upgrade to REST Assured 5.3.1
...
Closes gh-35972
2023-06-19 16:30:58 +01:00
e94f35f85a
Upgrade to Rabbit Stream Client 0.10.0
...
Closes gh-35971
2023-06-19 16:30:57 +01:00
be1eb32ac0
Upgrade to OpenTelemetry 1.27.0
...
Closes gh-35969
2023-06-19 16:30:57 +01:00
2ce6458cd4
Upgrade to OkHttp 4.11.0
...
Closes gh-35968
2023-06-19 16:30:57 +01:00
fe1f675c43
Upgrade to Neo4j Java Driver 5.9.0
...
Closes gh-35967
2023-06-19 16:30:56 +01:00
9fb9d5518d
Upgrade to Mockito 5.4.0
...
Closes gh-35965
2023-06-19 16:30:56 +01:00
a5df44cbca
Upgrade to Maven War Plugin 3.4.0
...
Closes gh-35964
2023-06-19 16:30:55 +01:00
045307994b
Upgrade to Maven Surefire Plugin 3.1.2
...
Closes gh-35963
2023-06-19 16:30:55 +01:00
0cac2e2603
Upgrade to Maven Source Plugin 3.3.0
...
Closes gh-35962
2023-06-19 16:30:55 +01:00
853db91e31
Upgrade to Maven Shade Plugin 3.5.0
...
Closes gh-35961
2023-06-19 16:30:54 +01:00
b167c6e45d
Upgrade to Maven Invoker Plugin 3.6.0
...
Closes gh-35960
2023-06-19 16:30:54 +01:00
3c482a024c
Upgrade to Maven Failsafe Plugin 3.1.2
...
Closes gh-35959
2023-06-19 16:30:53 +01:00
559989a0ad
Upgrade to Maven Dependency Plugin 3.6.0
...
Closes gh-35958
2023-06-19 16:30:53 +01:00
6745ec9224
Upgrade to Maven Assembly Plugin 3.6.0
...
Closes gh-35957
2023-06-19 16:30:52 +01:00
1e17d8eeea
Upgrade to Liquibase 4.22.0
...
Closes gh-35956
2023-06-19 16:30:52 +01:00
fdc6f54405
Upgrade to Kotlin Coroutines 1.7.1
...
Closes gh-35955
2023-06-19 16:07:44 +01:00
e82bd223a0
Upgrade to Kafka 3.5.0
...
Closes gh-35954
2023-06-19 16:07:44 +01:00
dfe317ef81
Upgrade to Jedis 4.4.3
...
Closes gh-35953
2023-06-19 16:07:43 +01:00
fc269a5c69
Upgrade to Infinispan 14.0.11.Final
...
Closes gh-35952
2023-06-19 16:07:43 +01:00
152fc42d4e
Upgrade to Hibernate 6.2.5.Final
...
Closes gh-35951
2023-06-19 16:07:42 +01:00
9d8caf1133
Upgrade to Hazelcast 5.3.1
...
Closes gh-35950
2023-06-19 16:07:42 +01:00
e4b207e73b
Upgrade to Git Commit ID Maven Plugin 6.0.0
...
Closes gh-35949
2023-06-19 16:07:41 +01:00
454aae92d6
Upgrade to Flyway 9.19.4
...
Closes gh-35948
2023-06-19 16:07:41 +01:00
3d336f9204
Upgrade to Elasticsearch Client 8.8.1
...
Closes gh-35947
2023-06-19 12:15:00 +01:00
6b1a1141aa
Upgrade to Cassandra Driver 4.16.0
...
Closes gh-35946
2023-06-19 12:15:00 +01:00
57a44bf55d
Upgrade to Build Helper Maven Plugin 3.4.0
...
Closes gh-35945
2023-06-19 12:14:59 +01:00
fd2ae822f0
Upgrade to Brave 5.16.0
...
Closes gh-35944
2023-06-19 12:14:59 +01:00
fe3579bd1e
Upgrade to Angus Mail 2.0.2
...
Closes gh-35943
2023-06-19 12:14:59 +01:00
71597300f4
Merge branch '3.1.x'
2023-06-17 17:18:00 +02:00
30d5a988a9
Upgrade to Spring Retry 2.0.2
...
Closes gh-35753
2023-06-17 17:17:16 +02:00
139873733d
Upgrade to Spring Data Bom 2023.0.1
...
Closes gh-35750
2023-06-17 17:17:16 +02:00
607c155d4c
Upgrade to Spring Retry 2.0.2
...
Closes gh-35742
2023-06-17 17:14:33 +02:00
3194edefbd
Upgrade to Spring LDAP 3.0.4
...
Closes gh-35741
2023-06-17 17:14:32 +02:00
381857b3d3
Upgrade to Spring Data Bom 2022.0.7
...
Closes gh-35738
2023-06-17 17:14:32 +02:00
33341f241d
Upgrade to Spring Data Bom 2021.2.13
...
Closes gh-35728
2023-06-17 17:03:11 +02:00
b4b6477899
Upgrade to Spring AMQP 2.4.13
...
Closes gh-35727
2023-06-17 17:03:10 +02:00
8afbff3f28
Merge branch '3.1.x'
2023-06-16 16:17:59 -07:00
3d6c6a6611
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35934
2023-06-16 16:15:04 -07:00
af846da69b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35933
2023-06-16 16:14:52 -07:00
efa072204a
Don't migrate properties that cause a circular reference
...
Update `PropertiesMigrationReporter` so that properties are only
migrated automatically when they don't cause a circular reference.
Fixes gh-35919
2023-06-16 16:14:41 -07:00
2f39ebfe89
Polish
2023-06-16 15:23:12 -07:00
abe417d9bc
Merge branch '3.1.x'
2023-06-16 15:21:20 -07:00
1de7edb615
Remove accidentally committed code
2023-06-16 15:21:03 -07:00
23eb7ec1f8
Merge branch '3.1.x'
2023-06-16 14:35:44 -07:00
5d6a507142
Merge branch '3.0.x' into 3.1.x
2023-06-16 14:35:23 -07:00
48e13af8c4
Merge branch '2.7.x' into 3.0.x
2023-06-16 14:34:54 -07:00
b8d2c279ee
Update copyright year of changed files
2023-06-16 14:32:43 -07:00
854b29b8fb
Polish
2023-06-16 14:32:14 -07:00
fe927f0e06
Merge branch '3.1.x'
2023-06-16 16:11:00 -05:00
e8301a065f
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35932
2023-06-16 16:10:48 -05:00
fbba2df7bf
Enable Gradle plugin tests on Java 20
...
Closes gh-35931
2023-06-16 16:10:24 -05:00
13f16da716
Merge branch '3.1.x'
2023-06-16 14:00:12 -07:00
baddf4c857
Merge branch '3.0.x' into 3.1.x
2023-06-16 13:54:01 -07:00
0fd1c89889
Polish
2023-06-16 13:53:33 -07:00
9b72cc41ab
Polish 'Add support for multiple tracing propagation formats'
...
See gh-35611
2023-06-16 13:43:46 -07:00
85934c3919
Merge branch '3.1.x'
...
Closes gh-35930
2023-06-16 13:03:08 -07:00
06157837e5
Polish
...
See gh-35872
2023-06-16 12:39:03 -07:00
691b549e36
Merge branch '2.7.x' into 3.0.x
2023-06-16 10:18:43 -07:00
f3f8610539
Polish
2023-06-16 10:17:08 -07:00
3664df61eb
Polish API of SpanExporters and SpanProcessors
2023-06-16 14:54:44 +02:00
fe65806582
Merge branch '3.1.x'
2023-06-16 14:32:39 +02:00
db8dee5aac
Refine SpringApplication.Augmented.with Kotlin extension
...
This commit allows to specify multiple Kotlin classes.
See gh-35784
2023-06-16 14:22:18 +02:00
27add2bbe3
Rework @AutoConfigureObservability and tracing auto-configurations
...
@ConditionalOnEnabledTracing is now applied to the minimal amount of
beans. The beans which are annotated with it are beans that will lead
to span sending to backends.
This leaves the majority of the Micrometer Tracing, Brave and
OpenTelemetry infrastructure untouched in tests.
Closes gh-35354
2023-06-16 14:09:10 +02:00
fb4b26a842
Merge branch '3.1.x'
2023-06-16 10:45:44 +01:00
1652c27b3c
Apply additional sources once when using SpringApplication.from()
...
Previously, when using SpringApplication.from() any additional
sources configured using with() would be applied to every
SpringApplication that was created within the scope of the call to
run(). This caused problems with Spring Cloud's bootstrap context
where the additional sources would be applied to both the user's
application and to the boostrap context's application.
This commit updates the hook that's used to apply the additional
sources so that it's only applied once. This results in the
additional sources only being added to the first SpringApplication
that is run.
Closes gh-35873
2023-06-16 10:39:20 +01:00
c25b084391
Polish
2023-06-16 10:36:33 +02:00
929283f4dc
Support overriding OTel SpanExporters
...
See gh-35596
2023-06-16 10:24:45 +02:00
d51559956f
Support overriding default OTel SpanProcessor
...
Also makes it easier to set the MeterProvider used in the default
SpanProcessor.
Closes gh-35560
2023-06-16 09:54:27 +02:00
0439b630d1
Merge branch '3.1.x'
...
Closes gh-35923
2023-06-15 14:27:11 -07:00
c192fb85b2
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35922
2023-06-15 14:26:55 -07:00
4c8b93b37d
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35920
2023-06-15 14:26:36 -07:00
137f4ee451
Support reporting of custom Log4J2 log levels from the LoggersEndpoint
...
Support custom Log4J2 log levels by changing `LoggerConfiguration` so
that it can now report levels using a `LevelConfiguration` object
rather than the limited `LogLevel` enum.
The `Log4J2LoggingSystem` class now uses `LevelConfiguration.ofCustom`
for custom logging levels, rather than throwing an exception.
The `LoggersEndpoint` has also been updated so that it can return the
custom logger name.
Fixes gh-35227
2023-06-15 14:03:22 -07:00
c033484815
Merge branch '3.1.x'
2023-06-15 15:50:34 +01:00
3d9a308053
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35913
2023-06-15 15:50:07 +01:00
eeea065595
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35912
2023-06-15 15:49:36 +01:00
e779fb0bc4
Validate constructor bound config props that implement Validator
...
Closes gh-33669
2023-06-15 15:29:20 +01:00
91fdae45b6
Merge branch '3.1.x'
2023-06-15 14:47:32 +01:00
61752184f2
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35911
2023-06-15 14:47:21 +01:00
7bb3caf914
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35910
2023-06-15 14:47:01 +01:00
ee606db34a
Update Data REST starter description to mention Spring MVC
...
Closes gh-35678
2023-06-15 14:46:23 +01:00
740815da03
Merge branch '3.1.x'
2023-06-15 14:38:43 +01:00
251b5f2d0f
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35909
2023-06-15 14:38:31 +01:00
a5981a4dac
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35908
2023-06-15 14:38:13 +01:00
9feb84e234
Add DynmicPropertySource to ordered list of property sources
...
Closes gh-32901
2023-06-15 14:36:38 +01:00
6e86f5c444
Register uncategorized ObservationHandlers after categorized ones
...
Closes gh-34399
2023-06-15 15:01:13 +02:00
5bad242bfb
Merge branch '3.1.x'
2023-06-15 13:50:17 +02:00
be471c58fe
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35907
2023-06-15 13:49:57 +02:00
8cd8d21720
Add support for multiple tracing propagation formats
...
See gh-35611
2023-06-15 13:37:33 +02:00
2c06f274dc
Merge branch '3.1.x'
2023-06-15 12:21:08 +01:00
cb36df47c8
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35905
2023-06-15 12:20:55 +01:00
6def7252d6
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35904
2023-06-15 12:20:27 +01:00
088006ff60
Use ephemeral port for Hazelcast
...
When Hazelcast is started on a fixed port and that port is already in
use, it does not fail to start which makes the problem hard to
detect. A symptom of the problem is that clients will not be able to
connect and will either retry indefinitely or will timeout depending
on their configuration.
This commit updates the Hazelcast client tests to start the Hazelcast
instance on an ephemeral port and to customize the client
configuration with the instance's address before use. This should
allow the client tests to work reliably in an environment where
Hazelcast's default port is already in use.
Closes gh-35903
2023-06-15 12:19:34 +01:00
efcc65bc5b
Apply filter order to ServerHttpObservationFilter
...
Closes gh-35067
2023-06-15 11:45:05 +02:00
140c37ceba
Enable virtual threads on Jetty
...
Closes gh-35703
2023-06-15 11:01:11 +02:00
3e4a9f5204
Add property to limit maximum connections for Jetty
...
Closes gh-35899
2023-06-15 09:42:51 +02:00
f81787e65d
Enable virtual threads on Tomcat
...
Closes gh-35704
2023-06-15 08:30:09 +02:00
6e604ad65c
Implement @ConditionalOnVirtualThreads
...
Closes gh-35892
2023-06-15 08:30:09 +02:00
fb64f6744e
Add 21 to JavaVersion
...
See gh-35892
2023-06-15 08:30:08 +02:00
0ce2b054d2
Merge branch '3.1.x'
2023-06-14 18:20:07 +01:00
9b88128e3b
Merge branch '3.0.x' into 3.1.x
2023-06-14 18:19:53 +01:00
4694e20628
Merge branch '2.7.x' into 3.0.x
2023-06-14 18:19:43 +01:00
7d07c0d09c
Polish configuration related to predictive test selection
...
Most notably, this commit splits the tests that use Spring REST Docs
out into a separate task for which predictive test selection is
disabled. This allows it to be cached and use Gradle's built-in
up-to-date checking, thereby avoiding the generation of new snippets
and the need to then run the asciidoctor and asciidoctorPdf tasks.
It also updates spring-boot-smoke-test-junit-vintage to disable
predictive test selection so that we can continue to assert that
the some tests were executed.
See gh-35869
2023-06-14 18:15:04 +01:00
67fc2f9346
Merge branch '3.1.x'
2023-06-14 09:36:47 +02:00
f299a2473e
Upgrade to Reactor Bom 2022.0.8
...
Closes gh-35747
2023-06-14 09:35:39 +02:00
61bae46deb
Upgrade to Micrometer Tracing 1.1.2
...
Closes gh-35746
2023-06-14 09:35:38 +02:00
b17c948d61
Upgrade to Micrometer 1.11.1
...
Closes gh-35745
2023-06-14 09:35:38 +02:00
4f3761c852
Upgrade to Logback 1.4.8
...
Closes gh-35885
2023-06-14 09:35:37 +02:00
9e642c9843
Upgrade to Hazelcast 5.2.4
...
Closes gh-35884
2023-06-14 09:35:32 +02:00
1093d172a4
Upgrade to Couchbase Client 3.4.7
...
Closes gh-35883
2023-06-14 09:35:25 +02:00
d3ff04fa4b
Upgrade to Reactor Bom 2022.0.8
...
Closes gh-35736
2023-06-14 09:23:44 +02:00
1900910008
Upgrade to Micrometer Tracing 1.0.7
...
Closes gh-35735
2023-06-14 09:23:44 +02:00
2d43f345de
Upgrade to Micrometer 1.10.8
...
Closes gh-35734
2023-06-14 09:23:43 +02:00
7cf41e9e0a
Upgrade to Logback 1.4.8
...
Closes gh-35881
2023-06-14 09:23:43 +02:00
10b66975dd
Upgrade to Glassfish JAXB 4.0.3
...
Closes gh-35880
2023-06-14 09:23:38 +02:00
2dbfe54762
Upgrade to Couchbase Client 3.4.7
...
Closes gh-35879
2023-06-14 09:23:33 +02:00
f2a44d7f06
Upgrade to Reactor Bom 2020.0.33
...
Closes gh-35726
2023-06-14 09:20:05 +02:00
7576117dd9
Upgrade to Micrometer 1.9.12
...
Closes gh-35725
2023-06-14 09:20:04 +02:00
4950e2a6b7
Merge branch '3.1.x'
2023-06-13 16:42:38 -05:00
7e6452edee
Fix Redis URL property userinfo parsing
...
Fixes gh-35850
2023-06-13 16:42:19 -05:00
b3e2f9a212
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35868
2023-06-13 15:49:33 +01:00
ac8ea1d841
Upgrade to Neo4j Java Driver 5.9.0
...
Closes gh-35867
2023-06-13 15:48:52 +01:00
21a54ec66d
Merge branch '3.1.x'
2023-06-13 13:52:36 +01:00
e12ae5add5
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35865
2023-06-13 13:52:10 +01:00
bdbbbc6470
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35864
2023-06-13 13:51:51 +01:00
984dc1d58f
Allow package-private main classes to be used with Devtools
...
Fixes gh-35858
2023-06-13 13:50:27 +01:00
c73315b4a3
Add property to prevent observations starting with a prefix
...
For example, setting management.observations.enable.denied.prefix=false
will prevent all observations starting with 'denied.prefix'
Closes gh-34802
2023-06-13 14:04:33 +02:00
7b90fbb0b2
Add property to specify the order of ServerHttpObservationFilter
...
The property is named 'management.observations.http.server.filter.order'
Closes gh-35067
2023-06-13 12:14:58 +02:00
1955139b72
Start building against Spring Integration 6.1.1 snapshots
...
See gh-35859
2023-06-13 11:04:31 +01:00
491e12ab5e
Add property to disable Spring Security observations
...
Setting 'management.observations.spring-security.enabled' installs an
ObservationPredicate, which prevents all observations starting with
'spring.security.' to be created.
Closes gh-34802
2023-06-13 11:18:05 +02:00
6eede829d2
Merge branch '3.1.x'
2023-06-13 10:21:06 +02:00
96d5f8641c
Fix typo in Docker Compose documentation
...
See gh-35818
2023-06-13 10:18:16 +02:00
5b06224af5
Add property for common key/values on observations
...
- Deprecates 'management.metrics.tags.*'
Closes gh-33241
2023-06-13 09:56:42 +02:00
214f06083b
Auto-configure OtlpHttpSpanExporter only if property is set
...
- Remove the default value of 'management.otlp.tracing.endpoint'
Closes gh-35596
2023-06-13 08:14:22 +02:00
cd018aff9c
Merge branch '3.1.x'
2023-06-12 09:45:49 +02:00
71856687d7
Upgrade to Undertow 2.3.7.Final
...
Closes gh-35849
2023-06-12 08:46:00 +02:00
c6bb958ce3
Upgrade to UnboundID LDAPSDK 6.0.9
...
Closes gh-35848
2023-06-12 08:45:56 +02:00
815fe626f8
Upgrade to Testcontainers 1.18.3
...
Closes gh-35847
2023-06-12 08:45:51 +02:00
9048686080
Upgrade to SQLite JDBC 3.41.2.2
...
Closes gh-35846
2023-06-12 08:45:45 +02:00
bba8569c25
Upgrade to R2DBC Proxy 1.1.1.RELEASE
...
Closes gh-35845
2023-06-12 08:45:40 +02:00
009b4bbcd9
Upgrade to R2DBC MySQL 1.0.2
...
Closes gh-35844
2023-06-12 08:45:35 +02:00
e51402ef59
Upgrade to R2DBC MSSQL 1.0.1.RELEASE
...
Closes gh-35843
2023-06-12 08:45:30 +02:00
10fbaea743
Upgrade to Netty 4.1.93.Final
...
Closes gh-35842
2023-06-12 08:45:25 +02:00
dac5023c52
Upgrade to Lombok 1.18.28
...
Closes gh-35841
2023-06-12 08:45:21 +02:00
99aeb4eef6
Upgrade to Kafka 3.4.1
...
Closes gh-35840
2023-06-12 08:45:16 +02:00
Andy Wilkinson
Eddú Meléndez
Scott Frederick
Johnny Lim
James Stansell
ThomazPassarelli
Moritz Halbritter
Jonatan Ivanov
Phillip Webb
Fernando Cappi
Stephane Nicoll
Sébastien Deleuze
Sungchan Cho