Commit Graph

16539 Commits

Author SHA1 Message Date
Madhura Bhave
cdb5d76c7d Merge branch '2.0.x' 2018-05-04 18:12:25 -07:00
Madhura Bhave
469372c5ef Account for servlet path "/" in EndpointRequest
See gh-12934
2018-05-04 18:09:15 -07:00
Madhura Bhave
e02954a25b Merge branch '2.0.x' 2018-05-04 16:55:54 -07:00
Madhura Bhave
f5f3af7f9c Point to gradle plugin's doc for custom dependency versions
Fixes gh-12807
2018-05-04 16:54:11 -07:00
Phillip Webb
7b120c1c97 Formatting 2018-05-04 16:36:35 -07:00
Phillip Webb
42c053cf1b Merge branch '2.0.x' 2018-05-04 16:31:46 -07:00
Phillip Webb
6de479fe6a Polish 2018-05-04 16:08:05 -07:00
Phillip Webb
93046d058d Polish 2018-05-04 16:05:12 -07:00
Madhura Bhave
6855c5556d EndpointRequest should consider server.servlet.path
Fixes gh-12934
2018-05-04 16:03:31 -07:00
Phillip Webb
5b3cb8a698 Update copyright header year for changed files 2018-05-04 15:59:26 -07:00
Phillip Webb
57bfbfb3ad Fix checkstyle errors 2018-05-04 15:58:59 -07:00
Phillip Webb
9ca13911ab Merge branch '1.5.x' into 2.0.x 2018-05-04 15:53:06 -07:00
Phillip Webb
c104bae76c Fix checkstyle errors 2018-05-04 15:32:29 -07:00
Phillip Webb
99dad81e9a Update copyright header year for changed files 2018-05-04 12:15:13 -07:00
Phillip Webb
6e09e497f2 Formatting 2018-05-04 12:06:19 -07:00
Phillip Webb
86f43c4750 Merge branch '1.5.x' into 2.0.x 2018-05-04 12:04:48 -07:00
Andy Wilkinson
b18a456123 Merge branch '2.0.x' 2018-05-04 20:02:43 +01:00
Phillip Webb
0a0247975c Formatting 2018-05-04 12:00:50 -07:00
Andy Wilkinson
fefe9e4e49 Upgrade to Junit Jupiter 5.1.1
Closes gh-13075
2018-05-04 19:18:41 +01:00
Andy Wilkinson
c74292c222 Upgrade to Jooq 3.10.7
Closes gh-13074
2018-05-04 19:18:40 +01:00
Andy Wilkinson
ee587130b2 Upgrade to Narayana 5.8.1.Final
Closes gh-13073
2018-05-04 19:18:40 +01:00
Andy Wilkinson
36880ad25b Upgrade to Hibernate 5.2.17.Final
Closes gh-13072
2018-05-04 19:18:39 +01:00
Andy Wilkinson
578dd8611c Upgrade to Elasticsearch 5.6.9
Closes gh-13071
2018-05-04 19:18:39 +01:00
Andy Wilkinson
205449cca1 Upgrade to Javax Money 1.0.3
Closes gh-13070
2018-05-04 19:18:38 +01:00
Andy Wilkinson
9ec27d1f97 Upgrade to Rxjava2 2.1.13
Closes gh-13069
2018-05-04 19:18:37 +01:00
Andy Wilkinson
ff915b3450 Upgrade to Hazelcast 3.9.4
Closes gh-13068
2018-05-04 19:18:36 +01:00
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.

See gh-13056
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