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

22051 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phillip Webb
eddbfb34f7 Merge branch '2.1.x' 
Closes gh-17258
 2019-06-18 15:08:54 -07:00
Phillip Webb
ffbb23bc6d Always use credentials in forward merge script 
Closes gh-17257
 2019-06-18 15:08:09 -07:00
Phillip Webb
d85a69aa8e Merge branch 'spring-projects/2.1.x' 
Closes gh-17256
 2019-06-18 15:06:17 -07:00
Phillip Webb
b0415c4044 Don't ignore images on CI build 
Closes gh-17255
 2019-06-18 14:49:16 -07:00
Phillip Webb
cc1807608e Merge branch '2.1.x' 
Closes gh-17249
 2019-06-18 10:33:20 -07:00
Phillip Webb
718c1d7204 Upgrade Java 12 version in CI image 
Closes gh-17246
 2019-06-18 10:32:57 -07:00
Phillip Webb
f4756e500d Merge '2.1.x' 
Closes gh-17248
 2019-06-18 10:31:37 -07:00
Phillip Webb
064240266f Upgrade Java 11 version in CI image 
Closes gh-17244
 2019-06-18 10:31:14 -07:00
Phillip Webb
43ef81cbb6 Merge branch '2.1.x' 
Closes gh-17247
 2019-06-18 10:29:58 -07:00
Phillip Webb
3869da88d4 Upgrade Java 8 version in CI image 
Closes gh-17245
 2019-06-18 10:29:19 -07:00
Phillip Webb
1513ed1b09 Merge branch '2.1.x' 2019-06-18 09:50:34 -07:00
Phillip Webb
de037f55dc Fix detect JDK CI script 2019-06-18 09:50:05 -07:00
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