Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,874 Commits 20 Branches 322 Tags 258 MiB
70e42e09c6
Commit Graph

34874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson
70e42e09c6 Merge branch '2.5.x' 
Closes gh-28750
 2021-11-19 13:43:32 +00:00
Andy Wilkinson
c68e66c63f Merge pull request #28747 from jprinet 
* gh-28747:
  Upgrade Gradle Enterprise plugin to 3.7.2

Closes gh-28747
 2021-11-19 13:43:19 +00:00
Jerome Prinet
80e6bb2939 Upgrade Gradle Enterprise plugin to 3.7.2 
See gh-28747
 2021-11-19 13:42:47 +00:00
Andy Wilkinson
381c094c41 Merge branch '2.5.x' 2021-11-19 13:39:37 +00:00
Andy Wilkinson
8f0e12dc34 Revert accidentally committed changes 
This partially reverts commit c083e0b049.
 2021-11-19 13:39:22 +00:00
Andy Wilkinson
c0d90dfa8f Merge branch '2.5.x' 
Closes gh-28749
 2021-11-19 13:36:01 +00:00
Andy Wilkinson
c083e0b049 Avoid using temp before @TempDir has initialized it 
Closes gh-28748
 2021-11-19 13:35:30 +00:00
Andy Wilkinson
4a0fa62d2e Polish "Replace "you're"" 
See gh-28710
 2021-11-19 13:24:17 +00:00
Jay Bryant
e629e77b29 Replace "you're" 
This commit replaces "you're" with some other structure, often
simplifying the sentence in the process.

Also checked for words that end with "'ll" and "n't" but did not find
any.

See gh-28710
 2021-11-19 13:23:10 +00:00
Andy Wilkinson
00fa0fb769 Merge branch '2.5.x' 
Closes gh-28746
 2021-11-19 10:19:14 +00:00
Andy Wilkinson
f2b959b0a5 Add <type>zip</type> to Elasticsearch dist in dependencies bom 
Fixes gh-28725
 2021-11-19 10:13:14 +00:00
Spring Builds
96eaef4290 Next development version (v2.6.1-SNAPSHOT) 2021-11-19 07:16:27 +00:00
Phillip Webb
e9beac6fd6 Drop CI registry mirror settings 2021-11-18 22:08:29 -08:00
Phillip Webb
b6d0b44703 Fix @SuppressWarnings 2021-11-18 17:26:18 -08: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
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