root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
46,652 Commits 23 Branches 345 Tags 276 MiB
Commit Graph

4541 Commits

Author SHA1 Message Date
Abhijeet Mishra 4abf6f95ae Switch to single topic for same intervals in Spring Kafka retry config 
See gh-34504
 2023-03-21 13:48:20 -05:00
Andy Wilkinson f6add35f8b Upgrade to Tomcat 10.1.7 
Closes gh-34674
 2023-03-21 10:07:21 +00:00
Scott Frederick 3d65be0e1c Merge branch '3.0.x' 
Closes gh-34660
 2023-03-20 18:39:26 -05:00
Scott Frederick 86a1cfff6f Merge branch '2.7.x' into 3.0.x 
Closes gh-34659
 2023-03-20 18:39:11 -05:00
Scott Frederick 6dc0f90e00 Polish "Disable embedded web auto-config when not using embedded web server" 
See gh-34332
 2023-03-20 18:38:04 -05:00
Guirong Hu b2facecb12 Disable embedded web auto-config when not using embedded web server 
See gh-34332
 2023-03-20 18:14:58 -05:00
Andy Wilkinson 4be288f672 Upgrade to Tomcat 9.0.73 
Closes gh-34655
 2023-03-20 21:07:57 +00:00
Andy Wilkinson 59921d823c Merge branch '3.0.x' 
Closes gh-34606
 2023-03-14 15:04:36 +00:00
Andy Wilkinson d9c5f274c8 Merge branch '2.7.x' into 3.0.x 
Closes gh-34605
 2023-03-14 15:03:53 +00:00
1993heqiang a3bb3b1510 Polish name of JettyServletWebServerFactory bean method 
See gh-34421
 2023-03-14 15:02:12 +00:00
Andy Wilkinson ef6c9853e9 Merge branch '3.0.x' 
Closes gh-34604
 2023-03-14 14:58:49 +00:00
Andy Wilkinson 03865eebd7 Polish "Fix Javadoc in JobLauncherApplicationRunner" 
See gh-34596
 2023-03-14 14:58:01 +00:00
Sanghyuk Jung 03acc0273e Fix Javadoc in JobLauncherApplicationRunner 
See gh-34596
 2023-03-14 14:55:27 +00:00
Andy Wilkinson eda299df90 Configure exception resolver for `@GraphQlExceptionHandler` methods 
To apply `@ControllerAdvice` exception handling to non-controller
DataFetcher implementations like QueryDslDataFetcher,
QueryByExampleDataFetcher, and others, this commit exposes the
DataFetcherExceptionResolver from AnnotatedControllerConfigurer as a
bean. The existing auto-configured for DataFetcherExceptionResolver
then picks this up and passes it into the builder used to create the
GraphQlSource.

Closes gh-34526
 2023-03-14 12:10:34 +00:00
Andy Wilkinson daba3ce52b Upgrade to Tomcat 10.1.7 
Closes gh-34582
 2023-03-10 19:32:15 +00:00
Andy Wilkinson 1e5169846f Fix handling of deprecated identityprovider verification.credentials 
Fixes gh-34525
 2023-03-09 10:36:16 +00:00
Scott Frederick 8c3bf88aba Merge branch '3.0.x' 2023-03-02 15:01:23 -06:00
Scott Frederick f28bb221a2 Suppress Spring Kafka deprecation warning 
See gh-34441
 2023-03-02 15:01:05 -06:00
Moritz Halbritter 2becf70c2a Polish "Add RabbitTemplateCustomizer" 
See gh-34050
 2023-03-01 13:03:21 +01:00
dzcr 5f77c1cd77 Add RabbitTemplateCustomizer 
See gh-34050
 2023-03-01 12:57:03 +01:00
Phillip Webb b20b5edf2a Polish 2023-02-23 13:00:30 -08:00
Andy Wilkinson 6885c3432e Upgrade to Spring Kafka 3.0.3 
Closes gh-34354
 2023-02-23 16:50:07 +00:00
Andy Wilkinson 525cba1b6f Upgrade to Neo4j Java Driver 5.4.0 
Closes gh-34344
 2023-02-23 09:41:41 +00:00
Phillip Webb 157091a811 Merge branch '3.0.x' 2023-02-22 18:36:57 -08:00
Phillip Webb 0b15962aca Merge branch '2.7.x' into 3.0.x 2023-02-22 18:36:16 -08:00
Andy Wilkinson f6e208c647 Merge branch '3.0.x' 
See gh-34235
 2023-02-22 21:29:28 +00:00
Andy Wilkinson 88de3cc089 Temporarily remove auto-config for Reactor context propagation 
See gh-34201
 2023-02-22 21:10:59 +00:00
Phillip Webb b07269a018 Merge branch '3.0.x' 2023-02-21 23:20:07 -08:00
Phillip Webb c4de86c244 Merge branch '2.7.x' into 3.0.x 2023-02-21 23:17:57 -08:00
Phillip Webb df5898a146 Reformat code following spring-javaformat upgrade 2023-02-21 22:53:27 -08:00
Andy Wilkinson cae8c14ac7 Make Micrometer context-propagation available to test compilation 
See gh-34201
 2023-02-21 19:08:55 +00:00
Andy Wilkinson e67efe2674 Make Micrometer context-propagation available to test compilation 
See gh-34235
 2023-02-20 20:29:50 +00:00
Andy Wilkinson c40e9f437f Upgrade to Undertow 2.3.4.Final 
Closes gh-34304
 2023-02-20 20:29:49 +00:00
Andy Wilkinson a73973f5f5 Upgrade to Kafka 3.4.0 
Closes gh-34284
 2023-02-20 20:07:33 +00:00
Andy Wilkinson 6983850a2c Upgrade to Undertow 2.3.4.Final 
Closes gh-34273
 2023-02-20 16:21:43 +00:00
Brian Clozel ea6ed4b486 Merge branch '3.0.x' 
Closes gh-34235
 2023-02-20 10:26:11 +01:00
Brian Clozel 4da42c09a6 Configure automatic context propagation for Reactor 
This commit adds a new configuration property,
`spring.reactor.context-propagation` that configures the context
propagation mode for Reactor operators. By default the value is set to
"AUTO" for reinstating automatically context values as ThreadLocals
within Reactor operators. The "LIMITED" mode restricts this feature ot
the "tap" and "handle" operators but has a slightly lower footprint.

Closes gh-34201
 2023-02-20 10:22:57 +01:00
Andy Wilkinson 537e5e920f Merge branch '3.0.x' 
Closes gh-34185
 2023-02-14 20:02:18 +00:00
Andy Wilkinson 68f97f5361 Merge branch '2.7.x' into 3.0.x 
Closes gh-34184
 2023-02-14 20:02:01 +00:00
Johnny Lim 70d561a929 Polish "Set Reactor Netty's shutdownQuietPeriod to 0 when using devtools" 
See gh-34140
 2023-02-14 20:01:22 +00:00
Johnny Lim f9da3696ff Add metadata for default for spring.jmx.registration-policy 
See gh-34122
 2023-02-14 19:46:18 +00:00
Andy Wilkinson eda59f71b0 Start building against Spring Kafka 3.0.3 snapshots 
See gh-34153
 2023-02-09 17:36:28 +00:00
Andy Wilkinson 205018ec8f Fix HazelcastAutoConfigurationServerTests on Windows 
See gh-33687
 2023-02-07 16:24:08 +00:00
Andy Wilkinson 9cba05da90 Upgrade to Neo4j Java Driver 5.4.0 
Closes gh-34099
 2023-02-06 14:46:09 +00:00
Andy Wilkinson 238b85fabc Upgrade to Flyway 9.14.1 
Closes gh-34080
 2023-02-06 14:46:03 +00:00
Guirong Hu b514ea776e Auto-configure Spring Kafka ContainerCustomizer 
See gh-34033
 2023-02-06 12:04:31 +01:00
Moritz Halbritter a92ed5e2c2 Merge branch '3.0.x' 
Closes gh-34068
 2023-02-06 09:41:16 +01:00
Moritz Halbritter 3af30b0a11 Don't use global ObjectMapper when creating JacksonJsonpMapper 
See gh-33438
Closes gh-33426
 2023-02-06 09:41:10 +01:00
Andy Wilkinson 636b70a77d Merge branch '3.0.x' 
Closes gh-34040
 2023-02-01 15:19:56 +00:00
Andy Wilkinson 56a1551c2d Polish "Configure jOOQ with TransactionProvider bean when available" 
See gh-33979
 2023-02-01 15:19:16 +00:00
ath0s b2a8c8be1c Configure jOOQ with TransactionProvider bean when available 
See gh-33979
 2023-02-01 14:53:55 +00:00
Moritz Halbritter 0440e23233 Merge branch '3.0.x' 
Closes gh-34038
 2023-02-01 10:34:29 +01:00
Moritz Halbritter b28369d511 Merge branch '2.7.x' into 3.0.x 
Closes gh-34036
 2023-02-01 09:44:30 +01:00
Moritz Halbritter 2a843d1853 Set Reactor Netty's shutdownQuietPeriod to 0 when using devtools 
See gh-33855
 2023-02-01 09:31:41 +01:00
Marten Deinum f2950f2d09 Allow JMX Registration Policy to be set 
See gh-32573
 2023-01-31 14:30:36 +01:00
Thomas Kåsene d1a089ba71 Auto-configure BatchInterceptor on ConcurrentKafkaListenerContainerFactory 
See gh-32951
 2023-01-31 13:59:02 +01:00
Francois Rosiere eaa7cdf910 Add configuration property to control auto-startup of listener container 
See gh-33082
 2023-01-31 13:45:33 +01:00
Guirong Hu 6e064ed5e0 Support setting more properties of KafkaAdmin 
See gh-33288
 2023-01-31 13:30:30 +01:00
Moritz Halbritter de699b4d11 Fix HazelcastAutoConfigurationServerTests 
See gh-33687
 2023-01-31 12:05:04 +01:00
Moritz Halbritter 64c2320ce1 Polish "Merge pull request #33553 from michaelweidmann" 
See gh-33553
 2023-01-31 11:43:33 +01:00
Michael Weidmann 93d46d11e9 Add max http response header size configuration for tomcat and jetty 
See gh-33553
 2023-01-31 11:43:33 +01:00
Moritz Halbritter e955fb5cb6 Polish "Merge pull request #33687 from luben93" 
See gh-33687
 2023-01-31 11:05:47 +01:00
lucas persson 275f15b8d3 Use hazelcast's Config.loadFromStream() 
To allow the private function Config.applyEnvAndSystemVariableOverrides()
to override with environment variables

See gh-33687
 2023-01-31 11:03:09 +01:00
Phillip Webb 390892f11b Merge branch '3.0.x' 
Closes gh-33998
 2023-01-26 21:45:57 -08:00
Krzysztof Krason 0e68cae57f Use instanceof patterns 
See gh-33987
 2023-01-26 20:36:25 -08:00
Krzysztof Krason 6e46423983 Use diamond operators 
See gh-33987
 2023-01-26 20:35:08 -08:00
Moritz Halbritter a4e7a8bae0 Use bean name for servlet and filter registrations if name is not set 
If the name is set, it is used. If not, the bean name is used. If that's
not set, the convention based name is taken.

Registration failures now throw an IllegalStateException instead of
being logged. DynamicRegistrationBean.setIgnoreRegistrationFailure
can be used to restore the old behavior.

See gh-33911
 2023-01-24 09:14:06 +01:00
Phillip Webb e05b7e49c6 Polish 'Order SessionRepositoryCustomizer before other customizers' 
See gh-33514
 2023-01-19 12:48:49 -08:00
Michael Weidmann 19ce32dc34 Order SessionRepositoryCustomizer before other customizers 
Update `JdbcSessionConfiguration` so the `SessionRepositoryCustomizer`
used to map properties is always applied before other customizers.

See gh-33514
 2023-01-19 12:44:03 -08:00
Moritz Halbritter 61ad227178 Update copyright 2023-01-19 11:51:20 +01:00
Moritz Halbritter fe7aeffc0d Update copyright 2023-01-19 11:51:06 +01:00
Moritz Halbritter 3b58aa6fbd Add runtime hints for GroovyTemplateAvailabilityProperties 
Closes gh-33847
 2023-01-19 11:47:42 +01:00
Moritz Halbritter ae79c60619 Remove instance suppliers in bean definitions 
Remove instance suppliers in bean definitions and depend instead
on reflection. This allows the AOT engine to correctly process
the definitions.

