Commit Graph

39586 Commits

Author SHA1 Message Date
Stephane Nicoll
1c1006f755 Start building against Micrometer 1.9.4 snapshots
See gh-32272
2022-09-10 08:56:24 +02:00
Andy Wilkinson
2f3b681a82 Merge branch '2.7.x' 2022-09-10 07:49:32 +01:00
Andy Wilkinson
3f779191e6 Merge branch '2.6.x' into 2.7.x 2022-09-10 07:49:12 +01:00
Andy Wilkinson
5cb23aeb85 Only disable test tasks when a project isn't compatible with toolchain
Disabling compilation means that any downstream project will break.
For example, disabling our Gradle plugin's compileJava task means
that the launch script test app fails to build as it uses our
Gradle plugin and its classes are missing.

See gh-gh-32280
2022-09-10 07:47:19 +01:00
Andy Wilkinson
82b2fcd46a Correct the "base" JDK version used in JDK 19 CI image
See gh-32288
2022-09-10 06:39:26 +01:00
Andy Wilkinson
bfbb466456 Merge branch '2.7.x'
Closes gh-32288
2022-09-10 06:23:28 +01:00
Andy Wilkinson
9ab061afb3 Merge branch '2.6.x' into 2.7.x
Closes gh-32287
2022-09-10 06:20:36 +01:00
Andy Wilkinson
4523f01092 Set up CI on JDK 19
Closes gh-32258
2022-09-10 06:00:31 +01:00
Phillip Webb
aa62e3d1bd Fix deprecation issues in WebMvcAutoConfigurationTests 2022-09-09 12:52:27 -07:00
Phillip Webb
fc279b7083 Deprecate ThemeResolver auto-configuration
Update `WebMvcAutoConfiguration` to deprecate the `ThemeResolver` bean
to align with recent Spring Framework changes.
2022-09-09 12:45:24 -07:00
Andy Wilkinson
aafceb3868 Merge branch '2.7.x'
Closes gh-32285
2022-09-09 16:47:06 +01:00
Andy Wilkinson
f17df7bf30 Merge branch '2.6.x' into 2.7.x
Closes gh-32284
2022-09-09 16:46:43 +01:00
Andy Wilkinson
23c2f73b3f Update tests to allow them to run on Java 19
Closes gh-32280
2022-09-09 16:46:14 +01:00
Andy Wilkinson
205378e769 Merge branch '2.7.x' 2022-09-09 15:15:56 +01:00
Andy Wilkinson
144fdaa703 Merge branch '2.6.x' into 2.7.x
Closes gh-32283
2022-09-09 15:14:40 +01:00
Andy Wilkinson
78f4242e46 Build with Gradle 7.5 while still supporting Gradle 6.8+
Closes gh-32281
2022-09-09 15:13:43 +01:00
Brian Clozel
89c61e9093 Adapt GlobalObservationConvention imports
See micrometer-metrics/micrometer#3387
2022-09-09 14:30:53 +02:00
Stephane Nicoll
e37a0cb91e Merge branch '2.7.x' 2022-09-09 10:30:54 +02:00
Stephane Nicoll
50ca22f89d Merge branch '2.6.x' into 2.7.x 2022-09-09 10:30:42 +02:00
Stephane Nicoll
6d0a504283 Start building against Spring Batch 4.3.7 snapshots
See gh-32271
2022-09-09 08:30:41 +02:00
Stephane Nicoll
bb6307a506 Start building against Spring Kafka 2.8.9 snapshots
See gh-32270
2022-09-09 08:30:17 +02:00
Stephane Nicoll
91fb8b8b68 Start building against Spring AMQP 2.4.7 snapshots
See gh-32269
2022-09-09 08:29:48 +02:00
Stephane Nicoll
b4e97b73a6 Start building against Spring Data 2021.1.7 snapshots
See gh-32268
2022-09-09 08:29:26 +02:00
Stephane Nicoll
0c5d5c331a Start building against Spring Framework 5.3.23 snapshots
See gh-32267
2022-09-09 08:28:59 +02:00
Stephane Nicoll
126c3cf0d8 Start building against Rector 2020.0.23 snapshots
See gh-32266
2022-09-09 08:28:34 +02:00
Stephane Nicoll
33b3a5f8bf Start building against Micrometer 1.8.10 snapshots
See gh-32265
2022-09-09 08:28:09 +02:00
Phillip Webb
2f78d52c36 Merge branch '2.7.x' 2022-09-08 19:52:40 -07:00
Phillip Webb
55ad2b9371 Remove accidentally committed debug code 2022-09-08 19:52:01 -07:00
Phillip Webb
46be4a3f30 Merge branch '2.7.x' 2022-09-08 19:38:18 -07:00
Phillip Webb
e88a682220 Merge branch '2.6.x' into 2.7.x 2022-09-08 19:37:52 -07:00
Phillip Webb
85697ac482 Update copyright year of changed files 2022-09-08 19:36:59 -07:00
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