Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
50,613 Commits 23 Branches 0 Tags
38d96aabef94debe6ae5647802e61b9510d88a67
Commit Graph

50613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
09286b437a Merge branch '1.5.x' 2016-12-27 17:39:01 +01:00
Stephane Nicoll
05ebed774c Revert upgrade to Jersey 2.25 
See gh-7763
 2016-12-27 17:36:17 +01:00
Stephane Nicoll
968f90886f Merge branch '1.5.x' 2016-12-27 17:20:59 +01:00
Stephane Nicoll
a257fd3680 Merge pull request #7763 from Dichotomia:patch-3 
* pr/7763:
  Upgrade to Jersey 2.25
 2016-12-27 17:20:49 +01:00
Quentin Caillard
49c77b868d Upgrade to Jersey 2.25 
Closes gh-7763
 2016-12-27 17:20:19 +01:00
Stephane Nicoll
b8fcc0ea23 Merge branch '1.5.x' 2016-12-27 17:12:48 +01:00
Stephane Nicoll
0e28771ad4 Merge branch '1.4.x' into 1.5.x 2016-12-27 17:12:32 +01:00
Stephane Nicoll
2b2bccca12 Merge pull request #7765 from arthur-noseda:patch-1 
* pr/7765:
  Changed "right the way" to "right away"
 2016-12-27 17:12:22 +01:00
arthur-noseda
8771d9e700 Changed "right the way" to "right away" 
Closes gh-7765
 2016-12-27 17:11:33 +01:00
Stephane Nicoll
80df396e3c Fix parent version 2016-12-27 12:43:15 +01:00
Stephane Nicoll
31bde8ffc9 Merge branch '1.5.x' 2016-12-27 11:59:38 +01:00
Stephane Nicoll
2fe98f8f85 Merge branch '1.4.x' into 1.5.x 2016-12-27 11:59:25 +01:00
Stephane Nicoll
022f7e86a0 Align library file naming mapping 
This commit aligns the mapping from library to name to the default
behaviour of the `maven-war-plugin`. Previously, our plugin would use
the full version of the library (i.e. including build timestamp if there
is one), rather than using the `baseVersion` property.

Closes gh-7743
 2016-12-27 11:59:01 +01:00
Stephane Nicoll
740813a1e8 Merge branch '1.5.x' 2016-12-27 11:42:03 +01:00
Stephane Nicoll
0d4ef3dbdb Fix formatting 2016-12-27 11:41:53 +01:00
Stephane Nicoll
3fdfc3f052 Merge branch '1.5.x' 2016-12-27 11:12:38 +01:00
Stephane Nicoll
b24c8d04ba Allow to customize the auto-configured JestClient 
This commit adds a `HttpClientConfigBuilderCustomizer` to further tune
the auto-configured `JestClient`.

Closes gh-7762
 2016-12-27 11:12:23 +01:00
Stephane Nicoll
a60e356136 Enable Jest's multi-threaded support by default 
Since the `JestClient` is auto-configured as a bean, it must have its
multi-threaded support enabled by default. This commit exposes a new
`spring.elasticsearch.jest.multi-threaded` property that is `true` by
default.

Closes gh-6806
 2016-12-27 10:46:26 +01:00
Stephane Nicoll
fb70097c4f Merge branch '1.5.x' 2016-12-27 10:12:03 +01:00
Stephane Nicoll
d0fa72a169 Filter AbstractRoutingDataSource from health indicator 
Closes gh-6806
 2016-12-27 10:11:52 +01:00
Stephane Nicoll
b552abaa41 Merge branch '1.5.x' 2016-12-26 10:19:12 +01:00
Stephane Nicoll
ba3fae373d Merge branch '1.4.x' into 1.5.x 2016-12-26 10:18:57 +01:00
Stephane Nicoll
92d313f820 Merge pull request #7755 from shubham391:patch-1 
* pr/7755:
  Minor fix in description
 2016-12-26 10:18:42 +01:00
Shubham Aggarwal
e7f13b446a Minor fix in description 
Closes gh-7755
 2016-12-26 10:18:21 +01:00
Stephane Nicoll
ec15607bad Merge branch '1.5.x' 2016-12-25 10:00:48 +01:00
Stephane Nicoll
37519ecfef Merge branch '1.4.x' into 1.5.x 2016-12-25 10:00:33 +01:00
Stephane Nicoll
062104f1d6 Fix TestRestTemplate#patchFor methods visibility 
Closes gh-7742
 2016-12-25 10:00:20 +01:00
