root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity
28,398 Commits 23 Branches 348 Tags 288 MiB
Commit Graph

10538 Commits

Author SHA1 Message Date
Stephane Nicoll 6b679b7d64 Polish 
See gh-22945
 2020-08-17 13:24:51 +02:00
Phillip Webb 4df618a2b1 Merge branch '2.3.x' 
Closes gh-22967
 2020-08-14 17:12:53 -07:00
Phillip Webb f75e988450 Merge branch '2.2.x' into 2.3.x 
Closes gh-22966
 2020-08-14 17:12:41 -07:00
Phillip Webb 3271542d98 Add @Interited to @TypeExcludeFilters 
Update `@TypeExcludeFilters` so that it is also annotated with
`@Inherited`.

Closes gh-22939
 2020-08-14 17:12:31 -07:00
Phillip Webb 7a85373fea Merge branch '2.3.x' 
Closes gh-22965
 2020-08-14 17:09:13 -07:00
Phillip Webb 1675b47637 Merge branch '2.2.x' into 2.3.x 
Closes gh-22964
 2020-08-14 17:08:48 -07:00
Phillip Webb 89a6f83344 Fix and improve SpringApplicationBuilder javadoc 
Update SpringApplicationBuilder.properties method javadoc to fix
inaccuracies and apply more consistency.

Closes gh-22962
 2020-08-14 17:06:39 -07:00
Phillip Webb 3e939cbabd Polish method order 2020-08-14 17:02:13 -07:00
Phillip Webb 5591a6ab77 Merge branch '2.3.x' 
Closes gh-22961
 2020-08-14 15:11:47 -07:00
Phillip Webb 03d4b89c06 Merge branch '2.2.x' into 2.3.x 
Closes gh-22960
 2020-08-14 15:11:23 -07:00
Maciej Walkowiak 15de956566 Fix typo `Assert4J` -> `AssertJ` 
See gh-22948
 2020-08-14 15:09:56 -07:00
Madhura Bhave bbbbe8e4d2 Make security auto-configs back off when SecurityFilterChain present 
Closes gh-22739
 2020-08-14 12:24:25 -07:00
Andy Wilkinson c9b8a05321 Merge branch '2.3.x' 2020-08-14 15:41:20 +01:00
Andy Wilkinson 3e35fd480f Wait longer for server port and improve diagnostics on timeout 
See gh-22909
 2020-08-14 15:34:41 +01:00
Phillip Webb 310ef6e999 Rename volumemount -> configtree 
Closes gh-22941
 2020-08-13 13:28:25 -07:00
Phillip Webb 5579f9d1c4 Polish 2020-08-13 11:53:36 -07:00
Scott Frederick 2a998a4373 Fix DataNeo4jTestReactiveIntegrationTests 
See gh-22940
 2020-08-13 13:45:04 -05:00
Stephane Nicoll 045d2f678d Document Spring Data Neo4j 6 support 
Closes gh-22652
 2020-08-13 17:51:39 +02:00
Stephane Nicoll d4ba55f8d6 Do not configure a ReactiveNeo4jTransactionManager 
The current arrangement with Neo4j does not allow us to know for sure
that the user intends to use `@Transactional` for reactive or imperative
operations.

The main reason for that is that the only trigger for the reactive
auto-configuration is the presence of reactor on the classpath given
that the Neo4j driver ships with both styles in the same jar. And
reactor can be on the classpath for a number of reasons that are
unrelated to imperative access (typically `WebClient`).

This commits removes the auto-configuration of the
ReactiveNeo4jAutoConfiguration and makes sure that if the user defines
one, the regular `PlatformTransactionManager` backs off. This is
a temporarily situation until we can provide a better signal that the
user intends to primarily use imperative repositories.

Closes gh-22940
 2020-08-13 16:57:51 +02:00
Andy Wilkinson 4398c71d12 Merge branch '2.3.x' 
Closes gh-22938
 2020-08-13 13:32:27 +01:00
Andy Wilkinson 8c4e6f766c Revert "Merge pull request #21060 from dsyer" 
This reverts commit 6547ea56f9, reversing
changes made to e9e4a34e62.

