Andy Wilkinson
e4bdf4e513
Polish
2018-05-08 12:14:39 +01:00
Andy Wilkinson
a1bea69555
Make Elasticsearch dependency available to javadoc generation
...
See gh-12600
2018-05-08 12:12:21 +01:00
Stephane Nicoll
503faf3153
Merge branch '2.0.x'
2018-05-08 12:45:17 +02:00
Stephane Nicoll
6577513464
Upgrade to Spring Framework 5.0.6.RELEASE
...
Closes gh-13021
2018-05-08 12:44:55 +02:00
Andy Wilkinson
5b26974000
Merge branch '2.0.x'
2018-05-08 11:30:37 +01:00
Andy Wilkinson
874650cb33
Merge branch '1.5.x' into 2.0.x
2018-05-08 11:30:30 +01:00
Andy Wilkinson
8a5cefb547
Upgrade to Spring Framework 4.3.17.RELEASE
...
Closes gh-13013
2018-05-08 11:29:04 +01:00
Andy Wilkinson
63aff45438
Upgrade to Jetty 9.4.10.v20180503
...
Closes gh-13097
2018-05-08 11:28:01 +01:00
Andy Wilkinson
55d66f3e6d
Merge branch '2.0.x'
2018-05-08 09:58:57 +01:00
Andy Wilkinson
14520f6ca8
Include build pipeline name in Slack alerts
2018-05-08 09:58:33 +01:00
Brian Clozel
84c9a65e9d
Auto-configure Elasticsearch REST clients
...
This commit adds auto-configuration support for both `RestClient` and
`RestHighLevelClient` which are provided by `elasticsearch-rest-client`
and `elasticsearch-rest-high-level-client` dependencies respectively.
`RestClient` is associated with configuration properties in the
`spring.elasticsearch.rest.*` namespace, since this is the component
taking care of HTTP communication with the actual Elasticsearch node.
`RestHighLevelClient` wraps the first one and naturally inherits that
configuration.
Closes gh-12600
2018-05-07 17:57:09 +02:00
Stephane Nicoll
43ef5ba205
Merge pull request #13078 from izeye:polish-20180505
...
* pr/13078:
Polish
2018-05-07 14:55:39 +02:00
Johnny Lim
96ce71ddc4
Polish
...
Closes gh-13078
2018-05-07 14:55:13 +02:00
Stephane Nicoll
3ad8f3fcbf
Merge branch '2.0.x'
2018-05-07 14:53:58 +02:00
Stephane Nicoll
9dccf5b895
Polish
...
See gh-13078
2018-05-07 14:48:56 +02:00
Stephane Nicoll
7f50d49251
Merge branch '2.0.x'
2018-05-07 14:42:39 +02:00
Stephane Nicoll
6e428100d7
Merge pull request #13084 from dreis2211:mock-server-empty-enumeration
...
* pr/13084:
Remove MockServletWebServer.emptyEnumeration()
2018-05-07 14:42:06 +02:00
dreis2211
15d67d6b12
Remove MockServletWebServer.emptyEnumeration()
...
Closes gh-13084
2018-05-07 14:41:06 +02:00
Stephane Nicoll
9cf68a2de4
Merge branch '2.0.x'
2018-05-07 14:38:52 +02:00
Stephane Nicoll
4a1bdc2c05
Merge pull request #13085 from dreis2211:remove-deprecation-yaml-loader
...
* pr/13085:
Fix deprecation warning in OriginTrackedYamlLoader
2018-05-07 14:38:40 +02:00
dreis2211
e3862d9bdf
Fix deprecation warning in OriginTrackedYamlLoader
...
Closes gh-13085
2018-05-07 14:38:22 +02:00
Brian Clozel
31c7102800
Upgrade to Reactor Californium
...
This Reactor generation will get the Reactor Netty 0.8 upgrade, which
will include important changes such as maven coordinate, package and API
changes.
2018-05-07 11:48:04 +02:00
Brian Clozel
2e9b6bec1b
Merge branch '2.0.x'
2018-05-07 10:56:22 +02:00
Brian Clozel
925269eacc
Upgrade to Reactor Bismuth SR9
...
Closes gh-12848
2018-05-07 10:54:24 +02:00
Phillip Webb
c578a30e90
Polish
2018-05-04 23:12:42 -07:00
Stephane Nicoll
ea2a98d009
Merge branch '2.0.x'
2018-05-05 07:22:20 +02:00
Stephane Nicoll
c22e9a5514
Make sure that JpaProperties does not have Hibernate imports
...
This commit removes Hibernate imports from JpaProperties so that it can
be used with another JPA provider.
This commit is a breaking change for an internal, yet public class used
to transmit customizations provided by the user. It does not change the
external functionality though: naming strategies defined as bean are
still taken into account and a customizer has a chance to override it
regardless.
Closes gh-13043
2018-05-05 07:21:50 +02:00
Phillip Webb
cff552fb05
Merge branch '2.0.x'
2018-05-04 20:14:33 -07:00
Phillip Webb
6556bb2e89
Fix checkstyle violations
2018-05-04 20:13:57 -07:00
Phillip Webb
a323a85e3b
Merge branch '2.0.x'
2018-05-04 20:06:55 -07:00
Phillip Webb
975e986fef
Polish
2018-05-04 20:06:27 -07:00
Phillip Webb
f9750248ef
Migrate KafkaProperties to use PropertyMapper
2018-05-04 20:06:11 -07:00
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