Stephane Nicoll
548ff2395c Merge branch '1.5.x' 2016-12-25 09:33:33 +01:00
Stephane Nicoll
f0be1d9d97 Upgrade to Spring Security 4.2.1.RELEASE 
Closes gh-7745
 2016-12-25 09:32:19 +01:00
Phillip Webb
291752a317 Merge branch '1.5.x' 2016-12-24 11:26:50 -08:00
Phillip Webb
5d2a2b6b64 Support and upgrade to Jetty 9.4 
See gh-7599
 2016-12-24 11:25:30 -08:00
Phillip Webb
d05357e036 Migrate to Tomcat WebSocket client 
Move samples and tests from Jetty websocket client to Tomcat since the
upcoming Jetty release contains a bug in `JsrSession`
(https://github.com/eclipse/jetty.project/issues/1202).

See gh-7599
 2016-12-24 11:24:30 -08:00
Phillip Webb
a116579cfc Work around Jetty websocket client bug 
Add workaround for Jetty JsrSession NullPointerException bug
(https://github.com/eclipse/jetty.project/issues/1202) in
`spring-boot-sample-websocket-jetty`.

See gh-7599
 2016-12-24 11:22:58 -08:00
Phillip Webb
a23591e047 Support Jetty 9.4 and upgrade to 9.4.0.v20161208 
Update `JettyEmbeddedServletContainerFactory` to support Jetty 9.4
directly and Jetty 9.3 via reflection. The primary difference between
Jetty 9.3 and 9.4 are the session management classes. Websocket suppport
has also been updates, but this is handled transparently by the
Spring Framework support.

Fixes gh-7599
 2016-12-24 11:22:38 -08:00
Phillip Webb
5299db3806 Fix deadlock when calling LiveReloadServer.stop() 
Update LiveReloadServer so that different synchronization blocks are
used for the sockets and connection lists. Prior to this commit calling
`LiveReloadServer.stop()` would always result in a 60 second delay since
`stop()` owned the monitor add `removeConnection()` (called from a
different thread) needs it to remove the active connection.

Fixes gh-7749
 2016-12-24 11:06:09 -08:00
Sebastien Deleuze
2127556121 Upgrade to Reactor Core 3.0.4.RELEASE 
Fixes gh-7740
 2016-12-23 14:11:40 +00:00
Phillip Webb
62b520c469 Merge branch '1.5.x' 2016-12-22 19:05:09 -08:00
Phillip Webb
42cfef8ec1 Merge branch '1.4.x' into 1.5.x 2016-12-22 19:03:58 -08:00
Phillip Webb
c3edf9e341 Fixup version numbers following release 2016-12-22 19:03:09 -08:00
Spring Buildmaster
9057f9ae1f Next development version 2016-12-23 00:15:23 +00:00
Stephane Nicoll
7f9e534b67 Merge branch '1.5.x' 2016-12-22 16:49:58 +01:00
Stephane Nicoll
5d16edd067 Polish 
See gh-6543
 2016-12-22 16:49:44 +01:00
Stephane Nicoll
d91ee8d6a1 Merge branch '1.5.x' 2016-12-22 16:26:02 +01:00
Stephane Nicoll
3cf54884d8 Fix merge issue 
See gh-7718
 2016-12-22 16:25:44 +01:00
Stephane Nicoll
e2e690d31c Exclude xml-apis 
This commit excludes the transitive dependencies on xml-apis when using
Hibernate. Such dependency is no longer required on modern JDKs

Closes gh-7554
 2016-12-22 16:12:55 +01:00
Stephane Nicoll
219e0baa58 Merge branch '1.5.x' 2016-12-22 15:40:02 +01:00
Stephane Nicoll
ff28e2d380 Merge pull request #6900 from vpavic:flyway-vendor-dir 
* pr/6900:
  Polish contribution
  Add support for vendor specific Flyway migration locations
 2016-12-22 15:39:50 +01:00
Stephane Nicoll
449043bf21 Polish contribution 
Closes gh-6900
 2016-12-22 15:39:31 +01:00
Vedran Pavic
65c2d1f5e7 Add support for vendor specific Flyway migration locations 
This commit adds support for using `{vendor}` placeholder in
`flyway.locations` configuration property value.

See gh-6900
 2016-12-22 14:56:28 +01:00
Stephane Nicoll
234c170bbb Merge branch '1.5.x' 2016-12-22 14:49:14 +01:00