Commit Graph

39190 Commits

Author SHA1 Message Date
Phillip Webb 4ec2e357d9 Merge branch '2.7.x'
See gh-32086
2022-08-17 12:49:52 -07: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 24a52aa66d Annotate actuator internal infrastructure with @Reflective
This commit simplifies the registration of hints for the infrastructure
of the Actuator that is invoked via reflection.
2022-08-17 17:25:06 +02:00
Stephane Nicoll 6d6270edaf Start building against Spring LDAP 3.0.0-M4 snapshots
See gh-32105
2022-08-17 14:45:01 +02:00
Stephane Nicoll 4823b8ef7b Merge branch '2.7.x'
Closes gh-32104
2022-08-17 13:33:33 +02: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 e6977777cc Merge branch '2.7.x'
Closes gh-32100
2022-08-17 09:10:13 +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 2e3c3efd44 Merge branch '2.7.x'
Closes gh-32098
2022-08-17 08:34:52 +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 bb07eec4ed Merge pull request #32051 from puppylpg
* pr/32051:
  Polish "Add socketKeepAlive configuration property for Elasticsearch"
  Add socketKeepAlive configuration property for Elasticsearch

Closes gh-32051
2022-08-17 08:26:04 +02:00
Stephane Nicoll d6f6bcb770 Polish "Add socketKeepAlive configuration property for Elasticsearch"
See gh-32051
2022-08-17 08:25:51 +02:00
puppylpg 122d40a110 Add socketKeepAlive configuration property for Elasticsearch
See gh-32051
2022-08-17 08:25:39 +02:00
Stephane Nicoll f58012395c Merge pull request #32030 from mdeinum
* pr/32030:
  Remove use of reflection in MustacheViewResolver

Closes gh-32030
2022-08-17 08:07:55 +02:00
Marten Deinum 3b410719e6 Remove use of reflection in MustacheViewResolver
Prior to this commit the MustacheViewResolver used reflection
to instantiate a MustacheView class, which fails when using AOT.
Creating the view without reflection (analogous to the
FreemarkerViewResolver) will fix this without the need for additional
constructor hints.

See gh-32030
2022-08-17 08:00:43 +02:00
Madhura Bhave cea6492c4a Align default JMX and WEB endpoint exposures
Closes gh-32005
2022-08-16 14:29:08 -07:00
Madhura Bhave 1f6a966336 Start building against Spring Integration 6.0.0-SNAPSHOT
See gh-32096
2022-08-16 10:58:35 -07:00
Stephane Nicoll 888ccfea2d Adapt to changes in Spring Framework 2022-08-16 16:02:00 +02:00
Stephane Nicoll 12d9864e41 Merge branch '2.7.x' 2022-08-16 09:59:06 +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 6e580dac83 Merge branch '2.7.x' 2022-08-16 07:15:28 +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 ee2bd9e065 Merge branch '2.7.x'
Closes gh-32086
2022-08-15 17:59:28 -07: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
Andy Wilkinson a8ae7a1e44 Fix Gradle AOT integration test on Windows
See gh-31970
2022-08-15 10:21:42 +01:00
Stephane Nicoll 4a00d76b85 Adapt integration tests to proxy changes in Spring Framework 2022-08-13 13:56:09 +02:00
Stephane Nicoll 332419e3a7 Remove extra 'build' directory
See gh-32069
2022-08-12 17:47:38 +02:00
Stephane Nicoll e21041ce65 Harmonize location of generated classes processed Ahead-of-time
Closes gh-32069
2022-08-11 17:07:16 +02:00
Stephane Nicoll 2c33400af8 Merge branch '2.7.x' 2022-08-11 13:30:06 +02: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 5d29057309 Enable stable configuration cache feature flag
Closes gh-32061
2022-08-10 12:35:22 +01:00
Andy Wilkinson 066e9671ae Upgrade to Gradle 7.5.1
Closes gh-32060
2022-08-10 12:31:40 +01:00
Andy Wilkinson 053b0e5fc3 Merge branch '2.7.x' 2022-08-10 12:28:43 +01:00
Andy Wilkinson 9caad3d31b Merge branch '2.6.x' into 2.7.x
Closes gh-32059
2022-08-10 12:28:26 +01:00