fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,521 Commits 22 Branches 339 Tags
Commit Graph

3118 Commits

Author SHA1 Message Date
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
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
Andy Wilkinson
9da6fb4a5a Merge branch '2.5.x' into 2.6.x 
Closes gh-29903
 2022-02-18 11:42:10 +00:00
Andy Wilkinson
c676b8b84d Remove KafkaPropertiesKafka24Tests 
We now use Kafka 2.7 by default so tests against 2.4 are no longer
required.

Closes gh-29882
 2022-02-18 11:41:24 +00:00
Andy Wilkinson
0cebb332d1 Merge branch '2.5.x' into 2.6.x 
Closes gh-29901
 2022-02-18 11:08:21 +00:00
Andy Wilkinson
ac38a5a3e9 Update javadoc to reflect move to SecurityFilterChain 
Closes gh-29900
 2022-02-18 11:05:48 +00:00
Andy Wilkinson
b74f668254 Only auto-configure WebSessionIdResolver in reactive web app 
Closes gh-29669
 2022-02-11 12:09:45 +00:00
Andy Wilkinson
197ba9ebc9 Merge branch '2.5.x' into 2.6.x 
Closes gh-29731
 2022-02-10 15:04:58 +00:00
Andy Wilkinson
64ee54423a Polish "Configure ForwardedHeaderFilter with Tomcat's use relative redirects" 
See gh-29333
 2022-02-10 15:01:57 +00:00
Guirong Hu
cec69feb95 Configure ForwardedHeaderFilter with Tomcat's use relative redirects 
Previously, when Tomcat was configured to use relative redirects
and the ForwardedHeaderFilter is in use, the filter would ignore
the use of the relative redirects.

This commit corrects this misalignment by applying Tomcat's use
relative redirects setting to the filter, but only when Tomcat is
being used as the servlet container.

See gh-29333
 2022-02-10 15:01:56 +00:00
Stephane Nicoll
03d393bc4c Merge branch '2.5.x' into 2.6.x 
Closes gh-29649
 2022-02-04 09:50:47 +01:00
Stephane Nicoll
48649192cb Fix schema file name for Batch auto-configuration tests 
Closes gh-29648
 2022-02-04 09:49:15 +01:00
Stephane Nicoll
d130819fb4 Merge branch '2.5.x' into 2.6.x 
Closes gh-29616
 2022-02-01 16:35:19 +01:00
Stephane Nicoll
5fe6176966 Polish "Add a note on early init with @ConditionalOnExpression" 
See gh-29276
 2022-02-01 16:32:27 +01:00
Mihail Cornescu
fce3cd1684 Add a note on early init with @ConditionalOnExpression 
See gh-29276
 2022-02-01 16:24:13 +01:00
Stephane Nicoll
136b5959c3 Merge branch '2.5.x' into 2.6.x 
Closes gh-29612
 2022-02-01 10:59:08 +01:00
Stephane Nicoll
7f17f819a6 Polish "Enforce use of BDDMockito" 
See gh-29178
 2022-02-01 10:03:18 +01:00
Yanming Zhou
b49418aaaf Enforce use of BDDMockito 
1. Replace Mockito.verify*() with BDDMockito.then()
2. Replace Mockito.doReturn() with BDDMockito.willReturn()
3. Adjust checkstyle rule

See gh-29178
 2022-02-01 09:37:15 +01:00
Phillip Webb
5b1486cc26 Merge branch '2.5.x' into 2.6.x 2022-01-19 15:54:19 -08:00
Phillip Webb
d211b0f3b3 Disable test is Docker is not available 
See gh-28843
 2022-01-19 15:53:07 -08:00
Andy Wilkinson
6bea2172cb Switch tests to properties that are not deprecated 
Closes gh-29488
 2022-01-19 19:08:31 +00:00
Andy Wilkinson
ee9c399eba Merge branch '2.5.x' into 2.6.x 
Closes gh-29485
 2022-01-19 17:27:36 +00:00
Andy Wilkinson
1b3d088056 Move JdbcSessionDataSourceInitializerTests into src/test/java 
Closes gh-29484
 2022-01-19 17:26:55 +00:00
Andy Wilkinson
8868d34c24 Merge branch '2.5.x' into 2.6.x 
Closes gh-29399
 2022-01-14 15:48:57 +00:00
