Stephane Nicoll
e3f81f0243
Merge branch '2.4.x'
2021-04-21 17:23:42 +02:00
Stephane Nicoll
db7460ddd5
Polish contribution based on Andy's review
...
See gh-26188
2021-04-21 17:23:21 +02:00
Stephane Nicoll
3ca6ed6246
Polish
...
Closes gh-26190
2021-04-21 17:20:22 +02:00
izeye
4be48d0d50
Polish
...
See gh-26188
2021-04-21 15:20:06 +02:00
Phillip Webb
beaf03a008
Update copyright year of changed files
2021-04-15 12:22:48 -07:00
Andy Wilkinson
9d0e1a2cb3
Include SQL init auto-config in Data RDBC test slice
...
Closes gh-24741
2021-04-14 16:37:33 +01:00
Andy Wilkinson
05adf02a47
Include SQL init auto-config in JDBC-based test slices
...
Closes gh-25323
2021-04-14 15:11:28 +01:00
Stephane Nicoll
0d81b4d07e
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26108
2021-04-14 15:04:28 +02:00
Stephane Nicoll
0fb482579b
Harmonize Neo4jContainer startup options
...
Closes gh-26084
2021-04-14 14:50:04 +02:00
Andy Wilkinson
a58b25b5db
Add package-info to o.s.b.test.autoconfigure.data.Cassandra
...
Closes gh-26081
2021-04-13 20:14:29 +01:00
Stephane Nicoll
fd6ad5b889
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26024
2021-04-12 14:19:41 +02:00
Stephane Nicoll
7286c33f53
Document default behaviour of DataJpaTest#showSql
...
Closes gh-25843
2021-04-12 14:14:36 +02:00
izeye
852e5778a3
Polish
...
See gh-25875
2021-04-04 11:12:03 +02:00
Phillip Webb
363f5829d1
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25825
2021-03-29 15:46:50 -07:00
Phillip Webb
11a94ee6f0
Merge branch '2.3.x' into 2.4.x
2021-03-23 12:52:07 -07:00
Phillip Webb
82127fdaa3
Update copyright year of changed files
2021-03-23 12:50:49 -07:00
Andy Wilkinson
96ba9ae47f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25768
2021-03-23 14:48:24 +00:00
Andy Wilkinson
62023104de
Test auto-configured MockRestServiceServer with metrics and a root URI
...
Closes gh-25741
2021-03-23 14:37:37 +00:00
Andy Wilkinson
788a42d694
Merge branch '2.3.x' into 2.4.x
...
See gh-25076
2021-02-02 15:12:27 +00:00
Andy Wilkinson
67479b6380
Add junit-platform-launcher dependency by convention
...
Closes gh-25074
2021-02-02 13:03:21 +00:00
Andy Wilkinson
79c0597aa2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25072
2021-02-01 15:39:19 +00:00
Andy Wilkinson
3585d20453
Include IDialect beans in WebFluxTest and WebMvcTest
...
Fixes gh-24149
2021-02-01 15:03:08 +00:00
Phillip Webb
d06407ec0a
Update copyright year of changed files
2021-01-26 19:06:14 -08:00
Phillip Webb
d95d7a0245
Update code for Spring Framework 5.3.4
...
See gh-24998
2021-01-26 17:35:54 -08:00
Andy Wilkinson
a67edfbeb7
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24518
2020-12-15 17:21:39 +00:00
Andy Wilkinson
76198f9a8d
Include properties from test-autoconfigure in config props appendix
...
Closes gh-24486
2020-12-15 17:20:21 +00:00
Phillip Webb
72d36e0c07
Update copyright year of changed files
2020-12-10 10:46:04 -08:00
Stephane Nicoll
93d83342d2
Merge branch '2.3.x'
...
Closes gh-24401
2020-12-08 15:42:52 +01:00
Stephane Nicoll
06671aa50e
Stop deferring JPA bootstrap mode by default
...
This commit changes the default value of bootstrap-mode to "default"
rather than "deferred" so that the JPA infrastructure starts in the
main thread rather than asynchronously.
Closes gh-24249
2020-12-08 15:42:14 +01:00
Phillip Webb
30c27274e2
Merge branch '2.3.x'
...
Closes gh-24339
2020-12-04 18:31:55 -08:00
Phillip Webb
5f351a6983
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24338
2020-12-04 18:21:57 -08:00
Phillip Webb
837fc83527
Fix checkstyle header violations
...
See gh-24337
2020-12-04 18:05:53 -08:00
Stephane Nicoll
b6fc0913cf
Merge branch '2.3.x'
...
Closes gh-24104
2020-11-10 17:44:05 +01:00
Stephane Nicoll
515b18e142
Merge branch '2.3.x'
...
Closes gh-24108
2020-11-10 17:10:26 +01:00
Stephane Nicoll
9e901b6e07
Upgrade to Testcontainers 1.15.0
...
Closes gh-24103
2020-11-10 16:24:16 +01:00
Stephane Nicoll
23ad2b4156
Rationalize Testcontainers image versions
...
This commit rationalizes the Docker image names used in integration
tests.
Closes gh-24107
2020-11-10 16:04:27 +01:00
Andy Wilkinson
a4505eaeb0
Merge branch '2.3.x'
...
Closes gh-24024
2020-11-04 09:41:41 +00:00
Andy Wilkinson
81f672eae3
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24023
2020-11-04 09:40:54 +00:00
Andy Wilkinson
28ccf54b21
Ignore schema username when auto-configuring a test DB
...
Previously, when an embedded test database was being auto-configured
any schema username and password specified by the user would result
in a separate embedded test database being created to load the schema.
This then left the actual test database without the schema causing
test failures.
This commit updates the test database auto-configuration to set the
schema username to an empty string in a property source that's added
first to the environment's property sources. This causes any schema
username configured by the user to be ignored, preventing the creation
of a separate database for schema.sql processing.
Fixes gh-19321
2020-11-04 09:30:19 +00:00
Andy Wilkinson
c93d91175d
Merge branch '2.3.x'
...
Closes gh-24007
2020-11-03 10:27:53 +00:00
Andy Wilkinson
2513071b1f
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24006
2020-11-03 10:27:38 +00:00
Andy Wilkinson
622606d85a
Make it clearer that only the main DataSource bean may be replaced
...
Closes gh-23808
2020-11-03 10:24:44 +00:00
Andy Wilkinson
8004a821f2
Fix nested test config discovery for sliced tests
...
Fixes gh-23984
2020-11-02 20:40:27 +00:00
Phillip Webb
929d8fcd3c
Update copyright year of changed files
2020-10-29 09:08:13 -07:00
Andy Wilkinson
506f7acc8d
Streamline use of TestContextAnnotationUtils
...
See gh-12470
2020-10-28 10:20:14 +00:00
Andy Wilkinson
6b437ece54
Inherit enclosing class's configuration in nested tests
...
Fixes gh-12470
2020-10-28 08:56:42 +00:00
Phillip Webb
11a153869f
Polish 'Support nested @PropertyMapping annotations'
...
See gh-23146
2020-10-27 18:49:04 -07:00
Stefan Zwanenburg
edf4c833c2
Support nested @PropertyMapping annotations
...
Update `AnnotationsPropertySource` so that nested annotations are
supported. Prior to this commit, annotations annotated with
`@PropertyMapping` that contained nested annotation attributes would
result in instances of `TypeMappedAnnotation` being used as properties.
This usually led to errors due to not being able to convert those to
Strings. This commit makes it so that nested annotations are recursively
mapped to properties. This should allow for more complex configuration
to be mapped from annotations.
See gh-23146
2020-10-27 18:48:46 -07:00
Brian Clozel
9c54a5369d
Merge branch '2.3.x'
...
Closes gh-23816
2020-10-22 21:40:22 +02:00
Brian Clozel
b37eecc015
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23812
2020-10-22 20:16:01 +02:00
Brian Clozel
5eb1e26e10
Add HttpEncodingAutoConfiguration to WebMvcTest
...
Prior to this commit, tests using the `@WebMvcTest` annotation would not
include the `HttpEncodingAutoConfiguration`. This means that, even if
configured, the encoding filter would not be configured in MVC tests,
resulting in an inconsistency with `@SpringBootTest` tests.
This commit ensures that the `HttpEncodingAutoConfiguration` is included
when `@WebMvcTest` is used.
Fixes gh-23749
2020-10-22 20:02:45 +02:00
Stephane Nicoll
a5b27789c0
Document how to use DataNeo4jTest with reactive access
...
Closes gh-23630
2020-10-14 14:04:58 +02:00
Madhura Bhave
7c22e71753
Polish "Deprecate EmbeddedDatabaseConnection#HSQL"
...
See gh-23565
2020-10-01 16:56:48 -07:00
Stephane Nicoll
366fec33d0
Adapt to API change in Spring Framework 5.3.0 snapshots
...
See gh-23534
2020-09-30 13:46:57 +02:00
Stephane Nicoll
2852ea0808
Remove useless version override for MongoDBContainer
...
Closes gh-23520
2020-09-29 10:50:30 +02:00
Phillip Webb
c284edde67
Update copyright year of changed files
2020-09-17 00:31:01 -07:00
Stephane Nicoll
91cc283c39
Upgrade to JUnit Jupiter 5.7.0
...
Closes gh-23351
2020-09-16 13:28:31 +02:00
Stephane Nicoll
5a86162ff3
Polish "Simplify code"
...
See gh-23111
2020-09-01 10:06:17 +02:00
EruDev
ffc577b499
Simplify code
...
See gh-23111
2020-09-01 10:04:31 +02:00
Andy Wilkinson
9ee2487a6e
Merge branch '2.3.x'
...
Closes gh-23128
2020-08-28 14:37:20 +01:00
dreis2211
51c9dee899
Use DynamicPropertySource in MongoDB tests
...
See gh-23127
2020-08-28 14:32:01 +01:00
Andy Wilkinson
2c166d1a58
Merge branch '2.3.x'
...
Closes gh-23125
2020-08-28 12:29:29 +01:00
Andy Wilkinson
33ef1b6e5b
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23124
2020-08-28 12:29:07 +01:00
Andy Wilkinson
5cd910c7ce
Replace Embedded Mongo with Testcontainers' MongoDB support
...
Closes gh-23090
2020-08-28 12:00:31 +01:00
Andy Wilkinson
cf0036992f
Increase timeouts used in Cassandra integration tests
...
Closes gh-23083
2020-08-25 16:33:26 +01:00
Phillip Webb
4df618a2b1
Merge branch '2.3.x'
...
Closes gh-22967
2020-08-14 17:12:53 -07:00
Phillip Webb
f75e988450
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22966
2020-08-14 17:12:41 -07:00
Phillip Webb
3271542d98
Add @Interited to @TypeExcludeFilters
...
Update `@TypeExcludeFilters` so that it is also annotated with
`@Inherited`.
Closes gh-22939
2020-08-14 17:12:31 -07:00
Madhura Bhave
bbbbe8e4d2
Make security auto-configs back off when SecurityFilterChain present
...
Closes gh-22739
2020-08-14 12:24:25 -07:00
Scott Frederick
2a998a4373
Fix DataNeo4jTestReactiveIntegrationTests
...
See gh-22940
2020-08-13 13:45:04 -05:00
Stephane Nicoll
045d2f678d
Document Spring Data Neo4j 6 support
...
Closes gh-22652
2020-08-13 17:51:39 +02:00
Andy Wilkinson
0d8719adb7
Merge branch '2.3.x'
...
Closes gh-22911
2020-08-12 13:14:33 +01:00
Andy Wilkinson
65ccb514d0
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22910
2020-08-12 13:14:15 +01:00
Johnny Lim
68e2dd626d
Mention configuration customizers for WebTestClient and RestAssured
...
See gh-22765
2020-08-12 13:13:11 +01:00
Andy Wilkinson
969dd35e45
Upgrade to Mockito 3.4.6
...
Closes gh-22838
2020-08-10 15:22:03 +01:00
Phillip Webb
f7f4ff0ac9
Update copyright year of changed files
2020-08-06 14:35:43 -07:00
Stephane Nicoll
dac63fc3e5
Polish
2020-08-06 17:35:01 +02:00
Stephane Nicoll
313b2bef6f
Polish "Add test slice for Spring Data Cassandra"
...
See gh-17490
2020-08-05 16:46:52 +02:00
ayudovin
ae152b176b
Add test slice for Spring Data Cassandra
...
See gh-17490
2020-08-05 16:46:52 +02:00
Stephane Nicoll
36fb86a110
Update to core r2dbc support
...
This commit adapts the auto-configuration for the new core r2dbc support
in Spring Framework and provides auto-configuration for
R2dbcEntityOperations.
Closes gh-22708
2020-08-04 16:00:29 +02:00
Andy Wilkinson
5f1198c917
Merge branch '2.3.x'
...
Closes gh-22670
2020-07-30 12:13:04 +01:00
Andy Wilkinson
45346b63ba
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22669
2020-07-30 12:12:45 +01:00
Andy Wilkinson
22dc4e7608
Clarify documentation on @AutoConfigureRestDocs with WebTestClient
...
Closes gh-15977
2020-07-30 12:12:10 +01:00
Stephane Nicoll
9bc71fe44f
Polish "Upgrade to Spring Data Neo4j 6"
...
See gh-22299
2020-07-29 19:36:42 +02:00
Gerrit Meier
15cd343737
Upgrade to Spring Data Neo4j 6
...
See gh-22299
2020-07-29 18:58:08 +02:00
Andy Wilkinson
8a9cc64221
Merge branch '2.3.x'
...
Closes gh-22577
2020-07-27 10:12:09 +01:00
Andy Wilkinson
5279b90ced
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22576
2020-07-27 10:11:47 +01:00
Andy Wilkinson
1c3528f5a4
Include Jackson Modules in WebMvcTest and WebFluxTest
...
Fixes gh-22530
2020-07-27 10:11:29 +01:00
Stephane Nicoll
3530ac9b0c
Polish "Disable metrics export in integration tests"
...
See gh-21658
2020-07-24 15:43:17 +02:00
bono007
b1830da0da
Disable metrics export in integration tests
...
This commit introduces a new property to globally disable metrics
export. In integration tests, this property is automatically set to
disable everything but in-memory metrics.
This commit also introduces a `@AutoConfigureMetrics` annotation that
can be used for integration tests that require metrics export to operate
as they would in an application.
See gh-21658
2020-07-24 15:43:17 +02:00
Andy Wilkinson
0ac7178ae1
Merge branch '2.3.x'
...
Closes gh-22491
2020-07-22 06:43:28 +01:00
dreis2211
198131f5e4
Remove redundant compiler arguments in Gradle build files
...
See gh-22488
2020-07-22 06:42:48 +01:00
Andy Wilkinson
0d6ea79007
Start building against Spring Framework 5.3.0 snapshots
...
See gh-21929
2020-06-22 18:02:21 +01:00
Stephane Nicoll
f0f8424191
Merge branch '2.3.x'
...
Closes gh-22008
2020-06-18 11:31:00 +02:00
dreis2211
855d596c2a
Use lazy lambda instead of explicit argument
...
See gh-21986
2020-06-18 11:29:49 +02:00
Andy Wilkinson
9e08490522
Merge branch 'gh-21271'
...
Closes gh-21271
2020-06-16 12:52:17 +01:00
Andy Wilkinson
9636350b0b
Enable rawtypes compilation warnings
...
See gh-21271
2020-06-16 12:50:50 +01:00
Andy Wilkinson
47874d8c6a
Treat warnings as errors when compiling
...
See gh-21271
2020-06-16 12:50:41 +01:00
Andy Wilkinson
0de466e06e
Require dependency on s-b-dependencies to use its constraints
...
Previously, Spring Boot's modules published Gradle Module Metadata
(GMM) the declared a platform dependency on spring-boot-dependencies.
This provided versions for each module's own dependencies but also had
they unwanted side-effect of pulling in spring-boot-dependencies
constraints which would influence the version of other dependencies
declared in the same configuration. This was undesirable as users
should be able to opt in to this level of dependency management, either
by using the dependency management plugin or by using Gradle's built-in
support via a platform dependency on spring-boot-dependencies.
This commit reworks how Spring Boot's build uses
spring-boot-dependencies and spring-boot-parent to provide its own
dependency management. Configurations that aren't seen by consumers are
configured to extend a dependencyManagement configuration that has an
enforced platform dependency on spring-boot-parent. This enforces
spring-boot-parent's version constraints on Spring Boot's build without
making them visible to consumers. To ensure that the versions that
Spring Boot has been built against are visible to consumers, the
Maven publication that produces pom files and GMM for the published
modules is configured to use the resolved versions from the module's
runtime classpath.
Fixes gh-21911
2020-06-16 08:50:21 +01:00
Andy Wilkinson
ce68f1a097
Merge branch '2.2.x' into 2.3.x
...
Closes gh-21837
2020-06-10 09:56:24 +01:00