Commit Graph

6962 Commits

Author SHA1 Message Date
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
6e09e497f2 Formatting 2018-05-04 12:06:19 -07:00
Andy Wilkinson
b18a456123 Merge branch '2.0.x' 2018-05-04 20:02:43 +01: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
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
15936a1fe8 Merge branch '2.0.x' 2018-05-04 14:27:39 +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
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
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
Stephane Nicoll
36a377764f Merge branch '2.0.x' 2018-05-03 15:53:32 +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
Gary Russell
8cf34238d3 Start building against Spring Kafka 2.2.0 snapshots
Closes gh-13007
2018-05-02 16:15:08 +02:00
Stephane Nicoll
eab2d4a404 Merge branch '2.0.x' 2018-05-02 16:13:31 +02:00
Johnny Lim
e7d2f22911 Polish IgnoreTopLevelConverterNotFoundBindHandlerTests
Closes gh-13022
2018-05-02 16:12:37 +02:00