Fixes gh-22039
 2020-08-13 13:31:45 +01:00
Andy Wilkinson 1c8392e980 Upgrade to Selenium HtmlUnit 2.43.1 
Closes gh-22937
 2020-08-13 12:04:42 +01:00
Andy Wilkinson 7310b7dbcd Upgrade to Micrometer 1.5.4 
Closes gh-22936
 2020-08-13 12:04:40 +01:00
Andy Wilkinson 1c930396b4 Upgrade to Flyway 6.5.4 
Closes gh-22935
 2020-08-13 12:04:39 +01:00
Stephane Nicoll 2f5145b6a1 Upgrade to Micrometer 1.5.4 
Closes gh-22932
 2020-08-13 13:04:03 +02:00
Andy Wilkinson a087d706d0 Upgrade to Spring Batch 4.3.0-M2 
Closes gh-22892
 2020-08-13 12:03:07 +01:00
Stephane Nicoll 42ca62b2e7 Merge branch '2.3.x' 
Closes gh-22931
 2020-08-13 11:49:03 +02:00
Stephane Nicoll df78105a3c Merge branch '2.2.x' into 2.3.x 
Closes gh-22930
 2020-08-13 11:48:43 +02:00
Stephane Nicoll f61a632a37 Polish "Fix conditions that lead to auto-configure PushGateway" 
See gh-22919
 2020-08-13 11:47:43 +02:00
smlc c355b95f6c Fix conditions that lead to auto-configure PushGateway 
See gh-22919
 2020-08-13 11:41:49 +02:00
Stephane Nicoll 947e484001 Merge branch '2.3.x' 
Closes gh-22928
 2020-08-13 09:44:26 +02:00
Stephane Nicoll d0662e824a Fix default value of server.jetty.accesslog.format 
Closes gh-22921
 2020-08-13 09:43:37 +02:00
Scott Frederick 7c7079f91a Merge branch '2.3.x' 2020-08-12 17:44:52 -05:00
Scott Frederick 4c6a722f18 Fix test for Java version in image building docs 
See gh-22916
 2020-08-12 17:43:37 -05:00
Scott Frederick 092bbd198e Merge branch '2.3.x' 
Closes gh-22923
 2020-08-12 17:04:54 -05:00
Scott Frederick 005ed8b8db Use Java version wildcard in image building docs 
Fixes gh-22916
 2020-08-12 17:04:17 -05:00
Scott Frederick 6b15822cb1 Polish "Add pullPolicy option for image building" 
See gh-22736
 2020-08-12 15:16:38 -05:00
anshlykov c7449b57ce Add pullPolicy option for image building 
This commit adds a pullPolicy option to the configuration of the Maven
plugin spring-boot:build-image goal and the Gradle plugin bootBuildImage
task. The new option gives users control over pulling the builder image
and run image from a remote image registry to the local Docker daemon.

See gh-22736
 2020-08-12 15:16:38 -05:00
Andy Wilkinson b35cfb7fb7 Upgrade to Spring Integration 5.4.0-M2 
Closes gh-22729
 2020-08-12 20:17:50 +01:00
Andy Wilkinson c59b48b690 Upgrade to Spring Kafka 2.5.5.RELEASE 
Closes gh-22843
 2020-08-12 19:19:57 +01:00
Andy Wilkinson ce729b7188 Upgrade to Spring AMQP 2.2.10.RELEASE 
Closes gh-22842
 2020-08-12 19:19:18 +01:00
Andy Wilkinson 2de48ac6ee Upgrade to Spring Kafka 2.6.0-M1 
Closes gh-22730
 2020-08-12 19:17:14 +01:00
dreis2211 c00d5c5643 Introduce @ForkedClassPath for testing unmodified class path 
See gh-22710
 2020-08-12 17:21:31 +01:00
Andy Wilkinson 0158213b3f Upgrade to Spring AMQP 2.3.0-M2 
Closes gh-22761
 2020-08-12 17:20:33 +01:00
Andy Wilkinson fff9193860 Merge branch '2.3.x' 
Closes gh-22917
 2020-08-12 17:06:30 +01:00
