root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
36,114 Commits 24 Branches 369 Tags 282 MiB
Commit Graph

36114 Commits

Author SHA1 Message Date
Andy Wilkinson f95fa63ae4 Merge branch '2.5.x' into 2.6.x 2022-05-19 12:00:34 +01:00
Spring Builds 98d91ba35e Next development version (v2.6.9-SNAPSHOT) 2022-05-19 10:06:29 +00:00
Spring Builds bf3c6dfdba Next development version (v2.5.15-SNAPSHOT) 2022-05-19 08:47:35 +00:00
Stephane Nicoll d8bcdde1bc Merge branch '2.5.x' into 2.6.x 2022-05-19 09:12:24 +02:00
Stephane Nicoll b0a867bd4f Upgrade CI to Docker 20.10.16 
Closes gh-31106
 2022-05-19 09:12:14 +02:00
Stephane Nicoll d20f94e67b Upgrade CI to Docker 20.10.16 
Closes gh-31107
 2022-05-19 09:11:33 +02:00
Andy Wilkinson a712b1e6b0 Upgrade to Spring Security 5.6.5 
Closes gh-31102
 2022-05-18 19:19:47 +01:00
Andy Wilkinson 62963d77c9 Merge branch '2.5.x' into 2.6.x 2022-05-18 19:19:13 +01:00
Andy Wilkinson e82def03ca Upgrade to Spring Security 5.5.8 
Closes gh-31096
 2022-05-18 19:18:24 +01:00
Andy Wilkinson 69edce0629 Upgrade to Spring Batch 4.3.6 
Closes gh-31011
 2022-05-18 17:37:11 +01:00
Andy Wilkinson b695496165 Merge branch '2.5.x' into 2.6.x 2022-05-18 17:36:40 +01:00
Andy Wilkinson 7f60c67074 Upgrade to Spring Batch 4.3.6 
Closes gh-31003
 2022-05-18 17:35:55 +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
Stephane Nicoll e26c58baaf Merge branch '2.5.x' into 2.6.x 2022-05-18 08:59:54 +02:00
Stephane Nicoll 01288b61af Upgrade to Spring Integration 5.5.12 
Closes gh-31061
 2022-05-18 08:54:57 +02:00
Stephane Nicoll 4eb778df43 Upgrade to Spring Integration 5.5.12 
Closes gh-31060
 2022-05-18 08:54:24 +02: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
Phillip Webb 0beccde6ee Merge branch '2.5.x' into 2.6.x 
Closes gh-31094
 2022-05-17 22:18:38 -07:00
Phillip Webb 7da42d7139 Allow tests to pass when a NAME environment variable exists 
Update `ConfigurationPropertiesTests` so that it will pass even if a
local `NAME` environment variable is declared.

Closes gh-31076
 2022-05-17 22:16:24 -07:00
Phillip Webb 6bce0c5044 Merge branch '2.5.x' into 2.6.x 
Closes gh-31092
 2022-05-17 22:14:21 -07:00
Phillip Webb 44c979beb0 Reorder default property sources after @PropertySource processing 
Update `SpringApplication` so that the `DefaultPropertiesPropertySource`
is moved to the end after `@PropertySource` annotations have been
processed. This restores functionality that used to be handled by
the `ConfigFileApplicationListener` and was inadvertently dropped
when the `ConfigDataEnvironmentPostProcessor` was developed.

Fixes gh-31068
 2022-05-17 22:13:49 -07:00
Phillip Webb 99f5c781a5 Merge branch '2.5.x' into 2.6.x 2022-05-17 21:48:50 -07:00
Phillip Webb 350d27fe50 Polish code to use method references when possible 2022-05-17 21:16:42 -07:00
Scott Frederick f395cfa255 Merge branch '2.5.x' into 2.6.x 
Closes gh-31088
 2022-05-17 18:46:38 -05:00
Scott Frederick 50e27333d2 Tolerate failures when recording WebClient metrics 
Fixes gh-30978
 2022-05-17 18:45:37 -05:00
