Andy Wilkinson
abfb675d20
Upgrade to Spring Security 6.0.0-M5
...
Closes gh-31101
2022-05-18 19:22:16 +01:00
Andy Wilkinson
8f3c2c192e
Merge branch '2.7.x'
2022-05-18 19:21:57 +01:00
Andy Wilkinson
c81b324446
Merge branch '2.6.x' into 2.7.x
2022-05-18 19:21:17 +01: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
d82bf235db
Merge branch '2.7.x'
2022-05-18 17:39:31 +01:00
Andy Wilkinson
d46c09cda3
Upgrade to Spring Security 5.7.1
...
Closes gh-31100
2022-05-18 17:38:59 +01:00
Andy Wilkinson
cc93a0a30e
Upgrade to Spring Batch 4.3.6
...
Closes gh-31020
2022-05-18 17:38:09 +01:00
Andy Wilkinson
99ecfe1739
Merge branch '2.6.x' into 2.7.x
2022-05-18 17:37:44 +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
Brian Clozel
9f91a1f0df
Merge branch '2.7.x'
2022-05-18 18:31:51 +02:00
Brian Clozel
e34187d05f
Upgrade to Spring for GraphQL 1.0.0
...
Closes gh-30858
2022-05-18 18:31:18 +02:00
Stephane Nicoll
216d156968
Refine native profile to use a classifier for the repackaged jar
...
This commit refines 80470f0b26
so that the 'repackage' goal of the
Spring Boot maven plugin uses a classifier. Previously, a regular
package with the profile fails as the Native Build Tools is trying to
use the repackaged archive as a regular jar file.
This is temporary as we'd like to explore other solutions, including
suggesting an additional option in the NBT plugin itself that uses the
regular classpath, rather than the produced jar.
See gh-30830
2022-05-18 15:45:40 +02:00
Andy Wilkinson
723a7b2bff
Upgrade to Spring Kafka 3.0.0-M4
...
Closes gh-30645
2022-05-18 14:07:58 +01:00
Andy Wilkinson
842cea2fc1
Merge branch '2.7.x'
2022-05-18 13:18:20 +01:00
Andy Wilkinson
0ee05ba582
Merge pull request #31033 from terminux
...
* gh-31033:
Restore Spring Security dependency check for SpringSecurityDialect
Closes gh-31033
2022-05-18 13:16:41 +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
Andy Wilkinson
c4beca3e01
Fix Maven-based AOT generation on Windows
...
Closes gh-30525
2022-05-18 10:54:35 +01:00
Stephane Nicoll
3e0994fb53
Merge branch '2.7.x'
2022-05-18 09:00:17 +02:00
Stephane Nicoll
8b611df160
Merge branch '2.6.x' into 2.7.x
2022-05-18 09:00:03 +02:00
Stephane Nicoll
e26c58baaf
Merge branch '2.5.x' into 2.6.x
2022-05-18 08:59:54 +02:00
Stephane Nicoll
2f46928f84
Upgrade to Spring Integration 5.5.12
...
Closes gh-31062
2022-05-18 08:58:50 +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
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
Phillip Webb
ea881aadc6
Merge branch '2.7.x'
2022-05-17 22:19:08 -07:00
Phillip Webb
13670e556b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31095
2022-05-17 22:18:53 -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
e83ed4fe5e
Merge branch '2.7.x'
2022-05-17 22:16:02 -07:00
Phillip Webb
fbde59d635
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31093
2022-05-17 22:14:40 -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
06f8041e4d
Merge branch '2.7.x'
2022-05-17 21:50:42 -07:00
Phillip Webb
d5d5997be7
Merge branch '2.6.x' into 2.7.x
2022-05-17 21:49:20 -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
8a1c8b5c2c
Fix deprecation warning
...
See gh-30978
2022-05-17 19:25:24 -05:00
Scott Frederick
8e38e28e94
Merge branch '2.7.x'
2022-05-17 18:47:13 -05:00
Scott Frederick
03deb1d067
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31089
2022-05-17 18:46:59 -05:00