Commit Graph

4489 Commits

Author SHA1 Message Date
Stéphane Nicoll
4e4dbaf832 Merge branch 'main' into 4.0.x 2025-05-26 16:43:01 +02:00
Julio Gómez Díaz
3eaed90d94 Fix artifactId of prometheus-metrics-exporter-pushgateway in example
See gh-45684

Signed-off-by: Julio Gómez Díaz <juliojgd@gmail.com>
2025-05-26 16:41:54 +02:00
Stéphane Nicoll
e0d10d7d8c Merge branch 'main' into 4.0.x 2025-05-26 16:18:32 +02:00
Stéphane Nicoll
d05148d4d6 Merge branch '3.4.x'
Closes gh-45683
2025-05-26 16:18:21 +02:00
Stéphane Nicoll
6a82134f94 Merge branch '3.3.x' into 3.4.x
Closes gh-45682
2025-05-26 16:18:12 +02:00
Tran Ngoc Nhan
7448f8c73a Document use of git-commit-id-maven-plugin consistently
See gh-45677

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-05-26 16:11:52 +02:00
Andy Wilkinson
d98ca77235 Merge branch '3.3.x' into 3.4.x
Closes gh-45649
2025-05-23 12:31:08 +01:00
Andy Wilkinson
9a2d8c589e Clarify how to use Pushgateway auto-configuration
Closes gh-44392
2025-05-23 12:30:08 +01:00
Andy Wilkinson
e65d1a3ac1 Merge branch 'main' into 4.0.x 2025-05-23 09:46:08 +01:00
Andy Wilkinson
a9cc83dc8f Merge branch '3.4.x'
Closes gh-45646
2025-05-23 09:32:09 +01:00
Andy Wilkinson
492a4abd70 Merge branch '3.3.x' into 3.4.x
Closes gh-45645
2025-05-23 09:29:23 +01:00
Andy Wilkinson
7628ae8503 Check Kotlin code using Detekt
Closes gh-45583
2025-05-23 09:22:08 +01:00
Andy Wilkinson
69a9162ab6 Merge branch 'main' into 4.0.x 2025-05-21 08:41:22 +01:00
Andy Wilkinson
b142798bdb Merge branch '3.4.x'
Closes gh-45626
2025-05-21 08:41:04 +01:00
Andy Wilkinson
ea8c64262d Merge branch '3.3.x' into 3.4.x
Closes gh-45625
2025-05-21 08:40:37 +01:00
Andy Wilkinson
bdf0ef19a4 Correct docs for use of static with @ConfigurationPropertiesBinding
Closes gh-45621
2025-05-21 08:39:10 +01:00
Phillip Webb
eb2163aecf Merge branch 'main' into 4.0.x 2025-05-20 17:23:20 -07:00
Lari Hotari
a9f5a4194e Make heapdump endpoint restricted by default
See gh-45624

Signed-off-by: Lari Hotari <lhotari@users.noreply.github.com>
2025-05-20 17:22:51 -07:00
Phillip Webb
f3c25b21eb Merge branch 'main' into 4.0.x 2025-05-20 17:19:57 -07:00
Phillip Webb
ab162fa0bb Remove SSL status tag from metrics
Update `SslMeterBinder` to the status tag is no longer included in the
reported metrics. Instead the expiry date should be used directly by
the monitoring system.

Closes gh-45602
2025-05-20 17:17:53 -07:00
Phillip Webb
f76d67d3f5 Merge branch 'main' into 4.0.x 2025-05-20 12:54:06 -07:00
Phillip Webb
3145ddfae8 Merge branch '3.4.x'
Closes gh-45626
2025-05-20 12:53:54 -07:00
Phillip Webb
0c313c368f Merge branch '3.3.x' into 3.4.x
Closes gh-45625
2025-05-20 12:53:39 -07:00
Phillip Webb
fa0107c431 Document @ConfigurationPropertiesBinding should use static bean methods
Closes gh-45621
2025-05-20 12:53:03 -07:00
Stéphane Nicoll
00e4ca2201 Merge branch 'main' into 4.0.x 2025-05-18 09:28:49 +02:00
Stéphane Nicoll
921b9fd6ac Merge branch '3.4.x'
Closes gh-45595
2025-05-18 09:28:38 +02:00
Stéphane Nicoll
fab15af876 Merge branch '3.3.x' into 3.4.x
Closes gh-45594
2025-05-18 09:26:57 +02:00
Johnny Lim
0a54804a0f Polish
See gh-45592

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-05-18 09:20:33 +02:00
Stéphane Nicoll
0b4cb4bff1 Merge branch 'main' into 4.0.x 2025-05-15 08:27:48 +02:00
Stéphane Nicoll
698821a916 Merge branch '3.4.x'
Closes gh-45557
2025-05-15 08:27:32 +02:00
Stéphane Nicoll
b3f3b06fdb Merge branch '3.3.x' into 3.4.x
Closes gh-45556
2025-05-15 08:27:24 +02:00
Yanming Zhou
0d153dd91a Remove unused imports in sample
See gh-45554

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-05-15 08:27:01 +02:00
Phillip Webb
666a98a4b4 Merge branch 'main' into 4.0.x 2025-05-14 18:14:10 -07:00
Phillip Webb
91d14fa27c Merge branch '3.4.x'
Closes gh-45553
2025-05-14 18:14:04 -07:00
Phillip Webb
bd40779bc6 Merge branch '3.3.x' into 3.4.x
Closes gh-45552
2025-05-14 18:14:00 -07:00
Phillip Webb
27c4d1ff24 Document the way that primary Kotlin constructors are used when binding
Improve constructor binding documentation for Kotlin and add a test
to prove a no-param primary constructor disables constructor binding.

