9d2d6d5812
Merge branch '2.1.x'
2018-12-20 15:30:51 +00:00
9a33d1a2f9
Merge branch '2.0.x' into 2.1.x
2018-12-20 15:30:42 +00:00
8c68da0882
Avoid blocking on a Mono indefinitely
...
Closes gh-15535
2018-12-20 15:24:53 +00:00
d8b487f127
Merge branch '2.1.x'
2018-12-20 11:52:03 +00:00
84a064a7dc
Merge branch '2.0.x' into 2.1.x
2018-12-20 11:51:53 +00:00
6403ec6e1b
Revert "Upgrade to Netty 4.1.32.Final"
...
This reverts commit f9ce6c9dc2
2018-12-20 11:49:33 +00:00
f3794d66e4
Merge branch '2.1.x'
2018-12-20 10:49:39 +00:00
f89682eae7
Add dependency management for xmlunit-assertj and xmlunit-placeholders
...
Closes gh-15532
2018-12-20 10:49:04 +00:00
b36bb78575
Merge branch '2.1.x'
2018-12-20 10:44:09 +00:00
974c4bfdb3
Polish
2018-12-20 10:44:01 +00:00
8cd387aea9
Merge branch '2.1.x'
2018-12-20 10:23:20 +00:00
cedcf157ab
Start building against Spring Session Bean-SR2 snapshots
...
See gh-15531
2018-12-20 10:22:44 +00:00
0a1add7116
Start building against Spring Session Apple-SR8 snapshots
...
See gh-15530
2018-12-20 10:20:52 +00:00
c09a76d4c4
Merge branch '2.1.x'
2018-12-20 10:06:43 +00:00
ad489baaa3
Merge branch '2.0.x' into 2.1.x
2018-12-20 10:06:32 +00:00
658930acea
Start building against Spring Framework 5.0.12 snapshots
...
See gh-15528
2018-12-20 10:03:35 +00:00
d5c8caab59
Merge branch '1.5.x' into 2.0.x
2018-12-20 10:00:35 +00:00
f9591307d3
Upgrade to Webjars Locator Core 0.36
...
Closes gh-15527
2018-12-20 09:50:22 +00:00
c823817a7e
Upgrade to Selenium 3.141.59
...
Closes gh-15526
2018-12-20 09:50:22 +00:00
5b101a8a81
Upgrade to Selenium Htmlunit 2.33.3
...
Closes gh-15525
2018-12-20 09:50:19 +00:00
47698e1812
Upgrade to Kafka 2.1.0
...
Closes gh-15524
2018-12-20 09:50:18 +00:00
9c84f9fc57
Upgrade to Rest Assured 3.2.0
...
Closes gh-15523
2018-12-20 09:50:17 +00:00
8aef2e50ea
Upgrade to Prometheus Pushgateway 0.6.0
...
Closes gh-15522
2018-12-20 09:50:16 +00:00
dcf8c42f6f
Upgrade to Embedded Mongo 2.2.0
...
Closes gh-15521
2018-12-20 09:50:15 +00:00
5d42d976e7
Upgrade to Rabbit Amqp Client 5.5.1
...
Closes gh-15520
2018-12-20 09:50:14 +00:00
754b42fd88
Upgrade to Hazelcast Hibernate5 1.3.0
...
Closes gh-15519
2018-12-20 09:50:13 +00:00
d00d7201c3
Merge branch '2.1.x'
2018-12-20 09:47:29 +00:00
7b58f9a79e
Upgrade to Maven Jar Plugin 3.1.1
...
Closes gh-15518
2018-12-20 09:47:03 +00:00
7f80bae0d9
Upgrade to Maven Help Plugin 3.1.1
...
Closes gh-15517
2018-12-20 09:47:02 +00:00
525c6970eb
Upgrade to Jedis 2.9.1
...
Closes gh-15516
2018-12-20 09:47:02 +00:00
6d0e357613
Upgrade to Infinispan 9.4.5.Final
...
Closes gh-15515
2018-12-20 09:47:01 +00:00
f364439825
Upgrade to Flyway 5.2.4
...
Closes gh-15514
2018-12-20 09:47:00 +00:00
4d6e8ca205
Upgrade to Tomcat 9.0.14
...
Closes gh-15513
2018-12-20 09:46:59 +00:00
8abcf22f6a
Upgrade to Byte Buddy 1.9.6
...
Closes gh-15512
2018-12-20 09:46:58 +00:00
2c0eddd28a
Upgrade to Embedded Mongo 2.1.2
...
Closes gh-15511
2018-12-20 09:46:57 +00:00
2b0976a45f
Upgrade to Hazelcast 3.11.1
...
Closes gh-15510
2018-12-20 09:46:56 +00:00
bec7257508
Upgrade to Couchbase Client 2.7.2
...
Closes gh-15509
2018-12-20 09:46:55 +00:00
a6a7c95d65
Merge branch '2.0.x' into 2.1.x
2018-12-20 09:43:05 +00:00
86280f1db2
Upgrade to Jedis 2.9.1
...
Closes gh-15508
2018-12-20 09:40:46 +00:00
172a930e31
Upgrade to Jetty El 8.5.35.1
...
Closes gh-15507
2018-12-20 09:40:45 +00:00
5ede23226b
Upgrade to Elasticsearch 5.6.14
...
Closes gh-15506
2018-12-20 09:40:44 +00:00
f9ce6c9dc2
Upgrade to Netty 4.1.32.Final
...
Closes gh-15505
2018-12-20 09:40:43 +00:00
e2433280c2
Upgrade to Jackson 2.9.8
...
Closes gh-15504
2018-12-20 09:40:41 +00:00
0a23f3b286
Merge branch '1.5.x' into 2.0.x
2018-12-20 09:36:57 +00:00
5a07c44a4f
Merge branch '2.1.x'
2018-12-19 17:55:51 +00:00
43d64ba580
Add dependency management for groovy-jaxb introduced in 2.5.1
...
Closes gh-15468
2018-12-19 17:55:19 +00:00
524067cd32
Merge branch '2.1.x'
2018-12-19 17:34:25 +00:00
4101e15421
Add dependency management for missing Groovy 2.5 modules
...
Closes gh-15468
2018-12-19 17:30:57 +00:00
70f4d5e5a8
Polish "Apply context and connector customizer beans to Tomcat factories"
...
Closes gh-15492
2018-12-19 17:09:21 +00:00
90c489048f
Apply context and connector customizer beans to Tomcat factories
...
See gh-15492
2018-12-19 17:01:02 +00:00
de599819ae
Merge branch '2.1.x'
2018-12-19 16:57:19 +00:00
33fb1fa9a3
Avoid creating meter binders before registry has been customized
...
Previously, MeterRegistryPostProcessor would trigger the creation of all
meter binders and meter registry customizers before applying the
customizers and calling the binders. In some situations with complex
dependency graphs where the creation of a binder and the injection of
its dependencies inadvertently triggered some meter binding, this
could result in meters being bound before the registry had been
customized.
This commit reworks MeterRegistryPostProcessor and MeterRegistryConfigurer
to defer the retrieval of registry customizers and meter binders until
just before they are needed. As a result, customizers are now retrieved
and applied before the binders are retrieved.
Closes gh-15483
2018-12-19 16:47:30 +00:00
903d940dd5
Merge branch '2.1.x'
2018-12-19 12:55:34 +00:00
007916f1ce
Start building against Spring Framework 5.1.4 snapshots
...
See gh-15493
2018-12-19 12:52:13 +00:00
0ad72d5b5e
Remove reliance on mavenLocal from Gradle plugin’s tests
...
See gh-15471
2018-12-18 11:41:51 +00:00
4edc32844a
Remove use of execute method inherited from internal class
...
Closes gh-15484
2018-12-17 17:33:20 +00:00
317c4c2c38
Merge branch '2.1.x'
2018-12-17 18:26:56 +01:00
7dbe70dc61
Merge branch '2.0.x' into 2.1.x
2018-12-17 18:26:36 +01:00
c0b07a9429
Polish "Fix StringSequence.equals() for different lengths"
...
Closes gh-15465
2018-12-17 18:24:08 +01:00
2a0680c2ba
Fix StringSequence.equals() for different lengths
...
See gh-15465
2018-12-17 18:20:09 +01:00
c8a0c99a21
Remove D…S…Init…InvokerTests' assumptions about classpath structure
...
See gh-15471
2018-12-17 16:35:22 +00:00
6d251a83dd
Merge branch '2.1.x'
2018-12-17 17:15:48 +01:00
af3fada396
Polish "Add missing dependency management entry for hibernate-vibur"
...
Closes gh-15467
2018-12-17 17:13:30 +01:00
c955906c3e
Add missing dependency management entry for hibernate-vibur
...
See gh-15467
2018-12-17 17:13:18 +01:00
6207b46bc6
Merge branch '2.1.x'
2018-12-17 17:07:58 +01:00
948902f090
Avoid unnecessary usage of ReflectionTestUtils
...
Closes gh-15482
2018-12-17 17:07:23 +01:00
ca13385534
Remove remaining assumption about File separator from LogFileTests
...
See gh-15471
2018-12-17 14:21:28 +00:00
3d7e4e99c5
Remove assumption about File separator from LogFileTests
...
See gh-15471
2018-12-17 14:14:57 +00:00
6adccbfd30
Make LoggingApplicationListener and tests more robust on Windows
...
Previously, LoggingApplicationListener its tests, and LogFile made some
assumptions that do not hold true on Windows. Specifically,
LoggingApplicationListenerTests used TestPropertySourceUtils to add
properties to the environment. This uses Java's standard Properties
parsing which does a poor job of handling Windows file paths (Strings
with backslashes in them). Secondly, LogFile made assumptions about
the use of forward clashes for the file separator.
This commit replaces the use of TestPropertySourceUtils and removes
the assumption about the OS's file separator.
Closes gh-15471
2018-12-17 14:02:10 +00:00
ddabfe3fcc
Deploy spring-boot-test-support so it's available downstream
...
Concourse builds spring-boot-tests separately from spring-boot-project
and relies on modules from the latter being available in the
distribution repository when building the former. This commit enables the
deployment of spring-boot-test-support from spring-boot-project so that it
is added to the distribution repository and is therefore available when
building spring-boot-tests. It is then excluded when putting to the
Artifactory resource as we do not want it to be published.
See gh-15471
2018-12-14 19:50:23 +00:00
61d04db0d7
Minimize and centralize assumptions about build output
...
Closes gh-15471
2018-12-14 17:50:20 +00:00
1f4be6ba37
Merge branch '2.1.x'
2018-12-14 08:45:22 +01:00
80cfff753a
Merge branch '2.0.x' into 2.1.x
2018-12-14 08:45:05 +01:00
a6ff7c786a
Remove test starter from core module
...
Closes gh-15463
2018-12-14 08:44:43 +01:00
db5ab1d14c
Do not rely on test runner using static main method in RestarterTests
...
Closes gh-15461
2018-12-13 13:39:19 +00:00
62fbf48446
Start Elasticsearch with single-node discovery type
...
See gh-15441
2018-12-12 21:02:28 +00:00
47fc35105d
Allow more time for the Elasticsearch container to start
...
See gh-15441
2018-12-12 19:41:30 +00:00
ed52dab3b5
Revert upgrade to JUnit Jupiter 5.4 snapshots
2018-12-12 17:53:52 +00:00
064f6478df
Move back to JUnit 4 until SUREFIRE-1614 has been resolved
...
See gh-14736
See gh-14737
See gh-14738
2018-12-12 16:49:30 +00:00
2b453bbb16
Minimise dependencies on Log4j2
...
Closes gh-15441
2018-12-12 08:19:34 +00:00
e16511279a
Add junit-jupiter-engine for running Junit5 tests
2018-12-11 15:08:28 -08:00
9a6dbb5290
Merge branch '2.1.x'
2018-12-11 11:54:08 +01:00
036aace2cc
Add details in Jest ElasticSearch HealthIndicator
...
This commit polishes the previous one and aligns the Jest
HealthIndicator with the changes made for the REST variant.
Closes gh-15366
2018-12-11 11:51:57 +01:00
1ec2bbf54f
Include details in ElasticsearchRestHealthIndicator
...
This commit adds more information to the ElasticSearch REST
health indicator.
When the ES instance responds with an error HTTP status,
the health details now include the actual status code and reason phrase.
When the ES instance returns a HTTP 200 response, the entire response
map is used as health details.
See gh-15366
2018-12-11 11:51:49 +01:00
71b29684b3
Remove redundant field type configuration
...
See gh-15435
2018-12-11 08:30:24 +00:00
dfd477aa74
Merge branch '2.1.x'
2018-12-11 08:53:37 +01:00
38e4d330b0
Merge branch '2.0.x' into 2.1.x
2018-12-11 08:52:58 +01:00
0f92b139f3
Remove Mockito 1 leftover
...
Closes gh-15422
2018-12-11 08:52:15 +01:00
f863ce32ee
Merge branch '2.1.x'
2018-12-10 16:44:42 -08:00
3cc441c83e
Do not remove trailing slash from OAuth2 Issuer URI
...
Fixes gh-15324
2018-12-10 16:35:52 -08:00
55d7c19c06
Merge branch '2.1.x'
2018-12-10 17:59:50 +00:00
d05ae40c99
Remove redundant field type and optional configuration
...
See gh-15435
2018-12-10 17:59:26 +00:00
393decff35
Merge branch '2.1.x'
2018-12-10 17:58:00 +00:00
ef4ea591b3
Mark nested optional fields as optional
...
See gh-15435
2018-12-10 17:49:41 +00:00
c9c5cd18a2
Merge branch '2.1.x'
2018-12-10 15:40:17 +00:00
6752be9333
Exclude logback-classic from liquibase-core
...
Closes gh-15436
2018-12-10 15:39:51 +00:00
beffc4da9f
Remove ordering dependence from tests that create embedded databases
...
Closes gh-15423
2018-12-10 14:57:39 +00:00
05cb4cb379
Merge branch '2.1.x'
2018-12-10 14:36:30 +00:00
9dc2116351
Merge branch '2.0.x' into 2.1.x
2018-12-10 14:36:21 +00:00
554e7061ce
Upgrade to Spring Restdocs 2.0.3.RELEASE
...
Closes gh-15435
2018-12-10 14:36:03 +00:00
b2c5fd84b9
Use spring-doc-resources 0.1.0.BUILD-SNAPSHOT
2018-12-10 12:53:24 +01:00
2b1653d009
Simplify code by using try-with-resources statement
...
Closes gh-15427
2018-12-10 09:05:33 +01:00
ba29788482
Polish "Replace explicit generic type with diamond operator"
...
Closes gh-15424
2018-12-09 11:43:28 +01:00
a2ebba8db1
Replace explicit generic type with diamond operator
...
See gh-15424
2018-12-09 11:42:27 +01:00
f040459ae5
Merge branch '2.1.x'
2018-12-07 14:32:07 -08:00
a11dea46d7
Use the right class in @ConditionalOnClass
...
See gh-15372
2018-12-07 14:15:59 -08:00
e0b55d36de
Merge branch '2.1.x'
2018-12-07 13:51:11 -08:00
f13697b278
Make Resource Server auto-config conditional on JwtDecoder class
...
Fixes gh-15372
2018-12-07 13:48:32 -08:00
d3e5c5688f
Polish
2018-12-07 19:58:13 +00:00
e367b54928
Merge branch '2.1.x'
2018-12-07 11:57:19 -08:00
31a5e85ab6
Perform placeholder resolution in test env post processor
...
Fixes gh-15354
2018-12-07 11:45:04 -08:00
bbf0932f0f
Exclude jcl-over-slf4j in favour of spring-jcl
...
Closes gh-15392
2018-12-07 15:37:24 +00:00
2cd3cff608
Merge branch '2.1.x'
2018-12-07 15:25:35 +00:00
4c6c07ddbb
Start building against Spring AMQP 2.1.3 snapshots
...
See gh-15407
2018-12-07 15:22:35 +00:00
f04f74870a
Start building against Spring Data Lovelace SR4 snapshots
...
See gh-15410
2018-12-07 15:22:06 +00:00
96f1a394b8
Start building against Spring Integration 5.1.2 snapshots
...
See gh-15413
2018-12-07 15:21:28 +00:00
e27d3d0d5e
Start building against Spring Kafka 2.2.3
...
See gh-15414
2018-12-07 15:20:40 +00:00
b01d5f62a4
Start building against Spring Security 5.1.3 snapshots
...
See gh-15417
2018-12-07 15:20:05 +00:00
a5f5ead520
Start building against Spring AMQP 2.0.11 snapshots
...
See gh-15406
2018-12-07 15:15:01 +00:00
5e640877c9
Start building against Spring Data Kay SR13 snapshots
...
See gh-15409
2018-12-07 15:14:15 +00:00
12a844d7da
Start building against Spring Integration 5.0.11 snapshots
...
See gh-15412
2018-12-07 15:13:36 +00:00
5336c8ccde
Start building against Spring Security 5.0.11 snapshots
...
See gh-15416
2018-12-07 15:13:01 +00:00
d5f90ffcfb
Polish "Replace this lambda with a method reference"
...
Closes gh-15401
2018-12-07 11:10:10 +01:00
5c1813aef8
Replace this lambda with a method reference
...
See gh-15401
2018-12-07 11:01:42 +01:00
71173f2db5
Merge branch '2.1.x'
2018-12-07 09:57:20 +01:00
c84d199cb7
Upgrade to Flyway 5.2.4
...
Closes gh-15402
2018-12-07 09:56:18 +01:00
95a14e7ba5
Remove duplicate dependency management for spring-core
...
Closes gh-15380
2018-12-06 12:07:25 +00:00
6f6e712a7b
Merge branch '2.1.x'
2018-12-06 09:08:12 +01:00
bd21113e9f
Fix indent of WebServiceTemplate section
...
Closes gh-15389
2018-12-06 09:06:02 +01:00
5a18df2d69
Fix tests
2018-12-05 18:33:50 -08:00
59d2b0a3fb
Upgrade tests to Junit5
...
See gh-14737
2018-12-05 17:49:09 -08:00
4c96c76f11
Include Junit5 dependencies in Spring Boot Starter Test
...
See gh-14736
2018-12-05 17:48:52 -08:00
12e1d9a6a4
Add Junit5 OutputCapture Extension
...
See gh-14738
2018-12-05 17:48:27 -08:00
fb1c7c82b4
Merge branch '2.1.x'
2018-12-05 15:56:18 +01:00
ef40241bf6
Merge branch '2.0.x' into 2.1.x
2018-12-05 15:56:04 +01:00
d864b427eb
Remove unused ByteArrayStartsWith matcher
...
Closes gh-15386
2018-12-05 15:52:42 +01:00
ed3347f00d
Configure Asciidoctor toolchain for ref docs
...
This commit replaces the Docbook+Asciidoctor documentation toolchain by
a single Asciidoctor generation process.
First, we need to unzip the contents of the Spring Asciidoctor
documentation resources provided by the
`io.spring.docsresources:spring-docs-resources` distribution zip. This
is done in a `/target/refdocs` folder. We then copy all files from
`src/main/asciidoc` to the same location, and then launch the generation
process.
Closes gh-12611
2018-12-05 14:20:07 +01:00
a7d22aaf4b
Reorganize asciidoc content
...
This commit adds an index page for the multi-file HTML version, and
fixed a couple of casing issues (significant words starting with lower
case in headings).
While researching how to get the content from index-docinfo.xml into
the output, I came across the notion of a colophon, which is a good name
for the information in that file. I have consequently changed "Legal"
(which I never liked but couldn't think of a better term for at the
time) to "Colophon".
See gh-12611
2018-12-05 10:32:37 +01:00
a60c575836
Cleanup asciidoctor build
...
Remove Guardfile for now; we might reintroduce it later, but it is
currently out of sync with the documentation changes.
Do not ignore html files in the asciidoc directory as those are needed
for docinfo parts.
See gh-12611
2018-12-05 10:32:36 +01:00
11f6a5ab70
Remove docbook toolchain
...
See gh-12611
2018-12-05 10:32:36 +01:00
096640de84
Merge branch '2.1.x'
2018-12-05 08:57:14 +01:00
185a49fb3b
Add reference to JaVers starter
2018-12-05 08:56:50 +01:00
95b94c0158
Merge branch '2.1.x'
2018-12-04 10:53:41 +01:00
c56c0ff433
Rename OAuth2ResourceServerJwkConfiguration
...
Closes gh-15375
2018-12-04 10:53:01 +01:00
5c986b5030
Merge branch '2.1.x'
2018-12-03 16:29:36 +00:00
42b58f6d27
Add JAXB API dependency that is no longer transitive via testcontainers
...
See gh-15371
2018-12-03 16:29:10 +00:00
8b21044902
Merge branch '2.1.x'
2018-12-03 15:07:54 +00:00
917108cce7
Merge branch '2.0.x' into 2.1.x
2018-12-03 15:07:30 +00:00
425a3aacf5
Add JAXB API dependency that is no longer transitive via testcontainers
...
See gh-15371
2018-12-03 15:06:32 +00:00
a85e27c7cd
Further replace magic number by HttpStatus
...
See gh-15130
2018-12-03 15:48:13 +01:00
Andy Wilkinson
Raheela
Stephane Nicoll
dreis2211
vasili pispanen
Madhura Bhave
Brian Clozel
Filip Hrisafov
igor-suhorukov
Jay Bryant