Commit Graph

37895 Commits

Author SHA1 Message Date
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
Stephane Nicoll 3b01325c6b Use asList consistently
Closes gh-32102
2022-08-17 13:32:36 +02:00
Stephane Nicoll ca63a6e9ad Merge branch '2.6.x' into 2.7.x
Closes gh-32099
2022-08-17 09:10:02 +02:00
Stephane Nicoll 191593cf15 Review Git contribution documentation
Closes gh-31904
2022-08-17 08:58:56 +02:00
Stephane Nicoll 1c6624db44 Merge branch '2.6.x' into 2.7.x
Closes gh-32097
2022-08-17 08:34:38 +02:00
Stephane Nicoll f7fba30345 Merge pull request #31997 from nilshartmann
* pr/31997:
  Polish "Explicit error message if source is not an archive"
  Explicit error message if source is not an archive

Closes gh-31997
2022-08-17 08:34:27 +02:00
Stephane Nicoll e94ddfa589 Polish "Explicit error message if source is not an archive"
See gh-31997
2022-08-17 08:33:54 +02:00
Nils Hartmann a0f273a041 Explicit error message if source is not an archive
This commit split the existing assertion to provide an explicit error
message if the source file is not an archive.

See gh-31997
2022-08-17 08:30:03 +02:00
Stephane Nicoll a912b727a6 Merge branch '2.6.x' into 2.7.x 2022-08-16 09:58:54 +02:00
Stephane Nicoll 1b12ea71ee Upgrade to Undertow 2.2.19.Final
Closes gh-32090
2022-08-16 09:56:15 +02:00
Stephane Nicoll 464c2ed83a Upgrade to Maven Javadoc Plugin 3.4.1
Closes gh-32089
2022-08-16 09:56:11 +02:00
Stephane Nicoll 2550763669 Upgrade to Undertow 2.2.19.Final
Closes gh-32087
2022-08-16 08:46:00 +02:00
Stephane Nicoll 18aabde1b0 Merge branch '2.6.x' into 2.7.x 2022-08-16 07:15:17 +02:00
Stephane Nicoll 542267e244 Upgrade to Spring Security 5.7.3
Closes gh-32040
2022-08-16 07:14:53 +02:00
Stephane Nicoll fd89ced078 Upgrade to Spring Security 5.6.7
Closes gh-32039
2022-08-16 07:14:15 +02:00
Phillip Webb ef7aac8c14 Merge branch '2.6.x' into 2.7.x
Closes gh-32085
2022-08-15 17:59:06 -07:00
Phillip Webb 360eb027be Don't close nested jars or wrapper when parent is closed
Update `JarFile` so that the `close()` method no longer closes nested
jars or the wrapper. Prior to this commit it was possible for a parent
jar file to be garbage collected and closed even though references still
existed to the nested jars. When this happened the nested jars would get
closed and any access to entries would result in `JarFile.ensureOpen()`
throwing an `IllegalStateException`. The user would often not see this
exception directly, but rather find `ClassNotFoundException` being
thrown.

Fixes gh-31853
2022-08-15 17:55:25 -07:00
Stephane Nicoll 798eb96467 Merge branch '2.6.x' into 2.7.x 2022-08-11 13:29:13 +02:00
Stephane Nicoll f5fad454df Upgrade Java 8 version in CI image and .sdkmanrc
Closes gh-32064
2022-08-11 13:28:42 +02:00
Stephane Nicoll 48443c95ef Upgrade Java 8 version in CI image and .sdkmanrc
Closes gh-32063
2022-08-11 13:28:07 +02:00
Andy Wilkinson 9caad3d31b Merge branch '2.6.x' into 2.7.x
Closes gh-32059
2022-08-10 12:28:26 +01:00
Andy Wilkinson c9e69f555e Test our Gradle plugin against Gradle 7.5.1
Closes gh-32058
2022-08-10 12:27:47 +01:00
Andy Wilkinson 0069fc831e Upgrade to Dependency Management Plugin 1.0.13.RELEASE
Closes gh-32056
2022-08-10 12:15:51 +01:00
Andy Wilkinson 648d6b0c04 Merge branch '2.6.x' into 2.7.x 2022-08-10 12:15:19 +01:00
Andy Wilkinson 64a3276b78 Upgrade to Dependency Management Plugin 1.0.13.RELEASE
Closes gh-32055
2022-08-10 12:15:09 +01:00
Andy Wilkinson 1f44da55f1 Merge branch '2.6.x' into 2.7.x 2022-08-10 11:50:37 +01:00
Andy Wilkinson 0b9c2025fb Fix handling of String Java version in cache smoke test 2022-08-10 11:49:21 +01:00
Andy Wilkinson 8e3346c24f Catch exception that's thrown on Java 11 and later
See gh-32034
2022-08-10 11:20:33 +01:00
Stephane Nicoll 37833753f8 Merge branch '2.6.x' into 2.7.x 2022-08-10 12:05:02 +02:00
Stephane Nicoll 556a4116d7 Upgrade to Reactor 2020.0.22
Closes gh-32038
2022-08-10 12:03:36 +02:00
Stephane Nicoll e8c218908c Upgrade to Reactor 2020.0.22
Closes gh-32037
2022-08-10 12:02:51 +02:00