Commit Graph

18242 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
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
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
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
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
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
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
0069fc831e Upgrade to Dependency Management Plugin 1.0.13.RELEASE
Closes gh-32056
2022-08-10 12:15:51 +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
8e3346c24f Catch exception that's thrown on Java 11 and later
See gh-32034
2022-08-10 11:20:33 +01: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
Stephane Nicoll
6d2d67b0bc Merge branch '2.7.x'
Closes gh-32050
2022-08-10 09:16:15 +02:00
Vedran Pavic
0e6cf07ec9 Polish LogFileWebEndpoint
See gh-32049
2022-08-10 09:12:57 +02:00
Andy Wilkinson
889c40355c Tolerate Flyway 9
Closes gh-32034
2022-08-09 17:50:47 +01:00
Andy Wilkinson
c6872e57a9 Remove support for Flyway 8.x and earlier
Closes gh-32036
2022-08-09 15:38:16 +01:00
Stephane Nicoll
caa2598b2b Start building against Spring Security 5.7.3
See gh-32040
2022-08-09 14:07:37 +02:00
Stephane Nicoll
3fc7736c34 Start building against Reactor 2020.0.22 snapshots
See gh-32038
2022-08-09 14:07:11 +02:00
Stephane Nicoll
24c2ed3c78 Start building against Spring Security 5.6.7 snapshots
See gh-32039
2022-08-09 14:06:24 +02:00
Stephane Nicoll
19eb69c1bb Start building against Reactor 2020.0.22 snapshots
See gh-32037
2022-08-09 14:05:53 +02:00
Andy Wilkinson
ff348f4c6b Merge branch '2.6.x' into 2.7.x
Closes gh-32017
2022-08-09 10:57:44 +01:00
Andy Wilkinson
4a807ebbf4 Upgrade to Groovy 3.0.12
Closes gh-32008
2022-08-09 10:56:41 +01:00
Phillip Webb
bb75f04ce6 Merge branch '2.7.x'
Closes gh-32032
2022-08-09 10:24:18 +01:00
Phillip Webb
9e1a69efc9 Merge branch '2.6.x' into 2.7.x
Closes gh-32031
2022-08-09 10:23:25 +01:00
Phillip Webb
2f85ea3a30 Protect against deeply nested maps
Update BasicJsonParser to fix the deeply nested map protection logic.

Fixes gh-32029
2022-08-09 10:21:13 +01:00
Stephane Nicoll
1efad88c8c Merge branch '2.7.x'
Closes gh-32027
2022-08-09 09:53:22 +02:00
Stephane Nicoll
6e64f49593 Merge branch '2.6.x' into 2.7.x
Closes gh-32026
2022-08-09 09:53:13 +02:00
Stephane Nicoll
12c1da275b Polish contribution
See gh-32004
2022-08-09 09:52:11 +02:00
Ionascu Stefan Ciprian
c441bafe27 Document the DefaultServlet is no longer being enabled by default
See gh-32004
2022-08-09 09:41:53 +02:00
Stephane Nicoll
ccf1b9ebe4 Upgrade to MySQL 8.0.30
Closes gh-32023
2022-08-08 21:06:20 +02:00
Stephane Nicoll
c050e08238 Upgrade to Micrometer 1.9.3
Closes gh-32022
2022-08-08 21:06:19 +02:00
Stephane Nicoll
9edbbbcc03 Upgrade to MariaDB 3.0.7
Closes gh-32021
2022-08-08 21:06:19 +02:00