Commit Graph

18993 Commits

Author SHA1 Message Date
Stephane Nicoll 8f67cfd709 Upgrade to Undertow 2.2.19.Final
Closes gh-32390
2022-09-15 09:39:16 +02:00
Stephane Nicoll 74c1f5bede Upgrade to UnboundID LDAPSDK 6.0.6
Closes gh-32389
2022-09-15 09:39:13 +02:00
Stephane Nicoll c10a8cb195 Upgrade to SQLite JDBC 3.39.3.0
Closes gh-32387
2022-09-15 09:39:08 +02:00
Stephane Nicoll 59448ce5d2 Upgrade to SnakeYAML 1.32
Closes gh-32386
2022-09-15 09:39:06 +02:00
Stephane Nicoll b352ebfc5a Upgrade to RSocket 1.1.3
Closes gh-32385
2022-09-15 09:39:04 +02:00
Stephane Nicoll 16bb543c16 Upgrade to Maven Shade Plugin 3.4.0
Closes gh-32384
2022-09-15 09:39:01 +02:00
Phillip Webb 4d037c3003 Update SpringBootContextLoader to support AOT
Update `SpringBootContextLoader` so that it now implements the
`AotContextLoader` interface. The `ContextLoaderHook` will abandon
at `contextLoaded` if the test class is being AOT processed.

This commit also introduces a new `AotApplicationContextInitializer`
which allows us to plug-in an alternative AOT application context
listener when the `SpringApplication` is running in test mode.

Closes gh-31965
2022-09-14 22:37:47 -07:00
Phillip Webb d1e7c9bd70 Introduce 'nativeTest' maven profile
Update `spring-boot-start-parent` with a new `nativeTest` profile. When
active, this profile will trigger AOT processing of test code and call
the native build tools 'test' goal.

Closes gh-32383
2022-09-14 22:37:41 -07:00
Phillip Webb 41e0bbf4bb Add SpringBootTest.useMainMethod support
Add a new `useMainMethod` attribute to `SpringBootTest` which can be
used to determine how the test should run. The three available options
are:

	- `ALWAYS`
	- `NEVER`
	- `WHEN_AVAILABLE`

The default is `WHEN_AVAILABLE` which will attempt to launch the test
using the `main` method if there is one.

The `SpringBootContextLoader` has been updated to use the new
`SpringApplicationHook` interface when the main method is being used.

Closes gh-22405
2022-09-14 22:37:37 -07:00
Phillip Webb fadbb4b763 Polish SpringBootContextLoader 2022-09-14 22:34:53 -07:00
Phillip Webb d3957dfa3e Provide a public API for SpringApplication hooks
Create a new public SpringApplication Hook API based on the existing
`SpringApplicationRunListener` interface.

The previous package-private `SpringApplicationHooks` class has been
replaced with a public `SpringApplicationHook` interface which acts as
a factory that can create additional `SpringApplicationRunListener`
instances to hook in.

The boolean result from the previous `preRefresh` method has been
replaced with an `AbandonedRunException` which can be thrown from
the `SpringApplicationRunListener`.

Closes gh-32301
2022-09-14 22:34:50 -07:00
Phillip Webb 88913b11ce Allow additional listeners registration in early events
Update `EventPublishingRunListener` so that event listeners may add
additional listeners to the `SpringApplication` during early events.

Prior to this commit, the listeners were collected only once which
meant that if a listener for an `ApplicationStartingEvent` called
`application.addListener(...)`, it would be ignored.

Closes gh-32300
2022-09-14 22:34:39 -07:00
Phillip Webb 6955ed9dcf Make EventPublishingRunListener package private
Closes gh-32299
2022-09-14 13:50:27 -07:00
Phillip Webb 20b91c5ae2 Include 'classesDirectory' in ProcessTestAotMojo classpath
Update `ProcessTestAotMojo` so that the classesDirectory and
the testClassesDirectory are on the classpath when compiling
code.

