Commit Graph

39905 Commits

Author SHA1 Message Date
Andy Wilkinson
58b5daec55 Merge pull request #32399 from jonatan-ivanov
* gh-32399:
  Polish "Use TracingAwareMeterObservationHandler if tracing is configured"
  Use TracingAwareMeterObservationHandler if tracing is configured

Closes gh-32399
2022-10-13 12:09:51 +01:00
Andy Wilkinson
1af21fe33f Polish "Use TracingAwareMeterObservationHandler if tracing is configured"
See gh-32399
2022-10-13 12:09:43 +01:00
Jonatan Ivanov
415b9025c8 Use TracingAwareMeterObservationHandler if tracing is configured
See gh-32399
2022-10-13 12:09:43 +01:00
Stephane Nicoll
f50987f470 Merge branch '2.7.x' 2022-10-13 11:28:48 +02:00
Stephane Nicoll
cae3a354d0 Upgrade Ubuntu version in CI images
Closes gh-32693
2022-10-13 11:28:26 +02:00
Stephane Nicoll
dde46d09a6 Merge branch '2.6.x' into 2.7.x 2022-10-13 11:27:54 +02:00
Stephane Nicoll
b79cbcb31d Upgrade Ubuntu version in CI images
Closes gh-32692
2022-10-13 11:27:40 +02:00
Stephane Nicoll
ba9e481310 Upgrade Ubuntu version in CI images
Closes gh-32690
2022-10-13 11:26:22 +02:00
Scott Frederick
a15c5e2498 Merge branch '2.7.x' 2022-10-12 13:47:26 -05:00
Scott Frederick
6c1103cde0 Support PEM formatted elliptic-curve TLS keys
Apply the changes from e0c79ce598
to the `PrivateKeyParser` used for web server SSL configuration.

See gh-32646
2022-10-12 13:25:58 -05:00
Andy Wilkinson
035d89df2a Merge pull request #32655 from bertoltmeier
* gh-32655:
  Add checkstyle rule for List.of() / Set.of() / Map.of()

Closes gh-32655
2022-10-12 18:47:15 +01:00
Bertolt Meier
647a2905c8 Add checkstyle rule for List.of() / Set.of() / Map.of()
This commits adds a checkstyle rule to not use List.of(), Set.of()
and Map.of(), preferring Collections.emptyList(), emptySet(), and
emptyMap() respectively.

It replaces usages of these methods across the codebase.

See gh-32655
2022-10-12 18:15:48 +01:00
Andy Wilkinson
7626de4e91 Merge pull request #32627 from izeye
* gh-32627:
  Polish Micrometer tracing changes

Closes gh-32627
2022-10-12 18:06:05 +01:00
Johnny Lim
1032f8cc94 Polish Micrometer tracing changes
See gh-32627
2022-10-12 18:05:41 +01:00
Andy Wilkinson
e4544c1785 Use new constructor to configure W3CPropagation without baggage
Closes gh-32524
2022-10-12 17:19:45 +01:00
Andy Wilkinson
a816851582 Upgrade to Spring HATEOAS 2.0.0-RC1
Closes gh-32652
2022-10-12 17:17:39 +01:00
Andy Wilkinson
c380a64b8c Merge branch '2.7.x'
Closes gh-32689
2022-10-12 17:09:49 +01:00
Andy Wilkinson
f76248de14 Merge branch '2.6.x' into 2.7.x
Closes gh-32688
2022-10-12 17:09:24 +01:00
Andy Wilkinson
ee60ed6e78 Upgrade to Gradle Enterprise Gradle Plugin 3.11.2
Closes gh-32687
2022-10-12 17:08:40 +01:00
Andy Wilkinson
7852c45a77 Generate reflection hints for loggers endpoint's responses
Some of the types that are returned are hidden behind a
Map<String, Object> so the operation annotations already been marked
as reflective isn't sufficient.

This commit uses `@RegisterReflectionForBinding` to register the
types that are used as (nested) values in the response maps.

Closes gh-32486
2022-10-12 15:56:22 +01:00
Andy Wilkinson
180d0edbca Decouple AutoTimeProperties from Micrometer Core
Closes gh-32676
2022-10-12 14:40:42 +01:00
Andy Wilkinson
7e9e64a2ea Revert "Merge pull request #32399 from jonatan-ivanov"
This reverts commit ad40ef3398, reversing
changes made to 6eb32647f5.
2022-10-12 14:36:08 +01:00
Andy Wilkinson
ad40ef3398 Merge pull request #32399 from jonatan-ivanov
* gh-32399:
  Use TracingAwareMeterObservationHandler if tracing is configured

Closes gh-32399
2022-10-12 14:03:19 +01:00
Jonatan Ivanov
a0ceb2c3ff Use TracingAwareMeterObservationHandler if tracing is configured
See gh-32399
2022-10-12 13:57:39 +01:00
Andy Wilkinson
6eb32647f5 Merge pull request #32662 from jonatan-ivanov
* gh-32662:
  Fix Observation lifecycle issues in ObservationAutoConfigurationTests

