Commit Graph

39355 Commits

Author SHA1 Message Date
Phillip Webb
6e239d551a Update Spring Batch to upstream API changes
Fix Spring Batch tests following upstream changes related to Spring
Batch issue 4130.

Closes gh-32237
2022-09-08 19:35:27 -07:00
Phillip Webb
127d320636 Refactor code to work around Eclipse compiler bug
Refactor code to work around the Eclipse compiler bug reported at
https://github.com/eclipse-jdt/eclipse.jdt.core/issues/378

Closes gh-32264
2022-09-08 19:10:30 -07:00
Andy Wilkinson
0555dda63d Remove rarely used commands from the CLI
Closes gh-32263
2022-09-08 21:23:33 +01:00
Andy Wilkinson
e112657e1a Merge branch '2.7.x'
Closes gh-32261
2022-09-08 15:30:01 +01:00
Andy Wilkinson
020e6dd3f1 Merge branch '2.6.x' into 2.7.x
Closes gh-32260
2022-09-08 15:28:08 +01:00
Andy Wilkinson
280ce6390a Add NINETEEN to JavaVersion enum
Closes gh-32226
2022-09-08 15:25:34 +01:00
Andy Wilkinson
5352468bcc Adapt to breaking transaction manager change in Spring Batch
See gh-32237
See spring-projects/spring-batch#4130
2022-09-08 14:51:03 +01:00
Stephane Nicoll
0f9ff867e7 Merge branch '2.7.x' 2022-09-08 10:55:56 +02:00
Stephane Nicoll
9a26f47fa5 Upgrade Ubuntu version in CI images
Closes gh-32253
2022-09-08 10:55:50 +02:00
Stephane Nicoll
1365eb7151 Merge branch '2.6.x' into 2.7.x 2022-09-08 10:55:43 +02:00
Andy Wilkinson
5577d16823 Start building against Spring Security 6.0.0-M7 snapshots
See gh-32255
2022-09-08 09:54:34 +01:00
Stephane Nicoll
5e132fb3a6 Upgrade Ubuntu version in CI images
Closes gh-32251
2022-09-08 10:54:05 +02:00
Stephane Nicoll
3852cf4c44 Upgrade Ubuntu version in CI images
Closes gh-32252
2022-09-08 10:53:11 +02:00
Andy Wilkinson
62a84487c9 Start building against Spring Data 2022.0.0-M6 snapshots
See gh-32254
2022-09-08 08:58:52 +01:00
Phillip Webb
d4ed2bd47a Support import into Eclipse 2022-06
Fix a few issues preventing clean project import into Eclipse 2022-06:

  - `buildSrc` need to limit module imports to prevent clashes
    with those in the gradle API jar.

  - The CLI app needs some classpath changes in order to allow
    compileOnly project dependencies to resolve.

  - `AbstractJpaAutoConfigurationTests` needs some minor refactoring
    in order for generic captures to work with the Eclipse compiler.
2022-09-07 15:56:57 -07:00
Andy Wilkinson
5470a6b349 Call FlywayConfigurationCustomizers after applying all other config
Closes gh-32070
2022-09-07 17:36:37 +01:00
Stephane Nicoll
d546ea515a Merge pull request #31769 from vpavic
* pr/31769:
  Add support for customizing WebJars resource handler path pattern

Closes gh-31769
2022-09-07 11:51:16 +02:00
Vedran Pavic
94f42d11e5 Add support for customizing WebJars resource handler path pattern
At present, both Spring MVC and Spring WebFlux auto-configurations
hardcode the path pattern for WebJars resource handlers to
"/webjars/**", which means users are unable to change the path.

This commit introduces "spring.mvc.webjars-path-pattern" and
"spring.webflux.webjars-path-pattern" configuration properties that
allow customization of WebJars resource handler path pattern.

See gh-31769
2022-09-07 11:46:19 +02:00
Stephane Nicoll
ec63a981d0 Merge branch '2.7.x'
Closes gh-32248
2022-09-07 09:33:29 +02:00
Stephane Nicoll
2fb257ad22 Merge branch '2.6.x' into 2.7.x
Closes gh-32247
2022-09-07 09:33:17 +02:00
Stephane Nicoll
1f535a6c55 Merge pull request #32142 from neilstevenson
* pr/32142:
  Polish "Add support for detecting .yml Hazelcast config files"
  Add support for detecting .yml Hazelcast config files