Andy Wilkinson f43a0b4891 Fix configuration of environment in Kotlin bootBuildImage examples 
Fixes gh-22913
 2020-08-12 17:06:16 +01:00
Phillip Webb bc3f028a1f Fix spring.config.activate.on-profile metadata 
Fix the `spring.config.activate.on-profile` entry which was accidentally
entered as `spring.config.import.on-profile`.

See gh-22497
 2020-08-12 07:13:11 -07:00
Stephane Nicoll 5e5c1fb4d0 Upgrade to Spring Data Neumann SR3 
Closes gh-22844
 2020-08-12 15:42:54 +02:00
Andy Wilkinson 147b048a07 Merge branch '2.3.x' 
See gh-22909
 2020-08-12 13:24:50 +01:00
Andy Wilkinson 2b1bb2f18f Improve diagnostics when remote application does not start as expected 
See gh-22909
 2020-08-12 13:24:17 +01:00
Andy Wilkinson 0d8719adb7 Merge branch '2.3.x' 
Closes gh-22911
 2020-08-12 13:14:33 +01:00
Andy Wilkinson 65ccb514d0 Merge branch '2.2.x' into 2.3.x 
Closes gh-22910
 2020-08-12 13:14:15 +01:00
Johnny Lim 68e2dd626d Mention configuration customizers for WebTestClient and RestAssured 
See gh-22765
 2020-08-12 13:13:11 +01:00
Stephane Nicoll 25e08d2dee Restore handling of certain spring.data.neo4j.* properties 
This commit switches the deprecation level of several properties in the
spring.data.neo4j namespace from error and warning. The server URI and
basic authentication can be used in a deprecated fashion to configure
the new neo4j driver.

Closes gh-22653
 2020-08-12 14:07:44 +02:00
Andy Wilkinson 9a2d2effa5 Merge branch '2.3.x' 
Closes gh-22907
 2020-08-12 12:24:38 +01:00
Andy Wilkinson 1381929525 Upgrade to Gradle 6.6 
Closes gh-22905
 2020-08-12 12:24:08 +01:00
Andy Wilkinson 520cfa4638 Merge branch '2.3.x' 
Closes gh-22904
 2020-08-12 11:40:48 +01:00
Andy Wilkinson 0841eab877 Simplify build.gradle for spring-boot-starter-data-solr 
Closes gh-22903
 2020-08-12 11:40:21 +01:00
Stephane Nicoll 8409df5540 Upgrade to Spring Data 2020.0.0-M2 
Closes gh-22647
 2020-08-12 12:15:23 +02:00
Stephane Nicoll 14eb041086 Polish "Add basic auth support for Prometheus pushgateway" 
See gh-22548
 2020-08-12 10:27:07 +02:00
AndrewDi 9ddc97f815 Add basic auth support for Prometheus pushgateway 
See gh-22548
 2020-08-12 09:54:08 +02:00
Stephane Nicoll 2c120eb161 Merge branch '2.3.x' 
Closes gh-22900
 2020-08-12 09:51:44 +02:00
Stephane Nicoll 38baaf31d3 Merge branch '2.2.x' into 2.3.x 
Closes gh-22899
 2020-08-12 09:51:25 +02:00
Stephane Nicoll ee2363fca7 Polish "Harmonize Discover the HTTP Port at Runtime How-To" 
See gh-22898
 2020-08-12 09:50:44 +02:00
John Franco 303768b2b5 Harmonize Discover the HTTP Port at Runtime How-To 
See gh-22898
 2020-08-12 09:48:57 +02:00
Phillip Webb 7838c7b072 Polish 'Support ConfigurationClassPostProcessor supplier' 
See gh-22858
 2020-08-11 12:31:02 -07:00
Dave Syer 06eff45a71 Support ConfigurationClassPostProcessor supplier 
Update `SharedMetadataReaderFactoryContextInitializer` to optionally
support a `ConfigurationClassPostProcessor` provided via an instance
`Supplier`.

If the instance supplier is available then we can use that to set the
`MetadataReaderFactory` non-reflectively, instead of using a
`PropertyValue` (and the `BeanWrapper` eventually).

