fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,365 Commits 22 Branches 339 Tags
Commit Graph

490 Commits

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