See gh-32191
2022-09-14 13:50:27 -07:00
Phillip Webb db89ee6904 Deprecate spring.mvc.ignore-default-model-on-redirect property
Closes gh-32381
2022-09-14 13:49:03 -07:00
Stephane Nicoll 9620fb5317 Start building against Spring HATEOAS 1.5.2 snapshots
See gh-32378
2022-09-14 22:16:03 +02:00
Stephane Nicoll 1839c8385e Upgrade to RSocket 1.1.3
Closes gh-32380
2022-09-14 22:15:40 +02:00
Stephane Nicoll 9b122924c8 Upgrade to RSocket 1.1.3
Closes gh-32379
2022-09-14 22:13:43 +02:00
Stephane Nicoll 1fa6985311 Upgrade to REST Assured 5.2.0
Closes gh-32371
2022-09-14 15:57:03 +02:00
Stephane Nicoll 447804fdc4 Upgrade to Rabbit Stream Client 0.7.0
Closes gh-32370
2022-09-14 15:57:02 +02:00
Stephane Nicoll 6e59f3fe18 Upgrade to Rabbit AMQP Client 5.16.0
Closes gh-32369
2022-09-14 15:57:02 +02:00
Stephane Nicoll 52e0293bd0 Upgrade to Postgresql 42.5.0
Closes gh-32368
2022-09-14 15:57:02 +02:00
Stephane Nicoll 6a4fef33bb Upgrade to Oracle Database 21.7.0.0
Closes gh-32367
2022-09-14 15:57:02 +02:00
Stephane Nicoll 777fbce1fa Upgrade to OpenTelemetry 1.18.0
Closes gh-32366
2022-09-14 15:57:02 +02:00
Stephane Nicoll 297e9019ac Upgrade to Netty 4.1.82.Final
Closes gh-32365
2022-09-14 15:57:01 +02:00
Stephane Nicoll aa47a9bd83 Upgrade to MySQL 8.0.30
Closes gh-32364
2022-09-14 15:57:01 +02:00
Stephane Nicoll 3fa038a393 Upgrade to MSSQL JDBC 11.2.1.jre17
Closes gh-32363
2022-09-14 15:57:01 +02:00
Stephane Nicoll bcf452918b Upgrade to MongoDB 4.7.1
Closes gh-32362
2022-09-14 15:57:01 +02:00
Stephane Nicoll 81a75f9e5d Upgrade to Mockito 4.8.0
Closes gh-32361
2022-09-14 15:57:00 +02:00
Stephane Nicoll 27d03aac3c Upgrade to Maven Resources Plugin 3.3.0
Closes gh-32360
2022-09-14 15:57:00 +02:00
Stephane Nicoll f624026d4e Upgrade to Maven Javadoc Plugin 3.4.1
Closes gh-32359
2022-09-14 15:57:00 +02:00
Stephane Nicoll 57e4b4447c Upgrade to Maven Install Plugin 3.0.1
Closes gh-32358
2022-09-14 15:57:00 +02:00
Stephane Nicoll a1f4f519fc Upgrade to Maven Help Plugin 3.3.0
Closes gh-32357
2022-09-14 15:56:59 +02:00
Stephane Nicoll 1b06966130 Upgrade to Maven Assembly Plugin 3.4.2
Closes gh-32356
2022-09-14 15:56:59 +02:00
Stephane Nicoll 0cedc5dbba Upgrade to MariaDB 3.0.7
Closes gh-32355
2022-09-14 15:56:59 +02:00
Stephane Nicoll bcb5f048d2 Upgrade to Liquibase 4.16.0
Closes gh-32354
2022-09-14 15:56:59 +02:00
Stephane Nicoll 4c7d6799f8 Upgrade to Kafka 3.2.2
Closes gh-32352
2022-09-14 15:18:40 +02:00
Stephane Nicoll 4f6c3ab2b0 Upgrade to JUnit Jupiter 5.9.0
Closes gh-32351
2022-09-14 15:18:40 +02:00
Stephane Nicoll b4a33e52c1 Upgrade to jOOQ 3.17.4
Closes gh-32350
2022-09-14 14:16:54 +02:00
Stephane Nicoll b6b743006e Upgrade to Jersey 3.0.8
Closes gh-32349
2022-09-14 14:16:51 +02:00
Stephane Nicoll b70ebe04ff Upgrade to Janino 3.1.8
Closes gh-32348
2022-09-14 14:16:48 +02:00
Stephane Nicoll 36e3588416 Upgrade to Jackson Bom 2.13.4
Closes gh-32347
2022-09-14 14:16:45 +02:00
Stephane Nicoll 1849cddcd3 Upgrade to HtmlUnit 2.64.0
Closes gh-32346
2022-09-14 14:16:43 +02:00
Stephane Nicoll 1e3bcc5afd Upgrade to HSQLDB 2.7.0
Closes gh-32345
2022-09-14 14:16:40 +02:00
Stephane Nicoll 5b8aa1e8e3 Upgrade to Hibernate Validator 7.0.5.Final
Closes gh-32344
2022-09-14 14:16:37 +02:00
Stephane Nicoll e3ea832bd8 Upgrade to Hibernate 6.1.3.Final
Closes gh-32343
2022-09-14 14:16:35 +02:00
Stephane Nicoll 52ee9932e0 Upgrade to Hazelcast 5.1.3
Closes gh-32342
2022-09-14 14:16:32 +02:00
Stephane Nicoll 52bd273dd0 Upgrade to Gson 2.9.1
Closes gh-32341
2022-09-14 14:16:30 +02:00
Stephane Nicoll a16da73843 Upgrade to Groovy 4.0.5
Closes gh-32340
2022-09-14 14:16:26 +02:00
Stephane Nicoll 29c9837131 Upgrade to Flyway 9.3.0
Closes gh-32339
2022-09-14 14:16:24 +02:00
Stephane Nicoll 947a751d5a Upgrade to Elasticsearch Client 8.3.3
Closes gh-32338
2022-09-14 14:16:21 +02:00
Stephane Nicoll 464237fc21 Upgrade to Ehcache3 3.10.1
Closes gh-32337
2022-09-14 14:16:18 +02:00
Stephane Nicoll e3972b66af Upgrade to Dropwizard Metrics 4.2.12
Closes gh-32336
2022-09-14 14:16:15 +02:00
Stephane Nicoll ebf51813aa Upgrade to Couchbase Client 3.3.4
Closes gh-32335
2022-09-14 14:16:13 +02:00
Stephane Nicoll ce018d5b6e Upgrade to Byte Buddy 1.12.16
Closes gh-32334
2022-09-14 14:16:10 +02:00
Stephane Nicoll 024ee55f6d Upgrade to Artemis 2.25.0
Closes gh-32333
2022-09-14 14:16:07 +02:00
Stephane Nicoll bafee1bb7c Upgrade to Micrometer 1.10.0-M6
Closes gh-32238
2022-09-14 13:59:25 +02:00
Stephane Nicoll 6fb70d143d Map R2DBC Pool 'minIdle' property
Closes gh-32332
2022-09-14 13:56:44 +02:00
Andy Wilkinson 6d2a1d3f3b Adapt to breaking changes in Batch's transaction management
See gh-32237
2022-09-14 10:15:30 +01:00
Stephane Nicoll cdac50a1c9 Upgrade to UnboundID LDAPSDK 6.0.6
Closes gh-32329
2022-09-14 11:01:19 +02:00
Stephane Nicoll d4a88041dc Upgrade to R2DBC Bom Borca-SR2
Closes gh-32328
2022-09-14 11:01:19 +02:00
Stephane Nicoll 24ab4e88cd Upgrade to Netty 4.1.82.Final
Closes gh-32327
2022-09-14 10:32:46 +02:00
Stephane Nicoll 8621e63aef Upgrade to Kafka 3.1.2
Closes gh-32326
2022-09-14 10:32:44 +02:00
Stephane Nicoll 7e8c560e9b Upgrade to Johnzon 1.2.19
Closes gh-32325
2022-09-14 10:32:42 +02:00
Stephane Nicoll d525d36fb9 Upgrade to Janino 3.1.8
Closes gh-32324
2022-09-14 10:32:39 +02:00
Stephane Nicoll 7cff955030 Upgrade to Jackson Bom 2.13.4
Closes gh-32323
2022-09-14 10:32:37 +02:00
Stephane Nicoll 051331beb9 Upgrade to Infinispan 13.0.11.Final
Closes gh-32322
2022-09-14 10:32:34 +02:00
Stephane Nicoll c5b2bacfd3 Upgrade to Hibernate Validator 6.2.5.Final
Closes gh-32321
2022-09-14 10:32:32 +02:00
Stephane Nicoll 1c41032d66 Upgrade to Hibernate 5.6.11.Final
Closes gh-32320
2022-09-14 10:32:29 +02:00
Stephane Nicoll a00951d673 Upgrade to Embedded Mongo 3.4.9
Closes gh-32319
2022-09-14 10:32:27 +02:00
Stephane Nicoll 07985e34fb Upgrade to Elasticsearch 7.17.6
Closes gh-32318
2022-09-14 10:32:25 +02:00
Stephane Nicoll a111f66e76 Upgrade to Ehcache3 3.10.1
Closes gh-32317
2022-09-14 10:32:22 +02:00
Stephane Nicoll a32bf83f60 Upgrade to Dropwizard Metrics 4.2.12
Closes gh-32316
2022-09-14 10:32:20 +02:00
Stephane Nicoll c9067cd6a8 Upgrade to Couchbase Client 3.3.4
Closes gh-32315
2022-09-14 10:32:18 +02:00
Stephane Nicoll 89491c3aaa Upgrade to Byte Buddy 1.12.16
Closes gh-32314
2022-09-14 10:32:15 +02:00
Andy Wilkinson c6990a34f9 Merge branch '2.7.x' 2022-09-14 09:20:37 +01:00
Andy Wilkinson a533f4fa32 Polish 2022-09-14 09:20:13 +01:00
Stephane Nicoll c216e1e4a4 Upgrade to Netty 4.1.82.Final
Closes gh-32312
2022-09-14 09:31:10 +02:00
Stephane Nicoll a3465ced28 Upgrade to Kafka 3.0.2
Closes gh-32311
2022-09-14 09:31:08 +02:00
Stephane Nicoll 3d21fcb381 Upgrade to Johnzon 1.2.19
Closes gh-32310
2022-09-14 09:31:05 +02:00
Stephane Nicoll 4848f8db5b Upgrade to Janino 3.1.8
Closes gh-32309
2022-09-14 09:31:03 +02:00
Stephane Nicoll b4475e1387 Upgrade to Jackson Bom 2.13.4
Closes gh-32308
2022-09-14 09:31:01 +02:00
Stephane Nicoll 1775fc148c Upgrade to Hibernate Validator 6.2.5.Final
Closes gh-32307
2022-09-14 09:30:58 +02:00
Stephane Nicoll 7de6d72346 Upgrade to Hibernate 5.6.11.Final
Closes gh-32306
2022-09-14 09:30:56 +02:00
Stephane Nicoll 2fa4195326 Upgrade to Dropwizard Metrics 4.2.12
Closes gh-32305
2022-09-14 09:30:53 +02:00
Stephane Nicoll 0937adbbbb Upgrade to Reactor Bom 2022.0.0-M6
Closes gh-32240
2022-09-14 08:21:48 +02:00
Stephane Nicoll bb80d4aa44 Upgrade to Micrometer Tracing 1.0.0-M8
Closes gh-32239
2022-09-14 08:21:22 +02:00
Stephane Nicoll d29d92b013 Upgrade to Micrometer 1.10.0-M5
Closes gh-32238
2022-09-14 08:20:27 +02:00
Stephane Nicoll e68b346c05 Upgrade to Reactor 2020.0.23
Closes gh-32273
2022-09-14 08:19:16 +02:00
Stephane Nicoll dc4d850b16 Upgrade to Rector 2020.0.23
Closes gh-32266
2022-09-14 08:18:40 +02:00
Andy Wilkinson 4e8e5f623b Adapt to recent deprecations in Spring Batch
See gh-32237
2022-09-13 17:44:50 +01:00
Andy Wilkinson d103bbc034 Avoid returning null from TestContext.getTestClass()
Our mock didn't configure an expectation so null was returned. That's
prohibited by the javadoc and some recent Framework changes mean that
it's no longer tolerated.
2022-09-13 17:41:06 +01:00
Stephane Nicoll f23f11aa13 Start building against Spring AMQP 2.4.7 snapshots
See gh-32276
2022-09-13 17:48:05 +02:00
Stephane Nicoll 88f2b33cc1 Add AOT-generated classes to classpath of the compiler
See gh-32304
2022-09-13 14:58:16 +02:00
Andy Wilkinson 867c49337a Add AOT-generated classes to classpath of AOT JavaCompile tasks
See gh-32304
2022-09-13 13:03:24 +01:00
Andy Wilkinson 421943f3cf Add reflection hints for retrieving Undertow's ports
Closes gh-32303
2022-09-13 12:13:06 +01:00
Johnny Lim 4cbabc40b3 Polish MimeMappings changes
See gh-32298
2022-09-12 17:59:06 +02:00
Stephane Nicoll 26cec61f32 Adapt to API change in Spring Framework
See https://github.com/spring-projects/spring-framework/issues/29135
2022-09-12 15:39:03 +02:00
Stephane Nicoll 6201cc076d Upgrade to Micrometer 1.9.4
Closes gh-32272
2022-09-12 14:20:53 +02:00
Stephane Nicoll 72ad69d696 Upgrade to Micrometer 1.8.10
Closes gh-32265
2022-09-12 14:17:46 +02:00
Stephane Nicoll 84298e3326 Adapt to API change in Spring Framework
See https://github.com/spring-projects/spring-framework/issues/29005
2022-09-12 10:13:03 +02:00
Stephane Nicoll 9fe24fe692 Fix windows build
This commit makes sure that files that are generated in a temporary
directory are closed once the related test completes.
2022-09-10 16:24:29 +02:00
Stephane Nicoll 358ee2c56b Upgrade to Netty 4.1.81.Final
Closes gh-32227
2022-09-10 09:51:19 +02:00
Stephane Nicoll 3572ede2fa Start building against Spring Retry 2.0.0-M1 snapshots
See gh-32293
2022-09-10 09:34:38 +02:00
Stephane Nicoll ebef52b207 Merge branch '2.7.x'
Closes gh-32292
2022-09-10 09:13:53 +02:00
Stephane Nicoll 04a668fd07 Merge branch '2.6.x' into 2.7.x
Closes gh-32291
2022-09-10 09:13:40 +02:00
Oliver B. Fischer 6e4e76597a Make the path of the config directory better understandable
Currently, the documentation relates to the subdirectory for external
configurations as `/config`. Read as UNIX path, the leading slash
could be read as reference to the root directory `/`.

This commit updates the documentation to use 'config/' instead.

