Commit Graph

37725 Commits

Author SHA1 Message Date
Andy Wilkinson
2003cfdd43 Merge branch '2.6.x' into 2.7.x
Closes gh-32231
2022-09-05 15:42:28 +01:00
Andy Wilkinson
b47eb1abfc Merge pull request #32223 from valentine-dev
* gh-32223:
  Polish "Support lower-case input in DurationStyle"
  Support lower-case input in DurationStyle

Closes gh-32223
2022-09-05 15:42:15 +01:00
Andy Wilkinson
bc23e70024 Polish "Support lower-case input in DurationStyle"
See gh-32223
2022-09-05 14:53:50 +01:00
valentine-dev
c579c9378b Support lower-case input in DurationStyle
See gh-32223
2022-09-05 14:53:29 +01:00
Brian Clozel
cca5ee8a89 Merge branch '2.6.x' into 2.7.x
Closes gh-32229
2022-09-05 14:24:06 +02:00
Brian Clozel
724f9ebf71 Support SnakeYaml 1.31
This commit keeps the managed dependency for SnakeYaml at 1.29 but
enables forward compatibility for SnakeYaml 1.31.

Closes gh-32228
2022-09-05 14:22:24 +02:00
Andy Wilkinson
d9265f0a92 Build against SnakeYAML 1.31 but still use 1.29 in dep mgmt and starter 2022-09-05 13:55:19 +02:00
Scott Frederick
7763a5df7d Polish auto-configuration documentation
Remove references to outdated information, emphasize use of the
`@AutoConfiguration` annotation and attributes, and edit for clarity.

Closes gh-32174
2022-09-01 15:35:59 -05:00
Andy Wilkinson
ed77567fce Upgrade Java 18 CI to 18.0.2.1+1
Closes gh-32216
2022-09-01 17:35:33 +01:00
Andy Wilkinson
c98e4310d8 Merge branch '2.6.x' into 2.7.x 2022-09-01 17:34:15 +01:00
Andy Wilkinson
7b12926d8c Upgrade Java 18 CI to 18.0.2.1+1
Closes gh-32207
2022-09-01 17:33:38 +01:00
Andy Wilkinson
d189853412 Merge branch '2.6.x' into 2.7.x
Closes gh-32201
2022-08-31 17:48:12 +01:00
Andy Wilkinson
01aeb550b6 Upgrade to Test Retry Gradle Plugin 1.4.1
Closes gh-32200
2022-08-31 14:58:03 +01:00
Andy Wilkinson
a253d8d589 Merge branch '2.6.x' into 2.7.x
Closes gh-32198
2022-08-31 14:41:47 +01:00
Andy Wilkinson
7d983be769 Clarify docs on disabling HTTP client request metrics
Closes gh-32136
2022-08-31 14:36:07 +01:00
Andy Wilkinson
13edfba1f5 Fix Kotlin example for empty @DefaultValue constructor binding
Closes gh-32177
2022-08-31 11:35:58 +01:00
Phillip Webb
13c0cf7e2a Refine Javadoc to use @AutoConfiguration
See gh-32166
2022-08-25 11:48:07 -07:00
Phillip Webb
e31c295ee9 Merge branch '2.6.x' into 2.7.x 2022-08-24 18:13:03 -07:00
Phillip Webb
adc4e05eff Polish 2022-08-24 18:12:57 -07:00
Phillip Webb
4ade89771f Merge branch '2.6.x' into 2.7.x
Closes gh-32171
2022-08-24 17:51:46 -07:00
Phillip Webb
ccc80f39c7 Upgrade to Java 17.0.4.1+1
Closes gh-32163
2022-08-24 17:51:21 -07:00
Phillip Webb
a7e2c0c8af Polish 2022-08-24 17:50:36 -07:00
Phillip Webb
753abedb5d Merge branch '2.6.x' into 2.7.x
Closes gh-32169
2022-08-24 17:48:22 -07:00
Phillip Webb
dda44f1ca2 Upgrade to Java 11.0.16.1+1
Closes gh-32164
2022-08-24 17:47:28 -07:00
Phillip Webb
10ded39217 Merge branch '2.6.x' into 2.7.x
Closes gh-32167
2022-08-24 17:33:50 -07:00
Phillip Webb
24c2daa99d Improve javadoc regarding use on @Bean methods
Closes gh-32166
2022-08-24 17:33:08 -07:00
Scott Frederick
257e236b06 Fix image-building unit tests on Windows
See gh-32000
2022-08-24 13:14:39 -05:00
Phillip Webb
5f2f6d32cf Merge branch '2.6.x' into 2.7.x
Closes gh-32157
2022-08-23 16:11:13 -07:00
Phillip Webb
ec65b293bf Merge pull request #32123 from dsyer
* pr/32123:
  Polish 'Add JVM options to prevent warnings with asciidoctor'
  Add JVM options to prevent warnings with asciidoctor

