Commit Graph

39177 Commits

Author SHA1 Message Date
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
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
f36a6a5b93 Upgrade to Dependency Management Plugin 1.0.13.RELEASE
Closes gh-32057
2022-08-10 12:17:58 +01:00
Andy Wilkinson
aab41f0e74 Merge branch '2.7.x' 2022-08-10 12:17:36 +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
d39f4acbbc Merge branch '2.7.x' 2022-08-10 11:50:52 +01:00
Andy Wilkinson
1f44da55f1 Merge branch '2.6.x' into 2.7.x 2022-08-10 11:50:37 +01:00
Andy Wilkinson
5befae94be Merge branch '2.7.x' 2022-08-10 11:50:27 +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
ffe4f785fc Merge branch '2.7.x' 2022-08-10 12:05:21 +02:00
Stephane Nicoll
37833753f8 Merge branch '2.6.x' into 2.7.x 2022-08-10 12:05:02 +02:00