Fixes gh-33763
 2023-01-18 19:55:56 -08:00
Phillip Webb 71efc55bf9 Merge branch '2.7.x' 2023-01-18 16:31:53 -08:00
Phillip Webb 7c508fa324 Update copyright year of changed files 2023-01-18 15:37:58 -08:00
Moritz Halbritter 94f4a4396c Merge branch '2.7.x' 
Closes gh-33880
 2023-01-18 17:35:52 +01:00
Moritz Halbritter e8d809fe65 Replace 'via' with 'over' or 'through' in the documentation 
Closes gh-33878
 2023-01-18 16:56:42 +01:00
Phillip Webb a889c539ab Merge branch '2.7.x' 2023-01-17 10:12:25 -08:00
Phillip Webb a0fe8241a7 Update copyright year of changed files 2023-01-17 10:07:03 -08:00
Moritz Halbritter 2f542f6c91 Merge branch '2.7.x' 
Closes gh-33776
 2023-01-12 11:38:16 +01:00
Moritz Halbritter 1606f5b88c Back off Jooq's TransactionProvider on custom TransactionProvider 
Closes gh-32899
 2023-01-12 11:24:49 +01:00
Moritz Halbritter ff3b0de02f Merge branch '2.7.x' 
Closes gh-33755
 2023-01-11 13:28:44 +01:00
Sébastien Deleuze 4466bffe52 Fix typo in class name MultipleConnectionPoolConfigurationsFailureAnalzyer 
See gh-33751
 2023-01-11 13:24:01 +01:00
Moritz Halbritter 46f09be1c0 Merge branch '2.7.x' 
Closes gh-33753
 2023-01-11 11:30:37 +01:00
Moritz Halbritter 7a148747a0 Fix NPE in RabbitProperties if user is given but password is not 
Closes gh-33752
 2023-01-11 11:13:51 +01:00
Moritz Halbritter 90a6d514a3 Fix assertions in ValidationAutoConfigurationTests 2023-01-11 10:51:29 +01:00
Phillip Webb 29b7c121fb Merge branch '2.7.x' 
Closes gh-33739
 2023-01-09 19:01:57 -08:00
Phillip Webb a369f936c9 Replace references to Pivotal 
Closes gh-33737
 2023-01-09 18:09:20 -08:00
Phillip Webb a2ac38e203 Update copyright year of changed files 2023-01-09 15:46:07 -08:00
Krzysztof Krason cf6493f65c Simplify AssertJ assertions and also make them more readable 
See gh-33653
 2023-01-09 11:10:20 +01:00
Phillip Webb f588793445 Update copyright year of changed files 2022-12-22 01:00:42 -08:00
Scott Frederick fead976952 Adapt to changes in Couchbase client 
See gh-33588
 2022-12-21 11:48:39 -06:00
Brian Clozel 41dce327a2 Fix Spring Integration failing test 
Instead of asserting that an observation registry is null, we should
ensure that it's a NOOP instance.
 2022-12-21 16:38:32 +01:00
Moritz Halbritter 08659baeba Polish away public modifier on tests 2022-12-16 16:08:44 +01:00
Moritz Halbritter f36e2ecb7b Use AutoClosables with try-with-resources 
Closes gh-33538
 2022-12-16 15:43:15 +01:00
Moritz Halbritter 725337f976 Make fields final 
Closes gh-33537
 2022-12-16 14:28:44 +01:00
Moritz Halbritter 216d15997a Merge branch '2.7.x' 
Closes gh-33512
 2022-12-12 11:41:09 +01:00
Aakarshit Uppal 2bb8dadeb3 Fix typo in tomcat accesslog checkExists doc 
See gh-33460
 2022-12-12 11:38:57 +01:00
Brian Clozel ce33ec19cd Start building against Spring GraphQL 1.1.1-SNAPSHOT 
See gh-33477
 2022-12-07 14:43:04 +01:00
Johnny Lim 78b43279a7 Polish 
See gh-33455
 2022-12-05 11:14:38 +01:00
Johnny Lim 90589fd6d4 Polish 
See gh-33384
 2022-12-01 11:32:39 +01:00
Moritz Halbritter d430779f00 Merge branch '2.6.x' into 2.7.x 
Closes gh-33328
 2022-11-23 16:32:19 +01:00
Moritz Halbritter 2f6edecedb Improve JavaDoc on ConditionalOnClass 
Closes gh-27846
 2022-11-23 16:26:43 +01:00
Brian Clozel e8c3157db5 Start building against Spring Framework 6.0.1 SNAPSHOTs 
See gh-33286
 2022-11-21 20:53:37 +01:00
Stephane Nicoll d89861e056 Merge branch '2.7.x' 
Closes gh-33284
 2022-11-21 16:23:11 +01:00
Stephane Nicoll 78d8bfdc52 Merge branch '2.6.x' into 2.7.x 
Closes gh-33283
 2022-11-21 16:22:54 +01:00
Henning Poettker 330848d339 Make `ScheduledBeanLazyInitializationExcludeFilter` conditional 
See gh-33276
 2022-11-21 16:11:07 +01:00
Vedran Pavic ca72f322d6 Fix Spring Security filter dispatcher types related docs 
See gh-33252
 2022-11-18 12:52:07 +00:00
Andy Wilkinson 98171921da Polish "Polish SecurityProperties" 
See gh-33251
 2022-11-18 12:50:15 +00:00
Vedran Pavic c1691f525a Polish SecurityProperties 
See gh-33251
 2022-11-18 12:50:15 +00:00
Sébastien Deleuze e7f91bab78 Refine BackgroundPreinitializer code reachability 
GraalVM code reachability algorithm is not able to evaluate at build
time that ENABLED static field is always false in a native image,
shipping unreachable code.

Before this commit, building a native image with -H:+PrintAnalysisCallTree
shows that the following methods are included:
- BackgroundPreinitializer$1.<init>(BackgroundPreinitializer):void
- BackgroundPreinitializer$1.run():void
- BackgroundPreinitializer$1.runSafely(Runnable):void
- BackgroundPreinitializer$CharsetInitializer.run():void
- BackgroundPreinitializer$ConversionServiceInitializer.run():void
- BackgroundPreinitializer$JacksonInitializer.run():void
- BackgroundPreinitializer$MessageConverterInitializer.run():void
- BackgroundPreinitializer$ValidationInitializer.run():void
- BackgroundPreinitializer.<clinit>():void
- BackgroundPreinitializer.getOrder():int
- BackgroundPreinitializer.onApplicationEvent(ApplicationEvent):void
- BackgroundPreinitializer.onApplicationEvent(SpringApplicationEvent):void
- BackgroundPreinitializer.performPreinitialization():void

After this commit, only those are included:
- BackgroundPreinitializer.<clinit>():void
- BackgroundPreinitializer.getOrder():int
- BackgroundPreinitializer.onApplicationEvent(ApplicationEvent):void
- BackgroundPreinitializer.onApplicationEvent(SpringApplicationEvent):void

See gh-33240
 2022-11-18 10:52:42 +00:00
Stephane Nicoll cb1ee205ea Exclude SharedMetadataReaderFactoryContextInitializer from AOT contexts 
SharedMetadataReaderFactoryContextInitializer exposes an additional
bean post processor that is only relevant when parsing the bean
factory, auto-configurations in particular. Given that this does not
happen in an AOT-optimized context, this commit excludes the bean
and makes sure the initializer does not do anything at runtime.

Closes gh-33216
 2022-11-17 11:30:22 +01:00
Phillip Webb e2dc35954e Merge branch '2.7.x' 
Closes gh-33230
 2022-11-16 12:06:20 -08:00
Phillip Webb e255bba018 Merge branch '2.6.x' into 2.7.x 
Closes gh-33229
 2022-11-16 12:06:10 -08:00
Phillip Webb 6cc6a15edf Polish 'Refine BackgroundPreinitializer Jackson initialization' 
See gh-33220
 2022-11-16 12:01:05 -08:00
Sébastien Deleuze bdac416a62 Refine BackgroundPreinitializer Jackson initialization 
AllEncompassingFormHttpMessageConverter already initializes
Jackson ObjectMapper. This commit updates BackgroundPreinitializer
in order to not run JacksonInitializer when
MessageConverterInitializer already takes care of initializing
ObjectMapper.

See gh-33220
 2022-11-16 12:00:47 -08:00
Andy Wilkinson f39b297677 Merge branch '2.7.x' 
Closes gh-33227
 2022-11-16 18:09:35 +00:00
Andy Wilkinson 04353e4961 Merge branch '2.6.x' into 2.7.x 
Closes gh-33226
 2022-11-16 16:41:02 +00:00
Andy Wilkinson 4bb13bcdfd Fix package tangles in spring-boot-autoconfigure 
See gh-17299
 2022-11-16 16:12:00 +00:00
Brian Clozel c1c818d43c Polish 
See gh-33208
 2022-11-16 16:34:49 +01:00
Brian Clozel 200458136c Contribute GraphQL resources during AOT phase 
This commit ensures that the default locations for GraphQL schema files
and the GraphiQL UI HTML page are included in the native image by
registering resource hints during the AOT phase.

Fixes gh-33208
 2022-11-16 15:56:15 +01:00
Johnny Lim 6027508cf7 Polish 
See gh-33108
 2022-11-16 10:00:36 +01:00
Andy Wilkinson 31f5e768a8 Polish "Add config property for Spring Integration component observation" 
See gh-33099
 2022-11-14 20:16:16 +00:00
artembilan b87d5c728d Add config property for Spring Integration component observation 
Spring Integration has introduced a new observationPatterns attribute
on EnableIntegrationManagement. Spring Boot auto-configures
EnableIntegrationManagement so this commit adds a property that
allows users to configure the patterns without declaring the
annotation themselves.

See gh-33099
 2022-11-14 20:16:16 +00:00
Madhura Bhave 8cb615e9b6 Remove workarounds for SecurityContextRepository 2022-11-10 14:23:17 -08:00
Madhura Bhave f4cf722c27 Align default security filter dispatcher types with Spring Security 
Fixes gh-33090
 2022-11-10 13:53:47 -08:00
Phillip Webb 1adc7c7dd4 Merge branch '2.7.x' 2022-11-09 11:32:24 -08:00
Phillip Webb 0ef03d725f Merge branch '2.6.x' into 2.7.x 2022-11-09 11:31:55 -08:00
Phillip Webb a431ae04e6 Polish 2022-11-09 11:30:11 -08:00
Andy Wilkinson 70f7258341 Simplify JacksonAutoConfiguration as we now require Jackson 2.14 
See gh-33086
 2022-11-09 17:31:04 +00:00
Andy Wilkinson 60917bd114 Remove tests for Jackson 2.11 
Closes gh-33086
 2022-11-09 11:33:55 +00:00
Phillip Webb 32b9945632 Polish 2022-11-08 23:15:30 -08:00
Phillip Webb 0d5c13cb28 Polish 'Add reflection hints for PropertyNamingStrategies' 
See gh-33080
 2022-11-08 23:09:27 -08:00
Ralf Ueberfuhr e9bca3e6de Add reflection hints for PropertyNamingStrategies 
See gh-33080
 2022-11-08 23:03:54 -08:00
Andy Wilkinson c314d62030 Merge branch '2.7.x' 
Closes gh-33067
 2022-11-08 13:11:01 +00:00
Andy Wilkinson 0e70c33725 Merge branch '2.6.x' into 2.7.x 
Closes gh-33066
 2022-11-08 13:10:40 +00:00
dreis2211 34902f5a02 Fix possible type pollution in ConditionEvaluationReport 
See gh-32916
 2022-11-08 13:01:27 +00:00
Andy Wilkinson a19f1a733e Correct crash handling in condition report logging listener 
Closes gh-33027
 2022-11-08 12:54:46 +00:00
Andy Wilkinson 3a2703e8f6 Upgrade to Jakarta Mail 2.1 and switch to Eclipse Angus RI 
Closes gh-33059
Closes gh-33050
 2022-11-08 11:01:15 +00:00
Phillip Webb 95557ddbc6 Start building against Spring Integration 6.0.0-RC2 snapshots 
See gh-33009
 2022-11-07 14:31:01 -08:00
Andy Wilkinson b67c427259 Upgrade to Servlet 6.0 and related EE 10 specs 
Co-authored-by: Phillip Webb <pwebb@vmware.com>

Closes gh-33036
Closes gh-33037
Closes gh-33038
Closes gh-33039
Closes gh-33040
Closes gh-33041
Closes gh-33042
Closes gh-33043
 2022-11-07 17:33:38 +00:00