Closes gh-44849
2025-05-14 18:13:54 -07:00
Phillip Webb
050d0edb09 Merge branch 'main' into 4.0.x 2025-05-14 16:22:45 -07:00
Phillip Webb
fee8aa07a6 Merge branch '3.4.x'
Closes gh-45551
2025-05-14 16:22:39 -07:00
Phillip Webb
6c02f587f3 Merge branch '3.3.x' into 3.4.x
Closes gh-45550
2025-05-14 16:22:32 -07:00
Phillip Webb
34dee77a3e Improve "profile" reference documentation with additional admonitions
Closes gh-45522
2025-05-14 16:20:35 -07:00
Stéphane Nicoll
b3f35baed3 Add metadata support for types in arbitrary modules
Previously, if a ConfigurationProperties had a nested type or was
extending from a type located outside the compilation unit, no
metadata discovered on the source code was available (documentation and
explicit default value, if any). This typically happens when such a type
resides in another module.

This commit introduces `@ConfigurationPropertiesSource` as a way to
annotate such type and have metadata generated for them in their own
module.

Type-metadata is generated as one file per type and is reused
transparently whenever that type is used. As for module metadata, an
additional file can be crafted manually and will be merged when the
metadata for the type is generated.

The following is an example structure with two types where one has
an additional metadata:

META-iNF/
  spring/
    configuration-properties/
      additional/
        com.example.SourceOne.json
      com.example.SourceOne.json
      com.example.SourceTwo.json

Those files are used only by the annotation processor and are not meant
to be public API.

See gh-18366
2025-05-13 13:42:55 +02:00
Phillip Webb
f1f54382ed Merge branch 'main' into 4.0.x 2025-05-12 17:58:06 -07:00
Phillip Webb
48ed394679 Remove settings suffix from http client properties
Remove `spring.http.client` deprecation and change
`spring.http.reactiveclient.settings` to `spring.http.reactiveclient`.

Closes gh-45507
2025-05-12 17:55:02 -07:00
Stéphane Nicoll
6fceab2c90 Replace spring-jcl with vanilla commons-logging
See gh-45487

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2025-05-09 17:38:11 -07:00
Stéphane Nicoll
0510cfa684 Refine '?' use in Kotlin code 2025-05-09 17:38:10 -07:00
Stéphane Nicoll
7035c0fa0a Upgrade to Kotlin 2.1.0
This commit upgrades to Kotlin 2.1.0. Two related dependencies have been
updated as well: Kotlin Coroutines to 1.10, and Kotlin Serialization to
1.8.

As of Kotlin 2, it is no longer possible to have a Java type and a
Kotlin type with the same name. As our code samples follow that
unfortunate pattern, this commit makes sure that the Kotlin sample code
does not depend on any of the Java counterpart and configure the kotlin
compilation plugin to ignore Java sources.

The minimum version of Gradle is 7.6.4. It bundles a version of Kotlin
that cannot compile a Kotlin build script when spring-core, compiled
with Kotlin 2.1, is on the classpath. Using Gradle 8.12 to run the DSL
tests avoids the problem.

Closes gh-45486

Co-authored-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2025-05-09 17:38:10 -07:00
Stéphane Nicoll
3881a79383 Upgrade to Hibernate 7.0.0.Beta3 and Jakarta Persistence 3.2.0
Closes gh-45476
Closes gh-45477
2025-05-09 17:38:09 -07:00
Stéphane Nicoll
b52b4d1b9a Polish MyTaskExecutorConfiguration.kt sample code 2025-05-08 23:06:31 -07:00
Phillip Webb
da5012086d Merge branch '3.4.x' 2025-05-06 10:42:52 -07:00
Phillip Webb
c1dbb2720a Merge branch '3.3.x' into 3.4.x 2025-05-06 10:42:47 -07:00