See gh-32224
2022-09-10 09:09:43 +02:00
Stephane Nicoll fd808ba16e Start building against Spring Batch 4.3.7 snapshots
See gh-32278
2022-09-10 08:56:25 +02:00
Stephane Nicoll b1b45f19fa Start building against Spring Kafka 2.8.9 snapshots
See gh-32277
2022-09-10 08:56:25 +02:00
Stephane Nicoll dbdb5f40ee Start building against Spring Data 2021.2.3 snapshots
See gh-32275
2022-09-10 08:56:25 +02:00
Stephane Nicoll b5aeb21e0a Start building against Spring Framework 5.3.23 snapshots
See gh-32274
2022-09-10 08:56:24 +02:00
Stephane Nicoll 1c1006f755 Start building against Micrometer 1.9.4 snapshots
See gh-32272
2022-09-10 08:56:24 +02: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 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 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 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
Andy Wilkinson 5577d16823 Start building against Spring Security 6.0.0-M7 snapshots
See gh-32255
2022-09-08 09:54:34 +01: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
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 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 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
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
valentine-dev 89e19ddab9 Support lower-case input in PeriodStyle
See gh-32235
2022-09-07 08:40:16 +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
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
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
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
Andy Wilkinson bc23e70024 Polish "Support lower-case input in DurationStyle"
See gh-32223
2022-09-05 14:53:50 +01:00
valentine-dev c579c9378b Support lower-case input in DurationStyle
See gh-32223
2022-09-05 14:53:29 +01:00
Brian Clozel 0789dd0eb1 Upgrade to SnakeYaml 1.31
Closes gh-32221
2022-09-05 14:30:36 +02:00
Brian Clozel cca5ee8a89 Merge branch '2.6.x' into 2.7.x
Closes gh-32229
2022-09-05 14:24:06 +02:00
Brian Clozel 724f9ebf71 Support SnakeYaml 1.31
This commit keeps the managed dependency for SnakeYaml at 1.29 but
enables forward compatibility for SnakeYaml 1.31.

Closes gh-32228
2022-09-05 14:22:24 +02:00
Andy Wilkinson 25e6c533d9 Polish "Add path to DiskSpaceHealthIndicator's details and log message"
See gh-31998
2022-09-05 13:16:12 +01:00
rreich 36f9230f01 Add path to DiskSpaceHealthIndicator's details and log message
See gh-31998
2022-09-05 13:15:56 +01:00
Andy Wilkinson d9265f0a92 Build against SnakeYAML 1.31 but still use 1.29 in dep mgmt and starter 2022-09-05 13:55:19 +02:00
Andy Wilkinson 3dfe28c9f1 Ensure that a test engine is available to AOT test processing
See gh-32192
2022-09-05 09:41:28 +01:00
Andy Wilkinson cf84ae7ad8 Exclude non-existent test classes dirs from AOT test processing
See gh-32192
2022-09-05 09:41:21 +01:00
Stephane Nicoll 33bec854ce Upgrade to Netty 4.1.80.Final
Closes gh-32227
2022-09-05 09:22:54 +02:00
Scott Frederick 95e62b7ff8 Sort the contents of generated imports files
The list of class names generated by annotation processors should be
sorted before being written to `AutoConfiguration.imports` and
`ManagementContextConfiguration.imports` files to make the build more
deterministic.

See gh-31228
2022-09-02 17:26:15 -05:00
Scott Frederick 6b3b0dd3a6 Generate ManagementContextConfiguration.imports file from annotations
This commit adds the
`ManagementContextConfigurationImportsAnnotationProcessor` to
the `spring-boot-autoconfigure-processor` annotation processor
module.

Closes gh-32222
2022-09-02 16:27:59 -05:00
Scott Frederick da4de7d67d Generate the AutoConfiguration.imports file from annotations
This commit adds the `AutoConfigurationImportsAnnotationProcessor` to
the `spring-boot-autoconfigure-processor` annotation processor
module. When added to a project build, the annotation processor will
generate the
`org.springframework.boot.autoconfigure.AutoConfiguration.imports`
file automatically from `@AutoConfiguration`-annotated classes. It
also applies the annotation processor to the Spring Boot build.

Closes gh-31228
2022-09-02 15:10:22 -05:00
Andy Wilkinson 795ea289db Adapt to BindingReflectionHintsRegistrar moving package 2022-09-02 19:46:02 +01:00
Andy Wilkinson cf8e84d406 Adapt to BindingReflectionHintsRegistrar moving into spring-core 2022-09-02 17:34:29 +01:00
Andy Wilkinson d6e9a03136 Adapt to synthesized annotation changes in Framework 2022-09-02 17:01:51 +01:00
Andy Wilkinson fc979397be Polish SpringBootAotPlugin 2022-09-02 16:37:15 +01:00
Andy Wilkinson fd28f6d1d6 Add Gradle plugin support for processing test contexts ahead-of-time
Closes gh-32192
2022-09-02 15:54:46 +01:00
Andy Wilkinson 746ed84120 Polish ProcessTestAotMojo 2022-09-02 12:06:54 +01:00
Phillip Webb 44f1949c5e Polish hint API calls 2022-09-01 19:43:43 -07:00
Scott Frederick 01c68a3dc8 Merge branch '2.7.x'
Closes gh-32217
2022-09-01 15:36:12 -05:00
Scott Frederick 7763a5df7d Polish auto-configuration documentation
Remove references to outdated information, emphasize use of the
`@AutoConfiguration` annotation and attributes, and edit for clarity.

Closes gh-32174
2022-09-01 15:35:59 -05:00
Sébastien Deleuze 138c55ee11 Refine ConfigurationPropertiesReflectionHintsProcessor
This commit refines ConfigurationPropertiesReflectionHintsProcessor
Java bean properties handling in order to register reflection hints
only for getters and setters, not for all methods.

It avoids including unconditionally method like SpringApplication#load
which in turn avoids shipping BeanDefinitionLoader and related transitively
used classes in the native image.

The gain is significant: it allows to remove up to 700 classes
(when no XML parser is used elsewhere) and to reduce the memory footprint
by 2M of RSS.

Closes gh-32186
2022-09-01 17:34:22 +02:00
Andy Wilkinson 49d3bf1d7f Remove AnsiColors following removal of image banner support
Closes gh-32209
2022-09-01 14:40:24 +01:00
Brian Clozel 4aa1efa2d8 Fix build with latest Spring for GraphQL changes 2022-09-01 11:26:04 +02:00
Andy Wilkinson ee701e5c7d Merge branch '2.7.x'
Closes gh-32199
2022-08-31 14:42:05 +01:00
Andy Wilkinson a253d8d589 Merge branch '2.6.x' into 2.7.x
Closes gh-32198
2022-08-31 14:41:47 +01:00
Andy Wilkinson 7d983be769 Clarify docs on disabling HTTP client request metrics
Closes gh-32136
2022-08-31 14:36:07 +01:00
hak7a3 fb61f8af53 Remove ANTLR 2 dependency management
See gh-32149
2022-08-31 14:09:42 +01:00
Andy Wilkinson 08fde3a004 Revert "Remove dependency management for ANTLR 2"
This reverts commit a46d6b3a4c.
2022-08-31 14:06:41 +01:00
Andy Wilkinson a46d6b3a4c Remove dependency management for ANTLR 2
Closes gh-32149
2022-08-31 13:56:55 +01:00
Andy Wilkinson 4c01810ca2 Merge branch '2.7.x'
Closes gh-32197
2022-08-31 11:37:20 +01:00
Andy Wilkinson 13edfba1f5 Fix Kotlin example for empty @DefaultValue constructor binding
Closes gh-32177
2022-08-31 11:35:58 +01:00
Phillip Webb 09bd531fe5 Add Maven plugin support for processing test contexts Ahead-of-time
Refactor and update the Spring Boot Maven Plugin so that it can
be used to perform AOT processing of test classes.

Closes gh-32191
2022-08-30 20:41:30 -07:00
Phillip Webb e599a70425 Disable ResetMocksTestExecutionListener on native
Add a guard for `ResetMocksTestExecutionListener` so that it is
not applied when running in a native image.

See gh-32195
2022-08-30 20:40:34 -07:00
Phillip Webb c0b3d36205 Rename 'generateAotSources' task to processAot'
See gh-31918
2022-08-25 15:10:48 -07:00
Phillip Webb 2f6354f633 Rename 'aot-generate' goal to process-aot'
See gh-31918
2022-08-25 15:02:28 -07:00
Phillip Webb 973e23dc5e Adapt to upstream Spring Framework changes 2022-08-25 12:12:42 -07:00
Phillip Webb 41c1d9f5c9 Polish 2022-08-25 12:12:38 -07:00
Phillip Webb c524f8c665 Merge branch '2.7.x' 2022-08-25 11:49:12 -07:00
Phillip Webb 13c0cf7e2a Refine Javadoc to use @AutoConfiguration
See gh-32166
2022-08-25 11:48:07 -07:00
Phillip Webb b2be193908 Merge branch '2.7.x' 2022-08-24 18:13:18 -07:00
Phillip Webb e31c295ee9 Merge branch '2.6.x' into 2.7.x 2022-08-24 18:13:03 -07:00
Phillip Webb adc4e05eff Polish 2022-08-24 18:12:57 -07:00
Phillip Webb a993731ee8 Merge branch '2.7.x'
Closes gh-32168
2022-08-24 17:34:17 -07:00
Phillip Webb 10ded39217 Merge branch '2.6.x' into 2.7.x
Closes gh-32167
2022-08-24 17:33:50 -07:00
Phillip Webb 24c2daa99d Improve javadoc regarding use on @Bean methods
Closes gh-32166
2022-08-24 17:33:08 -07:00
Madhura Bhave 47effdcade Support role-based sanitization for actuator endpoints
Closes gh-32156
2022-08-24 16:03:58 -07:00
Scott Frederick ada2450483 Reinstate testing for NoSuchMethodFailureAnalyzer parsing on OpenJ9
Closes gh-28785
2022-08-24 15:27:23 -05:00
Scott Frederick c0cbaa1460 Merge branch '2.7.x' 2022-08-24 13:18:22 -05:00
Scott Frederick 257e236b06 Fix image-building unit tests on Windows
See gh-32000
2022-08-24 13:14:39 -05:00
Stephane Nicoll bb7829791a Adapt to recent changes in RuntimeHints API
See gh-https://github.com/spring-projects/spring-framework/issues/29011
2022-08-24 19:58:29 +02:00
Moritz Halbritter 1db2ad08fa Add classpath checks for runtime hints
This suppresses native-image warnings.
2022-08-24 08:42:33 +02:00
Phillip Webb 6db88e12c8 Polish 'Allow multiple hosts to be set in MongoProperties'
See gh-32125
2022-08-23 20:23:11 -07:00
thegeekyasian e0d40009f3 Allow multiple hosts to be set in MongoProperties
Update `MongoProperties` with an `additional-hosts` property which
can be used to configure MongoDB in a multi-host environment.