Closes gh-32123
2022-08-23 16:10:36 -07:00
Phillip Webb
546d7b41e9 Polish 'Add JVM options to prevent warnings with asciidoctor'
See gh-32123
2022-08-23 16:09:58 -07:00
Dave Syer
7b4db4cafc Add JVM options to prevent warnings with asciidoctor
See gh-32123
2022-08-23 16:09:45 -07:00
Stephane Nicoll
4d2d0dedc8 Merge branch '2.6.x' into 2.7.x 2022-08-23 08:26:23 +02:00
Stephane Nicoll
50c099334b Adapt deprecated getIpAddress call with getHost in Redis Tests
Closes gh-32147
2022-08-23 08:25:52 +02:00
Stephane Nicoll
7a91fa90d5 Merge branch '2.6.x' into 2.7.x
Closes gh-32145
2022-08-23 07:25:45 +02:00
Stephane Nicoll
463766fd44 Merge pull request #32144 from russellyou
* pr/32144:
  Polish "Allow Netty default leak detection to be overidden"
  Allow Netty default leak detection to be overidden

Closes gh-32144
2022-08-23 07:25:39 +02:00
Stephane Nicoll
7f2d4fceec Polish "Allow Netty default leak detection to be overidden"
See gh-32144
2022-08-23 07:20:49 +02:00
Russell You
51f2e40c69 Allow Netty default leak detection to be overidden
See gh-32144
2022-08-23 07:12:24 +02:00
Stephane Nicoll
392aec4a78 Merge pull request #32131 from thegeekyasian
* pr/32131:
  Adapt deprecated getIpAddress call with getHost in Redis Tests

Closes gh-32131
2022-08-22 16:07:35 +02:00
thegeekyasian
5b1c6381db Adapt deprecated getIpAddress call with getHost in Redis Tests
See gh-32131
2022-08-22 16:06:21 +02:00
Stephane Nicoll
a6350b5992 Merge branch '2.6.x' into 2.7.x
Closes gh-32128
2022-08-22 06:38:38 +02:00
Stephane Nicoll
6d80b601b6 Upgrade to Testcontainers 1.17.3
Closes gh-32127
2022-08-22 06:37:56 +02:00
Scott Frederick
c16094e04b Disable SELinux label security policy when building images
When using the Gradle `bootBuildImage` task or Maven
`spring-boot:build-image` goal on a Linux distribution with SELinux
enabled, binding the Docker socket in the builder container might
fail. This commit disables the `label` security policy in the builder
container to prevent this type of failure.

Fixes gh-32000
2022-08-19 13:56:34 -05:00
Stephane Nicoll
238493a7d4 Merge branch '2.6.x' into 2.7.x 2022-08-18 09:29:51 +02:00
Spring Builds
e8eeec1c3d Next development version (v2.7.4-SNAPSHOT) 2022-08-18 06:09:57 +00:00
Spring Builds
a9c71a7b86 Next development version (v2.6.12-SNAPSHOT) 2022-08-18 04:20:21 +00:00
Phillip Webb
60e1cc510c Merge branch '2.6.x' into 2.7.x
See gh-32085
2022-08-17 12:48:21 -07:00
Phillip Webb
13bd61b6fe Revert nested jar fixes
Revert the recent updates to nested jar support that were intended
to allow verification of signed unpacked nested jars on Oracle JDK.

Unfortunately the changes caused a number of regressions which
affected a larger number of users than those that have issues with
signed jars.

Closes gh-31853
2022-08-17 12:43:48 -07:00
Phillip Webb
bd74344025 Revert "Don't close jar files early"
This reverts commit b42f056ddb.
2022-08-17 11:38:42 -07:00
Phillip Webb
674022d401 Revert "Don't close nested jars or wrapper when parent is closed"
This reverts commit 360eb027be.
2022-08-17 11:37:19 -07:00
Stephane Nicoll
3fcfcc4a3b Merge branch '2.6.x' into 2.7.x
Closes gh-32103
2022-08-17 13:33:24 +02:00