Andy Wilkinson
aefe52e4d0
Revert "Rework dep management to avoid consumers picking up strict constraints"
...
This reverts commit b34a311d02
as,
having disabled the publishing of Gradle's module metadata (4f75ab5
),
the changes are no longer needed.
See gh-19609
2020-01-14 12:15:53 +00:00
Phillip Webb
862462b791
Update copyright year of changed files
2020-01-13 17:04:19 -08:00
Phillip Webb
f57281340c
Merge branch '2.2.x'
2020-01-13 16:46:49 -08:00
Phillip Webb
3cfbfebbb1
Merge branch '2.1.x' into 2.2.x
2020-01-13 16:45:40 -08:00
Phillip Webb
9bd49562fe
Update copyright year of changed files
2020-01-13 14:09:11 -08:00
Andy Wilkinson
b34a311d02
Rework dep management to avoid consumers picking up strict constraints
...
Previously, enforcedPlatform dependencies were using to pull in the
constraints defined in spring-boot-dependencies and
spring-boot-parent and applied them strictly so that the constrained
version had to be used. This worked as intended in Spring Boot's own
build but incorrectly enforced those same strict version requirements
on external consumers of Spring Boot's modules.
This commit reworks how Spring Boot defines its internal dependency
management so that platform dependencies are exposed to external
consumers while enforced platform dependencies are using internally.
See gh-19609
2020-01-13 19:59:56 +00:00
Stephane Nicoll
ca1710ee56
Upgrade to Apache Cassandra 4.3.1
...
See gh-19588
2020-01-13 15:12:41 +01:00
Brian Clozel
e0171a5da8
Polish
2020-01-10 22:29:57 +01:00
Andy Wilkinson
b5ae8b0af5
Disable tests that use Docker when Docker is unavailable
...
Closes gh-19616
2020-01-10 20:35:18 +00:00
Andy Wilkinson
ce99db1902
Port the build to Gradle
...
Closes gh-19609
Closes gh-19608
2020-01-10 14:15:35 +00:00
Andy Wilkinson
bdffa860d9
Increase startup timeout for Docker containers
...
Closes gh-19569
2020-01-08 11:39:36 +00:00
Stephane Nicoll
2c1e81adf0
Polish
2019-12-26 10:42:40 +01:00
Phillip Webb
83d4d94e8b
Cache ModifiedClassPathClassLoaders
...
Closes gh-18694
2019-10-22 15:25:31 -07:00
Phillip Webb
8d08d654d1
Merge branch '2.1.x'
...
Closes gh-18693
2019-10-22 15:18:32 -07:00
Andy Wilkinson
46c30d6bb0
Merge branch '2.1.x'
...
Closes gh-18476
2019-10-02 10:48:57 +01:00
Andy Wilkinson
3d4157ad6d
Correct SCM URLs in published poms
...
Previously, Maven's default behaviour was relied up which resulted
in the artifact ID being appended to each URL as it was inherited.
This behaviour can only be disabled in Maven 3.6 and later, a version
that we cannot use due to an incompatibility with the Flatten Plugin.
This commit works around Maven's default behaviour by defining
properties for the SCM URL, connection, and developer connection and
then explicitly defining the settings in each pom using these
properties. The explicit definition of the properties in each pom
prevents them being inherited from the parent, thereby disabling the
unwanted appending of the artifact ID to the URL.
Fixes gh-18328
2019-10-02 10:48:30 +01:00
Andy Wilkinson
29080b87ec
Protect autoconfigure module against slow starting test containers
2019-09-04 10:15:10 +01:00
dreis2211
07b857e57a
Use disabledWithoutDocker option for @Testcontainers
...
See gh-18095
2019-09-03 09:51:53 +02:00
dreis2211
b4350a9d96
Remove unnecessary blank lines
...
See gh-18089
2019-09-03 08:48:10 +02:00
dreis2211
3e35a6616c
Fix duplicated words
...
See gh-18004
2019-09-01 09:09:38 +02:00
thelproad
9c1f503e46
Simplify if statements
...
See gh-17884
2019-08-17 06:50:32 +02:00
Phillip Webb
da4f436140
Change SearchStrategy EXHAUSTIVE to TYPE_HIERARCHY
...
Fixup references following upstream Spring Framework change.
2019-07-31 15:11:43 +01:00
Phillip Webb
8bc780762a
Merge branch '2.1.x'
2019-07-24 11:42:48 +01:00
Phillip Webb
fb1dd8fe93
Merge branch '2.0.x' into 2.1.x
2019-07-24 11:41:32 +01:00
Phillip Webb
913e831f4e
Merge '1.5.x' into 2.0.x
2019-07-24 11:39:58 +01:00
Andy Wilkinson
41957ec2ad
Polish "Polish OutputCapture and its JUnit Jupiter extension"
...
See gh-17049
2019-07-18 17:46:56 +01:00
dreis2211
2038fac825
Remove testsupport.assertj package
...
See gh-17557
2019-07-18 14:20:28 +02:00
Phillip Webb
a9ba7080ce
Merge branch '2.1.x'
2019-07-17 21:48:42 +01:00
dreis2211
4ec035977b
Polish testsupport.junit.platform package
...
See gh-17524
2019-07-15 21:35:25 +01:00
Phillip Webb
eff1147ccc
Rename classpath runner package
...
Remove `runner` since we're no longer tied to JUnit 4.
See gh-17491
2019-07-15 13:40:26 +01:00
Phillip Webb
1117fdb2b3
Make ModifiedClassPathExtension package private
...
Meta-annotate `ClassPathExclusions` and `ClassPathOverrides` with
so that the `ModifiedClassPathExtension` no longer needs to be
used directly.
See gh-17491
2019-07-15 13:38:26 +01:00
Phillip Webb
b6ec1332a0
Polish ModifiedClassPathClassLoader
...
Remove the `ModifiedClassPathClassLoaderFactory` in favor of
factory methods on `ModifiedClassPathClassLoader`.
See gh-17491
2019-07-15 13:37:34 +01:00
Phillip Webb
4fe5e9e31e
Remove direct junit-platform-launcher dependency
...
Replace any direct `junit-platform-launcher` dependencies and instead
rely on the test runner providing it. Launcher related class are not
handled via reflection.
This update allows us to workaround SUREFIRE-1679.
Closes gh-17517
2019-07-15 13:35:08 +01:00
Phillip Webb
543fcdbbfd
Delete internal OutputCaptureRule
...
Delete our internal `OutputCaptureRule` since we not longer have any
tests using it.
2019-07-15 00:36:13 +01:00
Phillip Webb
13b39cbbbf
Delete ModifiedClassPathRunner
...
Delete `ModifiedClassPathRunner` since we no longer have any tests
that use it.
See gh-17491
2019-07-15 00:33:00 +01:00
Phillip Webb
bd81bb90eb
Polish ModifiedClassPath support
...
See gh-17491
2019-07-15 00:32:34 +01:00
dreis2211
2a4c48cb91
Add JUnit 5 ModifiedClassPathExtension
...
Add a JUnit 5 extension that allows tests to be run with a
modified classpath. Since JUnit 5 does not currently offer a way
to run tests with a different classpath, we instead fake the
original invocation and launch an entirely new run for each
method.
See gh-17491
2019-07-15 00:28:53 +01:00
dreis2211
90d824f6cb
Extract ModifiedClassPathClass logic
...
Extract classes from `ModifiedClassPathRunner` so that they can
be reused.
See gh-17491
2019-07-15 00:27:42 +01:00
Phillip Webb
01933f9b06
Merge previously split strings
...
Merge some string lines that were previously split because of the
90 chars wide formatting.
2019-07-15 00:24:19 +01:00
Phillip Webb
cdf43a7489
Polish
2019-07-14 19:42:56 +01:00
Phillip Webb
8d4a2add63
Allow OutputCaptureRule to be used with AssertJ
...
Update `OutputCaptureRule` so that it now implements
`CapturedOutput` and can be used directly with AssertJ.
Closes gh-17512
2019-07-14 19:42:42 +01:00
dreis2211
32549cfc85
Remove folder that only contains package-info
...
See gh-17471
2019-07-10 06:24:40 +01:00
Andreas Gebhardt
ed7cfedb51
Fix JavaDoc within spring-boot-test-support
...
See gh-17443
2019-07-08 12:48:02 +01:00
Andy Wilkinson
2816635418
Polish
2019-07-04 17:51:20 +01:00
Phillip Webb
a66c4d3096
Unify method visibility of private classes
...
Apply checkstyle rule to ensure that private and package private
classes do not have unnecessary public methods. Test classes have
also been unified as much as possible to use default scoped
inner-classes.
Closes gh-7316
2019-07-03 11:39:47 -07:00
Phillip Webb
605599138e
Merge branch '2.1.x'
2019-06-28 23:56:02 -07:00
Phillip Webb
92bff3c328
Merge branch '2.0.x' into 2.1.x
2019-06-28 23:42:28 -07:00
Phillip Webb
cfeb0239b7
Merge branch '1.5.x' into 2.0.x
2019-06-28 23:28:34 -07:00
Madhura Bhave
30cfe7b4c5
Polish
2019-06-13 08:02:26 -07:00
Phillip Webb
b3d5cd538d
Add JUnit 5 checkstyle rules
...
Add a rule to enforce JUnit 5 usage and conventions.
Closes gh-17093
2019-06-10 16:16:45 -07:00
Andy Wilkinson
b18fffaf14
Move tests to JUnit 5 wherever possible
2019-06-07 12:25:54 +01:00
Andy Wilkinson
aef92b9295
Merge branch '2.1.x'
...
Closes gh-17079
2019-06-07 11:00:44 +01:00
Andy Wilkinson
24925c3dae
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17078
2019-06-07 10:50:34 +01:00
Andy Wilkinson
c6c139d980
Merge branch '1.5.x' into 2.0.x
2019-06-07 10:46:31 +01:00
Brian Clozel
c74badd4f2
Auto-configure Elasticsearch REST client in Spring Data
...
This commit auto-configures the Elasticsearch REST client support
as a template for Spring Data Elasticsearch. As of this commit,
using the transport client is still possible but developers
should migrate.
This commit also removes the deprecated annotation on the
Elasticsearch auto-configuration for the transport client, since
this deprecation notice is already present on the configuration
property.
Closes gh-17024
Closes gh-16542
2019-06-03 21:20:06 +02:00
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