Andy Wilkinson bf468ab808 Polish tests to make use of @ParamterizedTest 
Update tests to use @ParamterizedTest to reduce duplication.
 2022-11-05 18:46:13 -07:00
Andy Wilkinson 42f4fd7e41 Revert to Spring Integration 6.0.0-RC1 
Latest snapshots contain breaking changes that we do not yet know how
to address.
 2022-11-05 13:39:45 +00:00
Andy Wilkinson 7e6bc3fdca Adapt to breaking API change in Spring Integration 
See gh-33009
 2022-11-04 19:40:52 +00:00
Andy Wilkinson 61c9a1540f Start building against Spring Batch 5.0.0-RC2 snapshots 
See gh-32935
 2022-11-01 12:09:39 +00:00
Moritz Halbritter 4fef5291bf Fix build 
Commit 29f085bd1a690ff7281e00b3a925e1160850ffbb in Spring Framework
automatically registers hints for enclosing directories. This fixes the
tests to use a contains instead of exact match.
 2022-10-31 16:59:15 +01:00
Moritz Halbritter dd2bec267c Revert "Fix build" 
This reverts commit 50599c5046.
 2022-10-31 16:54:05 +01:00
Moritz Halbritter 50599c5046 Fix build 
Commit 29f085bd1a690ff7281e00b3a925e1160850ffbb in Spring Framework
automatically registers hints for enclosing directories. This fixes the
tests to expect hints for those directories as well.
 2022-10-31 16:03:49 +01:00
Moritz Halbritter 5bf088d88b Add runtime hints for Liquibase migration file 
Closes gh-32926
 2022-10-31 11:29:53 +01:00
Johnny Lim 5067aab552 Polish 
See gh-32840
 2022-10-27 16:33:14 +02:00
Andy Wilkinson b9e176ce1a Inject Jackson modules rather than retrieving them manually 
Fixes gh-32863
 2022-10-27 13:35:37 +01:00
Moritz Halbritter 65c68ba64e Reinstate old flyway bean method 
Closes gh-32849
 2022-10-27 10:15:58 +02:00
Moritz Halbritter cd5d2ad3e8 Revert "Extract Flyway configuration mapping in separate class" 
This reverts commit cf4117856b.
 2022-10-27 10:08:27 +02:00
Moritz Halbritter cf4117856b Extract Flyway configuration mapping in separate class 
Closes gh-32849
 2022-10-27 09:53:29 +02:00
Scott Frederick eeac08e50e Remove references to WebSecurityConfigurerAdapter from javadoc 
Closes gh-32879
 2022-10-26 16:55:10 -05:00
Phillip Webb a59b6cb1f3 Polish 2022-10-25 21:56:53 -07:00
Phillip Webb 0f405c06bf Merge branch '2.7.x' 2022-10-25 16:40:56 -07:00
Phillip Webb f44531a7a2 Merge branch '2.6.x' into 2.7.x 2022-10-25 16:02:04 -07:00
Phillip Webb 92b513dc8d Polish 2022-10-25 16:01:58 -07:00
Phillip Webb 4be3218cb6 Merge branch '2.7.x' 2022-10-25 15:48:26 -07:00
Andy Wilkinson 99edda735e Polish 2022-10-25 12:57:58 +01:00
Andy Wilkinson bed313746b Correct property names to align with changes in 3.0 
See gh-32837
 2022-10-21 12:23:07 +01:00
Andy Wilkinson a606b26920 Merge branch '2.7.x' 
Closes gh-32837
 2022-10-21 11:04:52 +01:00
Andy Wilkinson 032487117b Merge branch '2.6.x' into 2.7.x 
Closes gh-32836
 2022-10-21 11:04:09 +01:00
Andy Wilkinson fe51e03019 Support IPv6 addresses in spring.redis.sentinel.nodes 
Fixes gh-32762
 2022-10-21 10:53:54 +01:00
Phillip Webb ea094ddba6 Fix package tangles caused by ConfigurationProperties hints 
Relocate `ConfigurationPropertiesReflectionHintsProcessor` and refactor
it to be a general purpose `BindableRuntimeHintsRegistrar`.

Prior to this commit, `ConfigurationPropertiesReflectionHintsProcessor`
was used to declare binding hints for classes that were bound, but
might be `@ConfigurationProperties`. By moving and renaming the class,
it's now better aligned to the way it's used.

Support for `@NestedConfigurationProperties` has been implemented by
adding a `@Nestable` meta-annotation. This allow us to create the
appropriate hints, without the `Binder` needing to be directly aware of
the `@NestedConfigurationProperties` annotation.

Closes gh-32815
 2022-10-20 17:05:54 -07:00
Madhura Bhave ce3c933f77 Adapt to Spring Security changes 
Closes gh-32604
 2022-10-19 11:46:27 -07:00
Phillip Webb 2e74878ba4 Downgrade to OpenSAML 4.0.1 
See gh-32604
 2022-10-19 11:46:27 -07:00
Madhura Bhave cedd553b83 Remove error page security filter 
Spring Security now re-applies the authorization rules
to the error page by default. Additionally, it configures
RequestAttributeSecurityContextRepository as the default for
stateless applications allowing those applications to have access
to the original authentication during an error dispatch.

Closes gh-31703
 2022-10-19 11:46:27 -07:00
Andy Wilkinson a87aca2744 Merge branch '2.7.x' 
Closes gh-32782
 2022-10-19 10:02:56 +01:00
Andy Wilkinson a19e394ebb Merge branch '2.6.x' into 2.7.x 
Closes gh-32781
 2022-10-19 10:00:48 +01:00
Henning Poettker 4ed072a06b Upgrade MySQL Connector/J and use new Maven identifiers 
See gh-32747
 2022-10-19 09:58:32 +01:00
Phillip Webb 02cd910f5a Merge branch '2.7.x' 
Closes gh-32774
 2022-10-18 15:37:42 -07:00
Phillip Webb fbd416adc6 Merge branch '2.6.x' into 2.7.x 
Closes gh-32773
 2022-10-18 15:37:20 -07:00
Phillip Webb b02c702ad1 Polish 'Use more specific bean method return types in KafkaAutoConfiguration' 
See gh-32770
 2022-10-18 15:35:37 -07:00
yuanhao18 c498ad0320 Use more specific bean method return types in KafkaAutoConfiguration 
Update `KafkaAutoConfiguration` so that more specific bean types are
returned.

See gh-32770
 2022-10-18 15:33:58 -07:00
Moritz Halbritter b986a9b12e Add Flyway native-image support 
The ResourceProviderCustomizer, which is used by FlywayAutoConfiguration
gets replaced with NativeImageResourceProviderCustomizer when running
in AOT mode. The NativeImageResourceProvider does the heavy lifting when
running in a native image: it uses PathMatchingResourcePatternResolver
to find the migration files.

Closes gh-31999
 2022-10-18 12:07:04 +02:00
Bertolt Meier 647a2905c8 Add checkstyle rule for List.of() / Set.of() / Map.of() 
This commits adds a checkstyle rule to not use List.of(), Set.of()
and Map.of(), preferring Collections.emptyList(), emptySet(), and
emptyMap() respectively.

It replaces usages of these methods across the codebase.

See gh-32655
 2022-10-12 18:15:48 +01:00
Andy Wilkinson 3ab4606584 Make runScripts method of DB initializer more extensible 
Closes gh-29137
 2022-10-12 11:52:38 +01:00
Brian Clozel d870474fcd Remove spring.webflux.multipart.streaming property 
As of spring-projects/spring-framework#29293, the streaming mode on the
`DefaultPartHttpMessageReader` is deprecated as hard limitations have
been found with the design and won't be fixed. Instead, developers
should use the `PartEvent` API and the `PartEventHttpMessageReader`
(which is configured by default with the codecs).

This commit removes the `spring.webflux.multipart.streaming` property
and applies all `spring.webflux.multipart.*` properties that are
applicable to `PartEventHttpMessageReader`.

Closes gh-32658
 2022-10-10 14:59:34 +02:00
Madhura Bhave 263433cd81 Populate base for embedded LDAPContextSource 
Fixes gh-23030
 2022-10-07 13:20:45 -07:00
Andy Wilkinson 3eb3d79104 Log condition evaluation report during AOT processing 
Closes gh-32109
 2022-10-07 18:08:18 +01:00
Andy Wilkinson 8e35f2ae92 Separate report logging from context initialization and events 
See gh-32109
 2022-10-07 18:08:18 +01:00
Brian Clozel 23a9818e0d Auto-configure ProblemDetails support 
This commit auto-configures ProblemDetails support for both Spring MVC
and Spring WebFlux, contributing a `@ControllerAdvice` annotated
`ResponseEntityExceptionHandler` bean if the
`spring.mvc.problemdetails.enabled` or
`spring.webflux.problemdetails.enabled` properties are set to `true`.

Closes gh-32634
 2022-10-07 17:23:12 +02:00
Vedran Pavic e0a7bd8143 Fix deprecation warnings in Spring Session auto-configuration 
This commit updates Spring Session auto-configuration to avoid usage of
deprecated methods, and moves to newly introduced Duration based
defaultMaxInactiveInterval setters across all session repository
implementations.

Additionally, this fixes several tests that are broken due to session
repository implementations now using Duration type for their
defaultMaxInactiveInterval fields.

See gh-32633
 2022-10-07 15:38:46 +01:00
Brian Clozel da7128ce7e Upgrade to Thymeleaf 3.1.0-M3 
See gh-32628
 2022-10-07 11:42:01 +02:00
Brian Clozel 0f3b94592b Temporarily suppress warnings on R2DBC deprecation 
See gh-32601
See spring-projects/spring-data-relational#1350
 2022-10-07 11:41:16 +02:00
Andy Wilkinson 7e47d3bbd6 Polish "Rework Spring Session auto-configuration to use customizers" 
See gh-32554
 2022-10-06 20:59:59 +01:00
Vedran Pavic ad8753923a Rework Spring Session auto-configuration to use customizers 
This commit reworks Spring Session auto-configuration to avoid
extending Spring Session's configuration classes. Instead, those
configuration classes are now imported and customizations are
applied using dedicated (Reactive)SessionRepositoryCustomizer beans.

See gh-32554
 2022-10-06 20:59:13 +01:00
Brian Clozel c8c73b195d Switch to Spring Batch 5.0.0-SNAPSHOT 
See gh-32618
 2022-10-06 16:11:26 +02:00
Stephane Nicoll 4ffc421b3c Adapt to Spring Framework API change 2022-10-06 09:58:05 +02:00
Stephane Nicoll e94a1f7988 Replace outcome of JsonMixins scanning in AOT optimized contexts 
This commit adds an AOT contribution that replaces the scanning of
@JsonMixin by a mapping in generated code. This makes sure that such
components are found in a native image.

Closes gh-32567
 2022-10-05 15:55:33 +02:00
Andy Wilkinson 5199ffe6a9 Allow auto-configured Rabbit Stream Environment to be customized 
Closes gh-32580
 2022-10-05 11:56:32 +01:00
Andy Wilkinson 0ae7e935c3 Allow user to replace auto-configured Data JDBC beans 
Closes gh-32571
 2022-10-04 18:07:56 +01:00
Andy Wilkinson e6568596b9 Make max header size config consistent across web servers 
Closes gh-29382
 2022-10-04 15:16:54 +01:00
Andy Wilkinson 4f86f685c5 Reinstate support for Infinispan 
Closes gh-32556
 2022-10-04 11:32:56 +01:00
Phillip Webb e0b67889a8 Use Stream.toList instead of Stream.collect when possible 
Update code to make use of `Stream.toList()` whenever possible.

Closes gh-28177
 2022-10-04 00:29:22 -07:00
Andy Wilkinson 803d353d49 Fix formatting of R2dbcDataAutoConfiguration 
See c2b8d3d.
 2022-10-03 14:29:46 +01:00
Stephane Nicoll c2b8d3de21 Declare beans that can be instantiated at build-time static 
This commit updates the bean factory methods for beans that can be
instantiated at build-time to be static. Doing so makes sure that
the enclosing configuration class does not have to be resolved in
order to create the instance.

Closes gh-32570
 2022-10-03 14:36:04 +02:00
Andy Wilkinson 51df7813a5 Remove code deprecated in 2.x and add since and forRemoval attributes 
Closes gh-32548
Closes gh-32549
 2022-09-30 14:39:05 +01:00
Andy Wilkinson 0bfa9cd704 Upgrade to Logback 1.4 and SLF4J 2.0 
Closes gh-12649
 2022-09-28 21:14:08 +01:00
