Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,621 Commits 23 Branches 0 Tags
ddf75f095c5921b79e478cdce58cd40fd7ecfec9
Commit Graph

30621 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
034e7d4f7d Merge pull request #25507 from brenuart 
* pr/25507:
  Polish "Include properties in source merge algorithm"
  Include properties in source merge algorithm

Closes gh-25507
 2021-03-05 15:47:17 +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
2f95c1e2c8 Merge branch '2.3.x' into 2.4.x 
Closes gh-25513
 2021-03-05 14:16:07 +00:00
Andy Wilkinson
c62367e8c4 Merge pull request #25375 from cdalexndr 
* gh-25375:
  Polish "Improve documentaion of Mockito test execution listeners"
  Improve documentaion of Mockito test execution listeners

Closes gh-25375
 2021-03-05 14:15:03 +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
836ad76df1 Merge branch '2.3.x' into 2.4.x 
Closes gh-25510
 2021-03-05 11:03:08 +00:00
Andy Wilkinson
8b5c345d49 Merge pull request #25486 from cdalexndr 
* gh-25486:
  Polish "Make link to Actuator API docs more prominent"
  Make link to Actuator API docs more prominent

Closes gh-25486
 2021-03-05 10:59:07 +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
ac258a95a2 Merge branch '2.3.x' into 2.4.x 
Closes gh-25508
 2021-03-05 10:39:52 +00:00
Andy Wilkinson
1ac9b3fac2 Merge pull request #25505 from trungPa 
* gh-25505:
  Polish "Prevent extracting zip entries outside of destination path"
  Prevent extracting zip entries outside of destination path

Closes gh-25505
 2021-03-05 10:38:19 +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
2682b3803a Merge pull request #25499 from dreis2211 
* pr/25499:
  Fix some assertions

Closes gh-25499
 2021-03-05 10:01:48 +01:00
dreis2211
89a44f3da4 Fix some assertions 
See gh-25499
 2021-03-05 09:56:55 +01: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
cfac223cff Document configtree support for Docker secrets 
Closes gh-25095
 2021-03-04 13:02:28 -08:00
Andy Wilkinson
52350473d1 Merge pull request #25171 from dreis2211 
* gh-25171:
  Polish "Allow the project to be built with Java 16"
  Allow the project to be built with Java 16

Closes gh-25171
 2021-03-04 18:56:25 +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
181d0ee932 Merge default property sources 
Fixes gh-25408
 2021-03-04 09:46:00 -08:00
Andy Wilkinson
ca414733f3 Reinstate support for placeholders in @EntityScan 
Fixes gh-25436
 2021-03-04 12:21:27 +00:00
Andy Wilkinson
f85c7c9ef1 Merge branch '2.3.x' into 2.4.x 
See gh-25481
 2021-03-03 17:56:16 +00:00
Andy Wilkinson
da3920bd46 Wait for process to exit to avoid race with file deletion 
See gh-25457
 2021-03-03 17:55:37 +00:00
Andy Wilkinson
fefd49cce7 Merge branch '2.3.x' into 2.4.x 
See gh-25481
 2021-03-03 16:43:18 +00:00
Andy Wilkinson
c5cfb8750b Delete files after destroying processes that may be accessing them 
Closes gh-25457
 2021-03-03 16:42:49 +00: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
Andy Wilkinson
e984f0ca31 Merge branch '2.3.x' into 2.4.x 
Closes gh-25481
 2021-03-03 13:46:39 +00:00
Andy Wilkinson
14948cb12e Merge pull request #25457 from dreis2211 
* gh-25457:
  Speed up spring-boot-server-tests

Closes gh-25457
 2021-03-03 13:46:20 +00:00
dreis2211
b0a6e92fb6 Speed up spring-boot-server-tests 
See gh-25457
 2021-03-03 13:34:41 +00: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
f2f51062d6 Merge pull request #25300 from robert-smith-911 
* pr/25300:
  Polish "Document precedence between properties and yaml"
  Document precedence between properties and yaml

Closes gh-25300
 2021-03-01 10:45:02 +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
06b264084d Merge pull request #25454 from jnizet 
* pr/25454:
  Update copyright year of changed file
  Fix property name in gradle plugin documentation

Closes gh-25454
 2021-03-01 10:18:26 +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
Stephane Nicoll
aa032e093b Upgrade to Jetty 9.4.38.v20210224 
Closes gh-25461
 2021-03-01 09:22:06 +01:00
Stephane Nicoll
d3918e71e3 Merge branch '2.3.x' into 2.4.x 2021-03-01 09:21:27 +01:00
Stephane Nicoll
dd2dc22085 Upgrade to Jetty 9.4.38.v20210224 
Closes gh-25460
 2021-03-01 09:20:33 +01:00
Andy Wilkinson
12d3b15244 Ensure that Jersey's filter has a servlet at the end of its chain 
See gh-25449
 2021-02-26 15:42:13 +00:00
Andy Wilkinson
cb600f1c0b Merge branch '2.3.x' into 2.4.x 
Closes gh-25449
 2021-02-26 14:26:57 +00:00
Andy Wilkinson
8f72ca6521 Use ResourceConfig customization to register endpoints with Jersey 
Previously, actuator endpoints were registered with Jersey upon
injection of the ResourceConfig bean into a registrar class rather than
using a ResourceConfigCustomizer. This was done to fix a problem
when running the Actuator on a separate port where the main application
context's customizers were also applied to the management context,
breaking the singleton contract for those resources. This approach
meant that the registration could be performed at any point after the
ResourceConfig had been created. When Jersey's configured as a Filter
this resulted in the registration failing as the attempt was being made
after the Filter lifecyle callbacks which make the ResourceConfig
immutable.

This commit reworks the endpoint registration to be performed using a
ManagementContextResourceConfigCustomizer, a resource config customizer
that's only applied to the ResourceConfig that's used by the Actuator.
When there's a separate management context, this ResourceConfig is
created by the Actuator's auto-configuration and the management context
resource config customizers are applied to it during its creation. The
main application's customizers are not applied. When the actuator is
using the same context as the main application, this ResourceConfig is
created by the main application. In this case a
ResourceConfigCustomizer is defined that delegates to all
ManagementContextResourceConfigCustomizers, allowing them to register
the actuator endpoints with the main ResourceConfig.

Fixes gh-25262
 2021-02-26 14:25:24 +00:00
Andy Wilkinson
24b2bb9202 Merge branch '2.3.x' into 2.4.x 
Closes gh-25447
 2021-02-26 14:06:42 +00:00
Andy Wilkinson
1e6506934b Merge pull request #25446 from dreis2211 
* gh-25446:
  Split DeploymentIntegrationTests by container
  Rename DeploymentIntegrationTests

Closes gh-25446
 2021-02-26 14:06:31 +00:00
dreis2211
4ff9e5edaa Split DeploymentIntegrationTests by container 
Prior to this commit, every test started a new testcontainer. By splitting the
tests apart we can make use of static containers that are only instantiated once
per application (TomEE, Wildfly etc.)

See gh-25446
 2021-02-26 14:04:17 +00:00