Commit Graph

5747 Commits

Author SHA1 Message Date
Phillip Webb bf34dc5013 Merge pull request #3719 from sbuettner/master
* pr/3719:
  Add statsd metric export auto-configuration
2015-09-24 00:21:58 -07:00
Simon Buettner 70031cca66 Add statsd metric export auto-configuration
Update MetricExportAutoConfiguration to auto-configure statsd metrics
export when a `spring.metrics.export.statsd.host` property is set.

Closes gh-3719
2015-09-24 00:19:56 -07:00
Phillip Webb 9128f2b902 Merge pull request #3915 from fabriciocolombo/liquibase
* pr/3915:
  Add Liquibase labels and parameters properties
2015-09-23 23:56:51 -07:00
Fabricio Colombo 605eb8a14d Add Liquibase labels and parameters properties
Update `LiquibaseAutoConfiguration` and `LiquibaseProperties` to add
support for labels and parameters.

Closes gh-3915
2015-09-23 23:56:51 -07:00
Phillip Webb d0dbe93755 Merge pull request #3938 from candrews/patch-2
* pr/3938:
  Add `git.properties` to default devtools excludes
2015-09-23 23:56:50 -07:00
Craig Andrews 84da5a26a7 Add `git.properties` to default devtools excludes
Update `DevToolsProperties` to exclude `git.properties` files.

Prior to this commit any application configured to write `git.properties`
could trigger unexpected application restarts. The problem is particularly
prevalent when using Eclipse M2E in combination with the
`git-commit-id-plugin`.

Closes gh-3938
2015-09-23 23:56:43 -07:00
Phillip Webb a63ec53d2b Merge pull request #3962 from izeye/hazelcast
* pr/3962:
  Remove duplicate `@ConditionalOnMissingBean` checks.
2015-09-23 21:31:33 -07:00
izeye efb699de60 Remove duplicate `@ConditionalOnMissingBean` checks. 2015-09-23 21:30:47 -07:00
Ivan Chen 926b40e46c Delete duplicate application.properties
Closes gh-4004
2015-09-23 21:29:28 -07:00
Phillip Webb 2e6bbd3538 Merge pull request #4010 from tbadie/master
* pr/4010:
  Fix synchronization issue in OpenTSDBMetricWriter
2015-09-23 21:27:55 -07:00
Thomas Badie 2fd1cacbf3 Fix synchronization issue in OpenTSDBMetricWriter
Closes gh-4010
2015-09-23 21:27:14 -07:00
Phillip Webb c629813165 Rationalize Spring Data auto-configurations
Relocate several auto-configuration classes to `...autoconfigure.data`
to make it clearer that they are Spring Data specific.

Also moved `EntityManagerFactoryBuilder` to `spring-boot` since it is
generally useful and doesn't need to be directly tied to the
auto-configuration module.

Fixes gh-4002
2015-09-22 11:52:23 -07:00
Andy Wilkinson e9349ee53f Suppress warning from M2E by explicitly ignoring invoker plugin 2015-09-22 14:02:41 +01:00
Andy Wilkinson 051ebf3fac Polishing: fix a number of compiler warnings reported by Eclipse 2015-09-22 13:30:07 +01:00
Andy Wilkinson a38f01f9e5 Fix compile errors in Eclipse (STS 3.6.4) in UserInfoTokenServicesTests 2015-09-22 12:54:39 +01:00
Andy Wilkinson d10dd13714 Fix deprecation warning in ConfigurationPropertiesReportEndpoint 2015-09-22 12:43:15 +01:00
Andy Wilkinson 1be4394855 Add lifecycle mapping for checkstyle plugin to keep Eclipse happy 2015-09-22 12:42:44 +01:00
Andy Wilkinson 262dbc85e8 Merge branch '1.2.x' 2015-09-22 10:48:16 +01:00
Andy Wilkinson ecf7baf917 Merge branch '1.2.x' 2015-09-22 10:41:26 +01:00
Andy Wilkinson 31705982a0 Upgrade to Spring Social Twitter 1.1.1.RELEASE
Closes gh-3913
2015-09-22 10:35:09 +01:00
Phillip Webb 7ed1534c7b Exclude validation JARs from deployment tests
Exclude spring-boot-starter-validation since those jars are provided
by the container.
2015-09-21 16:46:57 -07:00
Phillip Webb 21de97da50 Make jackson-module-parameter-names optional
Update the spring-boot-autoconfigure POM so that
jackson-module-parameter-names is optional.

See gh-3804
2015-09-21 16:45:35 -07:00
Phillip Webb f2ce59c403 Polish 2015-09-21 15:04:22 -07:00
Phillip Webb 86daf44435 Add @Since tag 2015-09-21 14:43:41 -07:00
Andy Wilkinson 7f2be6ce27 Add auto-configuration for Jackson's parameter names module
The parameter names module allows users of Java 8 that have compiled
their code with the -parameters option to avoid the name for
annotations to map the json onto constructor and method parameters
with the names of the parameters being used instead.

This commit adds auto-configuration for the module that will only
be enabled when running on Java 8.

