Commit Graph

35886 Commits

Author SHA1 Message Date
qxo a1fe05f40b Fix NPE in configprops endpoint
This works around spring-projects/spring-framework#28298. The bug
means that when a @Configuration class is annotated with
@ConfigurationProperties any bean defined by a static @Bean method
is considered to be annotated with @ConfigurationProperties.

See gh-30068
2022-04-07 19:40:29 +01:00
Stephane Nicoll fa77e1ce5e Merge pull request #30562 from luozhenyu
* pr/30562:
  Add metadata for management.endpoint.health.probes.add-additional-paths

Closes gh-30562
2022-04-07 09:17:25 +02:00
luozhenyu 09daad0a16 Add metadata for management.endpoint.health.probes.add-additional-paths
See gh-30562
2022-04-07 09:14:02 +02:00
Stephane Nicoll af7bfc20c4 Merge branch '2.5.x' into 2.6.x 2022-04-07 08:46:45 +02:00
Stephane Nicoll a656df7ae9 Upgrade Ubuntu version in CI images
Closes gh-30568
2022-04-07 08:46:33 +02:00
Stephane Nicoll e3859fadd6 Upgrade Ubuntu version in CI images
Closes gh-30569
2022-04-07 08:45:40 +02:00
Moritz Halbritter c54b825a82 Merge branch '2.5.x' into 2.6.x
Closes gh-30553
2022-04-06 10:28:11 +02:00
Moritz Halbritter 8536c83999 Merge pull request #30489 from dugenkui03
* gh-30489:
  Make ApplicationAvailabilityBean threadsafe

Closes gh-30489
2022-04-06 10:27:31 +02:00
dugenkui03 035a16278e Make ApplicationAvailabilityBean threadsafe
See gh-30489
2022-04-06 10:26:21 +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
Andy Wilkinson 05d4093381 Merge branch '2.5.x' into 2.6.x
Closes gh-30544
2022-04-05 15:11:01 +01:00
Andy Wilkinson bc81ae81fc Merge pull request #30461 from dalbani
* gh-30461:
  Polish "Refer to list of internal proxies in reference documentation"
  Refer to list of internal proxies in reference documentation

Closes gh-30461
2022-04-05 15:10:49 +01:00
Andy Wilkinson 83cfc951f8 Polish "Refer to list of internal proxies in reference documentation"
See gh-30461
2022-04-05 14:37:08 +01:00
Damiano Albani 91306b58d5 Refer to list of internal proxies in reference documentation
See gh-30461
2022-04-05 14:34:37 +01:00
Moritz Halbritter 53b2c85df0 Merge branch '2.5.x' into 2.6.x
Closes gh-30541
2022-04-05 14:16:38 +02:00
Moritz Halbritter 18c62e2bf3 Merge pull request #30535 from chrisrhut
* gh-30535:
  Add Tomcat locale mapping for Japanese to preserve UTF-8 charset

Closes gh-30535
2022-04-05 14:16:17 +02:00
Chris Hut 65d8c76ac3 Add Tomcat locale mapping for Japanese to preserve UTF-8 charset
See gh-30535
2022-04-05 14:15:40 +02:00
Moritz Halbritter bf3c2d713d Merge branch '2.5.x' into 2.6.x
Closes gh-30526
2022-04-04 14:18:45 +02:00
Moritz Halbritter b5a02d9a66 Merge pull request #30498 from izeye
* gh-30498:
  Polish documentation

Closes gh-30498
2022-04-04 14:09:55 +02:00
izeye 09d6215b65 Polish documentation
See gh-30498
2022-04-04 14:09:28 +02:00
Stephane Nicoll b2a4ae38e8 Merge branch '2.5.x' into 2.6.x
Closes gh-30509
2022-04-03 09:32:39 +02:00
Stephane Nicoll 4faa1a741d Merge pull request #30506 from izeye
* pr/30506:
  Test Spring Boot Gradle Plugin against Gradle 7.4.2

Closes gh-30506
2022-04-03 09:30:06 +02:00
izeye 40d0e38e76 Test Spring Boot Gradle Plugin against Gradle 7.4.2
See gh-30506
2022-04-03 09:29:50 +02:00
Stephane Nicoll 062533f5ae Merge branch '2.5.x' into 2.6.x 2022-04-03 09:28:40 +02:00
Spring Builds 54fabf473f Next development version (v2.6.7-SNAPSHOT) 2022-03-31 14:16:00 +00:00
Spring Builds 0019243d25 Next development version (v2.5.13-SNAPSHOT) 2022-03-31 12:59:13 +00: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
Stephane Nicoll 57f11696eb Merge branch '2.5.x' into 2.6.x 2022-03-31 12:01:14 +02:00
Stephane Nicoll 7ccbdda1e7 Upgrade to Spring Framework 5.3.18
Closes gh-30492
2022-03-31 11:30:14 +02:00
Stephane Nicoll 94c40c7234 Upgrade to Spring Framework 5.3.18
Closes gh-30491
2022-03-31 11:29:49 +02:00
Stephane Nicoll be716d8765 Merge branch '2.5.x' into 2.6.x 2022-03-31 09:08:26 +02:00
Stephane Nicoll 8409c2f514 Upgrade CI to Docker 20.10.14
Closes gh-30481
2022-03-31 09:08:15 +02:00
Stephane Nicoll a99fcecd48 Upgrade Java 18 version in CI image
Closes gh-30482
2022-03-31 09:07:32 +02:00
Stephane Nicoll 2e90fd2302 Upgrade CI to Docker 20.10.14
Closes gh-30484
2022-03-31 09:06:56 +02:00
Stephane Nicoll 6cded5b928 Upgrade Java 18 version in CI image
Closes gh-30488
2022-03-31 09:06:19 +02:00
Andy Wilkinson 2da44a0b4f Upgrade to Jackson Bom 2.13.2.20220328
Closes gh-30478
2022-03-30 14:29:38 +01:00
Andy Wilkinson 1d53e711fe Merge branch '2.5.x' into 2.6.x 2022-03-30 14:24:28 +01:00
Andy Wilkinson 06c5e26f81 Upgrade to Jackson Bom 2.12.6.20220326
Closes gh-30477
2022-03-30 13:30:42 +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 c0c32d89a7 Merge pull request #30456 from candrews
* gh-30456:
  Polish "Make MustacheViewResolver bean back off without Spring MVC"
  Make MustacheViewResolver bean back off without Spring MVC

Closes gh-30456
2022-03-30 10:56:47 +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 880d33f391 Merge branch '2.5.x' into 2.6.x
Closes gh-30469
2022-03-29 15:06:47 +01:00
Andy Wilkinson 05b7befc7a Fix javadoc of ResolveMainClassName setClasspath(Object)
Closes gh-30468
2022-03-29 15:05:54 +01:00
Andy Wilkinson 8f985474a6 Merge branch '2.5.x' into 2.6.x
Closes gh-30465
2022-03-29 14:24:25 +01:00
Andy Wilkinson d574563616 Document @ConstructorBinding and @DefaultValue with records
Closes gh-30460
2022-03-29 14:14:28 +01:00
Stephane Nicoll e28b59693a Merge pull request #30446 from vikeychen
* pr/30446:
  Update copyright year of changed file
  Remove redundant Javadoc

Closes gh-30446
2022-03-28 09:46:34 +02:00
Stephane Nicoll 5dc4ff5366 Update copyright year of changed file
See gh-30446
2022-03-28 09:46:21 +02:00