111 Commits

Author SHA1 Message Date
Phillip Webb
ad5e905bd7 Update copyright header of changed files 2019-05-30 11:30:43 -07:00
Phillip Webb
68aec8b6ee Polish 2019-05-30 11:30:27 -07:00
Andy Wilkinson
23f803c6b6 Upgrade to Hamcrest 2.1, switch to hamcrest artifact from -core and -library
Closes gh-15555
2019-05-22 14:50:15 +01:00
Madhura Bhave
684a1c7a3c Migrate tests to JUnit5 testcontainer extensions
Closes gh-15456
2019-05-08 16:05:44 +02:00
Phillip Webb
17aaf26590 Use consistent javadoc style for annotation links
Closes gh-13920
2019-04-24 19:37:59 -07:00
Phillip Webb
b879972d0d Migrate to MergedAnnotations API
Migrate away from `AnnotationUtils` and `AnnotatedElementUtils`
when possible to the new `MergedAnnotations` API.

Closes gh-16551
2019-04-18 15:40:02 -07:00
Andy Wilkinson
36c1c051b8 Merge branch '2.1.x' 2019-03-20 16:55:10 +00:00
Andy Wilkinson
e23f72c8b0 Merge branch '2.0.x' into 2.1.x 2019-03-20 16:53:48 +00:00
Andy Wilkinson
9fbd38ab3c Merge branch '1.5.x' into 2.0.x 2019-03-20 16:45:26 +00:00
Andy Wilkinson
b828b398b5 Merge branch '2.1.x' 2019-03-19 17:11:45 +00:00
Andy Wilkinson
a36aa67b52 Merge branch '2.0.x' into 2.1.x 2019-03-19 17:04:41 +00:00
Spring Operator
3e2b6ac8ed Update build and setup configuration to use HTTPS
See gh-16246
2019-03-19 16:58:31 +00:00
Andy Wilkinson
d6a869fa98 Switch to Jakarta EE API dependencies where possible
Closes gh-16113
Closes gh-16112
Closes gh-16111
Closes gh-15916
Closes gh-15689
2019-03-06 11:20:51 +00:00
Andy Wilkinson
747e419db1 Merge branch '2.1.x' 2019-02-13 17:45:45 +00:00
Andy Wilkinson
9fb0b97f96 Decorate test containers so tests are skipped without Docker
Closes gh-15901
Closes gh-15638
2019-02-13 17:44:45 +00:00
Andy Wilkinson
db31e42751 Merge branch '2.1.x' 2019-02-12 09:58:21 +00:00
Andy Wilkinson
a975c0ad16 Use Testcontainers’ CassandraContainer rather than our own
Closes gh-15901
2019-02-12 09:58:05 +00:00
Andy Wilkinson
7e51e1a076 Merge branch '2.1.x' 2019-02-12 09:26:59 +00:00
Michael Simons
316126e8f0 Replace custom Neo4j container with Testcontainers version
See gh-15638
2019-02-12 09:24:44 +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
62fbf48446 Start Elasticsearch with single-node discovery type
See gh-15441
2018-12-12 21:02:28 +00: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
2b453bbb16 Minimise dependencies on Log4j2
Closes gh-15441
2018-12-12 08:19:34 +00:00
Andy Wilkinson
72ad0cc6be Merge branch '2.0.x' into 2.1.x 2018-12-03 12:15:36 +00:00
Andy Wilkinson
3fd0380359 Correct optional dependency declarations in spring-boot-test-support
Closes gh-15371
2018-12-03 12:14:18 +00:00
Phillip Webb
94798062ab Configure Cassandra JMX Reporting
Allow Cassandra JMX reporting to be configured via a property, and
disable it by default since it won't work with Dropwizard metrics 4.

Also update some of our own tests to explicitly disable it.

Closes gh-14778
2018-10-10 10:00:44 -07:00
Phillip Webb
d76bba5e6f Migrate from ExpectedException rule to AssertJ
Replace ExpectedException JUnit rules with AssertJ exception
assertions.

Closes gh-14336
2018-10-02 10:55:28 -07:00
Andy Wilkinson
c1b864c826 Polish 2018-09-18 11:18:28 +01:00
Phillip Webb
894e0e11d4 Switch from Aether to Maven Resolver
Replace Aether dependencies with Maven Resolver following the Eclipse
EOL announcement for Aether.

Closes gh-7627
2018-09-11 18:08:59 -07:00
Stephane Nicoll
eedeaa29e5 Polish "Replace loops with Arrays.setAll where possible"
Closes gh-14125
2018-08-20 10:23:16 +02:00
dreis2211
0bc66dc4a9 Replace loops with Arrays.setAll where possible
See gh-14125
2018-08-20 10:16:50 +02:00
Andy Wilkinson
de7899fba4 Improve reliability by give Cassandra more time and attempts to start 2018-07-19 19:57:54 +01:00
Johnny Lim
75639aa682 Polish
Closes gh-13192
2018-05-17 15:29:50 +02:00
dreis2211
15d67d6b12 Remove MockServletWebServer.emptyEnumeration()
Closes gh-13084
2018-05-07 14:41:06 +02:00
Phillip Webb
2d70a7ae5e Polish caught exception names
Prefer `ex` over `e`.
2018-05-03 22:43:32 -07:00
Andy Wilkinson
c9f04c3977 Avoid race between container starting and getting mapped port 2018-04-24 11:03:54 +01:00
Andy Wilkinson
f6cc1cbd76 Make Testcontainer wait strategies final 2018-04-24 10:38:57 +01:00
Andy Wilkinson
f39cea0428 Try to stabilize build by giving Cassandra longer to start 2018-04-24 10:27:11 +01:00
Andy Wilkinson
6c504a5098 Fix deprecation warnings in Testcontainers wait strategies
See gh-12821
2018-04-24 10:27:11 +01:00
Madhura Bhave
9c7612e681 Fix NPE in WaitStrategy used for test containers 2018-04-12 10:30:36 -07:00
Phillip Webb
98a2a91d16 Polish 2018-03-29 14:00:13 -07:00
Stephane Nicoll
006decea2a Merge branch '1.5.x' 2018-03-27 15:47:56 +02:00
Phillip Webb
4b9c3c137e Polish Collection.toArray
Consistently use `StringUtils.toStringArray`, `ClassUtils.toClassArray`
or zero length when converting collections to arrays.

Fixes gh-12160
2018-02-22 21:11:30 -08:00
Andy Wilkinson
5522174e96 Provide package info for all packages included in javadoc 2018-02-08 16:50:37 +00:00
dreis2211
c1675c2d5f Use InvocationOnMock.getArgument() where possible
Closes gh-11818
2018-01-29 08:06:00 +01:00
dreis2211
a7663c88d3 Replace casted Mockito.any() calls
Closes gh-11817
2018-01-29 07:50:29 +01:00
Andy Wilkinson
1a1a62b744 Protect tests against Cassandra startup failures
On CI, Cassandra running inside the Docker container sometimes fails
to start or the start times out. This has nothing to do with Boot so
we  attempt to protect our tests from the flakiness of the container
by allowing 3 startup attempts.
2018-01-24 21:34:11 +00:00
Phillip Webb
85d3f5a180 Fix NPE in test containers
Fix NPE accidentally introduced during refinement.
2018-01-08 22:04:59 -08:00
Phillip Webb
201da97774 Further refine test containers 2018-01-08 16:32:39 -08:00