root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
31,171 Commits 23 Branches 345 Tags 276 MiB
Commit Graph

12486 Commits

Author SHA1 Message Date
Stephane Nicoll adaf2fc57c Merge branch '2.4.x' 
Closes gh-25536
 2021-03-08 08:48:41 +01:00
dreis2211 b85a50b7b6 Suppress rawtypes warning 
See gh-25531
 2021-03-08 08:47:16 +01:00
dreis2211 2575621e06 Fix some illegal reflective access warnings 
See gh-25531
 2021-03-08 08:47:10 +01:00
Andy Wilkinson 6b1bb225b6 Merge branch '2.4.x' 
Closes gh-25521
 2021-03-05 15:37:47 +00:00
Andy Wilkinson 3c84ea9350 Try to stabilize tests that use Neo4jContainer 
Closes gh-25520
 2021-03-05 15:36:45 +00:00
Andy Wilkinson 074744aee7 Increase socket timeout for communicating with Elasticsearch 
Closes gh-25518
 2021-03-05 15:26:51 +00:00
Stephane Nicoll bb0f43cf07 Allow JMX endpoint ObjectNames to be customized 
Closes gh-25317
 2021-03-05 16:19:19 +01:00
Andy Wilkinson f81921c005 Merge branch '2.4.x' 
Closes gh-25517
 2021-03-05 15:08:53 +00:00
Andy Wilkinson f9ef05f71e Polish "Add Bootstrapper initialize method to fix typo" 
See gh-25400
 2021-03-05 15:06:51 +00:00
cprayer bee6f41393 Add Bootstrapper initialize method to fix typo 
See gh-25400
 2021-03-05 15:06:50 +00:00
Stephane Nicoll 5a0c3a8497 Merge branch '2.4.x' 
Closes gh-25516
 2021-03-05 15:47:50 +01:00
Stephane Nicoll ddf75f095c Merge branch '2.3.x' into 2.4.x 
Closes gh-25515
 2021-03-05 15:47:36 +01:00
Stephane Nicoll 6ebc69d704 Polish "Include properties in source merge algorithm" 
See gh-25507
 2021-03-05 15:47:09 +01:00
Bertrand Renuart cf4bc6e9e0 Include properties in source merge algorithm 
This commit improves SimpleConfigurationMetadataRepository to include
properties that are contributed to an existing configuration metadata
source.

See gh-25507
 2021-03-05 15:47:09 +01:00
Andy Wilkinson 006cb643ea Merge branch '2.4.x' 
Closes gh-25514
 2021-03-05 14:16:27 +00:00
Andy Wilkinson 2f95c1e2c8 Merge branch '2.3.x' into 2.4.x 
Closes gh-25513
 2021-03-05 14:16:07 +00:00
Andy Wilkinson 22b73f3020 Polish "Improve documentaion of Mockito test execution listeners" 
See gh-25375
 2021-03-05 14:14:36 +00:00
cdalexndr 72562e0fd4 Improve documentaion of Mockito test execution listeners 
See gh-25375
 2021-03-05 12:49:18 +00:00
Andy Wilkinson 2cffbc90cb Merge branch '2.4.x' 
Closes gh-25511
 2021-03-05 11:03:41 +00:00
Andy Wilkinson 836ad76df1 Merge branch '2.3.x' into 2.4.x 
Closes gh-25510
 2021-03-05 11:03:08 +00:00
Andy Wilkinson 92133d47d0 Polish "Make link to Actuator API docs more prominent" 
See gh-25486
 2021-03-05 10:58:47 +00:00
cdalexndr 5f4e1b747e Make link to Actuator API docs more prominent 
See gh-25486
 2021-03-05 10:57:59 +00:00
Andy Wilkinson 2b7f23b29d Merge branch '2.4.x' 
Closes gh-25509
 2021-03-05 10:44:24 +00:00
Andy Wilkinson ac258a95a2 Merge branch '2.3.x' into 2.4.x 
Closes gh-25508
 2021-03-05 10:39:52 +00:00