The previous behavior is left as a  fallback and without a change in
Spring Framework will continue to be the default for most applications.

See gh-22858
 2020-08-11 12:31:02 -07:00
Madhura Bhave 4799b26d2c Merge branch '2.3.x' 
Closes gh-22897
 2020-08-11 12:25:48 -07:00
Madhura Bhave eeca767c49 Merge branch '2.2.x' into 2.3.x 
Closes gh-22895
 2020-08-11 12:22:43 -07:00
Madhura Bhave cdbb7f441a Do not ignore null/empty values from SPRING_APPLICATION_JSON 
Fixes gh-21542
 2020-08-11 12:22:08 -07:00
Phillip Webb a062b51efb Polish 'Allow step action to be optional' 
See gh-22845
 2020-08-11 10:57:03 -07:00
Marten Deinum 0e5be0ab62 Allow step action to be optional 
Update `SpringApplicationRunListeners` so that the step action
is optional and does not need to call `end()`.

This commit also introduces a test for the failure case showing
that there is a missed call to end with the initial solution.

See gh-22845
 2020-08-11 10:54:00 -07:00
Andy Wilkinson ac357283a6 Upgrade to Spring HATEOAS 1.2.0-M1 
Closes gh-22893
 2020-08-11 16:28:16 +01:00
Andy Wilkinson e358144b2e Polish "Exclude cookie headers by default from HTTP traces" 
See gh-22829
 2020-08-11 15:58:55 +01:00
Emily Tsanova 5ff515727d Exclude cookie headers by default from HTTP traces 
See gh-22829
 2020-08-11 15:58:55 +01:00
Stephane Nicoll 8bcf5186dc Merge branch '2.3.x' 
Closes gh-22891
 2020-08-11 16:51:58 +02:00
Stephane Nicoll 92445fcc54 Merge branch '2.2.x' into 2.3.x 
Closes gh-22890
 2020-08-11 16:51:34 +02:00
Stephane Nicoll ccffd50285 Document the limitation of default value detection 
Closes gh-22685
 2020-08-11 16:51:00 +02:00
Stephane Nicoll 64a5aa9340 Polish 2020-08-11 16:41:47 +02:00
Stephane Nicoll 44e807738b Merge branch '2.3.x' 
Closes gh-22889
 2020-08-11 15:54:03 +02:00
Stephane Nicoll ac7320d7fe Document that Cassandra's application.conf is not considered 
Closes gh-21787
 2020-08-11 15:53:06 +02:00
Andy Wilkinson 5e04e1f4a3 Merge branch '2.3.x' 
Closes gh-22888
 2020-08-11 14:34:27 +01:00
Andy Wilkinson 1896566bc8 Avoid duplicates with different versions in Devtools' int test deps 
Closes gh-22887
 2020-08-11 14:33:27 +01:00
Andy Wilkinson b54ef4c4ab Upgrade to Versions Maven Plugin 2.8.1 
Closes gh-22884
 2020-08-11 12:53:29 +01:00
Andy Wilkinson 7f143af6a2 Upgrade to Selenium HtmlUnit 2.43.0 
Closes gh-22883
 2020-08-11 12:53:27 +01:00
Andy Wilkinson 23f5bec312 Upgrade to Pooled JMS 1.1.2 
Closes gh-22882
 2020-08-11 12:53:26 +01:00
Andy Wilkinson 5bfc14b3bd Upgrade to Maven Resources Plugin 3.2.0 
Closes gh-22881
 2020-08-11 12:53:24 +01:00
Andy Wilkinson 76901bbb0c Upgrade to Lettuce 5.3.3.RELEASE 
Closes gh-22880
 2020-08-11 12:53:23 +01:00
Andy Wilkinson 59c0a16833 Upgrade to Kotlin Coroutines 1.3.8 
Closes gh-22879
 2020-08-11 12:53:21 +01:00
Andy Wilkinson e51d2734dd Upgrade to HtmlUnit 2.43.0 
Closes gh-22878
 2020-08-11 12:53:20 +01:00