See gh-32125
2022-08-23 20:21:16 -07:00
Phillip Webb 6e1b28e6a2 Relocate MimeMapping Tomcat comparison test
See gh-32101
2022-08-23 18:05:39 -07:00
Phillip Webb dd98b88732 Fix 'Align MimeMappings with Tomcat's defaults'
Update COMMON_MAPPINGS to align with the properties file and change
the test so that it consistently works.

See gh-32101
2022-08-23 16:38:31 -07:00
Phillip Webb 86f38e15f0 Polish 'Align MimeMappings with Tomcat's defaults'
Refine `MimeMappings` so that common default mappings are included
by default and the complete set is only loaded when needed.

The `TomcatServletWebServerFactory` has been updated so that if
`TomcatEmbeddedContext` is in use the mime mapping are used
directly rather than being copied to another Map.

The `AbstractServletWebServerFactory` class has also been changed
to use a lazy copy of the mappings. This should mean that the
complete set of properties is only loaded if the user mutates
the mappings.

See gh-32101
2022-08-23 11:37:16 -07:00
Guirong Hu 7728ae4e00 Align MimeMappings with Tomcat's defaults
Update `MimeMappings` to align with the default values used in
Tomcat. The mime mapping are now loaded from a properties file
and a test has been added to ensure that they remain in sync
with Tomcat's defaults.

See gh-32101
2022-08-23 10:15:41 -07:00
Stephane Nicoll c67010ddd1 Make test more robust 2022-08-23 14:45:52 +02:00
Moritz Halbritter 0cc0b48a67 Add runtime hints for freemarker
Registers reflection hints for the FreeMarkerTemplateAvailabilityProperties
class.

Closes gh-32052
2022-08-23 09:23:42 +02:00
Moritz Halbritter 7a8d7a9cd9 Polish TemplateAvailabilityProviders 2022-08-23 09:20:29 +02:00
Stephane Nicoll d637fe37cc Merge branch '2.7.x'
Closes gh-32146
2022-08-23 07:25:57 +02:00
Stephane Nicoll 7a91fa90d5 Merge branch '2.6.x' into 2.7.x
Closes gh-32145
2022-08-23 07:25:45 +02:00
Stephane Nicoll 7f2d4fceec Polish "Allow Netty default leak detection to be overidden"
See gh-32144
2022-08-23 07:20:49 +02:00
Russell You 51f2e40c69 Allow Netty default leak detection to be overidden
See gh-32144
2022-08-23 07:12:24 +02:00
Stephane Nicoll 639f980876 Avoid proxy on Validator in ValidationAutoConfiguration
Closes gh-32134
2022-08-22 14:44:18 +02:00
Stephane Nicoll 82a9c219e1 Merge branch '2.7.x'
Closes gh-32129
2022-08-22 06:38:52 +02:00
Stephane Nicoll a6350b5992 Merge branch '2.6.x' into 2.7.x
Closes gh-32128
2022-08-22 06:38:38 +02:00
Stephane Nicoll 6d80b601b6 Upgrade to Testcontainers 1.17.3
Closes gh-32127
2022-08-22 06:37:56 +02:00
Scott Frederick 2cdaab59f6 Merge branch '2.7.x'
Closes gh-32122
2022-08-19 13:57:26 -05:00
Scott Frederick c16094e04b Disable SELinux label security policy when building images
When using the Gradle `bootBuildImage` task or Maven
`spring-boot:build-image` goal on a Linux distribution with SELinux
enabled, binding the Docker socket in the builder container might
fail. This commit disables the `label` security policy in the builder
container to prevent this type of failure.

Fixes gh-32000
2022-08-19 13:56:34 -05:00
Stephane Nicoll e3ddb54cb8 Adapt JPA auto-configuration to PersistenceManagedTypes
This commit exposes a PersistenceManagedTypes bean with the entities
to consider in a typical auto-configuration scenario. This allows the
result of the scanning to be optimized AOT, if necessary.

Closes gh-32119
2022-08-19 16:17:44 +02:00
Stephane Nicoll f2f5bae314 Add native hints for default LDIF file
Closes gh-32084
2022-08-18 15:31:58 +02:00
Stephane Nicoll c41609d01d Polish 2022-08-18 09:44:55 +02:00
Phillip Webb 07c0a8bced Fix SecurityManager deprecation issues
See gh-32086
2022-08-17 13:22:40 -07:00
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 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 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
Stephane Nicoll 11112624f7 Upgrade to Hibernate Validator 6.2.4.Final
Closes gh-32020
2022-08-08 21:06:19 +02:00
Stephane Nicoll 5c1248b6cb Upgrade to Hazelcast 5.1.3
Closes gh-32019
2022-08-08 21:06:18 +02:00
Stephane Nicoll de59f948f2 Upgrade to Gson 2.9.1
Closes gh-32018
2022-08-08 21:06:18 +02:00
Stephane Nicoll 68b61f574a Upgrade to Netty tcNative 2.0.54.Final
Closes gh-32012
2022-08-08 21:02:07 +02:00
Stephane Nicoll 81c5b5a9fe Upgrade to MySQL 8.0.30
Closes gh-32011
2022-08-08 21:02:07 +02:00
Stephane Nicoll a614c912f6 Upgrade to Micrometer 1.8.9
Closes gh-32010
2022-08-08 21:02:06 +02:00
Stephane Nicoll 6233e0356a Upgrade to Hibernate Validator 6.2.4.Final
Closes gh-32009
2022-08-08 21:02:06 +02:00
Stephane Nicoll e8a89e44ce Upgrade to Embedded Mongo 3.4.8
Closes gh-32016
2022-08-08 20:54:26 +02:00
Stephane Nicoll e85e3f65d4 Upgrade to Dropwizard Metrics 4.2.11
Closes gh-32015
2022-08-08 20:54:23 +02:00
Stephane Nicoll 001cc473c9 Upgrade to Couchbase Client 3.3.3
Closes gh-32014
2022-08-08 20:54:20 +02:00
Stephane Nicoll a1d741b3a8 Upgrade to Byte Buddy 1.12.13
Closes gh-32013
2022-08-08 20:54:17 +02:00
Stephane Nicoll f0d61a8db8 Upgrade to Dropwizard Metrics 4.2.11
Closes gh-32007
2022-08-08 20:51:06 +02:00
Andy Wilkinson ba93e6c0ed Restore support for Jersey
Closes gh-28637
2022-08-08 15:45:20 +01:00
Andy Wilkinson fb2f7c1e38 Fix test to create correct type of child context
Closes gh-32002
2022-08-08 14:18:40 +01:00
Madhura Bhave 0991bd3983 Harmonize data configuration
Any classes that rely on Spring Data being on the classpath
have been moved under a data package.

Certain configuration properties have also been updated to
accurately reflect whether Spring Data is required for the
auto-configuration to work.

