spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-08 10:19:13 +00:00
Code Issues Projects Releases Wiki Activity
34,863 Commits 24 Branches 395 Tags
v2.6.0
Commit Graph
15142 Commits
Author SHA1 Message Date
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
Andy Wilkinson 29725ec68a Update links to Spring Security's reference docs 
Closes gh-28618
 2021-11-18 11:59:48 +00:00
Madhura Bhave 6b79d2860f Merge branch '2.5.x' into main 
Closes gh-28724
 2021-11-17 16:41:23 -08:00
Madhura Bhave 64270eca51 Convert environment used by SpringBootTestContextLoader 
This commit aligns `SpringBootTest`s to also use `ApplicationEnvironment`
instead of `StandardEnvironment`. This prevents the side-effect of active
profiles from `@ActiveProfiles` from being added to the environment when
doGetActiveProfiles is called. In this case, calling `addActiveProfiles()`
in the environment post processor would result in `@ActiveProfiles` being
added to the environment first, resulting in the wrong order.

The additional call to `setActiveProfiles()` is also not necessary when using
ApplicationEnvironment because that call was put in place to prevent the side-effect
which `ApplicationEnvironment` does not have.

Fixes gh-28530
 2021-11-17 16:40:53 -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 a6163f6acf Upgrade to Netty tcNative 2.0.46.Final 
Closes gh-28720
 2021-11-17 15:03:59 +01:00
Stephane Nicoll fc69be302a Upgrade to HttpClient5 5.1.2 
Closes gh-28719
 2021-11-17 15:03:57 +01:00
Stephane Nicoll f33c8f6fde Upgrade to Netty tcNative 2.0.46.Final 
Closes gh-28718
 2021-11-17 15:02:27 +01:00
Stephane Nicoll 9dd599c9e3 Upgrade to Neo4j Java Driver 4.2.8 
Closes gh-28717
 2021-11-17 15:02:25 +01:00
Stephane Nicoll ba3d0d7771 Upgrade to Spring Session 2021.1.0 
Closes gh-28522
 2021-11-17 14:14:08 +01:00
Andy Wilkinson ea0613c7d7 Merge branch '2.5.x' 
Closes gh-28261
 2021-11-17 10:07:18 +00:00
Andy Wilkinson 416a133fd1 Merge branch '2.4.x' into 2.5.x 
Closes gh-28250
 2021-11-17 10:06:41 +00:00
Andy Wilkinson 838533ef0e Upgrade to Spring Batch 4.3.4 
Closes gh-28230
 2021-11-17 10:04:51 +00:00
Stephane Nicoll afa006986b Merge branch '2.5.x' 
Closes gh-28713
 2021-11-17 09:01:53 +01:00
Vedran Pavic c8dd0a584b Fix "Configure Two DataSources" example 
With the present example, the `secondDataSource` bean factory method
will use `firstDataSourceProperties` due to it being annotated with
`@Primary`.

This commit adds the `@Qualifier` needed to ensure `secondDataSource`
bean factory method uses `secondDataSourceProperties`.

See gh-28712
 2021-11-17 09:00:14 +01:00
Stephane Nicoll d88658d47a Remove dependencies on micrometer-jersey2 
Closes gh-28706
 2021-11-17 08:56:08 +01:00
Stephane Nicoll 37864f6e66 Upgrade to Spring Integration 5.5.6 
Closes gh-28521
 2021-11-17 08:51:20 +01:00
Stephane Nicoll 6325df2055 Upgrade to Spring Integration 5.5.6 
Closes gh-28513
 2021-11-17 08:50:32 +01:00
Stephane Nicoll f1991d8d80 Avoid bean override with CachingMetadataReaderFactoryPostProcessor 
Closes gh-28705
 2021-11-16 16:24:32 +01:00
Stephane Nicoll dbcd0524a5 Upgrade to Logback 1.2.7 
Closes gh-28699
 2021-11-16 11:02:02 +01:00
Stephane Nicoll 8356204430 Upgrade to Flyway 8.0.4 
Closes gh-28697
 2021-11-16 11:02:02 +01:00
Stephane Nicoll 4b64f36356 Upgrade to Spring Security 5.6.0 
Closes gh-28520
 2021-11-16 09:43:30 +01:00
