Commit Graph

9997 Commits

Author SHA1 Message Date
Phillip Webb 97d7ffd8e8 Merge branch '1.4.x' into 1.5.x 2016-12-28 14:48:05 -08:00
Phillip Webb 61c931943f Fix Devtools PatternResolver Servlet support
Update ClassLoaderFilesResourcePatternResolver to support servlet
resources when it's being used with a WebApplicationContext.

Prior to commit 918e122ddc a `ResourceLoader` was not added to the
`ApplicationContext`, meaning that servlet resources could be found by
virtue of the protected `getResourceByPath()` method. Following commit
918e122ddc, the context `ResourceLoader` is set, meaning that all calls
to `getResource` delegate to the `ResourceLoader` and the
`ApplicationContext` methods are not invoked. Since the devtools
`ResourceLoader` wasn't Servlet aware, servlet resources could not
be found.

Fixes gh-7752
2016-12-28 14:25:11 -08:00
Stephane Nicoll 8b7055719f Move InMemoryMultiMetricRepository to a separate class
This commit moves the `MultiMetricRepository` implementation from
`InMemoryMetricRepository` to `InMemoryMultiMetricRepository`. Both
implementations can share the same underlying store (and are for backward
compatible reasons).

The side effect is that `reset` now works as expected for a group.

Closes gh-7687
2016-12-28 18:16:10 +01:00
Stephane Nicoll 25bd0e0455 Do not reset server.port if a custom inline property is set
This commit allows to define `server.port` in a non-embedded web
environment. Previously, `server.port` would have been set to `-1`
regardless.

Closes gh-7353
2016-12-28 12:10:04 +01:00
Stephane Nicoll 378b53d42b Merge branch '1.4.x' into 1.5.x 2016-12-28 12:09:13 +01:00
Stephane Nicoll 3389af2c2f Fix build failure (II) 2016-12-28 12:08:55 +01:00
Stephane Nicoll 6ecb525a57 Fix build failure 2016-12-28 11:52:53 +01:00
Stephane Nicoll d2900b8612 Merge branch '1.4.x' into 1.5.x 2016-12-28 10:14:38 +01:00
Stephane Nicoll a862b6dc79 Polish documentation
Closes gh-7771
2016-12-28 10:14:22 +01:00
Phillip Webb 1e9e1b04d0 Hide 'No log4j2 configuration file found' error
Add a Log4J2 `ConfigurationFactory` that is always applied so that the
"No log4j2 configuration file found" error message does not appear.

Although the message was harmless it was quite annoying to Spring Boot
users who could safely omit the file.

Fixes gh-4809
2016-12-27 17:36:38 -08:00
Phillip Webb 87a852959d Support logging.pattern.* properties with Log4J2
Update Log4J2 configurations to respect `FILE_LOG_PATTERN` and
`CONSOLE_LOG_PATTERN` system properties. These system properties are
set by `LoggingSystemProperties` from `logging.pattern.file` and
`logging.pattern.console` properties in the Spring Environment.

Fixes gh-7757
2016-12-27 17:33:17 -08:00
Phillip Webb 884c9ef11e Remove accidentally committed file 2016-12-27 15:18:17 -08:00
Phillip Webb 85504e74a6 Merge branch '1.4.x' into 1.5.x 2016-12-27 15:05:15 -08:00
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`
2016-12-27 15:04:06 -08:00
Phillip Webb e0541d0f74 Polish 2016-12-27 14:48:44 -08:00
Phillip Webb d69364c00a Merge pull request #7741 from ArloL/fix-7701
* pr/7741:
  Notify BuildContext of changed build-info file
2016-12-27 13:32:51 -08:00
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
2016-12-27 13:20:22 -08:00
Phillip Webb 8baac239c7 Merge pull request #7737 from mesutcang/master
* pr/7737:
  Improve Cassandra sample README documentation
2016-12-27 12:56:42 -08:00
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
2016-12-27 12:56:22 -08:00
Phillip Webb 44d6c3e846 Merge pull request #7769 from arthur-noseda/patch-1
* pr/7769:
  Fix typo in "you IDE"
2016-12-27 12:28:17 -08:00
arthur-noseda b31cd64524 Fix typo in "you IDE"
Change "you IDE" to "your IDE".

Closes gh-7769
2016-12-27 12:27:22 -08:00
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
2016-12-27 12:24:32 -08:00
Stephane Nicoll 435ca3db69 Polish actuator security changes
Closes gh-7569
2016-12-27 17:50:10 +01:00
Stephane Nicoll 05ebed774c Revert upgrade to Jersey 2.25
See gh-7763
2016-12-27 17:36:17 +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 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 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 0d4ef3dbdb Fix formatting 2016-12-27 11:41:53 +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 d0fa72a169 Filter AbstractRoutingDataSource from health indicator
Closes gh-6806
2016-12-27 10:11:52 +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 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 f0be1d9d97 Upgrade to Spring Security 4.2.1.RELEASE
Closes gh-7745
2016-12-25 09:32:19 +01: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
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 5d16edd067 Polish
See gh-6543
2016-12-22 16:49:44 +01:00