Closes gh-32662
2022-10-12 13:45:57 +01:00
Jonatan Ivanov
fff4aaaac1 Fix Observation lifecycle issues in ObservationAutoConfigurationTests
See gh-32662
2022-10-12 13:31:21 +01:00
Andy Wilkinson
ad833130e1 Merge pull request #32653 from sdeleuze
* gh-32653:
  Remove spring.xml.ignore flag usages

Closes gh-32653
2022-10-12 13:27:40 +01:00
Sébastien Deleuze
5b17cacb1f Remove spring.xml.ignore flag usages
This commit is a follow-up of spring-projects/spring-framework#29277.

See gh-32653
2022-10-12 13:27:29 +01:00
Stephane Nicoll
8013c5f182 Upgrade to MongoDB 4.8.0-beta0
Closes gh-32684
2022-10-12 14:06:59 +02:00
Andy Wilkinson
fcb8e968d5 Merge pull request #32656 from emilpaw
* gh-32656:
  Fix typo "Elastixsearch"

Closes gh-32656
2022-10-12 12:36:15 +01:00
Emil
ea654b42fa Fix typo "Elastixsearch"
See gh-32656
2022-10-12 12:35:23 +01:00
Andy Wilkinson
78dccb2772 Upgrade to Reactor 2022.0.0-RC1
Closes gh-32599
2022-10-12 12:28:34 +01:00
Andy Wilkinson
4c2c04ca95 Upgrade to Spring Framework 6.0.0-RC1
Closes gh-32550
2022-10-12 12:26:22 +01:00
Andy Wilkinson
3ab4606584 Make runScripts method of DB initializer more extensible
Closes gh-29137
2022-10-12 11:52:38 +01:00
Andy Wilkinson
403803837a Adapt to changes in REST Docs for documenting query parameters
See gh-32623
2022-10-12 11:30:57 +01:00
Phillip Webb
7e8ed075c0 Merge branch '2.7.x'
Closes gh-32682
2022-10-11 23:21:52 -07:00
Phillip Webb
ed01a77a99 Merge branch '2.6.x' into 2.7.x
Closes gh-32681
2022-10-11 23:19:34 -07:00
Phillip Webb
e0c79ce598 Support PEM formatted elliptic-curve TLS keys
Update `PrivateKeyParser` to support loading PEM formatted
elliptic-curve keys. We need to do a similar trick to the PKCS1 keys
and convert them to a `PKCS8EncodedKeySpec`.

Fixes gh-32646
2022-10-11 23:18:44 -07:00
Andy Wilkinson
4dfd770406 Ensure that metrics and observation properties are enabled
Closes gh-32676
2022-10-11 20:30:40 +01:00
Andy Wilkinson
3ca5c7ff5b Create AOT source sets as soon as the Java plugin is applied
Previously, the AOT source sets were not created until both the
Java and Spring Boot plugins had been applied. This could create
ordering problems when the Spring Boot plugin's native image plugin
action tried to access the AOT source sets to configure the
classpaths of the nativeCompile and nativeTest tasks. If the
plugins were applied in a particular order the AOT source sets
would not exist and a failure would occur.

This commit updates the Spring Boot AOT plugin to create the source
sets as soon as the Java plugin has been applied. This ensure that
they're in place when reacting to the native image plugin being
applied.

Closes gh-32661
2022-10-11 19:58:03 +01:00
Andy Wilkinson
808e0be552 Merge branch '2.7.x'
Closes gh-32679
2022-10-11 19:16:08 +01:00
Andy Wilkinson
1b604e30f7 Merge branch '2.6.x' into 2.7.x
Closes gh-32678
2022-10-11 19:15:33 +01:00
Andy Wilkinson
215eb96355 Improve error handling in SpringBootPlugin
Closes gh-32677
2022-10-11 19:15:23 +01:00
Stephane Nicoll
37f966558e Merge branch '2.7.x' 2022-10-11 12:44:03 +02:00
Stephane Nicoll
579a858361 Upgrade to Lettuce 6.2.1.RELEASE
Closes gh-32674
2022-10-11 12:42:17 +02:00
Stephane Nicoll
aee3ab75b1 Upgrade to Jedis 4.3.0
Closes gh-32673
2022-10-11 12:42:17 +02:00
Stephane Nicoll
df364987df Upgrade to Hibernate 6.1.4.Final
Closes gh-32672
2022-10-11 12:42:17 +02:00
Stephane Nicoll
cbf24bd1cd Upgrade to Elasticsearch Client 8.4.3
Closes gh-32671
2022-10-11 12:42:17 +02:00
Stephane Nicoll
2c5be354be Upgrade to Cassandra Driver 4.15.0
Closes gh-32670
2022-10-11 11:11:23 +02:00
Stephane Nicoll
e1aa438d9c Merge branch '2.6.x' into 2.7.x 2022-10-11 11:07:44 +02:00