Closes gh-11574
2022-08-05 13:32:25 -07:00
Stephane Nicoll 1af5994d8f Adapt to API change in Spring Framework
See https://github.com/spring-projects/spring-framework/issues/28927
2022-08-05 10:39:36 +02:00
Andy Wilkinson 36cf3b9f78 Merge branch '2.7.x'
See gh-31988
2022-08-04 21:56:57 +01:00
Andy Wilkinson eb67470b89 Merge branch '2.6.x' into 2.7.x
See gh-31987
2022-08-04 21:56:35 +01:00
Andy Wilkinson b905d7f341 Normalize included log output to remove CI-specific details
See gh-28208
2022-08-04 21:55:17 +01:00
Andy Wilkinson 05877dc927 Merge branch '2.7.x'
Closes gh-31988
2022-08-04 14:17:39 +01:00
Andy Wilkinson a69cf002f0 Merge branch '2.6.x' into 2.7.x
Closes gh-31987
2022-08-04 14:16:16 +01:00
Andy Wilkinson 6efa77f3f5 Generate console output examples at build time
Closes gh-28208
2022-08-04 14:15:25 +01:00
Andy Wilkinson a6271927b2 Merge branch '2.7.x'
Closes gh-31985
2022-08-04 11:47:31 +01:00
Andy Wilkinson 8d93040c59 Merge branch '2.6.x' into 2.7.x
Closes gh-31984
2022-08-04 11:46:56 +01:00
Andy Wilkinson 7c0ccdf78c Log allocated port when Livereload server is using an ephemeral port
Closes gh-31983
2022-08-04 11:45:39 +01:00
Andy Wilkinson 74283c3549 Merge branch '2.7.x'
Closes gh-31977
2022-08-03 19:42:46 +01:00
Andy Wilkinson f6ce25f9c5 Merge branch '2.6.x' into 2.7.x
Closes gh-31976
2022-08-03 19:42:34 +01:00
Andy Wilkinson c500d8e784 Note need to record req start time to use %D with Undertow access log
Closes gh-31103
2022-08-03 19:42:19 +01:00
Andy Wilkinson ae86707bca Merge branch '2.7.x'
Closes gh-31975
2022-08-03 19:34:32 +01:00
Andy Wilkinson 3e6b4e68ad Merge branch '2.6.x' into 2.7.x
Closes gh-31974
2022-08-03 19:34:15 +01:00
Andy Wilkinson 591cd0feb3 Mention TLS-terminating proxy as a usecase for h2c
Closes gh-25855
2022-08-03 19:33:34 +01:00
Phillip Webb dd87cf47a4 Revert SpringBootContextLoader and ErrorPageFilterIntegrationTests changes"
Spring Framework has change the signature so we no longer need the updates.
2022-08-03 15:43:57 +01:00
Andy Wilkinson 2f0dfc341c Merge branch '2.7.x'
Closes gh-31972
2022-08-03 15:20:34 +01:00
Andy Wilkinson 700460c322 Merge branch '2.6.x' into 2.7.x
Closes gh-31971
2022-08-03 14:58:07 +01:00
Andy Wilkinson fa73b73898 Fail build on missing configuration property descriptions
Closes gh-31916
2022-08-03 14:45:42 +01:00
Andy Wilkinson cb18eb095b Make transitive runtime dependencies available to AOT processing
Closes gh-31970
2022-08-03 13:54:50 +01:00
Phillip Webb 080ce92ac8 Adapt ErrorPageFilterIntegrationTests to upstream Framework changes 2022-08-03 13:09:19 +01:00
Phillip Webb db21bafd68 Merge branch '2.7.x'
Closes gh-31968
2022-08-03 12:35:02 +01:00
Phillip Webb cfde1878dd Merge branch '2.6.x' into 2.7.x
Closes gh-31967
2022-08-03 12:34:52 +01:00
Phillip Webb d540eefce0 Set running to false when stop method is called
Update `WebServerStartStopLifecycle` to change the `running` state when
the `stop()` method is called.

Fixes gh-31966
2022-08-03 12:34:37 +01:00
Phillip Webb 2dae04b2f4 Adapt SpringBootContextLoader to upstream Spring Framework changes 2022-08-03 12:27:30 +01:00
Phillip Webb 040ab4da5b Merge branch '2.7.x'
Closes gh-31964
2022-08-03 11:35:33 +01:00
Phillip Webb c652d3d95b Merge branch '2.6.x' into 2.7.x
Closes gh-31963
2022-08-03 11:34:24 +01:00
Phillip Webb 45ad1557c3 Perform LoggingSystem cleanup after web server shutdown
Update `LoggingApplicationListener` so that logging system cleanup is
performed by a `SmartLifecycle` phased after web server shutdown.

Prior to this commit, cleanup occurred on the `ContextClosedEvent` which
was published before Lifecycle beans were stopped. This meant that any
exceptions output during web server shutdown were not logged.

Fixes gh-9457
2022-08-03 11:34:05 +01:00
Johnny Lim 6a4681baf5 Polish
See gh-31948
2022-08-02 15:14:23 +02:00
Stephane Nicoll c05d0c51b7 Restore constructor binding support with AOT
This commit restores the generation of the BindMethod attribute that
is required at runtime to figure out how to bind a particular
configuration properties target.

It also improves the test to use TestCompiler and assert that the
generated contribution restores the proper behavior for both java
bean and value object binding.

Closes gh-31956
2022-08-02 15:08:48 +02:00
Brian Clozel a8c558a671 Fix build after Spring Framework deprecation
See spring-projects/spring-framework#28905
2022-08-02 15:03:13 +02:00
Brian Clozel 09c753d445 Remove duplicate reflection hints for Logback
Prior to this commit, the Spring Boot team contributed reflection hints
for the default Logback converters for native image compilation. Now
that some of those hints were contributed to the GraalVM reachability
metadata repository, we can safely remove the duplicates.

Closes gh-31959
2022-08-02 14:39:42 +02:00
Moritz Halbritter eaf8683e8d Fix timeunit in ZipkinConfigurations to milliseconds instead of seconds
Closes gh-31957
2022-08-02 13:40:00 +02:00
Moritz Halbritter 767631e2cc Fix bean chicken and egg problem with WavefrontSender
Closes gh-31954
2022-08-02 11:19:24 +02:00
Andy Wilkinson 0857cae943 Merge branch '2.7.x'
Closes gh-31952
2022-08-01 21:10:36 +01:00
Andy Wilkinson 0dde4278db Merge branch '2.6.x' into 2.7.x
Closes gh-31951
2022-08-01 21:09:37 +01:00
Marc Wrobel 3e0665e791 Fix links in documentations
- Fix broken links
- Use HTTPS where possible,
- Remove spring-security-oauth2-docs as it is no longer used
- Remove https://github.com/ThierrySquirrel/rocketmq-spring-boot-starter.
  This starter is 404 and https://github.com/rocketmq/rocketmq-spring-boot-starter
  hasn't been updated for 4 years.
- Clean up nohttp allowlist.lines.

See gh-31887
2022-08-01 21:07:36 +01:00
Andy Wilkinson 8a2cdb9759 Merge branch '2.7.x'
Closes gh-31950
2022-08-01 20:51:40 +01:00
Andy Wilkinson 012fbb3a57 Merge branch '2.6.x' into 2.7.x
Closes gh-31949
2022-08-01 20:51:18 +01:00
Andy Wilkinson c0daede1aa Ensure that jarmode jar added to an app has same SHA as published jar
Closes gh-31862
2022-08-01 20:49:10 +01:00
Brian Clozel 5261e42dab Fix PDF reference docs generation
See gh-31809
2022-08-01 16:17:35 +02:00
Brian Clozel cbf1cd81e9 Polish
See gh-31809
2022-08-01 15:57:32 +02:00
Brian Clozel 184945ab1e Fix graphql imports in reference docs generation
See gh-31809
2022-08-01 15:27:36 +02:00
Moritz Halbritter ed1f6ad543 Add native-image support for RestTemplateBuilder
Closes gh-31888
2022-08-01 15:18:25 +02:00
Brian Clozel 38f1bc9793 Reinstate Spring for GraphQL auto-configuration
This commit adds the Spring for GraphQL auto-configuration back
into Spring Boot 3.0, now that a 1.1.0 release is scheduled with the
required baseline. This release also needs GraphQL Java 19.0 as a
baseline.

Closes gh-31809
2022-08-01 14:33:25 +02:00
Brian Clozel 6e1b68044d Upgrade to GraphQL Java 18.3
Closes gh-31945
2022-08-01 14:32:27 +02:00
Phillip Webb ab469e8b6a Merge branch '2.7.x'
Closes gh-31944
2022-08-01 12:35:42 +01:00
Phillip Webb 06b537e2a0 Merge branch '2.6.x' into 2.7.x
Closes gh-31943
2022-08-01 12:35:23 +01:00
vilmos 00be9e4e94 Fix property placeholder references in @Value example
See gh-31941
2022-08-01 12:34:00 +01:00
Johnny Lim c9c435cdae Polish DataSourceBuilder.derivedFrom()
Fix duplication accidentally introduced in commit
fa43e1f378.

See gh-31928
2022-08-01 08:48:40 +01:00
Andy Wilkinson bdebdb5cc2 Start building against Spring Kafka 3.0.0-M6 snapshots
See gh-31925
2022-07-29 19:56:50 +01:00
Madhura Bhave a82b95c955 Merge branch '2.7.x' into main
Closes gh-31927
2022-07-29 11:33:41 -07:00
Madhura Bhave 2884ec81e9 Merge branch '2.6.x' into 2.7.x
Closes gh-31926
2022-07-29 11:33:17 -07:00
Madhura Bhave cc15eb0b96 Configure existing probes at additional path when necessary
Fixes gh-30612
2022-07-29 11:31:19 -07:00
Stephane Nicoll db0e008c01 Register composed annotations explicitly
Closes gh-31919
2022-07-29 16:41:50 +02:00
Stephane Nicoll 0e9f8a5994 Merge branch '2.7.x'
Closes gh-31922
2022-07-29 14:47:20 +02:00
Stephane Nicoll 4806881716 Merge branch '2.6.x' into 2.7.x
Closes gh-31921
2022-07-29 14:35:15 +02:00
Stephane Nicoll 3a5b40645a Restore support for C3P0
Closes gh-31920
2022-07-29 14:07:59 +02:00
Phillip Webb 22144987e9 Update copyright year of changed files 2022-07-29 12:10:03 +01:00
Phillip Webb e08c16dfd6 Polish 2022-07-29 12:10:02 +01:00
Stephane Nicoll 41e8697445 Polish 2022-07-29 10:00:54 +02:00
Andy Wilkinson 44beb11d38 Merge branch '2.7.x'
Closes gh-31915
2022-07-29 07:06:30 +01:00
Andy Wilkinson 6d279abe21 Merge branch '2.6.x' into 2.7.x
Closes gh-31914
2022-07-29 07:06:09 +01:00
Andy Wilkinson d39e146a7d Polish "Allow config prop annotation processor to find reactive cookie props"
See gh-31912
2022-07-29 07:05:21 +01:00
Kalpesh 1f0d5f1130 Allow config prop annotation processor to find reactive cookie props
See gh-31912
2022-07-29 07:05:21 +01:00
Stephane Nicoll da324c8b03 Merge branch '2.7.x' 2022-07-28 16:07:26 +02:00
Stephane Nicoll 6786659aae Merge branch '2.6.x' into 2.7.x 2022-07-28 16:07:18 +02:00
Stephane Nicoll 7d860df5f0 Polish 2022-07-28 16:05:16 +02:00
Stephane Nicoll b0bc7cd85b Reuse JavaProcessExecutor
See gh-31682
2022-07-28 16:00:06 +02:00
Stephane Nicoll c3ae6519f4 Reuse SpringApplicationClassFinder
See gh-31682
2022-07-28 16:00:05 +02:00
Stephane Nicoll 472b0b8bcb Remove AbstractApplicationRunMojo intermediate layer
This commit reverts the intermediate layer that was created to
accommodate with the AOT use case.

