Commit Graph

10327 Commits (446e9824c6655f368f8161f9309e41b01088e2de)
 

Author SHA1 Message Date
Phillip Webb 884c9ef11e Remove accidentally committed file 8 years ago
Phillip Webb 49fa702708 Merge branch '1.5.x' 8 years ago
Phillip Webb 85504e74a6 Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb 3af5ae2a26 Polish `ObjectProvider` names
Consistently use the simple name for ObjectProvider parameter and
field names. For example:

  `ObjectProvider<Something> something`

rather than

  `ObjectProvider<Something> somethingProvider`
8 years ago
Phillip Webb e0541d0f74 Polish 8 years ago
Phillip Webb d69364c00a Merge pull request #7741 from ArloL/fix-7701
* pr/7741:
  Notify BuildContext of changed build-info file
8 years ago
Arlo O'Keeffe 3a709511c4 Notify BuildContext of changed build-info file
Update Maven plugin to inform the BuildContext when changes are made to
the `build-info` file. Prior to this commit Eclipse could continually
trigger refreshes whenever "Refresh using native hooks or polling" was
enabled and the file was written to `src/main/resources`.

Closes gh-7741
8 years ago
Phillip Webb 8baac239c7 Merge pull request #7737 from mesutcang/master
* pr/7737:
  Improve Cassandra sample README documentation
8 years ago
Mesut Can Gurle ab2290eecd Improve Cassandra sample README documentation
Update the README file in `spring-boot-sample-data-cassandra` with
details of how to setup the keyspace and create the tables.

Closes gh-7737
8 years ago
Phillip Webb 44d6c3e846 Merge pull request #7769 from arthur-noseda/patch-1
* pr/7769:
  Fix typo in "you IDE"
8 years ago
arthur-noseda b31cd64524 Fix typo in "you IDE"
Change "you IDE" to "your IDE".

Closes gh-7769
8 years ago
Phillip Webb 61f65ea10e Add test for devtools + serving from `/public`
Add a simple test to show that basic serving of `/public` resources
works with devtoos.

See gh-7752
8 years ago
Stephane Nicoll 7cf08be353 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 435ca3db69 Polish actuator security changes
Closes gh-7569
8 years ago
Stephane Nicoll 09286b437a Merge branch '1.5.x' 8 years ago
Stephane Nicoll 05ebed774c Revert upgrade to Jersey 2.25
See gh-7763
8 years ago
Stephane Nicoll 968f90886f Merge branch '1.5.x' 8 years ago
Stephane Nicoll a257fd3680 Merge pull request #7763 from Dichotomia:patch-3
* pr/7763:
  Upgrade to Jersey 2.25
8 years ago
Quentin Caillard 49c77b868d Upgrade to Jersey 2.25
Closes gh-7763
8 years ago
Stephane Nicoll b8fcc0ea23 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 0e28771ad4 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 2b2bccca12 Merge pull request #7765 from arthur-noseda:patch-1
* pr/7765:
  Changed "right the way" to "right away"
8 years ago
arthur-noseda 8771d9e700 Changed "right the way" to "right away"
Closes gh-7765
8 years ago
Stephane Nicoll 80df396e3c Fix parent version 8 years ago
Stephane Nicoll 31bde8ffc9 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 2fe98f8f85 Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
Stephane Nicoll 740813a1e8 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 0d4ef3dbdb Fix formatting 8 years ago
Stephane Nicoll 3fdfc3f052 Merge branch '1.5.x' 8 years ago
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
8 years ago
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
8 years ago
Stephane Nicoll fb70097c4f Merge branch '1.5.x' 8 years ago
Stephane Nicoll d0fa72a169 Filter AbstractRoutingDataSource from health indicator
Closes gh-6806
8 years ago
Stephane Nicoll b552abaa41 Merge branch '1.5.x' 8 years ago
Stephane Nicoll ba3fae373d Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 92d313f820 Merge pull request #7755 from shubham391:patch-1
* pr/7755:
  Minor fix in description
8 years ago
Shubham Aggarwal e7f13b446a Minor fix in description
Closes gh-7755
8 years ago
Stephane Nicoll ec15607bad Merge branch '1.5.x' 8 years ago
Stephane Nicoll 37519ecfef Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 062104f1d6 Fix TestRestTemplate#patchFor methods visibility
Closes gh-7742
8 years ago
Stephane Nicoll 548ff2395c Merge branch '1.5.x' 8 years ago
Stephane Nicoll f0be1d9d97 Upgrade to Spring Security 4.2.1.RELEASE
Closes gh-7745
8 years ago
Phillip Webb 291752a317 Merge branch '1.5.x' 8 years ago
Phillip Webb 5d2a2b6b64 Support and upgrade to Jetty 9.4
See gh-7599
8 years ago
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
8 years ago
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
8 years ago
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
8 years ago
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
8 years ago
Sebastien Deleuze 2127556121 Upgrade to Reactor Core 3.0.4.RELEASE
Fixes gh-7740
8 years ago