Commit Graph

4997 Commits

Author SHA1 Message Date
Stephane Nicoll e02082da99 Merge pull request #3335 from izeye/patch-27
* pr/3335:
  Remove unnecessary import
  Remove unnecessary `@After` callback
2015-06-26 08:26:40 +02:00
Stephane Nicoll 12767a43e2 Remove unnecessary import
See gh-3335
2015-06-26 08:26:16 +02:00
izeye 761c985337 Remove unnecessary `@After` callback
`@After` callback was trying to remove the wrong file anyway. This is
now taken care of by the `TemporaryFolder` rule.

Closes gh-3335
2015-06-26 08:25:18 +02:00
Stephane Nicoll 8b5d44a56d Merge pull request #3333 from izeye/patch-26
* pr/3333:
  Fix typo
2015-06-26 08:21:32 +02:00
izeye 0dc096f905 Fix typo
Closes gh-3333
2015-06-26 08:21:04 +02:00
Phillip Webb 5eb9cd012c Report logback errors in the exception
Update LogbackLoggingSystem to include status errors in the exception
rather than using `System.err`. Also perform additional cleanup in an
attempt to fix CI build failures.

Fixes gh-3309
2015-06-25 12:37:56 -07:00
Phillip Webb 7879743b9f Polish 2015-06-25 12:00:48 -07:00
Andy Wilkinson bedca634c9 Add hamcrest-library to spring-boot's compile classpath
Fixes build break introduced in 31336c2.
2015-06-25 17:14:13 +01:00
Andy Wilkinson c3d93f70b8 Fail fast when a Logback configuration file is missing or malformed
Closes gh-3309
2015-06-25 16:58:58 +01:00
Andy Wilkinson 31336c2dce Allow matchers to be used to verify output captured by OutputCapture
Closes gh-3330
2015-06-25 16:58:58 +01:00
Stephane Nicoll 0ec9de9137 Add support for value provider
Improve the "hints" section of the metadata so that each hint can provide
the reference to a value provider.

A value provider defines how a tool can discover the potential values of
a property based on the context. The provider is identifed by a name and
may have an arbitrary number of parameters.

Closes gh-3303
2015-06-25 14:58:10 +02:00
Stephane Nicoll 43b9ea53d6 Polish (avoid dot at the end of the line) 2015-06-25 11:58:21 +02:00
Stephane Nicoll 56b13800ae Fix json structure 2015-06-25 10:25:21 +02:00
Stephane Nicoll 443fe3b9e6 Merge pull request #3326 from izeye/patch-25
* patch-25:
  Fix typos
2015-06-25 09:21:56 +02:00
izeye e6a3099003 Fix typos
Closes gh-3326
2015-06-25 09:15:28 +02:00
Phillip Webb 689fb0c877 Merge pull request #3314 from izeye/patch-24
* pr/3314:
  Use `bytes.length` in Base64Encoder loop
2015-06-24 21:08:24 -07:00
izeye 286c98d716 Use `bytes.length` in Base64Encoder loop
Update Base64Encoder to use `bytes.length` instead of `encoded.length`
when lopping over the bytes.

Fixes gh-3314
2015-06-24 21:08:10 -07:00
Phillip Webb 855e5a8e5f Minor doc polish 2015-06-24 20:42:16 -07:00
Phillip Webb f8e5bfde2b Merge pull request #3320 from ralscha/patch-1
* pr/3320:
  Fix type in deployment documentation
2015-06-24 20:40:52 -07:00
Ralph Schaer f5830bf46e Fix type in deployment documentation
Replace use of `link -s` with `ln -s`.

Fixes gh-3320
2015-06-24 20:39:43 -07:00
Phillip Webb 9e5239a819 Merge pull request #3321 from mbenson/uberjar
* pr/3321:
  Update documentation to remove 'shaded jar' term
2015-06-24 20:39:15 -07:00
Matt Benson f2dfb040ab Update documentation to remove 'shaded jar' term
Update documentation section that discusses uber jars since it conflates
the concepts of the uber jar and the shading of dependencies into jars
(which may or may not be true uber jars).

Fixes gh-3321
2015-06-24 20:37:27 -07:00
izeye 98ce54c4c3 Fix typo in test methods' names 2015-06-24 20:36:01 -07:00
Phillip Webb 4236a9336d Make FlywayMigrationStrategy an interface
Change FlywayMigrationStrategy from a class to an interface.

Fixes gh-3217
2015-06-24 20:34:06 -07:00
Phillip Webb 134bc02404 Extract common metric Buffer code
Extract common features from CounterBuffers and GuageBuffers into
a shared superclass. The new extracted types allows the service
implementations to be simplified.

Fixes gh-3257
2015-06-24 20:05:37 -07:00
Phillip Webb 291388affe Make EventPublishingRunListener Ordered `0`
Update EventPublishingRunListener to implement Ordered and use a default
order of 0. This allows for other run listeners to be added either
before or after it.