See gh-31682
2022-07-28 16:00:05 +02:00
Stephane Nicoll 6f8b9288f3 Extract AotGenerateMojo to its own structure
This commit stops AotGenerateMojo from being an extension of the
regular run infrastructure and used the opportunity to extract a
number of utility classes to run a Java process.

As a result, not all features of running an application is supported
and exposed options now are targeted against AOT.

See gh-31682
2022-07-28 16:00:05 +02:00
Andy Wilkinson 197b4eede0 Merge branch '2.7.x'
Closes gh-31907
2022-07-28 14:50:24 +01:00
Andy Wilkinson 4f0dac7601 Merge branch '2.6.x' into 2.7.x
Closes gh-31906
2022-07-28 14:50:00 +01:00
Andy Wilkinson 348b2c28e9 Improve logging of changes that trigger a DevTools upload or restart
Closes gh-31579
2022-07-28 14:13:23 +01:00
Phillip Webb c8735c1540 Remove spring.profiles metadata
See gh-22523
2022-07-28 10:46:46 +01:00
Phillip Webb 49a8e81dc3 Merge branch '2.7.x'
Closes gh-31902
2022-07-28 10:44:57 +01:00
Phillip Webb 5c52882f76 Merge branch '2.6.x' into 2.7.x
Closes gh-31901
2022-07-28 10:44:42 +01:00
Phillip Webb 9a2ad6d42d Remove references to ConfigFileApplicationListener
Update documentation and meta-data to remove referenced to the now
deprecated `ConfigFileApplicationListener` class.

Closes gh-31895
2022-07-28 10:43:48 +01:00
Phillip Webb 7b2bacb272 Merge branch '2.7.x'
Closes gh-31900
2022-07-28 10:37:15 +01:00
Phillip Webb 220c588996 Merge branch '2.6.x' into 2.7.x
Closes gh-31899
2022-07-28 10:37:00 +01:00
Phillip Webb 98627e3d71 Fix spring.beaninfo.ignore SourceType
Fixes gh-31898
2022-07-28 10:36:19 +01:00
Phillip Webb 57e967576e Adapt to upstream Spring Framework AOT changes 2022-07-27 21:44:18 +01:00
Phillip Webb b68e43f5fd Merge branch '2.7.x' 2022-07-27 19:23:05 +01:00
Phillip Webb 2382e8322b Merge branch '2.6.x' into 2.7.x 2022-07-27 19:22:45 +01:00
Phillip Webb 2709f77ab9 Collect to named contributors to `LinkedHashMap`
Update `NamedContributorsMapAdapter` to collect items to a
`LinkedHashMap` rather than a `HashMap`.

See gh-31676
2022-07-27 18:46:42 +01:00
Andy Wilkinson a4bafa88bc Disable schema validation when testing against Hazelcast 3
We have hazelcast configuration files that are used with multiple
versions of Hazelcast. Version 3's scheme doesn't allow us to set
<auto-detection enabled="false" />. To work around this, we
configure a system property that causes Hazelcast to disable schema
validation.

See gh-38163
2022-07-27 18:29:54 +01:00
Stephane Nicoll 204354e8ab Merge branch '2.7.x'
Closes gh-31894
2022-07-27 18:32:38 +02:00
Stephane Nicoll 04cb239296 Merge branch '2.6.x' into 2.7.x
Closes gh-31893
2022-07-27 18:32:28 +02:00
Stephane Nicoll 9184d5483a Remove reference to nitrite-spring-boot-starter
Closes gh-31892
2022-07-27 18:32:19 +02:00
Stephane Nicoll 76376d8822 Merge branch '2.7.x'
Closes gh-31891
2022-07-27 18:29:17 +02:00
Stephane Nicoll 344afd81de Merge branch '2.6.x' into 2.7.x
Closes gh-31890
2022-07-27 18:29:07 +02:00
Stephane Nicoll e6a9e48c54 Remove reference to Azure Application Insights
Closes gh-31889
2022-07-27 18:28:52 +02:00
Stephane Nicoll fdb1ee5f97 Adapt to deprecations in Spring Framework
See https://github.com/spring-projects/spring-framework/issues/27954
See gh-29699
2022-07-27 18:18:09 +02:00
Stephane Nicoll aac3ccf59c Adapt to deprecations in Spring Framework
See https://github.com/spring-projects/spring-framework/issues/27780
2022-07-27 17:47:02 +02:00
Andy Wilkinson ac1203551c Start building against Spring AMQP 3.0.0-M4 snapshots
See gh-31861
2022-07-27 15:55:42 +01:00
Stephane Nicoll c413f9adbe Merge branch '2.7.x'
Closes gh-31884
2022-07-27 09:23:39 +02:00
Stephane Nicoll 53a652ec65 Merge branch '2.6.x' into 2.7.x
Closes gh-31883
2022-07-27 09:23:05 +02:00
Stephane Nicoll 9cb614c626 Migrate Hazelcast 3 sanity tests to Hazelcast 4
Closes gh-31881
2022-07-27 09:09:35 +02:00
Stephane Nicoll 59139e632b Polish "Disable auto-detection in tests that start Hazelcast"
See gh-31863
2022-07-27 08:30:17 +02:00
Adrian Bob aad9c8906a Disable auto-detection in tests that start Hazelcast
This commit updates test configurations to disable auto-detection of
Hazelcast instances.

See gh-31863
2022-07-27 08:16:48 +02:00
Stephane Nicoll 782e3f75b6 Polish Hazelcast configuration
This commit updates the XSD to 4.2 and removes the "tcp-ip" network
option as it is disabled by default.

See gh-31863
2022-07-27 08:15:53 +02:00
Madhura Bhave aac1829106 Make Batch auto-configuration back-off is spring-jdbc isn't present
See gh-29487
2022-07-26 15:11:00 -07:00
Madhura Bhave 2804c84648 Adapt to spring-jdbc being required by Spring Batch
Closes gh-29487
2022-07-26 14:03:22 -07:00
Phillip Webb 94ca5b5b53 Merge branch '2.7.x'
Closes gh-31880
2022-07-26 18:16:44 +01:00
Phillip Webb bfc703a40d Merge branch '2.6.x' into 2.7.x
Closes gh-31879
2022-07-26 18:16:13 +01:00
Phillip Webb 59c9a9cd8a Polish "Call the value adapter during NamedContributorsMapAdapter construction"
See gh-31676
2022-07-26 18:15:32 +01:00
Guirong Hu c530f12cc3 Call the value adapter during NamedContributorsMapAdapter construction
Update `NamedContributorsMapAdapter` so that the adapter function is
called only once per entry. Prior to this commit, the adapter was called
dynamically which made `CompositeHealthContributor` behave differently
from a regular `HealthContributor`.

See gh-31676
2022-07-26 18:15:32 +01:00
Andy Wilkinson 17aa5d2d23 Merge branch '2.7.x'
Closes gh-31878
2022-07-26 17:58:40 +01:00
Andy Wilkinson 3a9525b5b7 Merge branch '2.6.x' into 2.7.x
Closes gh-31877
2022-07-26 17:58:12 +01:00
Andy Wilkinson 5243cb8369 Broaded dependency management for REST Assured
Closes gh-31864
2022-07-26 17:54:47 +01:00
Phillip Webb 35a65cf82e Merge branch '2.7.x'
Closes gh-31876
2022-07-26 17:48:00 +01:00
Phillip Webb fd076ab9ef Merge branch '2.6.x' into 2.7.x
Closes gh-31875
2022-07-26 17:46:20 +01:00
aoyvx 8c93d2e8a7 Ensure PROTOCOL_HANDLER system property is reset
See gh-31870
2022-07-26 17:20:55 +01:00
Stephane Nicoll 193c1d7acf Adapt to changes in DefaultGenerationContext
See https://github.com/spring-projects/spring-framework/issues/28877
2022-07-26 18:06:46 +02:00
Phillip Webb d6cce1f441 Merge branch '2.7.x' 2022-07-26 16:14:34 +01:00
Phillip Webb fcf12686b7 Merge branch '2.6.x' into 2.7.x 2022-07-26 16:14:18 +01:00
Phillip Webb 9329acdad8 Reduce size of 'repeated-open-array.txt' file
Attempt to fix CI memory issues.
2022-07-26 16:13:44 +01:00
Phillip Webb e08aa84892 Merge branch '2.7.x' 2022-07-26 15:53:33 +01:00
Phillip Webb 96fa4cd63c Merge branch '2.6.x' into 2.7.x 2022-07-26 15:53:17 +01:00
Phillip Webb da91cde304 Protect against deeply nested JSON maps
See gh-31868
2022-07-26 15:52:57 +01:00
Phillip Webb a7ea5dfeda Merge branch '2.7.x'
Closes gh-31874
2022-07-26 15:52:33 +01:00
Phillip Webb 06805f06af Merge branch '2.6.x' into 2.7.x
Closes gh-31873
2022-07-26 15:52:12 +01:00
Phillip Webb 4132414206 Protect against deeply malformed JSON map keys
Fixes gh-31869
2022-07-26 15:47:50 +01:00
Phillip Webb 0b1441f119 Merge branch '2.7.x'
Closes gh-31872
2022-07-26 15:38:25 +01:00
Phillip Webb 466724f77a Merge branch '2.6.x' into 2.7.x
Closes gh-31871
2022-07-26 15:37:41 +01:00
Phillip Webb 6966ebd2a3 Protect against deeply nested JSON lists
Update `BasicJsonParser` to protect against deeply nested JSON lists
in the same way as Jackson.