Andy Wilkinson 7d583939ff Auto-configure stream template and env irrespective of listener type 
Closes gh-32477
 2022-09-23 17:28:17 +01:00
Vedran Pavic 230f2cda84 Migrate to AuthorizationFilter in Spring Security auto-config 
This commit updates Servlet based Spring Security auto-configuration
to use AuthorizationFilter, which is intended to supersede
FilterSecurityInterceptor.

See gh-31255
 2022-09-22 13:53:54 +01:00
Scott Frederick 08022ba86e Remove support for locating imports using spring.factories 
With this commit, loading `@AutoConfiguration`,
`@ImportAutoConfiguration`, and `@ManagementContextConfiguration`
classes is supported with `.imports` files only. Support for loading
these classes with `spring.factories` is removed.

Closes gh-29699
 2022-09-21 17:34:51 -05:00
Scott Frederick f9c341c75a Revert "Generate the AutoConfiguration.imports file from annotations" 
This reverts commit da4de7d67d.
 2022-09-21 14:50:15 -05:00
Andy Wilkinson 2977373505 Polish "Add property to configure Spring Session Redis repository type" 
See gh-32205
 2022-09-21 17:16:29 +01:00
Vedran Pavic 3093380e35 Add property to configure Spring Session Redis repository type 
With Spring Session moving to RedisSessionRepository as the preferred
session repository, Spring Boot auto-configuration should make it
possible to easily switch back to the previous default
(RedisIndexedSessionRepository).

This commit introduces spring.session.redis.repository configuration
property that allows selecting the desired Redis-backed session
repository implementation.

See gh-32205
 2022-09-21 17:13:58 +01:00
Andy Wilkinson 64f4da80cb Align with breaking changes in latest Batch snapshots 
Batch is now auto-configured to use the context's
PlatformTransactionManager and DataSource or `@BatchDataSource`.
When this does not meet the user's needs, they can use
`@EnableBatchProcessing` or sub-class `DefaultBatchConfiguration` to
take complete control with the auto-configuration backing off.

Closes gh-32330
 2022-09-20 15:42:52 +01:00
dreis2211 bac7d62476 Fix Spring Batch deprecations 
See gh-32419
 2022-09-19 14:31:54 +02:00
Andy Wilkinson 2b3ef96156 Merge branch '2.7.x' 
Closes gh-32407
 2022-09-16 17:03:34 +01:00
Andy Wilkinson a800f7d77c Merge branch '2.6.x' into 2.7.x 
Closes gh-32406
 2022-09-16 17:03:13 +01:00
Andy Wilkinson 61e11cd361 Ensure that TCCL is clean when DataSource is accessed 
Previously, when using Tomcat, its web app class loader was the thread
context class loader when H2ConsoleAutoConfiguration triggered
initialization of Hikari's pool. This was the case because it's done
in the bean method of a ServletRegistrationBean. Such Servlet-related
beans are intentionally created with Tomcat's web app classloader as
the TCCL. This arrangement results in the pool's threads using
Tomcat's web app class loader as their TCCL which is not desirable.
One consequence of this was that Tomcat could log a warning at
shutdown about the thread being left running when it will, in fact,
be stopped as part of the context being closed.

This commit updates H2ConsoleAutoConfiguration to set the TCCL to its
own ClassLoader while the DataSource information is being logged.

Closes gh-32382
 2022-09-16 16:24:57 +01: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 bcb5f048d2 Upgrade to Liquibase 4.16.0 
Closes gh-32354
 2022-09-14 15:56:59 +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 d4a88041dc Upgrade to R2DBC Bom Borca-SR2 
Closes gh-32328
 2022-09-14 11:01:19 +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
Andy Wilkinson 4e8e5f623b Adapt to recent deprecations in Spring Batch 
See gh-32237
 2022-09-13 17:44:50 +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
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 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
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
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
Brian Clozel 4aa1efa2d8 Fix build with latest Spring for GraphQL changes 2022-09-01 11:26:04 +02: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
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
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 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 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 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
Andy Wilkinson 8e3346c24f Catch exception that's thrown on Java 11 and later 
See gh-32034
 2022-08-10 11:20:33 +01: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
Andy Wilkinson ba93e6c0ed Restore support for Jersey 
Closes gh-28637
 2022-08-08 15:45:20 +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
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
Johnny Lim 6a4681baf5 Polish 
See gh-31948
 2022-08-02 15:14:23 +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
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
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
Phillip Webb 57e967576e Adapt to upstream Spring Framework AOT changes 2022-07-27 21:44:18 +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 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
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 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
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
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
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
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
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
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 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 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
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
Andy Wilkinson b599bfe5ac Temporarily work around deprecations in Spring Batch 
See gh-31623
 2022-07-19 15:14:34 +01:00
Stephane Nicoll 501472697d Add resource hints for default templates location 
Closes gh-31310
 2022-07-18 15:14: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 92b8bcbdac Upgrade to Lettuce 6.2.0.RELEASE 
Closes gh-31761
 2022-07-15 12:12:21 +02:00
Andy Wilkinson 3405a54f9e Exclude Jetty toolchain dependencies in favor of official API artifacts 
Closes gh-31720
 2022-07-14 13:55:26 +01:00
Stephane Nicoll 4ae4698093 Polish "Add config property for KafkaAdmin modifyTopicConfigs" 
See gh-31679
 2022-07-13 16:10:35 +02:00
Michael Kreis 677c05a5b1 Add config property for KafkaAdmin modifyTopicConfigs 
See gh-31679
 2022-07-13 16:01:33 +02:00
Andy Wilkinson 88ee31c422 Upgrade to R2DBC 1.0 
With the 1.0 release of the SPI, R2DBC's bom is no longer published.
This commit updates Spring Boot's dependency management to no longer
use the bom. Tests have also been updated to adapt to slight changes
in R2DBC's configuration options and their default values.

Closes gh-31702
 2022-07-13 12:09:56 +01:00
Andy Wilkinson 4bd3534b7d Adapt to change in Security's filtering behavior 
Spring Security now filters every dispatch by default and not only
once-per-request. Security configuration has been updated in a number of
places to restore the old behavior as needed for the tests to pass.
gh-31703 has been opened to review this and to investigate if we can
now remove the error page security filter and rely on the filtering of
every dispatch instead.

In addition to switching to once-per-request filtering where needed,
this commit also restructures the configuration of the error page
security filter. The restructuring was necessary to ensure that the
privilege evaluator bean has been defined before the conditions on the
error page security filter are evaluated. Without the change, the filter
was no longer being configured as the privilege evaluator hadn't been
defined before the on bean condition was evaluated. We may want to back
port this change as the ordering doesn't appear to have been defined
before and we were just getting lucky.

See gh-31622
See spring-projects/spring-security#11466
 2022-07-13 12:09:46 +01:00
Madhura Bhave d66e108703 Revert actuator changes related to path pattern parsing 
See gh-31547
 2022-07-12 15:25:41 -07:00
Stephane Nicoll 67b5f42769 Name RuntimeHintsRegistrar implementations consistently 
Closes gh-31695
 2022-07-12 19:50:26 +02:00
Madhura Bhave 7954f5e566 Adapt to change in default strategy for URL path matching in Spring MVC 
Closes gh-31547
 2022-07-12 09:59:44 -07:00
Stephane Nicoll a5862dd55d Merge branch '2.7.x' 
Closes gh-31691
 2022-07-12 14:51:46 +02:00
Stephane Nicoll cb2844d527 Merge branch '2.6.x' into 2.7.x 
Closes gh-31690
 2022-07-12 14:51:33 +02:00
Stephane Nicoll a368919600 Polish "Fix deprecation metadata for grid-fs-database" 
See gh-31689
 2022-07-12 14:42:49 +02:00
Felix Scheinost d5e18e61c5 Fix deprecation metadata for grid-fs-database 
See gh-31689
 2022-07-12 14:42:36 +02:00
Oliver Drotbohm b10c57551c Upgrade to Hibernate 6.1.1.Final 
This commit makes the following potentially breaking changes:

- Dependency management for modules that do not exist in Hibernate
  6.1 has been removed.
- Hibernate's modules are now in the org.hibernate.orm group. Users
  not using the starter or using modules that are not in the starter
  will have to update their build configuration accordingly.
- spring.jpa.hibernate.use-new-id-generator-mappings has been removed
  as Hibernate no longer supports switching back to the old ID
  generator mappings.

Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>

Closes gh-31674
 2022-07-12 09:36:34 +01:00
Andy Wilkinson 03ec079040 Start building against Reactor 2022.0.0-M4 snapshots again 
See gh-31609
 2022-07-11 18:19:26 +01:00
Andy Wilkinson a5b178657f Revert "Start building against Reactor 2022.0.0-M4 snapshots" 
This reverts commit 47993c094b.

Couchbase and Spring Data Couchbase are not compatibile with the
latest Reactor snapshots as they use deprecated API that has now
been removed.

See gh-31609
 2022-07-08 18:23:36 +01:00
Andy Wilkinson efc5391496 Adapt to deprecations in Framework's scheduling APIs 
See gh-31241
 2022-07-08 17:53:55 +01:00
Andy Wilkinson 47993c094b Start building against Reactor 2022.0.0-M4 snapshots 
See gh-31609
 2022-07-08 12:08:57 +01:00
Andy Wilkinson 55aa17eb11 Start building against Spring Framework 5.3.22 snapshots 
See gh-31613
 2022-07-08 09:55:15 +01:00
Andy Wilkinson eb9df8ebfe Adapt to changes in Spring Data Elasticsearch's transitive deps 
See gh-31611
 2022-07-07 22:22:28 +01:00
Andy Wilkinson ece51636fd Start building against Spring Framework 5.3.22 snapshots 
See gh-31610
 2022-07-07 17:04:01 +01:00
Andy Wilkinson 7f00378eaf Polish "Start building against Spring Data 2022.0.0-M5 snapshots" 
See gh-31582
 2022-07-07 16:32:13 +01:00
Mark Paluch 0067611396 Start building against Spring Data 2022.0.0-M5 snapshots 
See gh-31582
 2022-07-07 16:31:55 +01:00
Andy Wilkinson 96ade2d07a Upgrade to Jedis 4.2.3 
Closes gh-31586
 2022-07-07 15:13:19 +01:00
Andy Wilkinson 048bab4400 Upgrade to jOOQ 3.17.1 
Closes gh-31587
 2022-07-07 14:34:16 +01:00
Andy Wilkinson 344a216feb Upgrade to Artemis 2.23.1 
Closes gh-31583
 2022-07-07 14:34:15 +01:00
dreis2211 458f989cf3 Use switch expressions where appropriate 
See gh-31527
 2022-06-24 16:19:28 +01:00
Andy Wilkinson 631b1e0d76 Merge branch '2.7.x' 
Closes gh-31526
 2022-06-24 13:10:10 +01:00
Andy Wilkinson 1e08f545d0 Merge branch '2.6.x' into 2.7.x 
Closes gh-31525
 2022-06-24 13:05:06 +01:00
Andy Wilkinson f49b16c645 Upgrade to Spring Java Format 0.0.34 
Closes gh-31524
 2022-06-24 12:57:52 +01:00
Andy Wilkinson 7c5aacc5f9 Adapt to upstream Spring Framework exception changes 2022-06-23 17:05:58 -07:00
Phillip Webb 2c22f21835 Merge branch '2.7.x' 
Closes gh-31504
 2022-06-22 20:32:23 -07:00
Phillip Webb 28775c2c53 Merge branch '2.6.x' into 2.7.x 
Closes gh-31503
 2022-06-22 20:31:58 -07:00
Phillip Webb 904feb2490 Polish 'Allow spring.data.cassandra.config file to override default values' 
See gh-31238
 2022-06-22 19:51:32 -07:00
Stern, Ittay (is9613) 1c7d99890e Allow spring.data.cassandra.config file to override default values 
Update `CassandraAutoConfiguration` so that properties in a
`spring.data.cassandra.config` file can override the default values
defined in `CassandraProperties`.

This commit changes two things:

1. Any primitive on `CassandraProperties` are replaced with object values.
   This allows distinguishing between defaults values and no-values. Then
   CassandraAutoConfiguration.mapConfig() can use whenNonNull() predicate
   to ignore those.

2. `CassandraProperties` no longer populate default values on any
   property. With that, the defaults can be applied on top of the file
   spring.data.cassandra.config; i.e. the config file have higher
   precedence than the defaults, but lower that any spring.data.cassandra.*
   property.

