Commit Graph

10245 Commits (ad2ff272080eb92d6a62a8639410d6383658a650)
 

Author SHA1 Message Date
Phillip Webb 367963f29f Polish 8 years ago
Phillip Webb 519f9c6c54 Merge branch '1.5.x' 8 years ago
Phillip Webb 8b69856fc9 Polish 8 years ago
Phillip Webb 97d7ffd8e8 Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
Stephane Nicoll ee9d86cb1c Merge branch '1.5.x' 8 years ago
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
8 years ago
Stephane Nicoll 576d5dd58f Merge branch '1.5.x' 8 years ago
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
8 years ago
Stephane Nicoll 378b53d42b Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 3389af2c2f Fix build failure (II) 8 years ago
Stephane Nicoll 6ecb525a57 Fix build failure 8 years ago
Stephane Nicoll ad3b767b03 Merge branch '1.5.x' 8 years ago
Stephane Nicoll d2900b8612 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll a862b6dc79 Polish documentation
Closes gh-7771
8 years ago
Phillip Webb a2c50a9828 Merge branch '1.5.x' 8 years ago
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
8 years ago
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
8 years ago
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