Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,039 Commits 23 Branches 0 Tags
809a3965c961752bcbbc4bcae488f34be062d480
Commit Graph

22039 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Clozel
809a3965c9 Add missing outcome tag for WebClient metrics 
On error cases, the "outcome" tag would be missing from recorded metrics
for the `WebClient`.

This commit fixes this issue and improves the reference documentation by
mentioning the tag values used for error cases, when the client response
is not received (I/O errors, client error, etc).

Fixes gh-17219
 2019-06-18 15:29:22 +02:00
Phillip Webb
82949b9cc4 Upgrade to Mariadb 2.4.2 
Closes gh-17237
 2019-06-17 20:56:14 -07:00
Phillip Webb
1e0cf960f0 Reinstate single page HTML and PDF docs 
Closes gh-16854
 2019-06-17 20:44:01 -07:00
Phillip Webb
e44caec60b Merge branch '2.1.x' 
Closes gh-17236
 2019-06-17 19:51:51 -07:00
Phillip Webb
e65d1c777e Exclude Gradle bin folder 2019-06-17 19:47:29 -07:00
Phillip Webb
3eb7af1506 Upgrade to Infinispan 9.4.15.Final 
Closes gh-17235
 2019-06-17 19:42:33 -07:00
Phillip Webb
2c2b962204 Merge branch '2.1.x' 
Closes gh-17232
 2019-06-17 15:54:51 -07:00
Phillip Webb
d82ccf1405 Ensure META-INF/MANIFEST.MF remains as first entry 
Update Gradle archive tasks to ensure that `META-INF/` and
`META-INF/MANIFEST.MF` remain as the first entries of the archive.

Prior to this commit, rewritten archives would violate the implicit
specification of `JarInputStream` that these entries should be first.

Fixes gh-16698
 2019-06-17 15:48:14 -07:00
Phillip Webb
f4d9e1c650 Fix checkstyle violation 2019-06-17 14:45:17 -07:00
Phillip Webb
69fbd8f20c Merge branch '2.1.x' 
Closes gh-17227
Closes gh-17228
 2019-06-17 11:53:16 -07:00
Phillip Webb
5e3438f095 Merge pull request #16535 from ayudovin 
* pr/16535:
  Polish "Fix connection timeout configuration for Netty"
  Fix connection timeout configuration for Netty
  Chain predicates in PropertyMapper when methods

Closes gh-16535
 2019-06-17 11:43:07 -07:00
Phillip Webb
692bda1595 Polish "Fix connection timeout configuration for Netty" 
See gh-16535
 2019-06-17 11:26:36 -07:00
ayudovin
b0e4c716d3 Fix connection timeout configuration for Netty 
Update `NettyWebServerFactoryCustomizer` to deal with the fact that
Netty treats `0` and negative connection timeout values differently to
Tomcat, Undertow and Jetty.

See gh-16535
 2019-06-17 11:24:35 -07:00
ayudovin
c2d1cb2c70 Chain predicates in PropertyMapper when methods 
Update `PropertyMapper` to correctly combine predicates when repeated
calls are made to `when` and `whenNot`. Prior to this commit, subsequent
invocations would replace the previous predicate.

Fixes gh-17225
 2019-06-17 11:21:56 -07:00
Andy Wilkinson
bd14050859 Merge branch '2.1.x' 
Closes gh-17224
 2019-06-17 16:16:41 +01:00
Andy Wilkinson
88fbc529e6 Upgrade to Micrometer 1.1.5 
Closes gh-17222
 2019-06-17 16:15:44 +01:00
Andy Wilkinson
f07f030ba9 Merge branch '2.1.x' 
Closes gh-17223
 2019-06-17 16:08:42 +01:00
Andy Wilkinson
fe9db792ee Complete dependency management for JavaBeans Activation Framework 
Fixes gh-17062
 2019-06-17 16:00:39 +01:00
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