Andy Wilkinson e3b2088e85 Merge branch '2.5.x' into 2.6.x 
Closes gh-31085
 2022-05-17 18:36:54 +01:00
Andy Wilkinson a51edec150 Use DockerHub mirror when running system tests 
See gh-31072
 2022-05-17 18:25:18 +01:00
Andy Wilkinson cc2d68968d Upgrade to Maven Resolver 1.6.3 
This commit also expands our internal dependency management for
Maven Resolver to cover all of the modules upon which we depend.

Closes gh-31083
 2022-05-17 17:51:37 +01:00
Andy Wilkinson f6b095bdfd Merge branch '2.5.x' into 2.6.x 
Closes gh-31078
 2022-05-17 15:03:57 +01:00
Andy Wilkinson f19d91561b Manage version of all Artemis modules upon which the build depends 
Closes gh-31077
 2022-05-17 15:01:23 +01:00
Andy Wilkinson 77f1b4141c Merge branch '2.5.x' into 2.6.x 
See gh-31072
 2022-05-17 11:09:20 +01:00
Andy Wilkinson 08bde72db5 Polish DockerHub and mirror configuration 
See gh-31070
 2022-05-17 11:08:41 +01:00
Andy Wilkinson dabf94360d Merge branch '2.5.x' into 2.6.x 
Closes gh-31072
 2022-05-17 10:00:26 +01:00
Andy Wilkinson d9bca72f1e Use Docker Hub mirror consistently on CI and avoid unneeded log in 
Closes gh-31070
 2022-05-17 09:57:36 +01:00
Stephane Nicoll 6907b337f1 Merge branch '2.5.x' into 2.6.x 2022-05-17 10:54:04 +02:00
Stephane Nicoll 7a7b1cc225 Upgrade to Tomcat 9.0.63 
Closes gh-31071
 2022-05-17 10:53:51 +02:00
Stephane Nicoll fb2075d399 Upgrade to Tomcat 9.0.63 
Closes gh-31069
 2022-05-17 10:37:56 +02:00
Stephane Nicoll d1cb7a5d25 Merge branch '2.5.x' into 2.6.x 2022-05-17 09:47:06 +02:00
Stephane Nicoll d2d4eefe1b Upgrade to Spring Security 5.6.4 
Closes gh-31012
 2022-05-17 09:42:13 +02:00
Stephane Nicoll a9df2a1ef7 Upgrade to Spring Kafka 2.8.6 
Closes gh-31010
 2022-05-17 09:41:36 +02:00
Stephane Nicoll f7f4831199 Upgrade to Spring Security 5.5.7 
Closes gh-31005
 2022-05-17 09:41:01 +02:00
Stephane Nicoll e9791e904d Upgrade to Spring Kafka 2.7.14 
Closes gh-31004
 2022-05-17 09:40:44 +02:00
Andy Wilkinson 9381daddb3 Upgrade to Spring AMQP 2.4.5 
Closes gh-31009
 2022-05-16 17:40:31 +01:00
Stephane Nicoll 1c217d268e Merge branch '2.5.x' into 2.6.x 2022-05-16 16:44:36 +02:00
Stephane Nicoll 6cc8714dec Start building against Spring Integration 5.5.12 snapshots 
See gh-31061
 2022-05-16 16:41:19 +02:00
Stephane Nicoll d479d2eeb9 Start building against Spring Integration 5.5.12 snapshots 
See gh-31060
 2022-05-16 16:39:57 +02:00
Stephane Nicoll 18129a5938 Merge branch '2.5.x' into 2.6.x 
Closes gh-31058
 2022-05-16 16:37:07 +02:00
Stephane Nicoll e703acb4fd Merge pull request #30898 from izeye 
* pr/30898:
  Polish "Add missing configuration properties for Statsd"
  Add missing configuration properties for Statsd

Closes gh-30898
 2022-05-16 16:37:00 +02:00