Phillip Webb
b0415c4044
Don't ignore images on CI build
...
Closes gh-17255
2019-06-18 14:49:16 -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
064240266f
Upgrade Java 11 version in CI image
...
Closes gh-17244
2019-06-18 10:31:14 -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
de037f55dc
Fix detect JDK CI script
2019-06-18 09:50:05 -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
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
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
88fbc529e6
Upgrade to Micrometer 1.1.5
...
Closes gh-17222
2019-06-17 16:15:44 +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
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
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
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
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
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
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
7d59b78829
Fix handling of jar files with + chars in their path
...
Closes gh-17208
2019-06-17 10:31:51 +01: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
Andy Wilkinson
84c6313332
Upgrade to Spring Session Bom Bean-SR6
...
Closes gh-17209
2019-06-16 08:47:40 +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
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
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
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
Andy Wilkinson
1b495f5a42
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17195
2019-06-14 15:47:39 +01:00
Andy Wilkinson
4bae91d933
Merge branch '1.5.x' into 2.0.x
2019-06-14 15:47:22 +01:00
Andy Wilkinson
9813889030
Merge pull request #16879 from lukaseder
...
* gh-16879:
Fix jOOQ's trademark
Closes gh-16879
2019-06-14 15:46:22 +01:00
Lukas Eder
6d967d9bf1
Fix jOOQ's trademark
...
See gh-16879
2019-06-14 15:46:09 +01:00
Andy Wilkinson
71214e7ef4
Merge pull request #17057 from izeye
...
* gh-17057:
Remove prohibited entry for couchbase-client
Closes gh-17057
2019-06-14 15:39:35 +01:00
Johnny Lim
a584c64254
Remove prohibited entry for couchbase-client
...
See gh-17057
2019-06-14 15:37:45 +01:00
Andy Wilkinson
96ac42e405
Upgrade to Spring Data Lovelace-SR9
...
Closes gh-17193
2019-06-14 15:24:32 +01:00
Andy Wilkinson
d5d96dff96
Honor logback.debug property and write Logback statuses to console
...
Closes gh-16876
2019-06-14 15:12:05 +01:00
Andy Wilkinson
60358da43a
Merge branch '2.0.x' into 2.1.x
2019-06-14 14:12:20 +01:00