Commit Graph

12520 Commits

Author SHA1 Message Date
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 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
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
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
dreis2211 101d88a840 Update Testcontainers image versions
See gh-25412
2021-02-25 14:27:41 +00:00
Andy Wilkinson 10109e75b3 Upgrade to Testcontainers 1.15.2
Closes gh-25429
2021-02-25 13:53:29 +00:00
Andy Wilkinson d822604ed2 Upgrade to MockK 1.10.6
Closes gh-25428
2021-02-25 13:53:27 +00:00
Andy Wilkinson f411bcd1a5 Upgrade to Maven Resolver 1.6.1
Closes gh-25427
2021-02-25 13:53:26 +00:00
Andy Wilkinson f876f413c9 Upgrade to Maven Invoker 3.1.0
Closes gh-25426
2021-02-25 13:53:25 +00:00
Andy Wilkinson bc9637c8b3 Upgrade to Maven Common Artifact Filters 3.2.0
Closes gh-25425
2021-02-25 13:53:24 +00:00
Andy Wilkinson e99184bb7f Upgrade to JNA 5.7.0
Closes gh-25424
2021-02-25 13:53:22 +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 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
Scott Frederick 4be04b0ea2 Support image building with Maven and war packaging
This commit updates the Maven image building goal to support building
images from executable and non-executable war files.

Fixes gh-23823
2021-02-24 15:23:33 -06:00
Scott Frederick a80c4ad38d Support image building with Gradle and war packaging
This commit updates the Gradle image building task to support building
images from executable and non-executable war files.

Fixes gh-23825
2021-02-24 14:42:46 -06:00
Andy Wilkinson f09630f73c Allow additional keys to be configured for value sanitization
Closes gh-25384
2021-02-24 19:28:29 +00:00
Andy Wilkinson 10ef991e1d Sanitize sensitive portion of the value of url and urls keys
Closes gh-25387
2021-02-24 14:42:25 +00:00
Andy Wilkinson 9836b060d4 Test the Gradle plugin against 7.0-milestone-2
Closes gh-25404
2021-02-24 11:28:45 +00:00
Andy Wilkinson 2a2daae14e Allow user's WebFluxConfigurers to be ordered after auto-config's
Previously, WebFluxAutoConfiguration's WebFluxConfigurer was unordered.
This mean that it had lowest precedence so it was not possible for a
user to provide their own configurer that was guaranteed to run after
the auto-configuration's configurer.

This commit updates the auto-configuration to order its configurer at
0. Any unordered user-defined configurer will now run after the
auto-configuration's configurer.

Closes gh-25302
2021-02-24 11:11:46 +00:00
Scott Frederick 76e42ff96f Correct grouping of custom buildpacks
This commit corrects the order.toml file that is generated and added
to the builder when building an image using custom buildpacks with the
Maven or Gradle plugin in order to support buildpacks that depend on
detection as a group.

Fixes gh-25378
2021-02-23 13:56:57 -06:00
Stephane Nicoll 9c24ca06ae Polish 2021-02-23 12:46:04 +01:00
Stephane Nicoll d9dcfeba5c Polish "Add more customization options for InfluxDB"
See gh-25319
2021-02-23 11:35:15 +01:00
Eddú Meléndez 8be0b87273 Add more customization options for InfluxDB
This commit augments the configuration properties that are exposed for
InfluxDB, alongside an `InfluxDbCustomizer` that gives more control.

See gh-25319
2021-02-23 11:35:06 +01:00
Scott Frederick 89555a8745 Add bindings option for image building
This commit adds configuration to the Maven and Gradle plugins to
allow a list of volume mount bindings to be provided to the image
building goal and task. This enables service bindings to be mounted
in the builder image that are recognized by buildpacks to support
custom certificates, build tool configuration, APM integration, and
other buildpack features.

Fixes gh-23518
2021-02-22 16:51:24 -06:00
Stephane Nicoll 817a4c5397 Merge branch '2.4.x'
Closes gh-25386
2021-02-22 10:46:13 +01:00
Stephane Nicoll 7c5a5c6663 Merge branch '2.3.x' into 2.4.x
Closes gh-25385
2021-02-22 10:45:55 +01:00
Stephane Nicoll 77daae1480 Update copyright year of changed file
See gh-25382
2021-02-22 10:41:49 +01:00
Mustafa Ulu abc90db32f Fix wording error in build-info goal description
See gh-25382
2021-02-22 10:26:53 +01:00
Andy Wilkinson a14bf7a3b8 Deprecate support for Gradle's maven plugin
Closes gh-25267
2021-02-19 19:29:17 +00:00
Stephane Nicoll 808e58265f Merge branch '2.4.x'
Closes gh-25372
2021-02-19 12:50:08 +01:00
Stephane Nicoll 9e6302ee6a Merge branch '2.3.x' into 2.4.x
Closes gh-25371
2021-02-19 12:49:40 +01:00
Tommy Ludwig bd2a890899 Polish HTTP client metrics documentation wording
See gh-25353
2021-02-19 12:48:56 +01:00
Phillip Webb a1dc107144 Update copyright year of changed files 2021-02-18 16:23:56 -08:00
Phillip Webb 4ad149e1e7 Protect against bad paths and URLs
See gh-21722
2021-02-18 16:23:56 -08:00
Scott Frederick 88e9f1d28c Fix Maven buildpacks example in docs
See gh-21722
2021-02-18 18:22:36 -06:00
Scott Frederick e3e229cc3d Remove unused import
See gh-21722
2021-02-18 17:39:59 -06:00
Scott Frederick f54f784f80 Add buildpack option for image building
This commit adds configuration to the Maven and Gradle plugins to
allow a list of buildpacks to be provided to the image building
goal and task.

Fixes gh-21722
2021-02-18 17:28:25 -06:00
Stephane Nicoll 548ca63076 Merge branch '2.4.x'
Closes gh-25364
2021-02-18 14:08:23 +01:00
Stephane Nicoll 526474f3b8 Add username alias for Postgres's PGSimpleDataSource
Closes gh-25363
2021-02-18 14:07:05 +01:00
Andy Wilkinson 8ec14e2855 Upgrade to Spring Kafka 2.7.0-M2
Closes gh-25295
2021-02-18 12:15:26 +00:00
Andy Wilkinson 05f1231a87 Upgrade to Spring Integration 5.5.0-M2
Closes gh-25294
2021-02-18 12:14:52 +00:00
Andy Wilkinson 87d60938e2 Upgrade to Spring AMQP 2.3.5
Closes gh-25362
2021-02-18 12:13:42 +00:00
Andy Wilkinson 0f323c125b Upgrade to MongoDB 4.2.0-beta1
Closes gh-25361
2021-02-18 12:13:40 +00:00
Andy Wilkinson 5714f97b0f Upgrade to Lettuce 6.1.0.M1
Closes gh-25360
2021-02-18 12:13:39 +00:00