spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-25 10:59:03 +00:00
Code Issues Projects Releases Wiki Activity
22,021 Commits 28 Branches 395 Tags
da897d691d3397d45bf57715bfe5ebfdb8e4807d
Commit Graph
22021 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson da897d691d Merge branch '2.1.x' 2019-06-17 14:26:06 +01:00
Andy Wilkinson ade4f32f96 Merge branch '2.0.x' into 2.1.x 2019-06-17 14:26:01 +01:00
Andy Wilkinson 5011338714 Merge branch '1.5.x' into 2.0.x 2019-06-17 14:23:27 +01:00
Andy Wilkinson 8589cf68ef Merge branch '2.1.x' 2019-06-17 14:22:32 +01:00
Andy Wilkinson e8e9ec93bb Merge branch '2.0.x' into 2.1.x 2019-06-17 14:22:26 +01:00
Andy Wilkinson a51d31b4d5 Merge branch '1.5.x' into 2.0.x 2019-06-17 14:22:06 +01:00
Andy Wilkinson 844873c18a Starting building against Spring Framework 4.3.25 snaphots 
See gh-17221
 2019-06-17 14:15:58 +01:00
Andy Wilkinson a189e4cf96 Merge branch '2.1.x' 
Closes gh-17220
 2019-06-17 14:05:16 +01:00
Andy Wilkinson ceace66a28 Merge pull request #16485 from lorenzodee 
* gh-16485:
  Polish "Honour base path from @WebAppConfiguration in @WebMvcTest"
  Honour base path from @WebAppConfiguration in @WebMvcTest

Closes gh-16485
 2019-06-17 13:54:57 +01:00
Andy Wilkinson 645514f848 Polish "Honour base path from @WebAppConfiguration in @WebMvcTest" 
See gh-16485
 2019-06-17 13:54:41 +01:00
Lorenzo Dee 7340d546b8 Honour base path from @WebAppConfiguration in @WebMvcTest 
See gh-16485
 2019-06-17 13:37:55 +01:00
Andy Wilkinson 9d355f00e1 Merge branch '2.1.x' 
Closes gh-17218
 2019-06-17 13:19:45 +01:00
Andy Wilkinson 6f4d598418 Merge pull request #16814 from deakandris 
* gh-16814:
  Polish "Consider properties from @AutoConfigureTestDatabase"
  Consider properties from @AutoConfigureTestDatabase

Closes gh-16814
 2019-06-17 11:45:03 +01:00
Andy Wilkinson 5dc2339ec2 Polish "Consider properties from @AutoConfigureTestDatabase" 
See gh-16814
 2019-06-17 11:38:13 +01:00
András Deák 92256c80d0 Consider properties from @AutoConfigureTestDatabase 
Both Flyway and Liquibase makes use of DataSourceProperties to get
default properties. Previously, both used strictly the configuration
properties and failed to consider embedded datasource properties
autoconfigured by @AutoConfigureTestDatabase. In case a database layer
test e.g. @JdbcTest relies on the autoconfigured embedded datasource,
Flyway and Liquibase autoconfiguration fails as they are not aware of
the embedded datasource properties.

See gh-16814
 2019-06-17 11:09:29 +01:00
Andy Wilkinson f36af7b16d Polish 2019-06-17 11:02:54 +01:00
Andy Wilkinson 78f51a490c Merge branch '2.1.x' 
Closes gh-17213
 2019-06-17 10:59:16 +01:00
Andy Wilkinson ba85394e83 Merge pull request #17066 from nosan 
* gh-17066:
  Polish "Auto-configure caching in jOOQ sliced tests"
  Auto-configure caching in jOOQ sliced tests

Closes gh-17066
 2019-06-17 10:58:26 +01:00
Andy Wilkinson c2a4a3f630 Polish "Auto-configure caching in jOOQ sliced tests" 
See gh-17066
 2019-06-17 10:55:35 +01:00
Dmytro Nosan 4701d8f82a Auto-configure caching in jOOQ sliced tests 
See gh-17066
 2019-06-17 10:55:35 +01:00
Andy Wilkinson c62543b514 Merge branch '2.1.x' 
Closes gh-17212
 2019-06-17 10:47:22 +01:00