Closes gh-3804
2015-09-21 17:06:06 +01:00
Andy Wilkinson 6c59e75874 Update tests to align with changes made in 8094076
See gh-3900
2015-09-21 16:55:20 +01:00
Andy Wilkinson 80940764f6 Do not trigger a restart when a test class is changed
Previously, dev tools would restart the application when any .class
file changed. This included test classes. This commit updates the
default excludes to ignore any classes with a name that ends in 
Test.class or Tests.class.

Closes gh-3900
2015-09-21 16:22:47 +01:00
Andy Wilkinson c3e447c84c Order char encoding filter so it sets encoding before request is read
For the character encoding filter to work, it's vital that it sets
the request's encoding before any other filters attempt to read the
request. This commit updates the order of
OrderedCharacterEncodingFilter to be HIGHEST_PRECEDENCE and improves
the existing test to check that the ordering is as required.

Closes gh-3912
2015-09-21 15:32:53 +01:00
Andy Wilkinson 702b8d041f Remove code used for documentation generation from actuator-docs jar
Closes gh-3902
2015-09-21 15:20:21 +01:00
Andy Wilkinson 94a737638e Update launch script to specify -jar as last option
The recommended usage for the java executable is:

    java [-options] -jar jarfile [args...]

This commit updates the default launch script to match this recommended
usage by moving -jar to be the last option, after both the
disableJarChecking system property and any JAVA_OPTS.

Closes gh-3930
2015-09-21 14:51:03 +01:00
Andy Wilkinson 1ce0ba6171 Upgrade to Spring Social Twitter 1.1.1.RELEASE
Closes gh-3913
2015-09-21 14:19:40 +01:00
Phillip Webb d22d0683b2 Fixup build following release 2015-09-16 12:03:23 -04:00
Spring Buildmaster 9409c49c10 Next development version 2015-09-16 09:00:17 -07:00
Stephane Nicoll 9a8dcab1db Merge pull request #3967 from izeye/patch-40
* pr/3967:
  Polish Javadoc
2015-09-15 22:25:40 -04:00
izeye 97167ce608 Polish Javadoc
Closes gh-3967
2015-09-15 22:24:59 -04:00
Andy Wilkinson be07a8a4c2 Merge branch 'gh-3943' 2015-09-15 17:07:15 -04:00
Andy Wilkinson bfc0745616 Add test for merging packages from multiple @ServletComponentScans 2015-09-15 17:06:49 -04:00
izeye 20da79e9bd Use mergedPackages in ServletComponentScanRegistrar
Closes gh-3943
2015-09-15 17:06:23 -04:00
Andy Wilkinson c274162e6f Correct since version in javadoc of Any and AllNestedCondition 2015-09-15 16:43:11 -04:00
Andy Wilkinson a9d67213be Override Eclipse’s formatting to keep Checkstyle happy
See gh-3964
2015-09-15 07:15:02 -04:00
Andy Wilkinson 95c8af462e Merge branch 'gh-3955' 2015-09-15 06:59:25 -04:00
Andy Wilkinson 2fd8a58197 Polish contribution
- Rename local variable to avoid shadowing field with the same name
 - Add a test to verify that local.mongo.port is set on the parent
   context

Closes gh-3955
2015-09-15 06:58:53 -04:00
Paweł Doleciński 8f5a753eff Fix propagation of local.mongo.port up the context hierarchy
Previously, a StackOverflowError would occur when using a random port
for embedded mongo as the logic for propagating the property up the
context hierarchy would repeatedly use the leaf context's parent.

This commit updates the logic to look to see if the current context
has a parent, only calling the method again if it does.

Closes gh-3956
2015-09-15 06:56:11 -04:00
Andy Wilkinson b79ca614a1 Replace usage of deprecated API in EmbeddedMongoAutoConfiguration 2015-09-15 06:41:15 -04:00
Stephane Nicoll 4805642931 Merge pull request #3946 from izeye/patch-39
* pr/3946:
  Polish tests
2015-09-13 18:08:48 -04:00
izeye 17d0dc5a86 Polish tests
Closes gh-3946
2015-09-13 18:08:01 -04:00
Phillip Webb 3444ebbc05 Merge branch '1.2.x' 2015-09-11 13:50:56 -07:00
Phillip Webb 11d59df3fd Add registerErrorPageFilter option flag
Update SpringBootServletInitializer with a registerErrorPageFilter flag
that can be used to disable ErrorPageFilter registration.

Fixes gh-3603
2015-09-11 13:03:10 -07:00
Phillip Webb de48223a2e Only handle status errors when sendError is called
Update ErrorPageFilter to only handle errors when `response.sendError`
has been called. This should allow custom @ExceptionHandlers to
completely handle errors and return custom status codes without
triggering the "Cannot forward to error page" log message.

The Javadoc for sendError states:

  "The server defaults to creating the response to look like an
   HTML-formatted server error page containing the specified message"

Where as setStatus states

  "This method is used to set the return status code when there is
   no error "

Fixes gh-2745
2015-09-11 12:27:39 -07:00
Phillip Webb 5f250ebbc1 Add exception endpoints to tomcat-jsp sample
Update `spring-boot-sample-tomcat-jsp` to include endpoints that trigger
exceptions. Primarily to aid testing of the ErrorPageFilter.

See gh-2745
2015-09-11 12:25:48 -07:00