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

35059 Commits

Author SHA1 Message Date
Andy Wilkinson 8bd3d53085 Merge branch '2.5.x' 
Closes gh-28738
 2021-11-18 13:58:46 +00:00
Andy Wilkinson c4e2252c6d Merge branch '2.4.x' into 2.5.x 
Closes gh-28737
 2021-11-18 13:58:35 +00:00
Andy Wilkinson da8261921a Upgrade to concourse/oci-build-task 0.9.1 
Closes gh-28736
 2021-11-18 13:58:09 +00:00
Andy Wilkinson 7ed19a3b59 Merge branch '2.5.x' 
Closes gh-28735
 2021-11-18 12:21:11 +00:00
Andy Wilkinson 88457d9cfa Merge branch '2.4.x' into 2.5.x 
Closes gh-28734
 2021-11-18 12:20:50 +00:00
Andy Wilkinson 7d19ea4ca1 Limit log output produced by spring-boot-deployment-tests:intTest 
Closes gh-28730
 2021-11-18 12:18:34 +00:00
Andy Wilkinson 11e1916766 Merge branch '2.5.x' 
Closes gh-28733
 2021-11-18 12:04:47 +00:00
Andy Wilkinson 5ccd70c73a Update LATEST_GA settings in preparation for 2.6.0 
Closes gh-28729
 2021-11-18 12:02:00 +00:00
Andy Wilkinson 29725ec68a Update links to Spring Security's reference docs 
Closes gh-28618
 2021-11-18 11:59:48 +00:00
Andy Wilkinson 5f52f1cc81 Merge branch '2.5.x' 2021-11-18 11:39:22 +00:00
Andy Wilkinson a1a04ebf11 Merge branch '2.4.x' into 2.5.x 2021-11-18 11:35:16 +00:00
Spring Builds 9e9215d05a Next development version (v2.5.8-SNAPSHOT) 2021-11-18 11:03:25 +00:00
Spring Builds 54b11cb3fb Next development version (v2.4.14-SNAPSHOT) 2021-11-18 08:02:52 +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 e17461ed8b Merge branch '2.5.x' 2021-11-17 16:43:56 +01: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 1b8d8cfefc Merge branch '2.5.x' 2021-11-17 15:24:16 +01:00
Stephane Nicoll 73cc23801a Merge branch '2.4.x' into 2.5.x 2021-11-17 15:24:05 +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 1df04c46b5 Upgrade to Netty tcNative 2.0.46.Final 
Closes gh-28716
 2021-11-17 14:59:51 +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 313470ac9d Merge branch '2.5.x' 2021-11-17 10:08:45 +00:00
Andy Wilkinson d541dda6b9 Merge branch '2.4.x' into 2.5.x 2021-11-17 10:08:33 +00:00
Andy Wilkinson c6b2567156 Upgrade to Spring Batch 4.3.4 
Closes gh-28230
 2021-11-17 10:08:27 +00: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
Stephane Nicoll 663d5d4362 Merge pull request #28712 from vpavic 
* pr/28712:
  Fix "Configure Two DataSources" example

Closes gh-28712
 2021-11-17 09:01:45 +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 a02be1b9a2 Merge branch '2.5.x' 2021-11-17 08:51:42 +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 de172a52e3 Merge branch '2.4.x' into 2.5.x 2021-11-17 08:50:48 +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 385e7dd612 Upgrade to Spring Integration 5.4.12 
Closes gh-28612
 2021-11-17 08:48:53 +01:00
Stephane Nicoll f1991d8d80 Avoid bean override with CachingMetadataReaderFactoryPostProcessor 
Closes gh-28705
 2021-11-16 16:24:32 +01:00
Stephane Nicoll 08e9725b76 Upgrade to Tomcat 9.0.55 
Closes gh-28700
 2021-11-16 11:02:02 +01:00
Stephane Nicoll dbcd0524a5 Upgrade to Logback 1.2.7 
Closes gh-28699
 2021-11-16 11:02:02 +01:00
Stephane Nicoll d9bef3c21e Upgrade to Kotlin 1.6.0 
Closes gh-28698
 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 619905a9b9 Merge branch '2.5.x' 2021-11-16 09:34:42 +01:00
Stephane Nicoll d3e9e9519c Merge branch '2.4.x' into 2.5.x 2021-11-16 09:34:32 +01:00
Stephane Nicoll b16b0c789f Upgrade to Tomcat 9.0.55 
Closes gh-28696
 2021-11-16 09:08:16 +01:00
Stephane Nicoll 4fcb772f37 Upgrade to Logback 1.2.7 
Closes gh-28695
 2021-11-16 09:08:15 +01:00