Commit Graph

24306 Commits

Author SHA1 Message Date
Moritz Halbritter 364af04377 Merge branch '3.1.x' into 3.2.x
Closes gh-40700
2024-05-13 11:30:42 +02:00
Yanming Zhou 0e450d602d Use CollectionUtils.isEmpty() and StringUtils.hasLength()
See gh-40645
2024-05-13 11:26:56 +02:00
Andy Wilkinson e55773d14e Merge branch '3.1.x' into 3.2.x
Closes gh-40690
2024-05-10 12:37:29 +01:00
Andy Wilkinson a67c8e4bbd Perform analysis even when property is not in the environment
Closes gh-33261
2024-05-10 12:36:59 +01:00
Andy Wilkinson 207ea098e9 Start building against Spring WS 4.0.11 snapshots
See gh-40664
2024-05-09 12:19:30 +01:00
Andy Wilkinson d0550d8441 Start building against Spring Session 3.2.3 snapshots
See gh-40663
2024-05-09 12:19:29 +01:00
Andy Wilkinson da1226822c Start building against Spring Pulsar 1.0.6 snapshots
See gh-40662
2024-05-09 12:19:29 +01:00
Andy Wilkinson ef503323d8 Start building against Spring Kafka 3.1.5 snapshots
See gh-40661
2024-05-09 12:19:28 +01:00
Andy Wilkinson 30ef19c422 Start building against Spring Integration 6.2.5 snapshots
See gh-40660
2024-05-09 12:19:28 +01:00
Andy Wilkinson 0a212dac4c Upgrade to Neo4j Java Driver 5.20.0
Closes gh-40665
2024-05-09 12:19:27 +01:00
Andy Wilkinson 5f6fb96931 Start building against Spring Data Bom 2023.1.6 snapshots
See gh-40658
2024-05-09 12:16:07 +01:00
Andy Wilkinson b6135c564c Start building against Spring Batch 5.1.2 snapshots
See gh-40657
2024-05-09 12:16:03 +01:00
Andy Wilkinson 077e29eb8c Start building against Reactor Bom 2023.0.6 snapshots
See gh-40656
2024-05-09 12:15:58 +01:00
Andy Wilkinson 36bf25da9c Start building against Micrometer 1.12.6 snapshots
See gh-40655
2024-05-09 12:15:52 +01:00
Andy Wilkinson dcae376a3b Start building against Spring WS 4.0.11 snapshots
See gh-40653
2024-05-09 11:25:49 +01:00
Andy Wilkinson b4dedd73c9 Start building against Spring Session 3.1.6 snapshots
See gh-40652
2024-05-09 11:25:49 +01:00
Andy Wilkinson a9df5b3d05 Start building against Spring Kafka 3.0.17 snapshots
See gh-40651
2024-05-09 11:25:48 +01:00
Andy Wilkinson 23f136d606 Upgrade to Neo4j Java Driver 5.20.0
Closes gh-40654
2024-05-09 11:25:47 +01:00
Andy Wilkinson d3116124b9 Start building against Spring Data Bom 2023.0.12 snapshots
See gh-40649
2024-05-09 11:21:44 +01:00
Andy Wilkinson 02e390f05d Start building against Spring Batch 5.0.6 snapshots
See gh-40648
2024-05-09 11:21:39 +01:00
Andy Wilkinson a7ac7bda4b Start building against Reactor Bom 2022.0.19 snapshots
See gh-40647
2024-05-09 11:21:35 +01:00
Andy Wilkinson 7a6a58174e Start building against Micrometer 1.11.12 snapshots
See gh-40646
2024-05-09 11:21:30 +01:00
Phillip Webb 24bfe5087f Fix checkstyle violation
See gh-40549
2024-05-08 18:28:09 -07:00
Phillip Webb 8457fc333f Adapt Windows path handling fix to deal with Jetty
Update `NestedLocation` to deal with the fact that Jetty attempts
to fix URLs.