Andy Wilkinson 28aac6cda5 Upgrade to Hibernate 5.4.20.Final 
Closes gh-22877
 2020-08-11 12:53:18 +01:00
Andy Wilkinson 92bc60fd87 Upgrade to Dropwizard Metrics 4.1.12.1 
Closes gh-22876
 2020-08-11 12:53:17 +01:00
Andy Wilkinson 62845b5a8d Upgrade to Dependency Management Plugin 1.0.10.RELEASE 
Closes gh-22875
 2020-08-11 12:53:16 +01:00
Andy Wilkinson 289797b5d4 Upgrade to Spring Security 5.3.4.RELEASE 
Closes gh-22873
 2020-08-11 12:50:16 +01:00
Andy Wilkinson 4f79f39b31 Upgrade to Spring HATEOAS 1.1.1.RELEASE 
Closes gh-22872
 2020-08-11 12:50:16 +01:00
Andy Wilkinson 33ece49921 Upgrade to RSocket 1.0.2 
Closes gh-22871
 2020-08-11 12:50:16 +01:00
Andy Wilkinson ad109c10d3 Upgrade to Pooled JMS 1.1.2 
Closes gh-22870
 2020-08-11 12:50:16 +01:00
Andy Wilkinson 006d960044 Upgrade to Lettuce 5.3.3.RELEASE 
Closes gh-22869
 2020-08-11 12:50:15 +01:00
Andy Wilkinson abf6123bae Upgrade to Kafka 2.5.1 
Closes gh-22868
 2020-08-11 12:50:15 +01:00
Andy Wilkinson e8307178c3 Upgrade to jOOQ 3.13.4 
Closes gh-22867
 2020-08-11 12:50:15 +01:00
Andy Wilkinson 6b843d3066 Upgrade to Jetty 9.4.31.v20200723 
Closes gh-22866
 2020-08-11 12:50:15 +01:00
Andy Wilkinson c89bc5120e Upgrade to Jackson Bom 2.11.2 
Closes gh-22865
 2020-08-11 12:50:15 +01:00
Andy Wilkinson 7a0af85b6e Upgrade to Hibernate 5.4.20.Final 
Closes gh-22864
 2020-08-11 12:50:15 +01:00
Andy Wilkinson 38891f7594 Upgrade to Dropwizard Metrics 4.1.12.1 
Closes gh-22863
 2020-08-11 12:50:14 +01:00
Andy Wilkinson 977f33ad80 Upgrade to Dependency Management Plugin 1.0.10.RELEASE 
Closes gh-22862
 2020-08-11 12:50:14 +01:00
Andy Wilkinson 8af4246db5 Upgrade to Couchbase Client 3.0.7 
Closes gh-22861
 2020-08-11 12:50:14 +01:00
Andy Wilkinson 6cb7eb926e Upgrade to Commons Pool2 2.8.1 
Closes gh-22860
 2020-08-11 12:50:14 +01:00
Andy Wilkinson d16aa3f377 Upgrade to Byte Buddy 1.10.14 
Closes gh-22859
 2020-08-11 12:50:14 +01:00
Stephane Nicoll 5bd69fcd61 Merge branch '2.3.x' 
Closes gh-22874
 2020-08-11 13:40:21 +02:00
Stephane Nicoll dc4de06b35 Restore customization of the Couchbase cache manager 
With the upgrade to the new Couchbase SDK and the related changes in
Spring Data Couchbase, CacheManagerCustomizer can no longer be used to
customize the Couchbase cache manager as it is an immutable class.

This commit introduces a dedicated callback for the
CouchbaseCacheManagerBuilder that is used by the auto-configuration and
update the documentation to refer to it with a sample usage.

Closes gh-22573
 2020-08-11 13:32:17 +02:00
Andy Wilkinson b2c0c958c9 Upgrade to Dependency Management Plugin 1.0.10.RELEASE 
Closes gh-22615
 2020-08-11 12:14:24 +01:00
Andy Wilkinson ca93c8da94 Merge branch '2.3.x' 
Closes gh-22856
 2020-08-11 10:29:20 +01:00