See gh-31238
 2022-06-22 19:27:40 -07:00
Madhura Bhave 7cb53b3c45 Remove session store type in favor of defined order 
Closes gh-27756
 2022-06-22 15:22:48 -07:00
Andy Wilkinson c9e0e8891f Make reactive user details back off with Auth Manager Resolver bean 
Closes gh-31317
 2022-06-22 10:41:54 +01:00
Phillip Webb 4c0a4cb669 Polish 2022-06-21 12:08:03 -07:00
dreis2211 5db04da275 Use pattern matching for instanceof where appropriate 
See gh-31475
 2022-06-20 17:55:36 +01:00
dreis2211 93defdaa17 Use String.repeat() where possible 
See gh-31456
 2022-06-20 08:03:01 +02:00
Johnny Lim aab59c5f2e Static-import Mockito.mock() 
See gh-31443
 2022-06-19 10:31:28 +02:00
Stephane Nicoll cb22905944 Merge branch '2.7.x' 
Closes gh-31455
 2022-06-19 10:15:13 +02:00
Johnny Lim 11a07a9d1e Polish OAuth2ResourceServerAutoConfigurationTests 
See gh-31453
 2022-06-19 10:11:48 +02:00
Johnny Lim 5d7d0d8047 Use 3.0.0 for Javadoc since tags 
See gh-31448
 2022-06-17 16:48:58 +02:00
Andy Wilkinson bde06a3115 Merge branch '2.7.x' 2022-06-16 15:39:48 +01:00
Andy Wilkinson 89bef73846 Polish 2022-06-16 15:39:04 +01:00
Andy Wilkinson 80ae3f36a9 Merge branch '2.7.x' 
Closes gh-31404
 2022-06-16 13:06:00 +01:00
Andy Wilkinson a1cc5bf238 Allow multiple JWS algorithms to be configured 
Closes gh-31321
 2022-06-16 12:59:13 +01:00
Madhura Bhave 55d6a87fef Remove support for multiple batch jobs 
Closes gh-25373
 2022-06-15 09:34:10 -07:00
Stephane Nicoll b536b209ab Refine assertions on exception messages 2022-06-14 18:20:27 +02:00
Phillip Webb 378e56f1d3 Add Order annotation to GraphQL RouterFunction beans 
Update GraphQL auto-configuration so that `RouterFunction` beans have
and `@Order` of 0.

Fixes gh-31314
 2022-06-13 16:44:20 -07:00
Stephane Nicoll b3601643af Add hints for web resource default locations 
Closes gh-31278
 2022-06-13 11:09:48 +02:00
Andy Wilkinson d4be484d27 Upgrade to AssertJ 3.23.1 
Closes gh-31331
 2022-06-10 13:44:21 +01:00
Andy Wilkinson 36f01eb40b Fix compilation error with Tomcat 10 
There's no setter for the max header size in Tomcat 10 as it's now
inherited from the underlying HTTP 1.1 protocol. The test that
was merged forwards from 2.7.x is retained to verify that this is
the case.

See gh-31330
 2022-06-10 12:40:40 +01:00
Andy Wilkinson b6ebf4a7db Merge branch '2.7.x' 
Closes gh-31330
 2022-06-10 11:36:11 +01:00
Andy Wilkinson 7f584a95a6 Merge branch '2.6.x' into 2.7.x 
Closes gh-31329
 2022-06-10 11:35:54 +01:00
Andy Wilkinson e02803d341 Configure max HTTP header size when using HTTP2 with Tomcat 
Closes gh-31322
 2022-06-10 11:32:57 +01:00
Andy Wilkinson 91bb5aa222 Move auto-config of ReactiveElasticClient to elasticsearch pkg 
Closes gh-28068
 2022-06-09 11:42:09 +01:00
Stephane Nicoll cf19c176f6 Adapt test to change in Spring Framework snapshots 2022-06-03 18:11:10 +02:00
Stephane Nicoll 6e9ea85835 Adapt BasePackages bean definition for AOT processing 
This commit adapts how the BasePackages bean is registered so that
AOT processing works with it out-of-the-box. Previously we were using
an instance supplier with the accumulated base packages. This commit
changes that to set a constructor argument values.

Closes gh-31223
 2022-05-31 15:19:35 +02:00
Stephane Nicoll b2e63db57f Merge branch '2.7.x' 
Closes gh-31209
 2022-05-30 15:14:23 +02:00
Stephane Nicoll dd437c4cf4 Merge branch '2.6.x' into 2.7.x 
Closes gh-31208
 2022-05-30 15:14:08 +02:00
Stephane Nicoll ad1214c972 Upgrade copyright year of changed files 
See gh-31197
 2022-05-30 15:13:12 +02:00
heqiang 3a0ab01066 Polish "Remove boxing" 
See gh-31197
 2022-05-30 15:02:58 +02:00
Andy Wilkinson 4bb5ba2bd0 Merge branch '2.7.x' 2022-05-26 18:26:52 +01:00
Andy Wilkinson 935d1264e0 Merge branch '2.6.x' into 2.7.x 2022-05-26 18:13:08 +01:00
Andy Wilkinson 3d203d0215 Polish 2022-05-26 17:30:39 +01:00
Andy Wilkinson 26b89bfc80 Remove redundant throws declarations from public APIs 
Closes gh-31179
 2022-05-26 16:00:47 +01:00
Andy Wilkinson 5dfa5adb75 Merge branch '2.7.x' 
Closes gh-31178
 2022-05-26 15:54:58 +01:00
Andy Wilkinson 455ee0ce22 Merge branch '2.6.x' into 2.7.x 
Closes gh-31177
 2022-05-26 15:53:38 +01:00
Andy Wilkinson ee45fd2fc8 Remove redundant throws declarations from internal APIs 
Closes gh-31176
 2022-05-26 15:47:35 +01:00
Andy Wilkinson b3a4982f31 Merge branch '2.6.x' into 2.7.x 
Closes gh-31174
 2022-05-26 14:01:23 +01:00
Andy Wilkinson cbf42dea14 Update deprecation messages to change removal version from 2.8 to 3.0 
Closes gh-30903
 2022-05-26 13:59:03 +01:00
Andy Wilkinson 842cea2fc1 Merge branch '2.7.x' 2022-05-18 13:18:20 +01:00
Guirong Hu 1d7f7c2d28 Restore Spring Security dependency check for SpringSecurityDialect 
See gh-31033
 2022-05-18 13:16:24 +01:00
Andy Wilkinson 646d582393 Merge branch '2.6.x' into 2.7.x 
Closes gh-31099
 2022-05-18 13:14:46 +01:00
Andy Wilkinson e407bae8c8 Merge branch '2.5.x' into 2.6.x 
Closes gh-31098
 2022-05-18 13:14:15 +01:00
Andy Wilkinson 5e78bef9f8 Test security dialect auto-config without Spring Security 
Closes gh-31097
 2022-05-18 13:06:09 +01:00
Andy Wilkinson 96c2d08fc4 Remove support for Solr as it is not compatible with Jetty 11 
Closes gh-31054
 2022-05-18 11:33:55 +01:00
Phillip Webb f8a41d34aa Merge branch '2.7.x' 2022-05-17 22:22:08 -07:00
Phillip Webb 23eceb0d8a Merge branch '2.6.x' into 2.7.x 2022-05-17 22:21:41 -07:00
Phillip Webb ea41e89c6c Merge branch '2.5.x' into 2.6.x 2022-05-17 22:21:10 -07:00
Phillip Webb 7d2f1bafc0 Update copyright year of changed files 2022-05-17 22:20:05 -07:00
Madhura Bhave f3cacbe6ec Fix formatting 2022-05-17 14:42:11 -07:00
Madhura Bhave c730ab7d0c Merge branch '2.7.x' into main 2022-05-17 14:29:36 -07:00
Scott Frederick 7d459a13c2 Add properties for SAML relying party single logout 
Closes gh-30128

Co-authored-by: Madhura Bhave <bhavem@vmware.com>
 2022-05-17 14:07:48 -07:00
Andy Wilkinson 5ffe4598f5 Revert "Upgrade to Solr 9.0.0" 
It requires Jetty 9.4.x but we're using Jetty 11.

This reverts commit b2bd3dee5e.

See gh-31054
 2022-05-16 13:00:51 +01:00
Andy Wilkinson b2bd3dee5e Upgrade to Solr 9.0.0 
Closes gh-31054
 2022-05-16 12:20:34 +01:00
Andy Wilkinson 48c948973d Polish 2022-05-12 12:12:22 +01:00
Andy Wilkinson d0e55643b1 Polish 
Closes gh-30993
 2022-05-12 12:11:51 +01:00
Andy Wilkinson 1fd9c4d82c Polish 
Closes gh-30992
 2022-05-12 12:10:52 +01:00
izeye 624c41c80e Polish 
See gh-30862
 2022-05-12 12:07:12 +01:00
Andy Wilkinson 4c17b4c865 Switch BackgroundPreinitializer to implementing Ordered 
Closes gh-30905
 2022-05-10 15:22:38 +01:00
Andy Wilkinson 770cb840c3 Use more flexible SpringFactoriesLoader 
Closes gh-30235

Co-authored-by: Madhura Bhave <bhavem@vmware.com>
Co-authored-by: Stephane Nicoll <snicoll@vmware.com>
 2022-05-09 14:13:04 +01:00
Andy Wilkinson 0fbfb8ef09 Remove remnants of support for Embedded Mongo 
See gh-30863 and 7e089a6b
 2022-05-09 09:55:42 +01:00
Scott Frederick 7e089a6b81 Remove support for embedded MongoDB 
This commit removes auto-configuration and dependency management
for Flapdoodle embedded MongoDB in favor of the Spring Boot support
provided by Flapdoodle.

Closes gh-30863
 2022-05-06 17:05:36 -05:00
Scott Frederick 88250f92bd Adapt to changes in Spring Kafka snapshots 
See gh-30645
 2022-05-05 17:17:23 -05:00
Andy Wilkinson 573fc34e29 Merge branch '2.7.x' 2022-05-05 10:19:32 +01:00
Andy Wilkinson 2b4f042325 Merge branch '2.6.x' into 2.7.x 
Closes gh-30874
 2022-05-05 10:19:19 +01:00
Andy Wilkinson c9571a04ab Merge branch '2.5.x' into 2.6.x 
Closes gh-30873
 2022-05-05 10:19:01 +01:00
Andy Wilkinson 6d4f0232ca Polish "Fix ConditionalOnProperty when used in an aliased composed annotation" 
See gh-30505
 2022-05-05 10:02:27 +01:00
Guirong Hu dc57ad54d5 Fix ConditionalOnProperty when used in an aliased composed annotation 
See gh-30505
 2022-05-05 10:02:15 +01:00
Andy Wilkinson 1ee079c265 Reinstate support for pooled-jms as it is now JMS 3.0 compatible 
Closes gh-30865
 2022-05-04 18:04:02 +01:00
Brian Clozel 5352c441e1 Do not use application/graphql as default MIME type 
As seen in spring-projects/spring-graphql#375, Spring Boot should also
use "application/json" as the default MIME type but remain compatible
with "application/graphql+json" still if clients POST content with this
type or explicitly accept it.

Closes gh-30860
 2022-05-04 13:05:45 +02:00
Andy Wilkinson 0e00fafe38 Polish "Provide callback mechanism for customizing validation configuration" 
See gh-29429
 2022-05-04 11:45:39 +01:00
当智才让 76a1c6bcaa Provide callback mechanism for customizing validation configuration 
See gh-29429
 2022-05-04 11:36:59 +01:00
Andy Wilkinson d36b63dae6 Polish "Add a configuration property for Kafka's async acks" 
See gh-30776
 2022-05-04 10:44:38 +01:00
TheCK 52c3f1c7ef Add a configuration property for Kafka's async acks 
See gh-30776
 2022-05-04 10:37:22 +01:00
Andy Wilkinson 541ab69aff Merge branch '2.7.x' 2022-05-03 15:18:20 +01:00
Andy Wilkinson 4cd850cfc0 Merge branch '2.6.x' into 2.7.x 
Closes gh-30851
 2022-05-03 15:17:13 +01:00
Andy Wilkinson fa327a783d Merge branch '2.5.x' into 2.6.x 
Closes gh-30850
 2022-05-03 15:14:00 +01:00
Andy Wilkinson 4fd2e0c916 Polish "Fix typos" 
See gh-30773
 2022-05-03 14:09:53 +01:00