Fixes gh-31868
2022-07-26 15:25:38 +01:00
Phillip Webb 7377d85096 Merge branch '2.7.x'
Closes gh-31866
2022-07-26 12:18:14 +01:00
Phillip Webb a4ef6a7c5c Merge branch '2.6.x' into 2.7.x
Closes gh-31865
2022-07-26 12:13:16 +01:00
Phillip Webb f8412847dc Update copyright year for "Fix typos in code and documentation"
See gh-31734
2022-07-26 12:08:30 +01:00
Marc Wrobel dbfc6bded4 Fix typos in code and documentation
See gh-31734
2022-07-26 12:08:07 +01:00
Phillip Webb b93dbd56e8 Merge branch '2.7.x' 2022-07-26 10:51:17 +01:00
Phillip Webb 3931e82841 Merge branch '2.6.x' into 2.7.x 2022-07-26 10:50:42 +01:00
Phillip Webb 4bcec6e0ee Polish 2022-07-26 10:50:01 +01:00
Stephane Nicoll a0dd6ef3b1 Revert "Merge pull request #31828 from quaff"
This reverts commit 68fc87bc7f.

See gh-31828
2022-07-25 16:16:51 +02:00
Moritz Halbritter 24cf5fff84 Start building against Spring HATEOAS 2.0.0-SNAPSHOT
See gh-31855
2022-07-25 09:34:33 +02:00
Andy Wilkinson b9b25644af Polish "Take MethodType into account to deduce main application class"
See gh-31828
2022-07-22 19:39:14 +01:00
Yanming Zhou 10a2471979 Take MethodType into account to deduce main application class
See gh-31828
2022-07-22 19:36:30 +01:00
dreis2211 75f375c68e Align Kotlin API and language versions
See gh-31849
2022-07-22 19:34:41 +01:00
Stephane Nicoll f962f2a430 Configure NBT so that it works consistently
This commit configures the Native Build Tools plugin to use Maven's
`target/classes` rather than the default generated JAR of the project.
Previously, this would fail with the default repackage option as the
default JAR is the repackaged archive and it has a specific format that
NBT can't understand.

Closes gh-31848
2022-07-22 17:36:25 +02:00
Andy Wilkinson 85c41d6698 Merge branch '2.7.x'
Closes gh-31847
2022-07-22 14:48:29 +01:00
Andy Wilkinson ac3f552dde Merge branch '2.6.x' into 2.7.x
Closes gh-31846
2022-07-22 14:47:45 +01:00
dreis2211 de5834d203 Polish
See gh-31845
2022-07-22 14:46:01 +01:00
Andy Wilkinson 6c28156b29 Avoid config-time creation of AOT source set's tasks
Closes gh-31844
2022-07-22 14:14:03 +01:00
Andy Wilkinson 0980362a88 Merge branch '2.7.x'
Closes gh-31843
2022-07-22 12:20:17 +01:00
Andy Wilkinson 64dcfe520d Merge branch '2.6.x' into 2.7.x
Closes gh-31842
2022-07-22 12:15:39 +01:00
Andy Wilkinson a1443d1cdc Enforce ordering in additional-spring-configuration-metadata.json files
Closes gh-31575
2022-07-22 12:09:58 +01:00
Moritz Halbritter 35c49afd97 Generate hints for nested generics in configuration properties
See gh-31708
2022-07-21 16:32:40 +02:00
Olga Maciaszek-Sharma 57dc274284 Switch to Spring Framework SNAPSHOTs
Switch to Spring Framework SNAPSHOTs and adapt to updated APIs.

See gh-31834
2022-07-21 13:42:48 +01:00
Stephane Nicoll e18398236f Upgrade to Maven Install Plugin 3.0.0
Closes gh-31833
2022-07-21 08:04:30 +02:00
Stephane Nicoll a98c30866a Upgrade to Maven Deploy Plugin 3.0.0
Closes gh-31832
2022-07-21 08:04:27 +02:00
Stephane Nicoll aa93b2153a Upgrade to Embedded Mongo 3.4.7
Closes gh-31830
2022-07-21 07:50:49 +02:00
Stephane Nicoll 939481b9d7 Upgrade to Spring Batch 5.0.0-M4
Closes gh-31623
2022-07-21 07:43:45 +02:00
Stephane Nicoll dfda08fd0d Upgrade to Spring Integration 6.0.0-M4
Closes gh-31624
2022-07-21 07:43:24 +02:00
Madhura Bhave 4057dd198b Change preference of session store implementations
The order has been determined based on usage statistics.

Closes gh-27756
2022-07-20 15:36:52 -07:00
Scott Frederick 6f65777035 Merge branch '2.7.x'
Closes gh-31827
2022-07-20 17:31:37 -05:00
Scott Frederick 9da38c8d2d Merge branch '2.6.x' into 2.7.x
Closes gh-31826
2022-07-20 17:29:58 -05:00
Scott Frederick 4e0b3aad9f Clarify how docker image publishing registry is determined
Closes gh-31820
2022-07-20 17:29:40 -05:00
Scott Frederick cf7a163c6d Merge branch '2.7.x' 2022-07-20 16:07:32 -05:00
Scott Frederick f9cf31e59e Fix compile errors
See gh-28844
2022-07-20 16:07:19 -05:00
Scott Frederick 36d6106bb0 Merge branch '2.7.x'
Closes gh-31825
2022-07-20 15:11:30 -05:00
Scott Frederick 09c7ce6dab Merge branch '2.6.x' into 2.7.x
Closes gh-31824
2022-07-20 15:10:43 -05:00
Scott Frederick a7dfeae09c Merge branch 'gh-28844' into 2.6.x
Closes gh-31823
2022-07-20 15:10:27 -05:00
Scott Frederick 9b0cdac58a Simplify support for pushing images to unauthenticated registries
This commit removes the requirement that `docker.publishRegistry`
configuration must be provided when an image is published by the Gradle
or Maven plugin.

Fixes gh-28844
2022-07-20 15:06:05 -05:00
Andy Wilkinson de672f4330 Merge branch '2.7.x'
Closes gh-31819
2022-07-20 21:02:06 +01:00
Andy Wilkinson 2e98cafcca Merge branch '2.6.x' into 2.7.x
Closes gh-31818
2022-07-20 21:01:47 +01:00
Andy Wilkinson ab2b04fafd Find health contributors in ancestor contexts in non-reactive apps
Previously, health contributors in a non-reative app were found by
retrieving them from the application context rather than via
dependency injection. This results in only contributors from the
current context being found, with contributors in ancestor contexts
ignored.

This commit moves to injection of the contributors, aligning the
behaviour with that of a reactive application.

Closes gh-27308
2022-07-20 20:52:02 +01:00
Andy Wilkinson 818e0d69a5 Merge branch '2.7.x'
Closes gh-31815
2022-07-20 19:26:42 +01:00
Andy Wilkinson cd1ce50105 Merge branch '2.6.x' into 2.7.x
Closes gh-31814
2022-07-20 19:24:38 +01:00
Andy Wilkinson 182adeed35 Add modules to dependency management for Derby
Closes gh-31570
2022-07-20 19:23:50 +01:00
Moritz Halbritter a4e84c26f0 Revert "Fix nested type discovery in ConfigurationPropertiesReflectionHintsProcessor"
This reverts commit 785588826e.
2022-07-20 18:04:13 +02:00
Brian Clozel 53b9ff5e89 Upgrade to Spring for GraphQL 1.0.1
Closes gh-31616
2022-07-20 17:37:41 +02:00
Brian Clozel 8cb2a0de94 Upgrade to GraphQL Java 18.2
Closes gh-31812
2022-07-20 17:36:45 +02:00
Andy Wilkinson 4bd82bb5af Polish "Upgrade to Flyway 9.0.1"
See gh-31723
2022-07-20 15:44:01 +01:00
Vedran Pavic f1bf80f5e1 Upgrade to Flyway 9.0.1
See gh-31723
2022-07-20 15:44:00 +01:00
Moritz Halbritter 785588826e Fix nested type discovery in ConfigurationPropertiesReflectionHintsProcessor
The old implementation picked up nested types only if they have been
annotated with NestedConfigurationProperty, which not all nested
properties are. Now the processor takes into account all referenced
types. It ignores only types in the java package and interfaces.

This commit also moves some of the tests from
ConfigurationPropertiesBeanFactoryInitializationAotProcessorTests to
ConfigurationPropertiesReflectionHintsProcessorTests for easier
discoverability

