Andy Wilkinson
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
Andy Wilkinson
f528fd0082
Merge branch '2.1.x'
2018-12-17 11:19:55 +00:00
Andy Wilkinson
d004ee9a41
Merge branch '2.0.x' into 2.1.x
2018-12-17 11:19:47 +00:00
Andy Wilkinson
64c6b9c648
Merge branch '1.5.x' into 2.0.x
2018-12-17 11:19:35 +00:00
Andy Wilkinson
146ad83dca
Upgrade to GemFire 8.2.13
...
Closes gh-15481
2018-12-17 11:18:33 +00:00
Andy Wilkinson
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
Andy Wilkinson
61d04db0d7
Minimize and centralize assumptions about build output
...
Closes gh-15471
2018-12-14 17:50:20 +00:00
Andy Wilkinson
7d0a7a65c8
Merge branch '2.1.x'
2018-12-14 14:58:52 +00:00
Andy Wilkinson
b264b4417d
Reinstate parent-context sample in list of modules
...
Closes gh-15469
2018-12-14 14:56:26 +00:00
Stephane Nicoll
1f4be6ba37
Merge branch '2.1.x'
2018-12-14 08:45:22 +01:00
Stephane Nicoll
80cfff753a
Merge branch '2.0.x' into 2.1.x
2018-12-14 08:45:05 +01:00
Stephane Nicoll
a6ff7c786a
Remove test starter from core module
...
Closes gh-15463
2018-12-14 08:44:43 +01:00
Andy Wilkinson
db5ab1d14c
Do not rely on test runner using static main method in RestarterTests
...
Closes gh-15461
2018-12-13 13:39:19 +00:00
Andy Wilkinson
62fbf48446
Start Elasticsearch with single-node discovery type
...
See gh-15441
2018-12-12 21:02:28 +00:00
Madhura Bhave
47c953ab13
Merge branch '2.1.x'
2018-12-12 12:09:12 -08:00
Madhura Bhave
a1db90fe94
Add missing get step
2018-12-12 12:08:21 -08:00
Andy Wilkinson
47fc35105d
Allow more time for the Elasticsearch container to start
...
See gh-15441
2018-12-12 19:41:30 +00:00
Andy Wilkinson
ed52dab3b5
Revert upgrade to JUnit Jupiter 5.4 snapshots
2018-12-12 17:53:52 +00:00
Andy Wilkinson
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
Andy Wilkinson
2b453bbb16
Minimise dependencies on Log4j2
...
Closes gh-15441
2018-12-12 08:19:34 +00:00
Madhura Bhave
e16511279a
Add junit-jupiter-engine for running Junit5 tests
2018-12-11 15:08:28 -08:00
Brian Clozel
9a6dbb5290
Merge branch '2.1.x'
2018-12-11 11:54:08 +01:00
Brian Clozel
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
Filip Hrisafov
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
Andy Wilkinson
e4f1a0f000
Merge branch '2.1.x'
2018-12-11 08:30:56 +00:00
Andy Wilkinson
31284cd3df
Merge branch '2.0.x' into 2.1.x
2018-12-11 08:30:43 +00:00
Andy Wilkinson
71b29684b3
Remove redundant field type configuration
...
See gh-15435
2018-12-11 08:30:24 +00:00
Stephane Nicoll
dfd477aa74
Merge branch '2.1.x'
2018-12-11 08:53:37 +01:00
Stephane Nicoll
38e4d330b0
Merge branch '2.0.x' into 2.1.x
2018-12-11 08:52:58 +01:00
Stephane Nicoll
adb145e225
Merge pull request #15422 from dreis2211
...
* pr/15422:
Remove Mockito 1 leftover
2018-12-11 08:52:41 +01:00
dreis2211
0f92b139f3
Remove Mockito 1 leftover
...
Closes gh-15422
2018-12-11 08:52:15 +01:00
Madhura Bhave
d77b52ca15
Merge branch '2.1.x'
2018-12-10 19:29:21 -08:00
Madhura Bhave
f1f26468bc
Set start and stop for time resource
...
See gh-15164
2018-12-10 19:27:19 -08:00
Madhura Bhave
8c950e809e
Merge branch '2.1.x'
2018-12-10 19:24:03 -08:00
Madhura Bhave
edc1a4fb86
Automate JDK CI upgrades using AdoptOpenJDK API
...
An issue is created if a new release is detected.
Closes gh-15164
2018-12-10 19:20:11 -08:00
Madhura Bhave
f863ce32ee
Merge branch '2.1.x'
2018-12-10 16:44:42 -08:00
Madhura Bhave
3cc441c83e
Do not remove trailing slash from OAuth2 Issuer URI
...
Fixes gh-15324
2018-12-10 16:35:52 -08:00
Andy Wilkinson
55d7c19c06
Merge branch '2.1.x'
2018-12-10 17:59:50 +00:00
Andy Wilkinson
d05ae40c99
Remove redundant field type and optional configuration
...
See gh-15435
2018-12-10 17:59:26 +00:00
Andy Wilkinson
393decff35
Merge branch '2.1.x'
2018-12-10 17:58:00 +00:00
Andy Wilkinson
ef4ea591b3
Mark nested optional fields as optional
...
See gh-15435
2018-12-10 17:49:41 +00:00
Andy Wilkinson
c9c5cd18a2
Merge branch '2.1.x'
2018-12-10 15:40:17 +00:00
Andy Wilkinson
6752be9333
Exclude logback-classic from liquibase-core
...
Closes gh-15436
2018-12-10 15:39:51 +00:00
Andy Wilkinson
beffc4da9f
Remove ordering dependence from tests that create embedded databases
...
Closes gh-15423
2018-12-10 14:57:39 +00:00
Andy Wilkinson
05cb4cb379
Merge branch '2.1.x'
2018-12-10 14:36:30 +00:00
Andy Wilkinson
9dc2116351
Merge branch '2.0.x' into 2.1.x
2018-12-10 14:36:21 +00:00
Andy Wilkinson
554e7061ce
Upgrade to Spring Restdocs 2.0.3.RELEASE
...
Closes gh-15435
2018-12-10 14:36:03 +00:00
Brian Clozel
b2c5fd84b9
Use spring-doc-resources 0.1.0.BUILD-SNAPSHOT
2018-12-10 12:53:24 +01:00
Andy Wilkinson
9a97e1b0f7
Drop use of OutputCapture in SampleKafkaApplicationTests
...
Closes gh-15432
2018-12-10 10:11:50 +00:00
Stephane Nicoll
83de570f33
Merge pull request #15427 from igor-suhorukov
...
* pr/15427:
Simplify code by using try-with-resources statement
2018-12-10 09:06:13 +01:00