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
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
Andy Wilkinson
3b235e4960
Merge branch '2.4.x'
...
See gh-25482
2021-03-03 17:56:42 +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
4a74521174
Merge branch '2.4.x'
...
See gh-25482
2021-03-03 16:43:53 +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
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
Andy Wilkinson
59d8c97634
Merge branch '2.4.x'
...
Closes gh-25482
2021-03-03 13:46:58 +00: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
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
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
a80f1af811
Merge branch '2.4.x'
...
Closes gh-25463
2021-03-01 10:18:42 +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
782f838074
Polish
2021-03-01 10:00:45 +01:00
Stephane Nicoll
d1b229ea79
Merge pull request #25456 from bono007
...
* pr/25456:
Polish contribution
Add configuration properties for Flyway's Vault and Conjur support
Closes gh-25456
2021-03-01 09:48:59 +01:00
Stephane Nicoll
288bece4e9
Polish contribution
...
See gh-25456
2021-03-01 09:44:20 +01:00
bono007
32caf760b5
Add configuration properties for Flyway's Vault and Conjur support
...
See gh-25456
2021-03-01 09:23:40 +01:00
Stephane Nicoll
14c4221fde
Upgrade to Jetty 9.4.38.v20210224
...
Closes gh-25462
2021-03-01 09:22:54 +01:00
Stephane Nicoll
bbf5052de7
Merge branch '2.4.x'
2021-03-01 09:22:34 +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
Stephane Nicoll
1bd603f3aa
Merge pull request #25443 from JohnNiang
...
* pr/25443:
Polish "Allow to configure PersistenceUnitPostProcessor"
Allow to configure PersistenceUnitPostProcessor
Closes gh-25443
2021-02-27 11:38:37 +01:00
Stephane Nicoll
e1b1580732
Polish "Allow to configure PersistenceUnitPostProcessor"
...
This commit updates EntityManagerFactoryBuilder so that persistence unit
post processors can be registered and applied when creating an
EntityManagerFactory.
See gh-25443
2021-02-27 11:33:52 +01:00
johnniang
c3c83c8a6c
Allow to configure PersistenceUnitPostProcessor
...
This commit updates EntityManagerFactoryBuilder so that persistence unit
post processors can be registered and applied when creating an
EntityManagerFactory.
See gh-25443
2021-02-27 11:33:39 +01:00
Stephane Nicoll
67f10e585a
Merge pull request #25451 from izeye
...
* pr/25451:
Upgrade copyright year of changed files
Polish
Closes gh-25451
2021-02-27 11:23:18 +01:00
Stephane Nicoll
36f8a7b9a6
Upgrade copyright year of changed files
...
See gh-25451
2021-02-27 11:23:07 +01:00
izeye
c823f44e76
Polish
...
See gh-25451
2021-02-27 11:22:05 +01:00
Andy Wilkinson
c35a4cc283
Merge branch '2.4.x'
...
See gh-25450
2021-02-26 15:46:52 +00: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
54ba9e6ddf
Merge branch '2.4.x'
...
Closes gh-25450
2021-02-26 14:30:47 +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