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

30599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
dreis2211
d55d8d6b19 Rename DeploymentIntegrationTests 
See gh-25446
 2021-02-26 14:04:08 +00:00
Andy Wilkinson
62737b1274 Merge branch '2.3.x' into 2.4.x 
Closes gh-25440
 2021-02-25 18:04:10 +00:00
Andy Wilkinson
04e1ad614c Merge pull request #25434 from dreis2211 
* gh-25434:
  Remove spring-boot-smoke-test-jta-jndi

Closes gh-25434
 2021-02-25 18:03:56 +00:00
dreis2211
8bacbff629 Remove spring-boot-smoke-test-jta-jndi 
See gh-25434
 2021-02-25 18:02:25 +00:00
Andy Wilkinson
d48551ff12 Merge branch '2.3.x' into 2.4.x 
Closes gh-25437
 2021-02-25 17:32:40 +00:00
Andy Wilkinson
94fe45a371 Merge pull request #25409 from wolfs 
* gh-25409:
  Enable stricter validation for Gradle plugin

Closes gh-25409
 2021-02-25 17:32:19 +00:00
Stefan Wolf
86ca32e694 Enable stricter validation for Gradle plugin 
See gh-25409
 2021-02-25 17:28:51 +00:00
Stephane Nicoll
2fde67dc10 Merge pull request #25411 from jxblum 
* pr/25411:
  Fix grammatical error in documentation

Closes gh-25411
 2021-02-25 15:58:35 +01:00
John Blum
cec4d45cf6 Fix grammatical error in documentation 
See gh-25411
 2021-02-25 15:57:56 +01:00
Andy Wilkinson
ecf8437d4a Merge branch '2.3.x' into 2.4.x 
Closes gh-25430
 2021-02-25 14:28:28 +00:00
Andy Wilkinson
cda7c686fd Merge pull request #25412 from dreis2211 
* gh-25412:
  Update Testcontainers image versions

Closes gh-25412
 2021-02-25 14:28:19 +00:00
dreis2211
101d88a840 Update Testcontainers image versions 
See gh-25412
 2021-02-25 14:27:41 +00:00
Andy Wilkinson
b477312100 Upgrade to Testcontainers 1.15.2 
Closes gh-25423
 2021-02-25 13:51:44 +00:00
Andy Wilkinson
9af8ad432a Upgrade to MockK 1.10.6 
Closes gh-25422
 2021-02-25 13:51:43 +00:00
Andy Wilkinson
070d3d434c Upgrade to Maven Common Artifact Filters 3.1.1 
Closes gh-25421
 2021-02-25 13:51:41 +00:00
Andy Wilkinson
0d781b5619 Merge branch '2.3.x' into 2.4.x 2021-02-25 13:51:03 +00:00
Andy Wilkinson
5f0d72487e Upgrade to Testcontainers 1.15.2 
Closes gh-25420
 2021-02-25 13:50:16 +00:00
Andy Wilkinson
ac78f55ba8 Upgrade to Maven Common Artifact Filters 3.1.1 
Closes gh-25419
 2021-02-25 13:48:53 +00:00
Andy Wilkinson
29bbbc3b79 Merge branch '2.3.x' into 2.4.x 
Closes gh-25406
 2021-02-24 12:27:23 +00:00
Andy Wilkinson
11b77037f1 Make TestFailuresPlugin compatible with Gradle's configuration cache 
Closes gh-25405
 2021-02-24 12:26:03 +00:00
Andy Wilkinson
999c36b6f2 Merge branch '2.3.x' into 2.4.x 
Closes gh-25393
 2021-02-22 17:24:13 +00:00
Andy Wilkinson
a1a61a44cb Upgrade to Gradle 6.8.3 
Closes gh-25392
 2021-02-22 17:23:58 +00:00