Closes gh-32142
2022-09-07 09:33:12 +02:00
Stephane Nicoll
19c69ff743 Polish "Add support for detecting .yml Hazelcast config files"
See gh-32142
2022-09-07 09:32:53 +02:00
Neil Stevenson
5eaafdee9a Add support for detecting .yml Hazelcast config files
See gh-32142
2022-09-07 09:20:32 +02:00
Stephane Nicoll
9fb0ecdae9 Merge branch '2.7.x'
Closes gh-32246
2022-09-07 09:11:45 +02:00
Stephane Nicoll
74a88cd34a Merge pull request #32184 from ldziedziul
* pr/32184:
  Polish "Make sure Hazelcast shutdown logs are available"
  Make sure Hazelcast shutdown logs are available

Closes gh-32184
2022-09-07 09:11:38 +02:00
Stephane Nicoll
960b034875 Polish "Make sure Hazelcast shutdown logs are available"
See gh-32184
2022-09-07 09:07:29 +02:00
Łukasz Dziedziul
24f3b2b1b7 Make sure Hazelcast shutdown logs are available
See gh-32184
2022-09-07 08:53:01 +02:00
Stephane Nicoll
86e2edf911 Merge pull request #32215 from izeye
* pr/32215:
  Polish

Closes gh-32215
2022-09-07 08:49:04 +02:00
Johnny Lim
2273191c03 Polish
See gh-32215
2022-09-07 08:48:08 +02:00
Stephane Nicoll
cfdceba687 Merge branch '2.7.x'
Closes gh-32245
2022-09-07 08:45:29 +02:00
Stephane Nicoll
9ef067d589 Merge branch '2.6.x' into 2.7.x
Closes gh-32244
2022-09-07 08:45:19 +02:00
Stephane Nicoll
cd61d69a2f Merge pull request #32235 from valentine-dev
* pr/32235:
  Support lower-case input in PeriodStyle

Closes gh-32235
2022-09-07 08:45:13 +02:00
valentine-dev
89e19ddab9 Support lower-case input in PeriodStyle
See gh-32235
2022-09-07 08:40:16 +02:00
Stephane Nicoll
59ecc962ca Merge branch '2.7.x' 2022-09-07 07:19:25 +02:00
Stephane Nicoll
d44fb56f58 Merge branch '2.6.x' into 2.7.x 2022-09-07 07:19:04 +02:00
Stephane Nicoll
df0674c949 Upgrade to Postgresql 42.3.7
Closes gh-32243
2022-09-07 07:18:50 +02:00
Stephane Nicoll
7688444704 Upgrade to Postgresql 42.3.7
Closes gh-32242
2022-09-07 07:17:20 +02:00
Phillip Webb
8f51cd0e9d Migrate eclipse setup to use Java 17 2022-09-06 17:57:37 -07:00
Phillip Webb
bf0fc837dd Merge branch '2.7.x' 2022-09-06 17:56:43 -07:00
Phillip Webb
9bd4cf18f8 Merge branch '2.6.x' into 2.7.x 2022-09-06 16:06:52 -07:00
Phillip Webb
f9e8361635 Update eclipse project setup file
Attempt to fix buildSrc import and JDK version.
2022-09-06 16:05:29 -07:00
Andy Wilkinson
791ddfa909 Start building against Spring Batch 5.0.0-M6 snapshots
See gh-32237
2022-09-06 20:16:16 +01:00
Andy Wilkinson
17b2998bfb Start building against Reactor Bom 2022.0.0-M6 snapshots
See gh-32240
2022-09-06 20:16:15 +01:00
Andy Wilkinson
754f47d6cc Merge pull request #32048 from jonatan-ivanov
* gh-32048:
  Build against Micrometer 1.10.0-M5 and Tracing 1.0.0-M8 snapshots

Closes gh-32048
2022-09-06 20:15:59 +01:00
Jonatan Ivanov
13a2ea9194 Build against Micrometer 1.10.0-M5 and Tracing 1.0.0-M8 snapshots
See gh-32048

Co-authored-by: Marcin Grzejszczak <mgrzejszczak@vmware.com>
2022-09-06 20:15:51 +01:00
Andy Wilkinson
d1810941e8 Automatically configure annotation processing in Eclipse
Closes gh-32236
2022-09-06 20:14:14 +01:00
Stephane Nicoll
5e24b5a110 Stop using RuntimeHintsUtils#registerAnnotation 2022-09-06 15:44:15 +02:00
Stephane Nicoll
e5d0e34268 Adapt to recent changes in Spring Framework
See https://github.com/spring-projects/spring-framework/issues/29082
See https://github.com/spring-projects/spring-framework/issues/28877
2022-09-05 18:23:05 +02:00
Andy Wilkinson
2dd2ca8f08 Merge branch '2.7.x'
Closes gh-32232
2022-09-05 15:42:43 +01:00
Andy Wilkinson
2003cfdd43 Merge branch '2.6.x' into 2.7.x
Closes gh-32231
2022-09-05 15:42:28 +01:00