Andy Wilkinson
5c2d4980de
Upgrade to Couchbase Client 2.5.8
...
Closes gh-13067
2018-05-04 19:18:36 +01:00
Andy Wilkinson
820115a125
Merge branch '2.0.x'
2018-05-04 16:01:54 +01:00
Andy Wilkinson
c16f99f782
Revert "Upgrade to Ehcache 2.10.5" in 2.0 as well
...
See gh-13056
2018-05-04 16:01:39 +01:00
Stephane Nicoll
23c49116ff
Merge branch '2.0.x'
2018-05-04 16:57:27 +02:00
Stephane Nicoll
18b1e8da60
Merge branch '1.5.x' into 2.0.x
2018-05-04 16:57:12 +02:00
Stephane Nicoll
1314aaa368
Avoid early init of CacheManager
...
This commit restructures the Cache auto-configuration to avoid an early
init on CacheManager (and potentially all its infrastructure). Rather
than adding a dependency on the validator bean, this commit relies on
the fact CacheAspectSupport checks if a CacheManager is available in the
afterSingletonsInstantiated callback. In this case, a simple bean with
a postconstruct callback is enough.
Closes gh-13038
2018-05-04 16:25:06 +02:00
Stephane Nicoll
303b479b90
Merge branch '2.0.x'
2018-05-04 16:15:26 +02:00
Stephane Nicoll
959c569199
Merge branch '1.5.x' into 2.0.x
2018-05-04 16:15:10 +02:00
Stephane Nicoll
7392c57343
Fix nested class binding example
...
Closes gh-13060
2018-05-04 16:13:13 +02:00
Andy Wilkinson
c43f1e65ab
Merge branch '2.0.x'
2018-05-04 14:04:17 +01:00
Andy Wilkinson
5b1312aa2a
Merge branch '1.5.x' into 2.0.x
2018-05-04 14:03:59 +01:00
Andy Wilkinson
ed9ac53acd
Revert "Upgrade to Ehcache 2.10.5"
...
This reverts commit f78fd74bb9
2018-05-04 14:01:17 +01:00
Andy Wilkinson
bea353962c
Align Undertow tests with changes made to fix UNDERTOW-1260
...
Closes gh-13055
2018-05-04 13:45:01 +01:00
Stephane Nicoll
15936a1fe8
Merge branch '2.0.x'
2018-05-04 14:27:39 +02:00
Stephane Nicoll
6396d28b06
Merge pull request #13061 from vpavic:improve-docs
...
* pr/13061:
Polish "Improve Spring Session docs"
Improve Spring Session docs
2018-05-04 14:27:28 +02:00
Stephane Nicoll
126f928f36
Polish "Improve Spring Session docs"
...
Closes gh-13061
2018-05-04 14:26:51 +02:00
Vedran Pavic
370160720d
Improve Spring Session docs
...
See gh-13061
2018-05-04 14:26:39 +02:00
Andy Wilkinson
65e6011b7f
Merge branch '2.0.x'
2018-05-04 11:45:35 +01:00
Andy Wilkinson
2bcf29913d
Skip building the Gradle plugin on Java 9 as well as 10
...
Upgrading the JDK 9-based build to use JDK 9.0.4 has revealed that
Gradle 4.0.x doesn't work with it as it fails to parse the 9.0.4
version number.
This commit disables building the Gradle plugin on Java 9 (as we
had already done for Java 10) until we decide what to do
(see gh-12333).
2018-05-04 11:40:35 +01:00
Andy Wilkinson
a3ac21a231
Merge branch '2.0.x'
2018-05-04 10:25:18 +01:00
Andy Wilkinson
d70434a27d
Use 9.0.4-12-jdk for JDK 9-based CI
...
Closes gh-13059
2018-05-04 10:24:55 +01:00
Andy Wilkinson
b4ccf5186b
Merge branch '2.0.x'
2018-05-04 10:04:19 +01:00
Andy Wilkinson
a1f3e7970c
Merge branch '1.5.x' into 2.0.x
2018-05-04 10:03:54 +01:00
Andy Wilkinson
bcd2b7d60f
Upgrade to Infinispan 8.2.11.Final
...
Closes gh-13058
2018-05-04 09:46:29 +01:00
Andy Wilkinson
ebf1622b3a
Upgrade to Tomcat 8.5.31
...
Closes gh-13057
2018-05-04 09:46:28 +01:00
Andy Wilkinson
f78fd74bb9
Upgrade to Ehcache 2.10.5
...
Closes gh-13056
2018-05-04 09:46:27 +01:00
Andy Wilkinson
f1ec54b3b6
Upgrade to Undertow 1.4.25.Final
...
Closes gh-13055
2018-05-04 09:46:27 +01:00
Andy Wilkinson
0fd5ef1632
Upgrade to Gson 2.8.4
...
Closes gh-13054
2018-05-04 09:46:26 +01:00
Andy Wilkinson
a45d05347f
Upgrade to Jackson 2.8.11.20180405
...
Closes gh-13053
2018-05-04 09:46:26 +01:00
Andy Wilkinson
208c4b9a35
Upgrade to GemFire 8.2.11
...
Closes gh-13052
2018-05-04 09:42:14 +01:00
Phillip Webb
b6a2a46f78
Merge branch '2.0.x'
2018-05-03 23:54:42 -07:00
Phillip Webb
2d70a7ae5e
Polish caught exception names
...
Prefer `ex` over `e`.
2018-05-03 22:43:32 -07:00
Phillip Webb
41efea51a7
Polish ternary expressions
...
Consistently format ternary expressions and always favor `!=` as the
the check.
2018-05-03 22:43:12 -07:00
Phillip Webb
bbf94c22da
Polish
2018-05-03 22:42:49 -07:00
Phillip Webb
8c0c0ee55a
Merge branch '2.0.x'
2018-05-03 12:44:58 -07:00
Phillip Webb
e125085993
Merge branch '1.5.x' into 2.0.x
2018-05-03 12:43:50 -07:00
Phillip Webb
4e96587dc8
Polish modifier declaration ordering
...
Follow that Java language specification.
2018-05-03 09:46:15 -07:00
Phillip Webb
64930d4e5b
Polish caught exception names
...
Prefer `ex` over `e`.
2018-05-03 09:46:15 -07:00
Phillip Webb
3ee777e142
Polish ternary expressions
...
Consistently format ternary expressions and always favor `!=` as the
the check.
2018-05-03 09:46:15 -07:00
Phillip Webb
690f946b6d
Polish
2018-05-03 09:46:14 -07:00
Stephane Nicoll
36a377764f
Merge branch '2.0.x'
2018-05-03 15:53:32 +02:00
Stephane Nicoll
60e4e51fea
Merge pull request #13031 from making:more-kafka-ssl-props
...
* pr/13031:
Polish "Complete SSL configuration for Kafka"
Complete SSL configuration for Kafka
2018-05-03 15:53:10 +02:00
Stephane Nicoll
700ec6b840
Polish "Complete SSL configuration for Kafka"
...
Closes gh-13031
2018-05-03 15:50:33 +02:00
Toshiaki Maki
d208641c59
Complete SSL configuration for Kafka
...
See gh-13031
2018-05-03 15:38:49 +02:00
Andy Wilkinson
4ea7d3a767
Merge branch '2.0.x'
2018-05-03 11:35:58 +01:00
Andy Wilkinson
f5fabbc1b9
Remove the use of internal API from Gradle Plugin's BootJar
...
Closes gh-13037
2018-05-03 11:34:42 +01:00
Stephane Nicoll
921c037956
Merge branch '2.0.x'
2018-05-03 11:47:33 +02:00
Stephane Nicoll
69ab956e8b
Stop assuming datasource creation failure originates from auto-config
...
There are documented way to reuse bits of the infrastructure in user
config to offer similar datasource configuration. If that fails, the
regular failure there will kick in.
This commit improves `DataSourceBeanCreationFailureAnalyzer` to not
misguide users that the auto-configuration has failed. Rather, it
describes what has failed in a more generic way.
Closes gh-12947
2018-05-03 11:46:27 +02:00
Stephane Nicoll
ca1b637728
Merge branch '2.0.x'
2018-05-03 11:14:59 +02:00
Stephane Nicoll
b3ad902902
Merge branch '1.5.x' into 2.0.x
2018-05-03 11:14:42 +02:00