See gh-40549
2024-05-08 18:04:17 -07:00
Phillip Webb 7708ec7592 Fix Windows path handling for nested jars
Update `Path` creation for nested locations to allow both UNC and classic
file references to be used. This commit attempts to align our URL
handling with that of standard file URLs. The `NestedLocation` class
no longer attempts to remove leading all `\` characters and instead
only removes the first `\` when the second char is `:`. This duplicates
the logic found in Java's own internal `WindowsUriSupport` class which
is used when calling `Path.of(url)` with a `file:` URL.

Fixes gh-40549
2024-05-08 15:44:03 -07:00
Moritz Halbritter 92f7414fad Favor Duration accepting timeout method over int method
Closes gh-40635
2024-05-08 14:01:09 +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
Moritz Halbritter d18fb9ce65 Upgrade to bcprov-jdk18on 1.78.1
Closes gh-40621
2024-05-06 09:49:32 +02:00
Phillip Webb 8a72e55106 Fix UriPathEncoder bug to improve performance
Fix `isAllowed` check and write test to ensure that additional object
instances are not created unnecessarily.

See gh-40615
2024-05-03 12:29:41 -07:00
Phillip Webb d0ce4daec1 Use URI encoded values when creating NestedPath URIs
Update `NestedPath.toUri()` so that the URI is constructed using encoded
strings.

Fixes gh-40615
2024-05-02 15:53:01 -07:00
Moritz Halbritter 75dac1435f Merge branch '3.1.x' into 3.2.x 2024-05-02 14:48:04 +02:00
Moritz Halbritter 68a63a7797 Polish 2024-05-02 14:47:53 +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 2183b47e62 Merge branch '3.1.x' into 3.2.x
Closes gh-40612
2024-05-02 11:53:21 +02:00
Moritz Halbritter 1534bc8ad2 Polish "Avoid using OkHttp3ClientHttpRequestFactory in test"
See gh-40611
2024-05-02 11:45:23 +02:00
Stéphane Nicoll 20042576e9 Avoid using OkHttp3ClientHttpRequestFactory in test
See gh-40611
2024-05-02 11:45:20 +02:00
Andy Wilkinson c7ec6080ce Publish a runtime variant that supports Java 22
In order to support Java 22, we must use spring-core 6.1.x.
spring-core 6.1.x is a multi-release jar so, in order to support Java
22, a version of Gradle that supports multi-release jars must be
used.

This commit adds a new variant to spring-boot-gradle-plugin for
modern versions of Gradle. When Gradle's plugin API version is 8.7 or
later, we use spring-core 6.1.x. spring-core 6.0.x is used at all
other times.

Closes gh-40074
2024-05-02 10:45:18 +01:00
Moritz Halbritter 713f4f2292 Polish "Fix broken AnsiOutput.detectIfAnsiCapable on JDK22"
See gh-40172
2024-05-02 11:27:55 +02:00
facewise 1f9b62b122 Fix broken AnsiOutput.detectIfAnsiCapable on JDK22
See gh-40172
2024-05-02 11:03:06 +02:00
Moritz Halbritter 46ab60cc43 Merge branch '3.1.x' into 3.2.x
Closes gh-40607
2024-05-02 10:59:43 +02:00
Dave Syer 421b8e23c4 Clarify devtools restart class loader documentation
See gh-40604
2024-05-02 10:58:30 +02:00
Moritz Halbritter 888ae040e4 Merge branch '3.1.x' into 3.2.x
Closes gh-40605
2024-05-02 10:51:10 +02:00
Moritz Halbritter 64b302032c Polish "Change Spring Boot CLI init command docs default build system to gradle"
See gh-40603
2024-05-02 10:49:51 +02:00
coursar 1a786fc788 Change Spring Boot CLI init command docs default build system to gradle
See gh-40603
2024-05-02 10:44:33 +02:00
Phillip Webb 93728cdfb1 Merge branch '3.1.x' into 3.2.x
Closes gh-40600
2024-05-01 22:55:30 -07:00
Johnny Lim f0fcc92b49 Remove reassignments for builders in GraphQL auto-configurations
See gh-40590
2024-05-01 22:51:19 -07:00
yokotaso 5b4bd61720 Fix possible NullPointerException from getPermission()
Fix regression in `JarUrlConnection` where a NullPointerException could
be thrown internally causing performance issues.

When the SecurityManager is present, the following stack trace is
thrown:

java.lang.NullPointerException: Cannot invoke "java.net.URLConnection.getPermission()" because "this.jarFileConnection" is null
        at org.springframework.boot.loader.net.protocol.jar.JarUrlConnection.getPermission(JarUrlConnection.java:175)
        at java.base/jdk.internal.loader.URLClassPath.check(URLClassPath.java:553)
        at java.base/jdk.internal.loader.URLClassPath$Loader.findResource(URLClassPath.java:612)
        at java.base/jdk.internal.loader.URLClassPath.findResource(URLClassPath.java:296)
        at java.base/java.net.URLClassLoader$2.run(URLClassLoader.java:629)
        at java.base/java.net.URLClassLoader$2.run(URLClassLoader.java:627)
        at java.base/java.security.AccessController.doPrivileged(AccessController.java:399)
        at java.base/java.net.URLClassLoader.findResource(URLClassLoader.java:626)
        at org.springframework.boot.loader.net.protocol.jar.JarUrlClassLoader.findResource(JarUrlClassLoader.java:70)
        at java.base/java.lang.ClassLoader.getResource(ClassLoader.java:1403)
        at java.base/java.net.URLClassLoader.getResourceAsStream(URLClassLoader.java:290)
        at java.base/java.lang.Class.getResourceAsStream(Class.java:2850)

See gh-39856
2024-05-01 22:42:52 -07:00
Moritz Halbritter a6dd8b71bd Add exception and failure analyzer for missing AOT initializer
The diagnostics text include the name of the AOT initializer class and
the main class name. It also tells the user how to switch of the AOT
mode.

Closes gh-38645
2024-04-30 15:11:32 +02:00
Scott Frederick 21a0bc7fee Merge branch '3.1.x' into 3.2.x
Closes gh-40576
2024-04-29 16:42:53 -05:00
Johnny Lim e2973a90a8 Use ConcurrentHashMap.newKeySet where feasible
See gh-40567
2024-04-29 15:41:37 -05:00