Andy Wilkinson c6ca7a53ab Polish "Prevent extracting zip entries outside of destination path" 
See gh-25505
 2021-03-05 10:13:32 +00:00
trungPa 2993e68715 Prevent extracting zip entries outside of destination path 
See gh-25505
 2021-03-05 10:12:06 +00:00
Stephane Nicoll 76d0a7f8ba Merge branch '2.4.x' 
Closes gh-25506
 2021-03-05 10:03:42 +01:00
dreis2211 89a44f3da4 Fix some assertions 
See gh-25499
 2021-03-05 09:56:55 +01:00
Madhura Bhave 37dcb90876 Merge branch '2.4.x' 
Closes gh-25502
 2021-03-04 14:48:11 -08:00
Madhura Bhave ae630e03ce Warn against using multi-document files with TestPropertySource 
Closes gh-24945
 2021-03-04 14:46:59 -08:00
Madhura Bhave e1904fb72f Merge branch '2.4.x' 
Closes gh-25500
 2021-03-04 13:04:18 -08:00
Madhura Bhave cfac223cff Document configtree support for Docker secrets 
Closes gh-25095
 2021-03-04 13:02:28 -08:00
Andy Wilkinson 961a34a5ee Merge branch '2.4.x' 
Closes gh-25497
 2021-03-04 19:15:03 +00:00
Andy Wilkinson 1ce6e796fe Polish "Allow the project to be built with Java 16" 
See gh-25171
 2021-03-04 18:54:58 +00:00
dreis2211 1ccd8dae8a Allow the project to be built with Java 16 
See gh-25171
 2021-03-04 18:54:56 +00:00
Madhura Bhave 9fd6a1e56a Merge branch '2.4.x' 
Closes gh-25495
 2021-03-04 09:46:26 -08:00
Madhura Bhave 181d0ee932 Merge default property sources 
Fixes gh-25408
 2021-03-04 09:46:00 -08:00
Andy Wilkinson 96ede9b975 Merge branch '2.4.x' 
Closes gh-25491
 2021-03-04 13:03:41 +00:00
Andy Wilkinson ca414733f3 Reinstate support for placeholders in @EntityScan 
Fixes gh-25436
 2021-03-04 12:21:27 +00:00
Stephane Nicoll e58353a32d Merge branch '2.4.x' 
Closes gh-25484
 2021-03-03 15:16:58 +01:00
Stephane Nicoll e5d8b6029b Merge branch '2.3.x' into 2.4.x 
Closes gh-25483
 2021-03-03 15:16:08 +01:00
Stephane Nicoll 8e67ae7113 Fix fallback fork value for spring-boot:stop 
This commit harmonizes the fallback value that spring-boot:stop goal
should use if no information is available in the current context.

Closes gh-25472
 2021-03-03 15:15:04 +01:00
Scott Frederick 434db48969 Merge branch '2.4.x' 
Closes gh-25469
 2021-03-01 16:01:12 -06:00
Scott Frederick afb60d6161 Add tests for Gradle examples used in plugin docs 
Fixes gh-25468
 2021-03-01 15:22:15 -06:00
Stephane Nicoll 9db78022bd Merge branch '2.4.x' 
Closes gh-25464
 2021-03-01 10:45:16 +01:00
Stephane Nicoll 63cca9b8c6 Polish "Document precedence between properties and yaml" 
See gh-25300
 2021-03-01 10:44:43 +01:00
Robert Smith 20ed8c2ec3 Document precedence between properties and yaml 
See gh-25300
 2021-03-01 10:39:34 +01:00
Stephane Nicoll a80f1af811 Merge branch '2.4.x' 
Closes gh-25463
 2021-03-01 10:18:42 +01:00
Stephane Nicoll ed1c68f567 Update copyright year of changed file 
See gh-25454
 2021-03-01 10:06:23 +01:00
jnizet cbab2396e2 Fix property name in gradle plugin documentation 
See gh-25454
 2021-03-01 10:01:52 +01:00