Closes gh-31708
2022-07-20 16:39:28 +02:00
Andy Wilkinson 38fedcff34 Polish "Use StackWalker to deduce main application class"
See gh-31701
2022-07-20 14:57:43 +01:00
GGGGGHT ea3fe95881 Use StackWalker to deduce main application class
See gh-31701
2022-07-20 12:37:11 +01:00
Andy Wilkinson 2814175505 Polish "Add auto-configuration for JdkClientHttpConnector"
See gh-31709
2022-07-20 12:18:50 +01:00
lihan e16734f937 Add auto-configuration for JdkClientHttpConnector
See gh-31709
2022-07-20 12:16:14 +01:00
Andy Wilkinson c3f3a2a707 Merge branch '2.6.x' into 2.7.x
Closes gh-31810
2022-07-20 11:54:01 +01:00
Andy Wilkinson efdd844c7a Log a warning if determining the app's PID takes too long
Closes gh-31572
2022-07-20 11:53:12 +01:00
Andy Wilkinson 1acc7857e6 Merge branch '2.7.x'
Closes gh-31807
2022-07-20 10:52:30 +01:00
Andy Wilkinson 84efc89d76 Merge branch '2.6.x' into 2.7.x
Closes gh-31806
2022-07-20 10:52:00 +01:00
Andy Wilkinson bcbe072d96 Fix 500 from mappings endpoint with attributed WebFlux router function
Closes gh-31784
2022-07-20 10:42:56 +01:00
Andy Wilkinson 18d3d4de5d Merge branch '2.7.x'
Closes gh-31805
2022-07-20 10:17:56 +01:00
Andy Wilkinson 10e19d504a Merge branch '2.6.x' into 2.7.x
Closes gh-31804
2022-07-20 10:17:39 +01:00
Andy Wilkinson 628c2cd0b1 Ensure JMX endpoints are uniquely named in a context hierarchy
Closes gh-31718
2022-07-20 10:15:52 +01:00
Andy Wilkinson 6da8c88b2b Include library resources on classpath of AOT source generation
Closes gh-31803
2022-07-20 10:07:02 +01:00
Stephane Nicoll c31ad5f175 Merge branch '2.7.x'
Closes gh-31802
2022-07-20 09:52:51 +02:00
Stephane Nicoll 6469a02c35 Merge branch '2.6.x' into 2.7.x
Closes gh-31801
2022-07-20 09:52:41 +02:00
Stephane Nicoll 585a57be76 Update copyright year of changed file
See gh-31798
2022-07-20 09:45:57 +02:00
aoyvx abe938eb2c Use Bean ClassLoader consistently to resolve class names
See gh-31798
2022-07-20 09:45:33 +02:00
Stephane Nicoll b9cf951423 Upgrade to Spring Integration 5.5.14
Closes gh-31800
2022-07-20 09:16:59 +02:00
Stephane Nicoll ac65835103 Upgrade to Spring Integration 5.5.14
Closes gh-31799
2022-07-20 09:16:17 +02:00
Moritz Halbritter c67876f913 Add resource hints for schema and data scripts
This only registers the default locations, not the one users can provide
via 'spring.sql.init.schema-locations' and
'spring.sql.init.data-locations'.

Closes gh-31533
2022-07-20 09:15:50 +02:00
Andy Wilkinson f29eed89ca Reinstate merge of pull request #31713 from dreis2211
This reverts commit 8deef6cb42.
2022-07-19 19:57:24 +01:00
Andy Wilkinson 62ec5c19de Remove temporary workaround for deprecations in Spring Batch
TaskExecutorJobLauncher has been improved so that its inherited
methods are no longer deprecated.

See gh-31623 and b599bfe5ac
2022-07-19 17:59:58 +01:00
Andy Wilkinson 8deef6cb42 Revert "Merge pull request #31713 from dreis2211"
This reverts commit 590bfd8a5c, reversing
changes made to 993e1bf5f2.
2022-07-19 17:29:14 +01:00
Andy Wilkinson 0f7079a05a Add missing auto-config to Elasticsearch reactive repo tests
See 5c057a2730
2022-07-19 17:16:30 +01:00
Brian Clozel 7c7a32a568 Auto-configure GraphQL subscription exception handling
Closes gh-31794
2022-07-19 16:53:11 +02:00
Moritz Halbritter 5030cfedcc Revert "Make MeterRegistry lazy in TimerObservationHandlerObservationRegistryCustomizer"
This reverts commit 04391275c1.
2022-07-19 16:33:35 +02:00
Moritz Halbritter e35140d54f Add tests for SpringApplicationRuntimeHints 2022-07-19 16:29:25 +02:00
Andy Wilkinson 5c057a2730 Auto-configure the new Elasticsearch clients
This commit introduces auto-configuration for the new Elasticsearch
clients that are based upon their new Java client. The new Java
client builds on top of their existing low-level REST client,
replacing the high-level REST client which has been deprecated.
As part of introducing support for the new Elasticsearch client,
the auto-configuration for the templates (both imperative and
reactive) provided by Spring Data has also been updated to use the
new templates that build upon the new Java client.

As part of these changes, support for the high-level REST client and
the old Spring Data Elasticsearch templates has been removed. One
significant change is that the new reactive template is no longer
based on WebClient. As a result, the WebClient-specific configuration
property has been removed.

Closes gh-30647
Closes gh-28597
Closes gh-31755
2022-07-19 15:26:42 +01:00
Moritz Halbritter f9ccfc1e12 Register Encoding on ReflectionHints for binding
Closes gh-31528
2022-07-19 16:22:08 +02:00
Moritz Halbritter 750e0aa293 Rename ConfigurationPropertiesReflectionHintsRegistrar 2022-07-19 16:22:08 +02:00
Andy Wilkinson b599bfe5ac Temporarily work around deprecations in Spring Batch
See gh-31623
2022-07-19 15:14:34 +01:00
Moritz Halbritter 26741d8044 Register SpringApplication on ReflectionHints for binding
Closes gh-31534
2022-07-19 16:07:10 +02:00
Moritz Halbritter 55bb921a37 Extract TypeProcessor into separate class 2022-07-19 16:06:02 +02:00
Moritz Halbritter 0291388f2a Polish 2022-07-19 14:26:00 +02:00
Moritz Halbritter 13c920b2a9 Add AOT support for ReactiveHealthEndpointWebExtension
See gh-31530
2022-07-19 14:24:20 +02:00
Stephane Nicoll a62ea1e3b8 Upgrade to AppEngine SDK 1.9.98
Closes gh-31790
2022-07-19 14:14:05 +02:00
Stephane Nicoll 4449f41cf5 Upgrade to Kotlin Coroutines 1.6.4
Closes gh-31742
2022-07-19 14:12:20 +02:00
Stephane Nicoll e48f5de20f Upgrade to AppEngine SDK 1.9.98
Closes gh-31788
2022-07-19 14:09:31 +02:00
Stephane Nicoll 51cba6ec72 Polish "Add AOT support for actuator"
See gh-31671
2022-07-19 13:02:49 +02:00
Moritz Halbritter 584b7d1343 Add AOT support for actuator
Mainly adds reflection hints for the actuator infrastructure.
Also adds the OperationReflectiveProcessor, which registers the
@ReadMethod, @DeleteMethod and @WriteMethod annotated methods for
reflection and adds reflection hints for method return types.

See gh-31671
2022-07-19 13:02:48 +02:00
Phillip Webb 00ec17b418 Fix checkstyle violation
See gh-31323
2022-07-19 11:51:44 +01:00
Chris Bono 8c70acc3c3 Add PropertyMapper.to(...) API designed for immutable instances
Add a new `to` method on `PropertyMapper` designed to work with
immutable instances. The new method takes an existing instance and
a mapping `BiFunction`.

See gh-31323

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2022-07-19 11:28:17 +01:00
Andy Wilkinson 4278683f26 Upgrade to Spring Kafka 2.8.8
Closes gh-31786
2022-07-18 20:12:04 +01:00
Andy Wilkinson a326a1291e Upgrade to Spring Kafka 2.8.8
Closes gh-31785
2022-07-18 20:10:36 +01:00
Andy Wilkinson 1bf0ee5b1c Upgrade to Spring Security 6.0.0-M6
Closes gh-31622
2022-07-18 20:02:51 +01:00
Andy Wilkinson 8957d50e61 Upgrade to Spring Kafka 3.0.0-M5
Closes gh-31620
2022-07-18 20:00:34 +01:00
Andy Wilkinson 7fb6665774 Upgrade to Spring REST Docs 3.0.0-M4
Closes gh-31621
2022-07-18 19:57:57 +01:00
Stephane Nicoll 69570a6f26 Revert to Spring LDAP 3.0.0-M2
See gh-31618
2022-07-18 15:19:35 +02:00
Stephane Nicoll 46ddd858b8 Upgrade to Spring Data 2022.0.0-M5
Closes gh-31619
2022-07-18 15:19:13 +02:00
Stephane Nicoll e1c22bc291 Upgrade to Spring HATEOAS 2.0.0-M5
Closes gh-31683
2022-07-18 15:18:44 +02:00
Stephane Nicoll 503656000d Upgrade to Spring Data 2021.1.6
Closes gh-31611
2022-07-18 15:17:46 +02:00
Stephane Nicoll e25d3d6a03 Upgrade to Spring Data 2021.1.6
Closes gh-31611
2022-07-18 15:17:02 +02:00
Stephane Nicoll 501472697d Add resource hints for default templates location
Closes gh-31310
2022-07-18 15:14:21 +02:00
dreis2211 5adccb7857 Fix deprecations in javadocs
See gh-31713
2022-07-18 14:31:21 +02:00
Stephane Nicoll f5f3d7cc67 Polish "Add configuration property for RemoteIpValve's trusted proxies"
See gh-31576
2022-07-18 11:58:05 +02:00
lihan 7d6129547f Add configuration property for RemoteIpValve's trusted proxies
See gh-31576
2022-07-18 11:50:52 +02:00
Stephane Nicoll 69050a96d2 Merge branch '2.7.x'
Closes gh-31781
2022-07-18 11:49:31 +02:00