Andy Wilkinson
d051146eb4 Use Testcontainers instead on Embedded Mongo 
We've seen some problems, particularly on CI, where Embedded Mongo
hangs while trying to start the Mongo process. To limit the problem,
this commit replaces the use of Embedded Mongo with Testcontainers
where we can, leaving Embedded Mongo in use only where we're
specifically testing our Embedded Mongo support.

Closes gh-28843
 2022-01-14 15:48:31 +00:00
izeye
7fbb5749d1 Polish 
See gh-29157
 2021-12-27 12:01:50 +01:00
Stephane Nicoll
653fdbd0a4 Configure comment prefixes 
Closes gh-29095
 2021-12-20 17:47:50 +01:00
Phillip Webb
f3bcbca841 Update copyright year of changed files 2021-12-16 13:05:17 -08:00
Stephane Nicoll
55859ea64c Stop accessing the datasource if initialization mode is set to never 
Closes gh-28931
 2021-12-16 16:50:22 +01:00
Stephane Nicoll
3b4d27e4d3 Merge branch '2.5.x' into 2.6.x 2021-12-15 16:41:09 +01:00
Stephane Nicoll
30ebb17b2b Polish 2021-12-15 16:38:27 +01:00
Stephane Nicoll
ba60e3d358 Merge branch '2.5.x' 
Closes gh-29002
 2021-12-14 15:31:45 +01:00
Stephane Nicoll
157b3aa25f Allow platform to be configured in DataSourceInitializers 
Closes gh-28932
 2021-12-14 15:07:32 +01:00
Stephane Nicoll
dfab6ee307 Merge branch '2.5.x' into 2.6.x 
Closes gh-28979
 2021-12-10 11:01:48 +01:00
Stephane Nicoll
f6f5aec183 Polish "Check for the presence of Spring Security" 
See gh-28967
 2021-12-10 10:59:00 +01:00
Guirong Hu
4462f9157e Check for the presence of Spring Security 
See gh-28967
 2021-12-10 10:58:30 +01:00
Vedran Pavic
0af4431db8 Apply SameSite session cookie property to Spring Session 
This commit maps the `server.servlet.session.cookie.same-site`
configuration property to the `DefaultCookieSerializer` bean configured
in the Spring Session auto-configuration.

See gh-28784
 2021-12-09 15:53:50 +01:00
Stephane Nicoll
25a2888be5 Fix default value of spring.mvc.pathmatch.matching-strategy property 
Closes gh-28936
 2021-12-09 10:45:21 +01:00
Željko Tomić
1c1c85c3f8 Fix MariaDB mapping for Quartz DataSource initialization 
See gh-28779
 2021-11-25 09:38:44 +01:00
Phillip Webb
beb68671bb Update copyright year of changed files 2021-11-24 10:23:32 -08:00
Madhura Bhave
e7ff2cf358 Guard ErrorPageSecurityFilter configuration with ConditionalOnClass 
Update `ErrorPageSecurityFilterConfiguration` to guard against the case
where `spring-security-core` is on the classpath but
`spring-security-web` is not.

Fixes gh-28774
 2021-11-24 10:20:29 -08:00
Andy Wilkinson
03e283a2e6 Mention WebProperties in deprecation of ResourceProperties 
Closes gh-28762
 2021-11-22 10:03:21 +00:00
Madhura Bhave
dd1d1482dc Deny unauthorized access to the error page 
Fixes gh-26356

Co-authored-by Andy Wilkinson <wilkinsona@vmware.com>
 2021-11-18 15:41:38 -08:00
Stephane Nicoll
7fbb9d471b Polish "Upgrade to Neo4j Java Driver 4.2.8" 
See gh-28717
 2021-11-17 16:14:25 +01:00
Stephane Nicoll
f1991d8d80 Avoid bean override with CachingMetadataReaderFactoryPostProcessor 
Closes gh-28705
 2021-11-16 16:24:32 +01:00
Stephane Nicoll
8356204430 Upgrade to Flyway 8.0.4 
Closes gh-28697
 2021-11-16 11:02:02 +01:00
Filip Hrisafov
d6bead1a2a Expose RestClientBuilder when RestHighLevelClient is not available 
This commits exposes the RestClientBuilder as a bean even when the
RestHighLevelClient is not available. It allows users to create their
own RestClient beans using the Spring Boot configured RestClientBuilder
when they are not using the RestHighLevelClient.

Fixes gh-28655
 2021-11-15 09:59:20 +01:00