Stephane Nicoll 4fcb772f37 Upgrade to Logback 1.2.7 
Closes gh-28695
 2021-11-16 09:08:15 +01:00
Stephane Nicoll c4eea99608 Upgrade to Kafka 2.7.2 
Closes gh-28694
 2021-11-16 09:08:14 +01:00
Stephane Nicoll 44b644c770 Merge branch '2.5.x' 
Closes gh-28693
 2021-11-16 08:59:58 +01:00
Stephane Nicoll 9ed7674ab0 Polish "Fix yaml sample format" 
See gh-28671
 2021-11-16 08:55:52 +01:00
Weix Sun 7f1bd43c84 Fix yaml sample format 
See gh-28671
 2021-11-16 08:53:42 +01:00
Stephane Nicoll 6d4537b5ae Merge branch '2.5.x' 
Closes gh-28692
 2021-11-16 08:50:53 +01:00
Stephane Nicoll 6d79599d99 Polish "Fix yaml sample format in reference doc" 
See gh-28670
 2021-11-16 08:50:24 +01:00
Weix Sun 793a107d27 Fix yaml sample format in reference doc 
See gh-28670
 2021-11-16 08:45:50 +01:00
Stephane Nicoll cdc14250c4 Merge branch '2.5.x' 
Closes gh-28691
 2021-11-16 08:34:39 +01:00
izeye e56efc03f6 Update URL for GraphQL Spring Boot starter 
See gh-28683
 2021-11-16 08:33:56 +01:00
Stephane Nicoll 52ecc1e0dd Polish "Create EndpointWebExtension only if necessary" 
See gh-28475
 2021-11-16 08:22:35 +01:00
davidh44 b658013a97 Create EndpointWebExtension only if necessary 
This commit updates Actuator's EndpointWebExtensions to be created only
if the related endpoint is exposed over HTTP.

See gh-28475
 2021-11-16 08:15:19 +01:00
Stephane Nicoll a4c5f07391 Upgrade to Spring Kafka 2.8.0 
Closes gh-28519
 2021-11-15 19:58:47 +01:00
Stephane Nicoll d058af5be2 Upgrade to Spring AMQP 2.4.0 
Closes gh-28518
 2021-11-15 19:58:29 +01:00
Stephane Nicoll 882c58b1f1 Upgrade to Spring Kafka 2.7.9 
Closes gh-28539
 2021-11-15 19:57:41 +01:00
Stephane Nicoll d3c5563e60 Upgrade to Spring AMQP 2.3.12 
Closes gh-28600
 2021-11-15 19:57:15 +01:00
Scott Frederick 8903c69b19 Avoid exposing time-related task metrics 
Fixes gh-28535
 2021-11-15 12:24:50 -06:00
Scott Frederick d7f8931dd4 Make TaskExecution and TaskScheduling metrics unique 
Fixes gh-28536
 2021-11-15 12:23:25 -06:00
Andy Wilkinson a1e7375fc0 Polish 2021-11-15 13:03:10 +00:00
Andy Wilkinson 2d7e0314f3 Merge branch '2.5.x' 
# Conflicts:
#	spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java
#	spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleMultiDslExtension.java
 2021-11-15 12:51:43 +00:00
Andy Wilkinson 0aae9c26da Test our Gradle plugin against Gradle 7.3 
Closes gh-28679
 2021-11-15 12:47:51 +00:00
Andy Wilkinson b1ff60c728 Merge branch '2.5.x' 
Closes gh-28681
 2021-11-15 12:09:06 +00:00
Andy Wilkinson 4cfbc0db36 Merge branch '2.4.x' into 2.5.x 
Closes gh-28680
 2021-11-15 12:08:49 +00:00
Leo Li 9de9983e25 Fix @deprecated and @see in Archive's javadoc 
See gh-28677
 2021-11-15 12:07:22 +00: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
Stephane Nicoll 6e06e69bba Merge branch '2.5.x' 
Closes gh-28673
 2021-11-14 08:25:01 +01:00
Stephane Nicoll 4c193a1511 Merge branch '2.4.x' into 2.5.x 
Closes gh-28672
 2021-11-14 08:24:48 +01:00
Stephane Nicoll d21c48e474 Update copyright year of changed file 
See gh-28532
 2021-11-14 08:23:32 +01:00