Andy Wilkinson f6d24dc1a8 Fix typos 
See gh-30773
 2022-05-03 14:09:37 +01:00
Andy Wilkinson 138e165d5f Merge branch '2.7.x' 2022-05-03 13:52:01 +01:00
Andy Wilkinson 8044df277b Merge branch '2.6.x' into 2.7.x 
Closes gh-30846
 2022-05-03 13:51:49 +01:00
Andy Wilkinson a8b5a1c688 Merge branch '2.5.x' into 2.6.x 
Closes gh-30845
 2022-05-03 13:51:38 +01:00
Andy Wilkinson 026b9e2efe Polish "Make event handling in JobExecutionExitCodeGenerator thread-safe" 
See gh-30705
 2022-05-03 13:49:12 +01:00
dugenkui03 c8d1dfebab Make event handling in JobExecutionExitCodeGenerator thread-safe 
See gh-30705
 2022-05-03 13:48:15 +01:00
Andy Wilkinson 7a98627127 Polish "Fix property in defaultDatabaseIsSet test" 
See gh-30778
 2022-05-03 11:36:12 +01:00
izeye d50b0e4602 Fix property in defaultDatabaseIsSet test 
See gh-30778
 2022-05-03 11:35:44 +01:00
Andy Wilkinson fb16907c0e Fix resolution Batch's Oracle schema location 
Closes gh-30564
 2022-04-25 19:38:37 +01:00
Andy Wilkinson 60e389ea38 Merge branch '2.7.x' 2022-04-25 19:37:48 +01:00
Andy Wilkinson facbc7b47b Merge branch '2.6.x' into 2.7.x 
Closes gh-30795
 2022-04-25 19:31:47 +01:00
Andy Wilkinson bf94ea24d3 Improve testing of Batch schema resolution 
Closes gh-30794
 2022-04-25 19:30:59 +01:00
Moritz Halbritter 85a4c94dea Merge branch '2.7.x' 2022-04-25 15:32:08 +02:00
Moritz Halbritter b406971094 Remove hyphen from asserting-party 
spring.security.saml2.relyingparty.registration.*.asserting-party.* is
now named spring.security.saml2.relyingparty.registration.*.assertingparty.*

Closes gh-30785
 2022-04-25 15:26:38 +02:00
Stephane Nicoll f76371be76 Merge branch '2.7.x' 2022-04-21 09:29:02 +02:00
Stephane Nicoll b3e3581271 Polish "Add auto-configuration to Kafka Retry Topics" 
See gh-29812
 2022-04-21 09:26:42 +02:00
tomazfernandes bf46d7244a Add auto-configuration to Kafka Retry Topics 
See gh-29812
 2022-04-21 08:32:04 +02:00
Stephane Nicoll 020e3617af Merge branch '2.7.x' 2022-04-21 08:30:13 +02:00
Madhura Bhave 7a659e4e12 Polish "Add support for aud claim in resource server" 
See gh-29084
 2022-04-21 08:09:08 +02:00
Mushtaq Ahmed ee65627f4c Add support for aud claim in resource server 
See gh-29084
 2022-04-21 08:09:08 +02:00
Stephane Nicoll 58b069a994 Merge branch '2.7.x' 2022-04-21 08:08:34 +02:00
Stephane Nicoll 9025d1d250 Fix deprecation warning 
See gh-28851
 2022-04-21 08:08:20 +02:00
Phillip Webb c7374fd415 Update copyright year of changed files 2022-04-20 15:30:20 -07:00
Phillip Webb 7a6ca8ce25 Merge branch '2.7.x' 2022-04-20 15:30:01 -07:00
Phillip Webb dd5696b59b Update copyright year of changed files 2022-04-20 15:26:30 -07:00
Phillip Webb 36f1249fc6 Polish 2022-04-20 15:26:15 -07:00
Madhura Bhave dfd0e7b948 Merge branch '2.7.x' into main 2022-04-20 12:57:21 -07:00
Madhura Bhave 71acc90da8 Simplify SecurityAutoConfiguration 
Closes gh-28851
 2022-04-20 12:50:10 -07:00
Moritz Halbritter bb4bccde6c Remove deprecated 'identityprovider' property 
Closes gh-30751
 2022-04-20 09:11:56 +02:00
Moritz Halbritter 1950d06585 Merge branch '2.7.x' 2022-04-20 08:26:35 +02:00
Moritz Halbritter 6c400daa48 Rename 'identityprovider' property to 'asserting-party' 
Rename spring.security.saml2.relyingparty.registration.*.identity-provider.*
to spring.security.saml2.relyingparty.registration.*.asserting-party.*

The old property names are still supported, but will lead to a warning
in the logs.

Closes gh-30642
 2022-04-20 08:25:58 +02:00
Stephane Nicoll 2d663f2e94 Upgrade to Spring Data 2021.2.0-RC1 
Closes gh-30610
 2022-04-20 08:05:15 +02:00
Brian Clozel 6bf6bde6bb Add new auto-configurations to imports 
See gh-30453
 2022-04-19 20:52:35 +02:00
Brian Clozel d137f92f66 Adapt to latest Spring for GraphQL changes 
This commit adapts to changes done in spring-projects/spring-graphql#312
 2022-04-19 16:58:06 +02:00
Brian Clozel 2dc2e5ab11 Auto-configure RSocketGraphQlClient 
This commit contributes a `RSocketGraphQlClient.Builder` component to
the context, pre-configured with the `RSocketStrategies`, a customized
`RSocketConnector` and the expected data MIME type.

See gh-30453
 2022-04-19 10:53:15 +02:00
Stephane Nicoll a4cccc98c6 Merge branch '2.7.x' 2022-04-19 09:37:08 +02:00
Stephane Nicoll 61915aa4d5 Update copyright year of changed files 
See gh-30695
 2022-04-19 09:36:38 +02:00
izeye ed412af138 Polish 
See gh-30695
 2022-04-19 09:34:28 +02:00
Stephane Nicoll 3175fb8302 Merge branch '2.7.x' 2022-04-19 08:44:43 +02:00
Stephane Nicoll a0707124f2 Remove unused method 
See gh-30655
 2022-04-19 08:42:00 +02:00
Andy Wilkinson 4a401bfa16 Adapt to breaking changes in Spring Session Data Redis 
See gh-30639
 2022-04-14 20:41:20 +01:00
Brian Clozel eddb2b16ff Configure RSocket server support in GraphQL 
This commit adds the RSocket server auto-configuration for GraphQL.

See gh-30453
 2022-04-14 19:54:40 +02:00
Scott Frederick f5f7fc8e9a Merge branch '2.7.x' 2022-04-13 16:29:00 -05:00
Scott Frederick d387b3fa81 Support configuration of web SSL using PEM-encoded certificates 
This commit adds the ability to configure SSL in embedded web containers
using PEM-encoded certificate and private key files, as an alternative
to configuring SSL with Java KeyStore files.

Closes gh-29273
 2022-04-13 16:28:04 -05:00
Andy Wilkinson d1cd95eb13 Merge branch '2.7.x' 2022-04-13 18:13:29 +01:00
Andy Wilkinson 5e76671859 Remove remaining code that was deprecated in 2.5 
Closes gh-30442
 2022-04-13 18:09:39 +01:00
Andy Wilkinson d5a92ccb8b Merge branch '2.7.x' 2022-04-12 21:20:34 +01:00
Andy Wilkinson a7a71da9ef Polish "Bring back Elasticsearch RestClient auto-configuration" 
See gh-28496
 2022-04-12 21:13:05 +01:00
Filip Hrisafov eb3bf40bdb Bring back Elasticsearch RestClient auto-configuration 
Prior to this commit, Spring Boot would only auto-configure the
`RestHighLevelClient` and `RestClientBuilder` if the
`RestHighLevelClient` was present. This was done in 1d73d4ed.

This commit brings back the exposing of the `RestClient` bean in when
exposing the `RestHighLevelClient` or when the `RestHighLevelClient`
is not present. It allows for using the auto-configuration and its
customizers of the `RestClientBuilder` in a similar way as it is done
for the `RestTemplateBuilder` and the `WebClient.Builder`.

The presence of the `elasticsearch-rest-high-level-client` module is
now optional. This opens the door for potentially adding support for
the new Elasticsearch Java Client[1] that is based on the same
`RestClient`.

The health contributor and its configuration has also been updated to
only depend on the low-level RestClient.

See gh-28496

[1] https://github.com/elastic/elasticsearch-java
 2022-04-12 21:13:05 +01:00
rstoyanchev b91bfc7067 Update WebMVC GraphQL autoconfig to the latest 
As a result of changes for
https://github.com/spring-projects/spring-graphql/issues/342,
GraphQlWebSocketHandler now exposes a method to create the
WebSocketHttpRequestHandler, pre-configured with a context propagating
HandshakeInterceptor. This commit updates the autoconfig to use it.

Closes gh-30641
 2022-04-12 20:17:29 +02:00
Brian Clozel 77b7f2f1ce Switch to Spring Framework SNAPSHOTs 
See gh-30624
 2022-04-12 17:02:03 +02:00
Andy Wilkinson b871a1e457 Merge branch '2.7.x' 2022-04-12 08:51:47 +01:00
Andy Wilkinson 48f8021d88 Migrate @Local*Port annotations to spring-boot-test 
Closes gh-29589
 2022-04-12 08:48:43 +01:00
Stephane Nicoll 2ded2bf71a Adapt to latest change in Spring Framework snapshots 2022-04-09 17:10:48 +02:00
Stephane Nicoll e735bb2fcd Start building against Spring Framework 5.3.19 snapshots 
See gh-30517
 2022-04-09 10:01:00 +02:00
Andy Wilkinson 6d865c2646 Merge branch '2.7.x' 2022-04-08 21:02:35 +01:00
Andy Wilkinson 7534e50d0b Merge branch '2.6.x' into 2.7.x 
Closes gh-30621
 2022-04-08 21:02:16 +01:00
Andy Wilkinson 7e44745816 Merge branch '2.5.x' into 2.6.x 
Closes gh-30620
 2022-04-08 21:01:48 +01:00
Andy Wilkinson b88f062f04 Polish "Remove assumptions about ordering when comparing JSON in tests" 
See gh-30514
 2022-04-08 20:56:20 +01:00
Vivek Gupta 5b3bc1a936 Remove assumptions about ordering when comparing JSON in tests 
See gh-30514
 2022-04-08 20:55:54 +01:00
Scott Frederick 0dd9493dc1 Merge branch '2.7.x' 2022-04-07 17:12:14 -05:00
Scott Frederick d67dcf16cd Migrate FailureAnalyzers to constructor injection 
All `FailureAnalyzer` implementations should use constructor
injection for `BeanFactory` and `Environment` instead of implementing
`BeanFactoryAware` or `EnvironmentAware` interfaces.

Fixes gh-30585
 2022-04-07 16:58:59 -05:00
Moritz Halbritter 8f275353ef Merge branch '2.7.x' 2022-04-06 08:57:15 +02:00
Moritz Halbritter 1b5927b325 Merge branch '2.6.x' into 2.7.x 
Closes gh-30552
 2022-04-06 08:56:59 +02:00
Moritz Halbritter 99a1b98e03 Merge branch '2.5.x' into 2.6.x 
Closes gh-30551
 2022-04-06 08:56:47 +02:00
Moritz Halbritter 41ab46d0c7 Fix wrong replacement hint for 'spring.data.neo4j.username' 
Closes gh-30550
 2022-04-06 08:56:23 +02:00
Brian Clozel 1c71567c94 Support "application/graphql+json" media type in GraphQL HTTP mapping 
As seen in spring-projects/spring-graphql#108, the GraphQL HTTP spec now
requires the "application/graphql+json" media type and accepts
"application/json" for backwards compatibility.

This commit updates the `RouterFunction` definition for the GraphQL HTTP
endpoints so that both types are accepted.

Closes gh-30407
 2022-04-04 16:45:11 +02:00
Stephane Nicoll ac93dc3252 Remove reference to spring.datasource.initialization-mode in tests 
Closes gh-30511
 2022-04-03 10:17:28 +02:00
Stephane Nicoll 535a9b7be0 Remove outdated reference to spring.datasource.initialization-mode 
Closes gh-30435
 2022-04-03 10:10:21 +02:00