Stephane Nicoll 91934b5e5a Upgrade to Spring Framework 5.3.0-M2 
Closes gh-22640
 2020-08-11 11:10:50 +02:00
Andy Wilkinson 1270af90c2 Only enable full path optimization when there's one DispatcherServlet 
Previously, UrlPathHelper's full path optimization was enabled when
there was a dispatcher servlet mapped to /. The UrlPathHelper is used
across Spring MVC and if there are multiple dispatcher servlets they
all share the sample UrlPathHelper. This meant that any additional
dispatcher servlets mapping to locations other than / would not be able
to map requests correctly as the UrlPathHelper would use the full path,
ignoring the url mapping of the dispatcher servlet.

This commit updates the MVC auto-configuration so that use of the full
path is only enabled if there's a single dispatcher servlet
registration.

Fixes gh-22682
 2020-08-11 09:59:06 +01:00
Stephane Nicoll 5a96f7d682 Upgrade to RSocket 1.1.0-M1 
Closes gh-22751
 2020-08-11 09:23:32 +02:00
Stephane Nicoll 72189eed3d Upgrade to Reactor 2020.0.0-M2 
Closes gh-22667
 2020-08-11 09:23:01 +02:00
Andy Wilkinson 969dd35e45 Upgrade to Mockito 3.4.6 
Closes gh-22838
 2020-08-10 15:22:03 +01:00
Stephane Nicoll f2a52a87ec Merge branch '2.3.x' 
Closes gh-22850
 2020-08-10 16:05:47 +02:00
Stephane Nicoll 980ddcffd0 Merge branch '2.2.x' into 2.3.x 
Closes gh-22849
 2020-08-10 16:05:13 +02:00
Stephane Nicoll dd9c9fd171 Polish "Migrate legacy endpoint that have a dash in their id" 
See gh-21615
 2020-08-10 14:53:18 +02:00
Gabriele Bianchet-David 0f9f10f97e Migrate legacy endpoint that have a dash in their id 
See gh-21615
 2020-08-10 14:42:46 +02:00
dreis2211 11df8216ad Fix some doc anchors 
See gh-22839
 2020-08-10 14:34:22 +02:00
Stephane Nicoll fcab5d6ce1 Merge branch '2.3.x' 2020-08-10 14:33:50 +02:00
Stephane Nicoll 2b578296f9 Merge branch '2.2.x' into 2.3.x 2020-08-10 14:33:37 +02:00
Stephane Nicoll 8962d6ca21 Polish 2020-08-10 14:31:16 +02:00
Stephane Nicoll dedf09d20f Merge branch '2.3.x' 
Closes gh-22848
 2020-08-10 14:23:56 +02:00
Stephane Nicoll f466734801 Merge branch '2.2.x' into 2.3.x 
Closes gh-22847
 2020-08-10 14:23:31 +02:00
Stephane Nicoll 333af3d4e7 Polish "Propagate the cause that led Reactor"s debug agent to fail" 
See gh-22777
 2020-08-10 14:21:44 +02:00
davidbilge 12c419054a Propagate the cause that led Reactor"s debug agent to fail 
Prior to this commit, DebugAgentEnvironmentPostProcessor throws a
RuntimeException with a generic error message if its initialization
fails. The causing exception is discarded, which makes error analysis
unnecessarily difficult.

This commit attaches the cause to the newly thrown RuntimeException.

See gh-22777
 2020-08-10 14:21:26 +02:00
Stephane Nicoll b2e581947f Upgrade to Reactor Dysprosium-SR11 
Closes gh-22841
 2020-08-10 14:13:07 +02:00
Stephane Nicoll 13260eab46 Merge branch '2.3.x' 
Closes gh-22846
 2020-08-10 14:08:38 +02:00
ksmilek 5cb1b41355 Fix wrong reference in `ReadinessStateHealthIndicator` javadoc 
See gh-22760
 2020-08-10 14:03:46 +02:00
Stephane Nicoll dea2cc480d Start building against Spring Data Neumann SR3 snapshots 
See gh-22844
 2020-08-10 10:49:06 +02:00
Stephane Nicoll 1fdc6017ae Start building against Spring Kafka 2.5.5 snapshots 
See gh-22843
 2020-08-10 10:48:31 +02:00
