Commit Graph

12468 Commits

Author SHA1 Message Date
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
Stephane Nicoll
782f838074 Polish 2021-03-01 10:00:45 +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
aa032e093b Upgrade to Jetty 9.4.38.v20210224
Closes gh-25461
2021-03-01 09:22:06 +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
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
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
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
Andy Wilkinson
9713bfc765 Enable the logging shutdown hook by default
This commit updates LoggingApplicationListener to register the logging
shutdown hook by default.

The hook is detrimental in a war deployment as it may pin parts of an
application in memory after it has been undeployed. For this reason,
the hook is still disabled by default in war deployments. This is
achieved by setting an attribute on the servlet context in
SpringBootServletInitializer that is then consumed via the Environment
by LoggingApplicationListener.

Closes gh-25046
2021-02-26 14:00:08 +00:00
dreis2211
4b694560eb Ignore empty prefixes in new PrefixedConfigurationPropertySource
See gh-25445
2021-02-26 10:18:03 +00:00
Madhura Bhave
a8592f36d4 Add prefix support for property source
We configure the `SystemEnvironmentPropertySource` as a `Prefixed` property
source. When adapting this to a `ConfigurationPropertySource, a
`PrefixedConfigurationPropertySource` will be created for it.
A `PrefixedConfigurationPropertySource` will resolve property
such as `foo.bar` to `my.foo.bar` for a prefix of `my`.

Closes gh-3450
2021-02-25 12:53:34 -08:00
Andy Wilkinson
b36caec413 Merge branch '2.4.x'
Closes gh-25438
2021-02-25 17:33:00 +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