Andy Wilkinson
f4e7b80651
Merge branch '2.0.x' into 2.1.x
...
See gh-17361
2019-06-29 20:38:18 +01:00
Andy Wilkinson
761856ac70
Merge branch '1.5.x' into 2.0.x
2019-06-29 20:29:16 +01:00
Phillip Webb
92bff3c328
Merge branch '2.0.x' into 2.1.x
2019-06-28 23:42:28 -07:00
Phillip Webb
cfeb0239b7
Merge branch '1.5.x' into 2.0.x
2019-06-28 23:28:34 -07:00
Phillip Webb
9aa4887376
Merge branch '2.0.x' into 2.1.x
2019-06-28 14:14:52 -07:00
Phillip Webb
ed3e1e076d
Fix AbstractFilterRegistrationBean merge error
...
Merging 1.5.x accidentally broke `AbstractFilterRegistrationBean`
2019-06-28 14:13:59 -07:00
Phillip Webb
de35efd1ef
Merge branch '2.0.x' into 2.1.x
2019-06-28 12:21:57 -07:00
Phillip Webb
bb34846630
Merge branch '1.5.x' into 2.0.x
2019-06-28 12:19:46 -07:00
Andy Wilkinson
91786bc712
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17334
2019-06-27 11:39:17 +01:00
Andy Wilkinson
256a0d636d
Merge branch '1.5.x' into 2.0.x
2019-06-27 11:39:02 +01:00
Andy Wilkinson
3fb06ee29e
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17320
2019-06-26 17:39:13 +01:00
Andy Wilkinson
4973a2b217
Merge branch '1.5.x' into 2.0.x
2019-06-26 17:37:39 +01:00
Phillip Webb
02e705c8e4
Relax nohttp requirement for service.wsdl
...
Unfortunately https references cause eclipse errors so we need to
relax the requirement for this file.
Fixes gh-17307
2019-06-25 11:17:27 -07:00
Stephane Nicoll
374e02cac8
Simplify HibernateJpaAutoConfiguration classes check
...
This commit removes the now outdated `HibernateEntityManagerCondition`
in favour of a simple check of `SessionImplementor`. As of
Hibernate 5.2, a single `hibernate-core` jar is required so a single
class check is enough.
Closes gh-17288
2019-06-21 15:26:07 +02:00
Stephane Nicoll
86ace26049
Fix broken link to Spring Integration reference guide
...
Closes gh-17279
2019-06-21 09:09:01 +02:00
Andy Wilkinson
a5ae1de706
Fix spring-boot-loader's tests on Windows
...
Closes gh-17275
2019-06-20 11:08:35 +01:00
Stephane Nicoll
7e5ca6d280
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17268
2019-06-19 15:30:13 +02:00
Stephane Nicoll
11dee3c0d8
Merge branch '1.5.x' into 2.0.x
2019-06-19 15:27:49 +02: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
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
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
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
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
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
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
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
1aa193e30b
Upgrade to Maven War Plugin 3.2.3
...
Closes gh-17168
2019-06-14 12:13:55 +01:00
Andy Wilkinson
a3bc383019
Upgrade to Neo4j Ogm 3.1.11
...
Closes gh-17167
2019-06-14 12:13:55 +01:00
Andy Wilkinson
491f5f3233
Upgrade to Infinispan 9.4.14.Final
...
Closes gh-17166
2019-06-14 12:13:55 +01:00
Andy Wilkinson
53c0860151
Upgrade to Hibernate Validator 6.0.17.Final
...
Closes gh-17165
2019-06-14 12:13:55 +01:00
Andy Wilkinson
bc713a6825
Upgrade to Jaybird 3.0.6
...
Closes gh-17164
2019-06-14 12:13:54 +01:00
Andy Wilkinson
8b44d07944
Upgrade to Jetty 9.4.19.v20190610
...
Closes gh-17163
2019-06-14 12:13:54 +01:00
Andy Wilkinson
24242ec476
Upgrade to Tomcat 9.0.21
...
Closes gh-17162
2019-06-14 12:09:44 +01:00
Andy Wilkinson
9a54ec2346
Upgrade to Solr 7.7.2
...
Closes gh-17161
2019-06-14 12:09:43 +01:00
Andy Wilkinson
34b55818d8
Upgrade to Johnzon Jsonb 1.1.12
...
Closes gh-17160
2019-06-14 12:09:42 +01:00