Commit Graph

22352 Commits

Author SHA1 Message Date
Stephane Nicoll
a3e94f4412 Harmonize component scan in slice tests
This commit updates ConfigurationPropertiesScanRegistrar to apply the
same component scan filters than the ones applied on standard classpath
scanning.

As a result, configuration properties scanning is automatically disabled
in slice tests and can be included by an explicit import or a dedicated
TypeFilter implementation if necessary.

Closes gh-16659
2019-07-15 15:05:12 +02:00
Stephane Nicoll
6d9a54a24f Merge pull request #17519 from dreis2211
* pr/17519:
  Fix formatting in Couchbase smoke tests

Closes gh-17519
2019-07-15 15:05:04 +02:00
dreis2211
1c3031e4db Fix formatting in Couchbase smoke tests
See gh-17519
2019-07-15 15:04:48 +02: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
4b744bdfd1 Merge pull request #17491 from dreis2211
* pr/17491:
  Delete ModifiedClassPathRunner
  Polish ModifiedClassPath support
  Migrate ModifiedClassPath tests to JUnit 5
  Add JUnit 5 ModifiedClassPathExtension
  Extract ModifiedClassPathClass logic
  Migrate to MockRestServiceServer
  Polish LoggingApplicationListenerTests
  Migrate to ApplicationContextRunner

Closes gh-17491
2019-07-15 00:34:21 +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
0f0278e69b Migrate ModifiedClassPath tests to JUnit 5
Migrate the remaining JUnit 4 tests to JUnit 5, making use of the
new `ModifiedClassPathExtension`.

See gh-17491
2019-07-15 00:31:03 +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
dreis2211
ca1808ecae Migrate to MockRestServiceServer
Migrate `RestClientTestWithoutJacksonIntegrationTests` to use
Spring's `MockRestServiceServer`.

See gh-17491
2019-07-15 00:26:16 +01:00
dreis2211
1bc9c8544e Polish LoggingApplicationListenerTests
See gh-17491
2019-07-15 00:26:12 +01:00
dreis2211
b0bf2dd7ab Migrate to ApplicationContextRunner
Migrate a new tests to use the `ApplicationContextRunner`.

See gh-17491
2019-07-15 00:26:08 +01:00
Phillip Webb
0cb6a7f47d Polish 2019-07-15 00:24:19 +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
c3816bfe7b Polish output capture names 2019-07-15 00:24:18 +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
Stephane Nicoll
79b29396d0 Merge branch '2.1.x'
Closes gh-17506
2019-07-14 13:14:21 +02:00
Stephane Nicoll
309329ace9 Merge pull request #17496 from dreis2211
* pr/17496:
  Test the Gradle Plugin against Gradle 5.5.1

Closes gh-17496
2019-07-14 13:13:36 +02:00
dreis2211
e9203a280c Test the Gradle Plugin against Gradle 5.5.1
See gh-17496
2019-07-14 13:13:17 +02:00
Stephane Nicoll
e73f8c1008 Merge pull request #17505 from dreis2211
* pr/17505:
  Polish

Closes gh-17505
2019-07-14 11:38:51 +02:00
dreis2211
82047a2544 Polish
See gh-17505
2019-07-14 11:38:40 +02:00
Phillip Webb
b7e092e821 Fix upstream RSocket method renames
Align with the recent upstream Spring Framework changes triggered by
their issue #23170.
2019-07-13 14:01:04 +01:00
Madhura Bhave
73cd1c9c77 Explicitly set release false for pre-release resource
Closes gh-17492
2019-07-11 11:36:54 -07:00
Madhura Bhave
6164e3efe8 Merge branch '2.1.x' 2019-07-10 18:26:25 -07:00
Madhura Bhave
aebb60d8b8 Fix tests
Setting the log file name to a random value in smoke tests
doesn't work because the logger context has already been initialized.
2019-07-10 18:14:58 -07:00
Madhura Bhave
d590c3ed10 Merge branch '2.1.x'
Closes gh-17486
2019-07-10 15:32:22 -07:00
Madhura Bhave
773dda3d55 Log file location should be evaluated just once
Using a random value for the logfile name caused
the logfile endpoint to return a 404 as the name
was resolved from the environment on every request.
This commit registers a bean for LogFile which is then
used by the logfile endpoint.

Fixes gh-17434
2019-07-10 14:46:09 -07:00
Andy Wilkinson
dc0432665b Use ephemeral ports rather than 8080 in our tests
Closes gh-17025
2019-07-10 17:22:40 +01:00
Brian Clozel
906f7637ed Add synchronoss multipart dependency in webflux starter
Fixes gh-17484
2019-07-10 16:19:39 +02:00
Andy Wilkinson
9f2accbbc5 Merge pull request #17390 from nosan
* gh-17390:
  Allow build.time to be disabled so BuildInfoMojo's output is repeatable

Closes gh-17390
2019-07-10 13:45:10 +01:00
Dmytro Nosan
8dd9c6baa1 Allow build.time to be disabled so BuildInfoMojo's output is repeatable
See gh-17390
2019-07-10 13:40:17 +01:00
Andy Wilkinson
1fffe0ab3e Merge branch '2.1.x'
Closes gh-17482
2019-07-10 13:37:32 +01:00
Andy Wilkinson
7854876608 Merge pull request #17480 from nosan
* gh-17480:
  Polish AbstractDependsOnBeanFactoryPostProcessor

Closes gh-17480
2019-07-10 13:37:26 +01:00
Dmytro Nosan
93d0427fb5 Polish AbstractDependsOnBeanFactoryPostProcessor
See gh-17480
2019-07-10 13:36:57 +01:00
Andy Wilkinson
47f4bb0d64 Merge branch '2.1.x'
Closes gh-17481
2019-07-10 13:30:10 +01:00
Andy Wilkinson
50fe7a0da5 Merge pull request #16627 from ielatif
* gh-16627:
  Polish "Set up MongoClient beans' dependencies by type rather than name"
  Set up MongoClient beans' dependencies by type rather than name

Closes gh-16627
2019-07-10 13:19:54 +01:00
Andy Wilkinson
f753c31988 Polish "Set up MongoClient beans' dependencies by type rather than name"
See gh-16627
2019-07-10 13:13:19 +01:00
ielatif
39f1039425 Set up MongoClient beans' dependencies by type rather than name
See gh-16627
2019-07-10 13:10:41 +01:00
Phillip Webb
2208dc1bc2 Refine smoke-tests setup for Eclipse 2019-07-10 13:02:02 +01:00
Brian Clozel
32ecb63002 Add reactor-tools dependency for javadoc generation
See gh-17128
2019-07-10 13:59:45 +02:00
Andy Wilkinson
6adcd75481 Merge branch '2.1.x'
Closes gh-17479
2019-07-10 12:37:40 +01:00
Andy Wilkinson
1678de7323 Merge pull request #17020 from nosan
* gh-17020:
  Polish "Allow depended on beans to be identified by type"
  Allow depended on beans to be identified by type

Closes gh-17020
2019-07-10 12:26:04 +01:00
Andy Wilkinson
80650f485d Polish "Allow depended on beans to be identified by type"
See gh-17020
2019-07-10 12:25:57 +01:00
Dmytro Nosan
9923ffe9bd Allow depended on beans to be identified by type
Prior to this commit, `AbstractDependsOnBeanFactoryPostProcessor`
could only identify depended on beans by name.

See gh-17020
2019-07-10 12:25:57 +01:00