Stephane Nicoll 6d7b14a5a2 Revert test assertion until we switch to framework snapshots 2022-04-01 12:14:17 +02:00
Stephane Nicoll 25d8888aff Merge branch '2.7.x' 2022-03-31 12:45:13 +02:00
Stephane Nicoll 1da5a7a600 Merge branch '2.6.x' into 2.7.x 2022-03-31 12:45:05 +02:00
Stephane Nicoll 546a7e5edb Merge branch '2.5.x' into 2.6.x 2022-03-31 12:44:52 +02:00
Stephane Nicoll 17936b855c Polish 2022-03-31 12:42:37 +02:00
Andy Wilkinson ad95aded7e Merge branch '2.7.x' 2022-03-30 10:57:28 +01:00
Andy Wilkinson b9029fcf9e Merge branch '2.6.x' into 2.7.x 
Closes gh-30476
 2022-03-30 10:57:10 +01:00
Andy Wilkinson 64beaba99f Merge branch '2.5.x' into 2.6.x 
Closes gh-30475
 2022-03-30 10:56:56 +01:00
Andy Wilkinson 8cb11b74cd Polish "Make MustacheViewResolver bean back off without Spring MVC" 
See gh-30456
 2022-03-30 10:33:35 +01:00
Craig Andrews 7101b5099f Make MustacheViewResolver bean back off without Spring MVC 
See gh-30456
 2022-03-30 10:31:44 +01:00
Andy Wilkinson 24e6417ddc Adapt to latest changes in Spring for GraphQL snapshots 
See gh-30463
 2022-03-29 16:50:12 +01:00
Brian Clozel 93817c708e Switch to Spring for GraphQL 1.0.0-SNAPSHOT 
See gh-30463
 2022-03-29 16:37:21 +02:00
Andy Wilkinson eabf6cd1d8 Merge branch '2.7.x' 2022-03-25 15:15:26 +00:00
Andy Wilkinson 685d2d4391 Polish 
See gh-30152
 2022-03-25 15:15:02 +00:00
Guirong Hu df417bf317 Simplify registration of Jackson mixin types 
See gh-30152
 2022-03-25 15:15:02 +00:00
Moritz Halbritter e431842668 Merge branch '2.7.x' 2022-03-25 14:56:49 +01:00
Moritz Halbritter 45f393b76b Merge branch '2.6.x' into 2.7.x 
Closes gh-30437
 2022-03-25 14:56:01 +01:00
Moritz Halbritter c003d5b533 Merge branch '2.5.x' into 2.6.x 
Closes gh-30436
 2022-03-25 14:55:31 +01:00
Moritz Halbritter 0ff8119a1b Sort entries in additional-spring-configuration metadata alphabetically 
Closes gh-30434
 2022-03-25 14:54:39 +01:00
Andy Wilkinson 5702f9ebc3 Merge branch '2.7.x' 2022-03-23 20:16:51 +00:00
Andy Wilkinson 5d55c663ba Allow spring.data.mongodb.uri to take precedence over separate props 
Closes gh-30067
 2022-03-23 20:15:04 +00:00
Andy Wilkinson 77e6279d03 Merge branch '2.7.x' 2022-03-23 12:11:24 +00:00
Andy Wilkinson 3255da23a2 Merge branch '2.6.x' into 2.7.x 
Closes gh-30388
 2022-03-23 12:11:13 +00:00
Andy Wilkinson c739831087 Merge branch '2.5.x' into 2.6.x 
Closes gh-30387
 2022-03-23 12:11:02 +00:00
Andy Wilkinson d8cf332c2e Document default value of spring.thymeleaf.reactive.media-types 
Closes gh-30280
 2022-03-23 12:09:48 +00:00
Andy Wilkinson 3ee44ca0b0 Merge branch '2.6.x' into 2.7.x 
Closes gh-30386
 2022-03-23 11:47:53 +00:00
Andy Wilkinson f378627f94 Merge branch '2.5.x' into 2.6.x 
Closes gh-30385
 2022-03-23 11:45:31 +00:00
Andy Wilkinson 8d882fa09b Fix possible duplicate templateEngine bean in Thymeleaf auto-config 
Closes gh-30384
 2022-03-23 11:44:59 +00:00
Andy Wilkinson 3410dd67d0 Merge branch '2.7.x' 2022-03-23 09:58:56 +00:00
Andy Wilkinson 47540eec61 Align default indices options with Spring Data Elasticsearch 
Closes gh-30378
 2022-03-23 09:39:05 +00:00
Andy Wilkinson c4425598cf Merge branch '2.7.x' 2022-03-22 20:13:16 +00:00
Andy Wilkinson 79ee53a587 Merge branch '2.6.x' into 2.7.x 
Closes gh-30377
 2022-03-22 20:13:04 +00:00
Andy Wilkinson f063da30d2 Merge branch '2.5.x' into 2.6.x 
Closes gh-30376
 2022-03-22 20:12:48 +00:00
Andy Wilkinson a8bddeb9cf Remove redundant setting of refresh policy 
Closes gh-30375
 2022-03-22 20:12:09 +00:00
Brian Clozel bae62c39a9 Adapt to latest Spring GraphQL changes 
This commit adapts to the latest Spring GraphQL changes, renaming
`GraphQlService` to `ExecutionGraphQlService` as well as the
`WebInterceptor` contract to `WebGraphQlHandlerInterceptor`.

See spring-projects/spring-graphql#332
 2022-03-21 11:12:59 +01:00
Stephane Nicoll 2088381d4b Merge branch '2.7.x' 2022-03-21 10:06:56 +01:00
Stephane Nicoll a2959bbcf2 Polish "Add support for cache2k in memory caching" 
See gh-28498
 2022-03-21 09:59:24 +01:00
Jens Wilke 774f61fcb5 Add support for cache2k in memory caching 
See gh-28498
 2022-03-21 08:22:19 +01:00
Chris Dennis 3ed3d3eb36 Restore Ehcache 3 Support 
See gh-30002
 2022-03-19 09:33:47 +01:00
Scott Frederick cabfb98a89 Merge branch '2.7.x' 2022-03-18 16:52:47 -05:00
Scott Frederick a14f3ed200 Use a ConfigurationProperties class for JMX properties 
Closes gh-30327
 2022-03-18 16:32:13 -05:00
Scott Frederick e5a09b3b31 Apply unique-names consistently in JmxAutoConfiguration 
Ensure that the `spring.jmx.unique-names` property is applied to the
auto-configured `MBeanExporter` as well as the `ObjectNamingStrategy`.

Fixes gh-29968
 2022-03-18 16:32:13 -05:00
Stephane Nicoll 1169c6df16 Upgrade to Neo4j Java Driver 4.4.5 
Closes gh-30326
 2022-03-18 18:34:09 +01:00
Andy Wilkinson 12d9127d3b Merge branch '2.7.x' 2022-03-18 15:56:29 +00:00
Andy Wilkinson c2d7e21312 Merge branch '2.6.x' into 2.7.x 
Closes gh-30322
 2022-03-18 15:56:13 +00:00
Andy Wilkinson 26719a211b Merge branch '2.5.x' into 2.6.x 
Closes gh-30321
 2022-03-18 15:55:39 +00:00
Andy Wilkinson 1669062231 Apply server.tomcat.keep-alive-timeout to HTTP/2 
Closes gh-30267
 2022-03-18 15:38:27 +00:00
Stephane Nicoll 39b6f2bd7d Merge branch '2.7.x' 2022-03-18 15:08:28 +01:00
Stephane Nicoll 2ab0ce3ea7 Upgrade to Neo4j Java Driver 4.4.5 
Closes gh-30303
 2022-03-18 14:52:46 +01:00
Andy Wilkinson dd812a3f76 Upgrade to Groovy 4.0.1 
Closes gh-30279
 2022-03-18 12:38:41 +00:00
Andy Wilkinson e60001fb16 Adapt to deprecations in Spring Data Redis 
See gh-30200
 2022-03-18 11:16:55 +00:00
Stephane Nicoll 2fbb36bd04 fixup! Upgrade to Flyway 8.5.4 2022-03-18 10:57:07 +01:00
Andy Wilkinson f693d7dfad Merge branch '2.7.x' 2022-03-17 20:12:12 +00:00
Andy Wilkinson b787ea4802 Add property for media types of reactive Mustache views 
Closes gh-28858
 2022-03-17 20:10:37 +00:00
Andy Wilkinson 36f24cf6bb Merge branch '2.7.x' 2022-03-17 19:31:59 +00:00
Andy Wilkinson 3a5a748ec0 Rework Mustache properties to show which are Servlet-specific 
Closes gh-30273
 2022-03-17 19:25:07 +00:00
Andy Wilkinson 6625a77f64 Merge branch '2.7.x' 2022-03-17 17:51:43 +00:00
Andy Wilkinson 2ba064c855 Merge branch '2.6.x' into 2.7.x 
Closes gh-30277
 2022-03-17 17:51:28 +00:00
Andy Wilkinson 3c117ca2d4 Merge branch '2.5.x' into 2.6.x 
Closes gh-30276
 2022-03-17 17:50:58 +00:00
Andy Wilkinson 2b75ea5fb8 Improve testing of spring.mustache.* properties 
Closes gh-30274
 2022-03-17 17:40:22 +00:00
Stephane Nicoll 1784fc19bb Adapt mock to API change 2022-03-17 10:34:22 +01:00
Andy Wilkinson f3f5a87af4 Merge branch '2.7.x' 2022-03-16 19:42:36 +00:00
Andy Wilkinson fee3b89b1b Merge branch '2.6.x' into 2.7.x 
Closes gh-30257
 2022-03-16 19:42:14 +00:00
Andy Wilkinson cdaafce614 Merge branch '2.5.x' into 2.6.x 
Closes gh-30256
 2022-03-16 19:41:14 +00:00
Andy Wilkinson 7f036e35fd Make MustacheViewResolvers conditional onspring.mustache.enabled 
Closes gh-30250
 2022-03-16 19:09:13 +00:00
Andy Wilkinson 09510db630 Merge branch '2.7.x' 2022-03-16 17:07:29 +00:00
Andy Wilkinson 81383e552a Merge branch '2.6.x' into 2.7.x 
Closes gh-30254
 2022-03-16 17:06:43 +00:00
Andy Wilkinson 6bc000565d Merge branch '2.5.x' into 2.6.x 
Closes gh-30253
 2022-03-16 17:06:17 +00:00
Andy Wilkinson 0accc3d67d Convert MustacheAutoConfigurationTests to application context runner 
Closes gh-30252
 2022-03-16 15:28:48 +00:00
Andy Wilkinson 23b5a3f70e Merge branch '2.7.x' 2022-03-16 14:14:35 +00:00
Andy Wilkinson 2282f9cc88 Upgrade to Embedded Mongo 3.4.2 
As part of the upgrade, the property for configuring features has
been removed as support for feature-aware versions has been removed
from Embedded Mongo. For advanced configuration where features were
specified, users should provide a MongodConfig bean instead.

Closes gh-29985
Closes gh-30219
 2022-03-16 14:13:10 +00:00
Stephane Nicoll 0e07eb2393 Remove deprecated Spring Kafka's only-log-record-metadata property 
See gh-30089
 2022-03-15 17:57:45 +01:00
Stephane Nicoll 7c8b4b6914 Restore Kafka tests 2022-03-13 18:53:05 +01:00
Stephane Nicoll 695685996a Start building against Spring Kafka 2.8.4 snapshots 
See gh-30190
 2022-03-12 18:26:03 +01:00
Stephane Nicoll 3717c4c883 Start building against Spring Kafka 2.8.4 snapshots 
See gh-30181
 2022-03-12 12:50:26 +01:00
Andy Wilkinson a2ecd600f8 Merge branch '2.7.x' 2022-03-11 11:03:46 +00:00
Andy Wilkinson 1c19995db7 Merge branch '2.6.x' into 2.7.x 
Closes gh-30165
 2022-03-11 11:03:20 +00:00
Andy Wilkinson 6bbf3aff0e Merge branch '2.5.x' into 2.6.x 
Closes gh-30164
 2022-03-11 11:03:01 +00:00
Andy Wilkinson eef89c6c35 Increase tests' Cassandra timeouts to 60s 
Closes gh-30163
 2022-03-11 11:02:18 +00:00
Andy Wilkinson faf7a35425 Merge branch '2.7.x' 2022-03-10 16:51:56 +00:00
Andy Wilkinson 6494a9f08a Merge branch '2.6.x' into 2.7.x 
Closes gh-30165
 2022-03-10 16:51:43 +00:00
Andy Wilkinson 7c3c5d3d3e Merge branch '2.5.x' into 2.6.x 
Closes gh-30164
 2022-03-10 16:51:33 +00:00
