Scott Frederick
3ad5f1013a
Fix Maven image building with classifiers
...
Fixes gh-25736
2021-03-26 11:36:38 -05:00
Andy Wilkinson
af7e4e211c
Support all known endpoint types
...
Previously, the configuration metadata annotation processor only
declared support for `@Endpoint` and none of the other more
specialized `@…Endpoint` annotations that are meta-annotated with
`@Endpoint` such as `@WebEndpoint` and `@JmxEndpoint. This would
result in missing metadata if a full or incremental build only
compiled classes annotated with one of the more specialized
`@…Endpoint` annotations as the annotation processor would not be
called.
This commit updates the processor's supported annotation types to
include every known `@…Endpoint` annotation. The test processor has
also been similarly updated to align its behaviour with that of the
main processor.
Fixes gh-25388
2021-03-25 15:23:09 +00:00
Phillip Webb
35aeae5a4f
Deprecate Bootstrapper
...
Deprecate the `Bootstrapper` interface entirely and provide a
`BootstrapRegistryInitializer` alternative so that people can migrate.
Unfortunately our previous attempt to fix the typo in the `Bootstrapper`
interface didn't provide us a way to remove the deprecated method
without impacting users. It was also problematic for people who were
implementing `Bootstrapper` rather than using a lambda since they needed
to introduce the deprecated method.
We unfortunately can't see a way to fix the original typo without
introducing a new interface.
Fixes gh-25735
2021-03-24 14:10:12 -07:00
Phillip Webb
ddf5c9f5d1
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25786
2021-03-24 12:52:51 -07:00
Phillip Webb
88b74097ba
Polish 'Ignore quality value when removing MediaType.ALL'
...
See gh-25778
2021-03-24 12:35:56 -07:00
Fábio Ramon
3090a3a71f
Ignore quality value when removing MediaType.ALL
...
Update the default reactive exception handler so that `MediaType.ALL`
is removed regardless of any quality setting. Prior to this commit,
the "match-all" media type was not properly ignored if it has a quality
value and would show HTML content if the accept header was
`application/json, */*;q=0.9`.
See gh-25778
2021-03-24 12:35:32 -07:00
Phillip Webb
5274cf2459
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25784
2021-03-24 12:23:44 -07:00
Phillip Webb
130cc5b036
Chain caught InvalidEndpointRequestExceptions
...
Update `AbstractWebMvcEndpointHandlerMapping` to chain any caught
InvalidEndpointRequestExceptions so that a more complete stacktrace
is available. The exception has also been updated to a
`ResponseStatusException` so that the reason can be propagated.
Fixes gh-25642
2021-03-24 12:22:26 -07:00
Phillip Webb
ca9fae6b47
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25774
2021-03-23 17:07:44 -07:00
Phillip Webb
ec21202d54
Delete unpacked jars when the JVM exits
...
Update `JarFileArchive` so that any unpacked files are now deleted when
the JVM exits.
Closes gh-25773
2021-03-23 17:06:56 -07:00
Phillip Webb
05f61bccea
Align unpack logic with Files.createTempDirectory
...
Update `JarFileArchive` to align the way that it creates temp files and
folders with the way that `Files.createTempDirectory` works.
Closes gh-25772
2021-03-23 17:06:56 -07:00
Phillip Webb
b8873578ca
Add missing @Deprecated annotations
2021-03-23 17:06:53 -07:00
Phillip Webb
9af6c895c9
Merge branch '2.3.x' into 2.4.x
2021-03-23 13:09:25 -07:00
Phillip Webb
2b591387b8
Restore tomcat-embed TldPatterns
...
Restore tomcat-embed-core-* and tomcat-embed-logging-* patterns which
were inadvertently removed in commit 0ec8d281ef
.
See gh-25764
2021-03-23 13:07:15 -07:00
Phillip Webb
11a94ee6f0
Merge branch '2.3.x' into 2.4.x
2021-03-23 12:52:07 -07:00
Phillip Webb
82127fdaa3
Update copyright year of changed files
2021-03-23 12:50:49 -07:00
Phillip Webb
56674b9031
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25770
2021-03-23 12:48:51 -07:00
Phillip Webb
0ec8d281ef
Align TldPatterns with Tomcat default
...
Update `TldPatterns` to align with the latest default shipped by Tomcat.
This commit also introduces a test to ensure that we will remain aligned
going forwards.
Closes gh-25764
2021-03-23 12:46:27 -07:00
Andy Wilkinson
96ba9ae47f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25768
2021-03-23 14:48:24 +00:00
Andy Wilkinson
62023104de
Test auto-configured MockRestServiceServer with metrics and a root URI
...
Closes gh-25741
2021-03-23 14:37:37 +00:00
Andy Wilkinson
33cf8b3bc4
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25765
2021-03-23 13:06:35 +00:00
Andy Wilkinson
bf6f36a783
Apply any root URI to RestTemplate metric's URI tag
...
Previously, a root URI configured via RestTemplateBuilder's rootUri
method and RootUriTemplateHandler was not taken into account when
generated the URI tag for RestTemplate request metrics.
This commit updates MetricsClientHttpRequestInterceptor to be aware
of RootUriTemplateHandler and capture the URI template once the
root URI has been applied.
Fixes gh-25744
2021-03-23 13:05:54 +00:00
Stephane Nicoll
2ecae2df77
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25754
2021-03-22 14:44:48 +01:00
Stephane Nicoll
c2f452a87a
Polish "Take JPA database action into account when setting ddlAuto"
...
See gh-25129
2021-03-22 14:41:25 +01:00
bono007
674b01cb06
Take JPA database action into account when setting ddlAuto
...
See gh-25129
2021-03-22 13:53:28 +01:00
Scott Frederick
6f860b441b
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25700
2021-03-19 14:52:20 -05:00
Stephane Nicoll
072c858d0e
Upgrade to Spring Batch 4.3.2
...
Closes gh-25579
2021-03-18 08:28:36 +01:00
Stephane Nicoll
8e35d6a5fc
Upgrade to Spring Integration 5.4.5
...
Closes gh-25646
2021-03-18 07:55:06 +01:00
Scott Frederick
e4fa39df01
Fail fast when finalName is misconfigured
...
When the `finalName` parameter is incorrectly set in the Spring Boot
Maven plugin configuration instead of in the `build` configuration, the
repackaged and original archive files are not named as expected. Prior
to this commit, the image building goal would detect this error
condition and throw an exception late in the process of creating the
build container, leaving the container in an unstable state. This
commit changes the image building goal to detect this condition early,
before attempting to create the container.
Fixes gh-25590
2021-03-17 15:19:21 -05:00
Andy Wilkinson
0d7a60f8cf
Upgrade to Spring AMQP 2.3.6
...
Closes gh-25647
2021-03-17 18:27:16 +00:00
Andy Wilkinson
5005bd3ded
Upgrade to Spring Kafka 2.6.7
...
Closes gh-25578
2021-03-17 18:26:44 +00:00
Stephane Nicoll
6f9352bda9
Fix description of management.metrics.export.influx.db
...
Closes gh-25723
2021-03-17 15:09:37 +01:00
Stephane Nicoll
42994349fe
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25724
2021-03-17 15:08:32 +01:00
Stephane Nicoll
446e838b1b
Fix description of management.metrics.export.influx.db
...
Closes gh-25723
2021-03-17 15:07:02 +01:00
Stephane Nicoll
606c871d4a
Upgrade to Spring Data 2020.0.6
...
Closes gh-25547
2021-03-17 14:27:48 +01:00
Stephane Nicoll
052624ffb2
Upgrade to Lettuce 6.0.3.RELEASE
...
Closes gh-25720
2021-03-17 14:25:38 +01:00
Stephane Nicoll
a8667daf52
Upgrade to Kotlin Coroutines 1.4.3
...
Closes gh-25719
2021-03-17 14:25:36 +01:00
Andy Wilkinson
758a2ee7ca
Don't pass null exception translation result into jOOQ
...
Closes gh-25717
2021-03-17 12:25:50 +00:00
Andy Wilkinson
c815195f13
Polish
2021-03-17 12:25:13 +00:00
Andy Wilkinson
5595fd4017
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25715
2021-03-17 11:31:46 +00:00
Andy Wilkinson
0e0418546b
Test spring-boot:build-image when repackage is also invoked
...
Closes gh-25714
2021-03-17 11:19:29 +00:00
Andy Wilkinson
ed4e419b0c
Revert "Merge branch '2.3.x' into 2.4.x"
...
This reverts commit eaa510872a
, reversing
changes made to 3e69522e2d
.
See gh-25700
2021-03-17 11:13:58 +00:00
Andy Wilkinson
ae2ff7849b
Revert "Fail fast when finalName is misconfigured"
...
This reverts commit 263b7c20e4
.
See gh-25590
2021-03-17 11:11:24 +00:00
Scott Frederick
eaa510872a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25700
2021-03-16 17:31:32 -05:00
Scott Frederick
263b7c20e4
Fail fast when finalName is misconfigured
...
When the `finalName` parameter is incorrectly set in the Spring Boot
Maven plugin configuration instead of in the `build` configuration, the
repackaged and original archive files are not named as expected. Prior
to this commit, the image building goal would detect this error
condition and throw an exception late in the process of creating the
build container, leaving the container in an unstable state. This
commit changes the image building goal to detect this condition early,
before attempting to create the container.
Fixes gh-25590
2021-03-16 17:22:48 -05:00
Andy Wilkinson
3e69522e2d
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25702
2021-03-16 20:25:25 +00:00
Andy Wilkinson
f823bbb9b2
Upgrade to Spring Asciidoctor Extensions 0.5.1
...
Closes gh-25558
2021-03-16 20:24:45 +00:00
Andy Wilkinson
2560f261cd
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25692
2021-03-16 16:35:31 +00:00
Andy Wilkinson
a832cc9ccd
Polish "Improve error message when no resources exist at a script location"
...
See gh-25620
2021-03-16 16:20:11 +00:00
Yuta Saito
42841b895f
Improve error message when no resources exist at a script location
...
See gh-25620
2021-03-16 16:19:27 +00:00
Andy Wilkinson
226ee61dea
Create exception reporters when needed so they pick up current state
...
Fixes gh-25691
2021-03-16 16:13:40 +00:00
Andy Wilkinson
f9db1968bf
Upgrade to Micrometer 1.6.5
...
Closes gh-25543
2021-03-16 10:53:15 +00:00
Andy Wilkinson
af23da1dff
Upgrade to Spring HATEOAS 1.2.5
...
Closes gh-25545
2021-03-16 10:52:37 +00:00
Stephane Nicoll
e100291043
Upgrade to Spring Framework 5.3.5
...
Closes gh-25541
2021-03-16 10:37:41 +01:00
Stephane Nicoll
c8fbbe9eaa
Upgrade to Reactor 2020.0.5
...
Closes gh-25539
2021-03-16 08:27:25 +01:00
Stephane Nicoll
6b9032b4d3
Document that Java 16 is supported
...
Closes gh-25527
2021-03-15 16:08:56 +01:00
Stephane Nicoll
9aa1ce235f
Document DataSource implementations supported by DataSourceBuilder
...
Closes gh-25333
2021-03-15 14:25:22 +01:00
Stephane Nicoll
c66db586bf
Upgrade to Undertow 2.2.5.Final
...
Closes gh-25641
2021-03-15 09:22:18 +01:00
Stephane Nicoll
bf4ebcf6ea
Upgrade to Tomcat 9.0.44
...
Closes gh-25640
2021-03-15 09:22:16 +01:00
Stephane Nicoll
e0b54cb102
Upgrade to Sun Mail 1.6.6
...
Closes gh-25639
2021-03-15 09:22:15 +01:00
Stephane Nicoll
0c67a6ad2c
Upgrade to R2DBC Bom Arabba-SR9
...
Closes gh-25638
2021-03-15 09:22:14 +01:00
Stephane Nicoll
97e54fc48c
Upgrade to Postgresql 42.2.19
...
Closes gh-25637
2021-03-15 09:22:13 +01:00
Stephane Nicoll
3362dd0f09
Upgrade to OAuth2 OIDC SDK 8.36.1
...
Closes gh-25636
2021-03-15 09:22:12 +01:00
Stephane Nicoll
3d4b89a154
Upgrade to Netty 4.1.60.Final
...
Closes gh-25635
2021-03-15 09:22:11 +01:00
Stephane Nicoll
eafb15b22d
Upgrade to MongoDB 4.1.2
...
Closes gh-25634
2021-03-15 09:22:09 +01:00
Stephane Nicoll
88fbd24650
Upgrade to Maven Invoker Plugin 3.2.2
...
Closes gh-25633
2021-03-15 09:22:08 +01:00
Stephane Nicoll
b930710d48
Upgrade to jOOQ 3.14.8
...
Closes gh-25631
2021-03-15 09:22:05 +01:00
Stephane Nicoll
df49298cc6
Upgrade to Jetty Reactive HTTPClient 1.1.6
...
Closes gh-25630
2021-03-15 09:22:04 +01:00
Stephane Nicoll
af8b5974d9
Upgrade to Jakarta Mail 1.6.6
...
Closes gh-25629
2021-03-15 09:22:03 +01:00
Stephane Nicoll
c743569113
Upgrade to Infinispan 11.0.10.Final
...
Closes gh-25628
2021-03-15 09:22:01 +01:00
Stephane Nicoll
89b10d71e6
Upgrade to Hibernate 5.4.29.Final
...
Closes gh-25627
2021-03-15 09:22:00 +01:00
Stephane Nicoll
ce13db4d86
Upgrade to Ehcache3 3.9.2
...
Closes gh-25626
2021-03-15 09:21:59 +01:00
Stephane Nicoll
f276be74a9
Upgrade to Dropwizard Metrics 4.1.18
...
Closes gh-25625
2021-03-15 09:21:58 +01:00
Stephane Nicoll
ace3376a0b
Upgrade to Byte Buddy 1.10.22
...
Closes gh-25624
2021-03-15 09:21:57 +01:00
Stephane Nicoll
947d81e03f
Upgrade to AppEngine SDK 1.9.87
...
Closes gh-25623
2021-03-15 09:21:56 +01:00
Stephane Nicoll
5535453555
Start building against Spring Batch 4.3.2 snapshots
...
See gh-25579
2021-03-14 08:26:33 +01:00
Stephane Nicoll
f63dcec60d
Start building against Spring Kafka 2.6.7 snapshots
...
See gh-25578
2021-03-14 08:26:33 +01:00
Stephane Nicoll
759e543337
Start building against Micrometer 1.6.5 snapshots
...
See gh-25543
2021-03-14 08:26:28 +01:00
izeye
09f4d4b9bf
Polish
...
See gh-25617
2021-03-13 18:08:54 +01:00
Madhura Bhave
11649bc1f0
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25614
2021-03-12 14:02:34 -08:00
Madhura Bhave
df1d1dbaa9
Fallback to BeanPropertyBindingResult for unbound property validation
...
gh-17424 updated `ValidationBindHandler` so that it would
only look at bound values when validating. This commit updates
`ValidationBindHandler` to use Spring Framework's `BeanPropertyBindingResult`.
This means that for fields that are not bound, JavaBean accessor methods can
be used to get the value to validate.
Fixes gh-25356
2021-03-12 13:56:54 -08:00
Andy Wilkinson
24d729ee3b
Close ClassLoader so jar it references can be deleted on Windows
...
Polishes 952ac7b8
2021-03-11 15:44:52 +00:00
Andy Wilkinson
c43ae0b2d3
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25603
2021-03-11 11:12:54 +00:00
maruoovv
b401be1589
Correct javadoc for ON_PARAM
...
See gh-25480
2021-03-11 11:12:04 +00:00
Johnny Lim
90666faf6d
Add Javadoc since tag to Bootstrapper.initialize()
...
See gh-25596
2021-03-11 09:34:57 +00:00
Andy Wilkinson
952ac7b8d2
Don't use RestartClassLoader when proxying classes it did not load
...
Fixes gh-19010
Fixes gh-25367
2021-03-10 17:12:38 +00:00
Stephane Nicoll
6840440220
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25573
2021-03-10 15:15:21 +01:00
Stephane Nicoll
f38e863fbc
Properly subscribe to CloseableConnectionFactory#close
...
Closes gh-25565
2021-03-10 15:03:27 +01:00
Stephane Nicoll
d5b1fd5b31
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25569
2021-03-10 13:24:32 +01:00
Stephane Nicoll
c8101f8c9b
Remove host name in R2DBC's embedded H2 url
...
Closes gh-25560
2021-03-10 13:24:08 +01:00
Stephane Nicoll
cad9fa2fc0
Start building against Spring Data 2020.0.6 snapshots
...
See gh-25547
2021-03-10 08:07:44 +01:00
Stephane Nicoll
924bb53c69
Start building against Spring HATEOAS 1.2.5 snapshots
...
See gh-25545
2021-03-10 08:07:17 +01:00
Stephane Nicoll
d2733b26b6
Start building against Spring Framework 5.3.5 snapshots
...
See gh-25541
2021-03-10 08:06:44 +01:00
Stephane Nicoll
0985845c3b
Start building against Reactor 2020.0.5 snapshots
...
See gh-25539
2021-03-10 08:06:06 +01:00
Andy Wilkinson
9be36f3a72
Merge branch '2.3.x' into 2.4.x
2021-03-09 11:11:46 +00:00
Andy Wilkinson
3e9341fbb4
Start using Spring Asciidoctor 0.5.1 snapshots
...
See gh-25558
2021-03-09 10:59:26 +00:00
Andy Wilkinson
dace7bb742
Merge branch '2.3.x' into 2.4.x
2021-03-09 09:25:45 +00:00
Andy Wilkinson
b76a9951e9
Polish RSocketServerAutoConfiguration
2021-03-09 09:25:34 +00:00
Andy Wilkinson
ba5c57c1b2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25555
2021-03-09 09:21:38 +00:00
Andy Wilkinson
84637acbdc
Make embedded RSocket server back off without spring-web
...
Fixes gh-25551
2021-03-09 08:53:25 +00:00
dreis2211
b85a50b7b6
Suppress rawtypes warning
...
See gh-25531
2021-03-08 08:47:16 +01:00
dreis2211
2575621e06
Fix some illegal reflective access warnings
...
See gh-25531
2021-03-08 08:47:10 +01:00
Andy Wilkinson
3c84ea9350
Try to stabilize tests that use Neo4jContainer
...
Closes gh-25520
2021-03-05 15:36:45 +00:00
Andy Wilkinson
f9ef05f71e
Polish "Add Bootstrapper initialize method to fix typo"
...
See gh-25400
2021-03-05 15:06:51 +00:00
cprayer
bee6f41393
Add Bootstrapper initialize method to fix typo
...
See gh-25400
2021-03-05 15:06:50 +00:00
Stephane Nicoll
ddf75f095c
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25515
2021-03-05 15:47:36 +01:00
Stephane Nicoll
6ebc69d704
Polish "Include properties in source merge algorithm"
...
See gh-25507
2021-03-05 15:47:09 +01:00
Bertrand Renuart
cf4bc6e9e0
Include properties in source merge algorithm
...
This commit improves SimpleConfigurationMetadataRepository to include
properties that are contributed to an existing configuration metadata
source.
See gh-25507
2021-03-05 15:47:09 +01:00
Andy Wilkinson
2f95c1e2c8
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25513
2021-03-05 14:16:07 +00:00
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
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
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
dreis2211
89a44f3da4
Fix some assertions
...
See gh-25499
2021-03-05 09:56:55 +01: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
cfac223cff
Document configtree support for Docker secrets
...
Closes gh-25095
2021-03-04 13:02:28 -08: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
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
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
afb60d6161
Add tests for Gradle examples used in plugin docs
...
Fixes gh-25468
2021-03-01 15:22:15 -06: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
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
dd2dc22085
Upgrade to Jetty 9.4.38.v20210224
...
Closes gh-25460
2021-03-01 09:20:33 +01: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
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
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
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
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
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
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