d2900b8612
Merge branch '1.4.x' into 1.5.x
2016-12-28 10:14:38 +01:00
a862b6dc79
Polish documentation
...
Closes gh-7771
2016-12-28 10:14:22 +01:00
a2c50a9828
Merge branch '1.5.x'
2016-12-27 17:37:12 -08:00
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
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
884c9ef11e
Remove accidentally committed file
2016-12-27 15:18:17 -08:00
49fa702708
Merge branch '1.5.x'
2016-12-27 15:06:22 -08:00
85504e74a6
Merge branch '1.4.x' into 1.5.x
2016-12-27 15:05:15 -08:00
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
e0541d0f74
Polish
2016-12-27 14:48:44 -08:00
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
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
8baac239c7
Merge pull request #7737 from mesutcang/master
...
* pr/7737:
Improve Cassandra sample README documentation
2016-12-27 12:56:42 -08:00
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
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
b31cd64524
Fix typo in "you IDE"
...
Change "you IDE" to "your IDE".
Closes gh-7769
2016-12-27 12:27:22 -08:00
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
7cf08be353
Merge branch '1.5.x'
2016-12-27 17:51:32 +01:00
435ca3db69
Polish actuator security changes
...
Closes gh-7569
2016-12-27 17:50:10 +01:00
09286b437a
Merge branch '1.5.x'
2016-12-27 17:39:01 +01:00
05ebed774c
Revert upgrade to Jersey 2.25
...
See gh-7763
2016-12-27 17:36:17 +01:00
968f90886f
Merge branch '1.5.x'
2016-12-27 17:20:59 +01:00
a257fd3680
Merge pull request #7763 from Dichotomia:patch-3
...
* pr/7763:
Upgrade to Jersey 2.25
2016-12-27 17:20:49 +01:00
49c77b868d
Upgrade to Jersey 2.25
...
Closes gh-7763
2016-12-27 17:20:19 +01:00
b8fcc0ea23
Merge branch '1.5.x'
2016-12-27 17:12:48 +01:00
0e28771ad4
Merge branch '1.4.x' into 1.5.x
2016-12-27 17:12:32 +01:00
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
8771d9e700
Changed "right the way" to "right away"
...
Closes gh-7765
2016-12-27 17:11:33 +01:00
80df396e3c
Fix parent version
2016-12-27 12:43:15 +01:00
31bde8ffc9
Merge branch '1.5.x'
2016-12-27 11:59:38 +01:00
2fe98f8f85
Merge branch '1.4.x' into 1.5.x
2016-12-27 11:59:25 +01:00
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
740813a1e8
Merge branch '1.5.x'
2016-12-27 11:42:03 +01:00
0d4ef3dbdb
Fix formatting
2016-12-27 11:41:53 +01:00
3fdfc3f052
Merge branch '1.5.x'
2016-12-27 11:12:38 +01:00
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
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
fb70097c4f
Merge branch '1.5.x'
2016-12-27 10:12:03 +01:00
d0fa72a169
Filter AbstractRoutingDataSource from health indicator
...
Closes gh-6806
2016-12-27 10:11:52 +01:00
b552abaa41
Merge branch '1.5.x'
2016-12-26 10:19:12 +01:00
ba3fae373d
Merge branch '1.4.x' into 1.5.x
2016-12-26 10:18:57 +01:00
92d313f820
Merge pull request #7755 from shubham391:patch-1
...
* pr/7755:
Minor fix in description
2016-12-26 10:18:42 +01:00
e7f13b446a
Minor fix in description
...
Closes gh-7755
2016-12-26 10:18:21 +01:00
ec15607bad
Merge branch '1.5.x'
2016-12-25 10:00:48 +01:00
37519ecfef
Merge branch '1.4.x' into 1.5.x
2016-12-25 10:00:33 +01:00
062104f1d6
Fix TestRestTemplate#patchFor methods visibility
...
Closes gh-7742
2016-12-25 10:00:20 +01:00
548ff2395c
Merge branch '1.5.x'
2016-12-25 09:33:33 +01:00
f0be1d9d97
Upgrade to Spring Security 4.2.1.RELEASE
...
Closes gh-7745
2016-12-25 09:32:19 +01:00
291752a317
Merge branch '1.5.x'
2016-12-24 11:26:50 -08:00
5d2a2b6b64
Support and upgrade to Jetty 9.4
...
See gh-7599
2016-12-24 11:25:30 -08:00
Stephane Nicoll
Phillip Webb
Arlo O'Keeffe
Mesut Can Gurle
arthur-noseda
Quentin Caillard
Shubham Aggarwal