root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
30,510 Commits 23 Branches 345 Tags 287 MiB
Commit Graph

416 Commits

Author SHA1 Message Date
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