Andy Wilkinson 13a7a52c71 Revert "Work around Framework regression in handling of null model values" 
This reverts commit 5fc67c545c.

Closes gh-16991
 2019-06-17 10:44:23 +01:00
Andy Wilkinson ece8703278 Merge branch '2.1.x' 
Closes gh-17211
 2019-06-17 10:36:46 +01:00
Andy Wilkinson 7d59b78829 Fix handling of jar files with + chars in their path 
Closes gh-17208
 2019-06-17 10:31:51 +01:00
Phillip Webb 840f0d7a9f Merge branch '2.1.x' 
Closes gh-17210
 2019-06-16 21:05:41 -07:00
Phillip Webb 4894affbb6 Allow maven central sync to run several times 
Update the "sync to maven central" CI job so that it can be rerun if
necessary. We now first check if artifacts are already published before
triggering the sync from Bintray.

Closes gh-16866
 2019-06-16 21:00:31 -07:00
Stephane Nicoll f97c9be277 Merge pull request #17132 from izeye 
* pr/17132:
  Fix typo

Closes gh-17132
 2019-06-16 11:43:09 +02:00
Johnny Lim 368c0eebe4 Fix typo 
See gh-17132
 2019-06-16 11:42:00 +02:00
Andy Wilkinson 801ce6d0a1 Upgrade to Spring Session Corn-M2 
Closes gh-16587
 2019-06-16 08:48:57 +01:00
Andy Wilkinson 7f19a8324b Merge branch '2.1.x' 2019-06-16 08:47:54 +01:00
Andy Wilkinson 84c6313332 Upgrade to Spring Session Bom Bean-SR6 
Closes gh-17209
 2019-06-16 08:47:40 +01:00
Andy Wilkinson fa99bd1d89 Upgrade to Spring Integration 5.2.0.M3 
Closes gh-17201
 2019-06-15 10:44:09 +01:00
Andy Wilkinson 8c41956291 Merge branch '2.1.x' 2019-06-15 10:42:22 +01:00
Andy Wilkinson fa8dc04751 Upgrade to Spring Kafka 2.2.7.RELEASE 
Closes gh-17206
 2019-06-15 10:42:14 +01:00
Andy Wilkinson e842dc7f0c Upgrade to Spring Integration 5.1.6.RELEASE 
Closes gh-17205
 2019-06-15 10:42:14 +01:00
Andy Wilkinson 88df70c4d0 Upgrade to Spring Amqp 2.1.7.RELEASE 
Closes gh-17204
 2019-06-15 10:42:14 +01:00
Andy Wilkinson d1dc457a87 Upgrade to Spring AMQP 2.2.0.M3 
Closes gh-17203
 2019-06-15 10:36:13 +01:00
Andy Wilkinson c059c02dca Upgrade to Spring Kafka 2.3.0.M3 
Closes gh-17202
 2019-06-15 10:35:41 +01:00
Andy Wilkinson 9fda7add5c Upgrade to Spring Security 5.2.0.M3 
Closes gh-16965
 2019-06-15 10:35:01 +01:00
Phillip Webb b74926e85d Merge branch '2.1.x' 2019-06-14 22:46:57 -07:00
Phillip Webb a7c38daff2 Merge branch '2.0.x' into 2.1.x 2019-06-14 22:46:26 -07:00
Phillip Webb 5259086a4b Fix type in CI readme 2019-06-14 22:46:00 -07:00
Phillip Webb 139b30091e Merge branch '2.1.x' 2019-06-14 22:42:20 -07:00
Phillip Webb bea0d08aac Merge branch '2.0.x' into 2.1.x 2019-06-14 22:40:50 -07:00
Phillip Webb 53ba37e3e1 Update CI readme 2019-06-14 22:39:03 -07:00
Phillip Webb 25e73633bb Update CI credhub references 2019-06-14 22:18:45 -07:00
Phillip Webb 3712e5af7f Merge branch 'local21x/2.1.x' 2019-06-14 21:16:02 -07:00
Phillip Webb b63e65049f Merge branch '2.0.x' into 2.1.x 2019-06-14 21:14:41 -07:00
Phillip Webb 8b64c54919 Add resource icons to CI pipeline 2019-06-14 21:12:42 -07:00
Phillip Webb 25839185c1 Fix checkstyle violation 2019-06-14 18:57:41 -07:00