Fixes gh-3305
2015-06-24 16:24:44 -07:00
Phillip Webb 778e3eb091 Polish 2015-06-24 16:15:12 -07:00
Stephane Nicoll bc9321734f Add support for property hint
Create a new section in the meta-data called "hints" where users can
provide hints about a given property. The most basic use case for now
is to provide a list of values that a property can have. Each value may
have a description.

This sample JSON provides a basic example for a property called `foo.mode`
that exposes 3 values: "auto", "basic" and "advanced".

```
 "hints": [
    {
      "id": "foo.mode",
      "values": [
        {
          "value": "auto",
          "description": "Some smart description."
        },
        {
          "name": "basic"
        },
        {
          "name": "advanced"
        }
      ]
    }
]
```

This information can be read by tools (such as IDE) and offer an
auto-completion with the list of values.

Closes gh-2054
2015-06-24 18:53:11 +02:00
Andy Wilkinson 9aa445bf46 Merge branch '1.2.x' 2015-06-24 17:13:39 +01:00
Andy Wilkinson f8fdcc1312 Include value of java.io.tmpdir in message when createTempFile fails
If java.io.tmpdir is configured to a directory that does not exist,
calls to File.createTempFile will fail with an IOException with the
message "The system cannot find the path specified". Unfortunately,
the path the was specified is not included in the message.

Rather than trying to automatically create the directory in what may
be a misconfigured location, we now include the value of
java.io.tmpdir in our own exception's message. Hopefully this will
help users to figure out what they've done wrong.

Closes gh-3307
2015-06-24 17:13:18 +01:00
Stephane Nicoll af1afeaf48 Merge branch '1.2.x' 2015-06-24 17:20:49 +02:00
Stephane Nicoll 982b81c675 Fix datasource metrics doc
The maximum and minimum number of connections are no metrics so these
are not exposed. Fix the doc that stated the contrary.

Fixes gh-3319
2015-06-24 17:20:31 +02:00
Stephane Nicoll 41b4d41f11 Remove dead code 2015-06-24 15:57:43 +02:00
Stephane Nicoll e9baa779cc Remove dead code 2015-06-24 15:52:27 +02:00
Stephane Nicoll 1d66aa35ed Fix typo 2015-06-24 15:20:20 +02:00
Stephane Nicoll 117d6b0da3 Fix typo 2015-06-24 11:12:42 +02:00
Phillip Webb fe57101076 Merge pull request #2294 from joshiste/2294
* pr/2294:
  Add /logfile MVC actuator endpoint
2015-06-23 17:32:44 -07:00
Johannes Stelzer 308a5eaff5 Add /logfile MVC actuator endpoint
Add a `/logfile` endpoint which can be used to fetch the contents of
the log file (if one is being used).

Fixes gh-2137
Closes gh-2294
2015-06-23 17:14:40 -07:00
Phillip Webb 880f31ae2e Merge pull request #2300 from drumonii/master
* pr/2300:
  Add a SpringBootVersion class like SpringVersion
2015-06-23 14:51:57 -07:00
drumonii 8b04973244 Add a SpringBootVersion class like SpringVersion
Provide a static utility method to get the Spring Boot version based on
the implementation version of SpringApplication's package. Similar to
Spring Frameworks' SpringVersion class.

Fixes gh-2300
2015-06-23 14:51:20 -07:00
Phillip Webb 69c44fafc7 Merge pull request #2704 from sailorgeoffrey/master
* pr/2704:
  Add support for ANSI colored resource banners
2015-06-23 14:31:59 -07:00
Geoffrey Chandler d6200389eb Add support for ANSI colored resource banners
Add AnsiPropertySource which allows named ANSI codes to be resolved
and update ResourceBanner to include it.

This commit also deprecates constants defined in AnsiElement and
replaces them with AnsiStyle, AnsiColor and AnsiBackground enums.

Closes gh-2704
2015-06-23 14:31:49 -07:00
Phillip Webb 9f143ad9ab Merge pull request #2901 from creactiviti/freemarker-autoconfigure-preferfilesystemaccess
* pr/2901:
  Add Freemarker `prefer-file-system-access` support
2015-06-23 11:34:22 -07:00
cohee016 d948ec5810 Add Freemarker `prefer-file-system-access` support
Add a `spring.freemarker.prefer-file-system-access` property and update
FreeMarkerAutoConfiguration to support it.

Fixes gh-2901
2015-06-23 11:34:02 -07:00
Phillip Webb 61fc4f3f12 Polish copyright headers 2015-06-23 10:22:14 -07:00
Phillip Webb d3007fae94 Polish formatting 2015-06-23 09:54:21 -07:00
Phillip Webb ab18fb29a3 Merge branch '1.2.x' 2015-06-23 09:46:12 -07:00
Phillip Webb 16e7c99e4d Polish formatting 2015-06-23 09:45:54 -07:00
Stephane Nicoll d0698bd8ed Remove unnecessary System.out in tests 2015-06-23 15:57:40 +02:00
Andy Wilkinson 0bb0f32c88 Reinstate code in Data REST sample that went AWOL in 1ce617f1 2015-06-23 14:44:43 +01:00