Commit Graph

31098 Commits

Author SHA1 Message Date
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
Andy Wilkinson
8ada183422 Merge branch '2.4.x'
Closes gh-25448
2021-02-26 14:07:00 +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
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
Andy Wilkinson
33b3753077 Merge pull request #25445 from dreis2211
* gh-25445:
  Ignore empty prefixes in new PrefixedConfigurationPropertySource

Closes gh-25445
2021-02-26 10:18:48 +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
888ca442fa Merge branch '2.4.x'
Closes gh-25441
2021-02-25 18:04:25 +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
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
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
9e3cfc5d7a Merge branch '2.4.x'
Closes gh-25432
2021-02-25 15:58:51 +01: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
84984fb148 Merge branch '2.4.x'
Closes gh-25431
2021-02-25 14:28:41 +00:00
Andy Wilkinson
ecf8437d4a Merge branch '2.3.x' into 2.4.x
Closes gh-25430
2021-02-25 14:28:28 +00:00