Stephane Nicoll 4d95fb560b Start building against Spring AMQP 2.2.10 snapshotsEnabled 
See gh-22842
 2020-08-10 10:47:50 +02:00
Stephane Nicoll 2a3d45e5c4 Start building against Reactor Dysprosium-SR11 snapshots 
See gh-22841
 2020-08-10 10:47:04 +02:00
Andy Wilkinson 4933b2688f Align with changes in latest Integration snapshots 
See gh-22729
 2020-08-07 20:11:01 +01:00
Brian Clozel 7e159c346e Adapt to MonoProcessor deprecations in Reactor 
This commit updates our usage of `MonoProcessor` after the deprecations
introduced in reactor/reactor-core#1053
 2020-08-07 19:03:53 +02:00
Brian Clozel 9343266c4f End StartupSteps only once in SpringApplicationRunListeners 
Fixes gh-22776
 2020-08-07 19:03:53 +02:00
Andy Wilkinson e240c180f3 Merge branch '2.3.x' 
Closes gh-22831
 2020-08-07 17:19:03 +01:00
Andy Wilkinson 181e3b34ba Isolate Maven Plugin's integration tests from repo.spring.io 
Previously, the Maven plugin integration tests used a settings.xml file
that defined https://repo.spring.io/snapshot as a repository. This
allowed them to resolve snapshots of the plugin's Spring Framework
dependencies but it had the unfortunate side-effect of also allowing
them to resolve snapshots of other Spring Boot modules from Artifactory
rather than using those currently being built.

This commit replaces the repositories in settings.xml with a Gradle
task that resolves the necessary dependencies and populates a local
repository with the dependencies' jars and pom files. This is achieved
using a ComponentMetadataRule that creates a custom variant of each
dependency that includes its pom file, inspired by the example in
gradle/gradle/#11449. A configuration that extends the
runtimeClasspath configuration and select the custom variant via its
attribute is then used to resolve the jars and pom files of the runtime
classpath such that they can then be used to populate the local
repository.

Closes gh-22828
 2020-08-07 17:18:47 +01:00
Brian Clozel 6336007038 Merge branch '2.3.x' 
Closes gh-22826
 2020-08-07 16:01:25 +02:00
Brian Clozel fea535d176 Update HTTP/2 auto-configuration for Jetty 
Prior to this commit, the HTTP/2 server auto-configuration for Jetty
would require Conscrypt as a hard dependency.

This commit updates the auto-configuration for more flexibility and now
allows the following deployments:

* JDK9+ with the JDK ALPN implementation
* JDK8u252+ with the backported ALPN implementation
* Conscrypt with no JDK requirement

The auto-configuration now improves detection and guides developers in
case there is a missing `jetty-alpn-*-server` dependency.

The reference docs in the HOWTO section has been updated accordingly.

Closes gh-22188
 2020-08-07 15:42:23 +02:00
Andy Wilkinson 0ffe51bb62 Merge branch '2.3.x' 
Closes gh-22820
 2020-08-07 11:31:03 +01:00
Andy Wilkinson be32843dab Configure generated snippets as inputs to the Asciidoctor tasks 
Closes gh-22819
 2020-08-07 11:28:58 +01:00
Andy Wilkinson cd05716194 Upgrade to Tomcat 9.0.37 
Closes gh-22818
 2020-08-07 09:58:38 +01:00
Andy Wilkinson ac9a269e77 Upgrade to SQLite JDBC 3.32.3.2 
Closes gh-22817
 2020-08-07 09:58:37 +01:00
Andy Wilkinson d3b8c3fc6c Upgrade to Spring HATEOAS 1.1.1.RELEASE 
Closes gh-22816
 2020-08-07 09:58:35 +01:00
Andy Wilkinson 312d94ef0c Upgrade to Solr 8.5.2 
Closes gh-22815
 2020-08-07 09:58:34 +01:00
Andy Wilkinson 47c22fdbee Upgrade to SendGrid 4.6.3 
Closes gh-22814
 2020-08-07 09:58:33 +01:00