Andy Wilkinson bbdef2b026 Increase timeouts in tests that use Cassandra 
Closes gh-30163
 2022-03-10 16:50:39 +00:00
Andy Wilkinson e9d2ec507e Merge branch '2.7.x' 2022-03-09 15:17:25 +00:00
Andy Wilkinson f5ca568014 Remove versions less than 17 from JavaVersion enum 
Closes gh-29503
 2022-03-09 15:16:59 +00:00
Andy Wilkinson 813c2a5b1e Merge branch '2.6.x' into 2.7.x 
Closes gh-30135
 2022-03-09 14:45:55 +00:00
Andy Wilkinson 3cb1629f45 Merge branch '2.5.x' into 2.6.x 
Closes gh-30134
 2022-03-09 14:44:51 +00:00
Andy Wilkinson da1eb25e4b Remove redundant JRE-based enabled and disabled annotations from tests 
Closes gh-29693
 2022-03-09 14:41:13 +00:00
Brian Clozel 087e853c5d Refine GraphQL server auto-configuration 
Prior to this commit, launching a GraphQL application without any schema
file or customizer bean would result in an exception caught by a
FailureAnalyzer telling the developer about configured locations.

Since then, a new client has been introduced in Spring GraphQL and the
mere presence of the GraphQL starter does not mean anymore that the
intent is to create a GraphQL API in the app: we could instead just
consume an existing, remote API.

This commit refines the GraphQL server auto-configuration so that it is
enabled only if:

* there is at least one schema file in the configured locations
* or a `GraphQlSourceCustomizer` bean has been defined in the app

These changes make the custom FailureAnalyzer useless and is also
removed as part of this commit.

Closes gh-30035
 2022-03-08 17:54:55 +01:00
Brian Clozel bf79d6baef Auto-configure ConversionService for GraphQL 
Prior to this commit, we would configure a default conversion service
for GraphQL annotated controllers, without registering any additional
formatters.

This commit aligns the GraphQL auto-configuration with MVC and WebFlux,
since we now use the `ApplicationConversionService` to register all
application formatters for the GraphQL infrastructure.

Closes gh-29638
 2022-03-08 17:54:55 +01:00
rstoyanchev ef4add27f0 Do not set ConversionService on AnnotatedControllerConfigurer 
After 0b449d89e1,
the ConversionService on AnnotatedControllerConfigurer is an internally
managed instance that is customized with FormatterRegistrar rather than
set.

Closes gh-29636
 2022-03-08 17:54:54 +01:00
Brian Clozel 81754c8bc4 Upgrade to Spring GraphQL 1.0.0-SNAPSHOT 
This commit switches to 1.0.0-SNAPSHOT for Spring GraphQL, before its
upcoming 1.0.0-M6 version.

This commit adapts to the changes introduced in
spring-projects/spring-graphql#317 : now that `GraphQlClient` has been
introduced, `GraphQlTester` has been aligned with the new
infrastructure. The `@GraphQlTest` and `@SpringBootTest` testing support
is now using different variants for each.

All samples have been updated to use the proper GraphQL terminology, see
and spring-projects/spring-graphql#310 .

See gh-29637
 2022-03-08 17:54:54 +01:00
Andy Wilkinson d92dcf9452 Merge branch '2.7.x' 2022-03-08 13:53:11 +00:00
Andy Wilkinson dcaca38154 Merge branch '2.6.x' into 2.7.x 
Closes gh-30099
 2022-03-08 13:52:46 +00:00
Andy Wilkinson 119a713f09 Merge branch '2.5.x' into 2.6.x 
Closes gh-30098
 2022-03-08 13:52:25 +00:00
Andy Wilkinson e7705f4f71 Improve condition message produced by @ConditionalOnSingleCandidate 
Closes gh-30073
 2022-03-08 13:51:38 +00:00
Stephane Nicoll e6f6b2068b Start building against Spring Kafka 3.0.0-M3 snapshots 
See gh-30089
 2022-03-07 21:09:41 +01:00
Moritz Halbritter a1b1377733 Merge branch '2.7.x' 2022-03-07 13:23:06 +01:00
Moritz Halbritter 50d766020c Merge branch '2.6.x' into 2.7.x 
Closes gh-30084
 2022-03-07 13:22:53 +01:00
Moritz Halbritter 564555347f Merge branch '2.5.x' into 2.6.x 
Closes gh-30083
 2022-03-07 13:22:34 +01:00
Moritz Halbritter be38311c5d Disable incompatible tests on Linux AArch64 
- Adds a new @DisableOnOs annotation, which is inspired from JUnit5s
  @DisableOnOs annotation. This new annotation supports the architecture
  and is repeatable

Closes gh-30082
 2022-03-07 13:22:17 +01:00
Stephane Nicoll f869c490f4 Merge branch '2.7.x' 2022-03-07 09:49:21 +01:00
Stephane Nicoll ce4f7ded8a Merge branch '2.6.x' into 2.7.x 
Closes gh-30081
 2022-03-07 09:49:10 +01:00
Stephane Nicoll c6a9e138e5 Merge branch '2.5.x' into 2.6.x 
Closes gh-30080
 2022-03-07 09:49:00 +01:00
Stephane Nicoll cf9cc82025 Update copyright year of change file 
See gh-30074
 2022-03-07 09:47:12 +01:00
hak7a3 0a035c7fa6 Fix references to spring.data.cassandra.connection.connect-timeout 
See gh-30074
 2022-03-07 09:42:43 +01:00
Andy Wilkinson c755e0d1f8 Merge branch '2.7.x' 2022-03-04 17:56:40 +00:00
Andy Wilkinson f44e7d9391 Merge branch '2.6.x' into 2.7.x 
Closes gh-30071
 2022-03-04 17:56:29 +00:00
Andy Wilkinson 2ef055a823 Merge branch '2.5.x' into 2.6.x 
Closes gh-30070
 2022-03-04 17:56:14 +00:00
Andy Wilkinson 1872af056e Make it clearer that the generated password is not for production use 
Closes gh-30061
 2022-03-04 17:55:54 +00:00
Andy Wilkinson f95e5b9b8a Merge branch '2.7.x' 2022-03-02 12:21:39 +00:00
Andy Wilkinson 324c4310a4 Merge branch '2.6.x' into 2.7.x 
Closes gh-30034
 2022-03-02 12:21:29 +00:00
Andy Wilkinson 8a4a639734 Merge branch '2.5.x' into 2.6.x 
Closes gh-30033
 2022-03-02 12:21:20 +00:00
izeye 140d24d567 Remove redundant ConditionalOnMissingFilterBean 
See gh-29983
 2022-03-02 11:40:44 +00:00
Andy Wilkinson 19b5431ba4 Polish "Remove redundant ResourceLoaders from GraphQL auto-configuration" 
See gh-29976
 2022-02-28 11:16:04 +00:00
dugenkui03 5a52b36ec7 Remove redundant ResourceLoaders from GraphQL auto-configuration 
See gh-29976
 2022-02-28 11:16:04 +00:00
Andy Wilkinson cce48a75fc Merge branch '2.7.x' 2022-02-28 11:15:38 +00:00
Andy Wilkinson 73d0d5bccf Merge branch '2.6.x' into 2.7.x 
Closes gh-30009
 2022-02-28 11:15:24 +00:00
Andy Wilkinson b379eea885 Merge branch '2.5.x' into 2.6.x 
Closes gh-30008
 2022-02-28 11:15:02 +00:00
Andy Wilkinson 7bc336cdc6 Use an ephemeral port to avoid potential port clash 
Closes gh-30007
 2022-02-28 10:54:31 +00:00
Madhura Bhave 7a4960d4ca Merge branch '2.7.x' into main 2022-02-24 11:01:23 -08:00
Madhura Bhave e24f5b7efd Revert "Upgrade to Embedded Mongo 3.4.1" 
This reverts to Embedded Mongo 3.3.1 due to some breaking
changes in 3.4.1 and 3.4.2
 2022-02-24 11:00:00 -08:00
Phillip Webb 5454e2e26a Merge branch '2.7.x' 2022-02-23 23:02:59 -08:00
Phillip Webb 9f00c3acf5 Polish 2022-02-23 21:44:43 -08:00
Phillip Webb adfaa8f778 Merge branch '2.6.x' into 2.7.x 2022-02-23 21:44:37 -08:00
Phillip Webb 9411fc264d Merge branch '2.5.x' into 2.6.x 2022-02-23 21:44:08 -08:00
Phillip Webb 57009d5623 Polish 2022-02-23 21:43:42 -08:00
Moritz Halbritter 54f1058d63 Merge branch '2.7.x' 2022-02-23 16:10:49 +01:00
Moritz Halbritter fd36215d72 Omit empty values for AutoConfigureAfter and AutoConfigureBefore 
As @AutoConfiguration is now meta-annotated with @AutoConfigureAfter
and @AutoConfigureBefore, the generated property files have a lot of
superfluous lines in the format <class>.AutoConfigureAfter= and
<class>.AutoConfigureBefore=.

One can now configure in the annotation processor for each property key
if empty values should be omitted. This is currently only activated for
AutoConfigureAfter and AutoConfigureBefore

See gh-29907
 2022-02-23 15:39:46 +01:00
Moritz Halbritter 7872f61bfc Add @AutoConfiguration annotation support to the autoconfigure-processor 
See gh-29907
 2022-02-23 15:39:46 +01:00
Moritz Halbritter 9149ae50da Use @AutoConfiguration for relative ordering on auto-configurations 2022-02-23 15:39:46 +01:00
Moritz Halbritter 9e9049ca7f Add relative ordering to @AutoConfiguration 
The relative ordering is implemented with @AliasFor annotations on the
@AutoConfiguration annotation. The production code already works without
changes, only the test code had to be modified. It now uses
AnnotationMetadata which already knows how to deal with @AliasFor
instead of using the reflection API directly.

See gh-29907
 2022-02-23 15:39:41 +01:00
Andy Wilkinson d427fa4b5d Merge branch '2.7.x' 2022-02-23 11:53:31 +00:00
Andy Wilkinson 57cd34be88 Merge branch '2.6.x' into 2.7.x 
Closes gh-29971
 2022-02-23 11:53:09 +00:00
Andy Wilkinson a979925e63 Merge branch '2.5.x' into 2.6.x 
Closes gh-29970
 2022-02-23 11:52:57 +00:00
Andy Wilkinson 7aca75c58c Preserve ObjectName property order when name is unchanged 
Closes gh-29953
 2022-02-23 11:30:21 +00:00
Stephane Nicoll c8b7a17545 Upgrade to Spring Kafka 2.8.3 
Closes gh-29722
 2022-02-23 08:27:24 +01:00
Scott Frederick b64a6e6229 Merge branch '2.7.x' into main 2022-02-22 14:42:52 -06:00
Scott Frederick c1fec6967e Support constructor injection for FailureAnalyzers 
This commit adds support for instantiating FailureAnalyzer
implementations with BeanFactory and/or an Environment constructor
arguments and deprecates support for setter injection of these values
using BeanFactoryAware and EnvironmentAware.

Closes gh-29811
 2022-02-22 14:24:59 -06:00
Stephane Nicoll fcca4920d3 Merge branch '2.7.x' 2022-02-22 14:57:04 +01:00
Stephane Nicoll dda3bae02a Upgrade to Embedded Mongo 3.4.1 
Closes gh-29944
 2022-02-22 14:56:50 +01:00
Andy Wilkinson 5e56757d4c Merge branch '2.7.x' 2022-02-21 19:00:20 +00:00
Andy Wilkinson da96eeab21 Remove redundant requestMappingHandlerMapping override 
The bean no longer needs to be primary so the override is not needed
any more.

Closes gh-29682
 2022-02-21 18:59:29 +00:00
Stephane Nicoll 935d37b2ca Polish "Reuse BatchLoaderRegistry in GraphQlService" 
See gh-29929
 2022-02-21 18:16:07 +01:00
dugenkui03 043e5ff0f5 Reuse BatchLoaderRegistry in GraphQlService 
See gh-29929
 2022-02-21 18:00:52 +01:00
Moritz Halbritter 03e5dcdb3a Merge branch '2.7.x' 2022-02-21 13:34:11 +01:00
Moritz Halbritter 1325153ee9 Move ManagementContextConfiguration from spring.factories 
The import selector will now, in addition to spring.factories, look for
ManagementContextConfiguration classes in a file called
META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports

The existing ManagementContextConfigurations have been moved from
spring.factories to the new file.

Closes gh-29730
 2022-02-21 13:16:12 +01:00