Commit Graph

3383 Commits

Author SHA1 Message Date
Stephane Nicoll 5946a44b7b Fix typo 2014-11-08 17:53:06 +00:00
Phillip Webb 91fb4f22bd Merge pull request #1856 from joshiste/systemLoad
* systemLoad:
  Add systemload.average to SystemPublicMetrics
2014-11-07 12:20:17 -08:00
Johannes Stelzer 7770b92411 Add systemload.average to SystemPublicMetrics
Fixes gh-1865
2014-11-07 12:19:51 -08:00
Phillip Webb 55ccd07ace Merge pull request #1824 from dturanski/gh-1824
* gh-1824:
  Add "include filter" support for the Maven plugin
2014-11-07 11:12:49 -08:00
David Turanski c12ffe76be Add "include filter" support for the Maven plugin
Update AbstractDependencyFilterMojo to support include filters as
well as exclude filters.

Fixes gh-1824
2014-11-07 10:56:29 -08:00
Phillip Webb e02dbbc16d Add some .gitignore entries 2014-11-07 09:54:09 -08:00
Phillip Webb 3abd0e1956 Merge branch '1.1.x' 2014-11-07 09:50:12 -08:00
Phillip Webb 354389932a Move tomcat websocket dependency
Relocate tomcat-embed-websocket from spring-boot-starter-websocket
to spring-boot-starter-tomcat.

Fixes gh-1847
2014-11-07 09:49:47 -08:00
Phillip Webb 8023ddd0c2 Rename AbstractBasicTemplateViewResolverProperties
Rename AbstractBasicTemplateViewResolverProperties to
AbstractViewResolverProperties.

See gh-1835
2014-11-07 09:24:07 -08:00
Phillip Webb d097c9a2f9 Formatting 2014-11-07 09:19:56 -08:00
Stephane Nicoll 6d9abdc8ca Harmonize view resolver properties
Move shared properties to avoid duplication in GroovyProperties

Fixes gh-1835
2014-11-07 13:19:40 +00:00
Andy Wilkinson 1a3b0309b3 Improve error handling in SpringPackageScanClassResolver
Previously, SpringPackageScanResolver was handling as subset of the
failures that Liquibase’s DefaultPackageScanResolver handles. This could
lead to a failure due to a LinkageError in certain environments.

This commit updates SpringPackageScanClassResolver to align its error
handling with what Liquibase does.

Fixes gh-1853
2014-11-07 12:39:32 +00:00
Stephane Nicoll 6df001d30f Fix json format 2014-11-07 07:20:34 +00:00
Stephane Nicoll 00961611b2 Move health.* properties to management.health.*
Fixes gh-1841
2014-11-07 07:20:34 +00:00
Phillip Webb 27cbf45dbe Merge branch 'gh-1842' 2014-11-06 22:52:23 -08:00
Phillip Webb d039f43107 Update samples to use @SpringBootApplication
Update the relevant samples to use the new @SpringBootApplication
annotation.

Closes gh-1842
2014-11-06 22:51:09 -08:00
Phillip Webb 68571ee535 Document @SpringBootApplication
Add a section to the reference guide about @SpringBootApplication.

See gh-1842
2014-11-06 22:50:25 -08:00
Phillip Webb e76a571dd3 Add @SpringBootApplication annotation
Add a new @SpringBootApplication which is equivalent to @Configuration,
@EnableAutoConfiguration and @ComponentScan.

See gh-1842
2014-11-06 22:49:10 -08:00
Phillip Webb 0c3911162b Polish 2014-11-06 22:48:40 -08:00
Phillip Webb 96a031cf20 Default spring.datasource.jmx-enabled to false
Change the default value of spring.datasource.jmx-enabled to false
to prevent InstanceAlreadyExistsException problems when using the
Spring Test Framework.

Fixes gh-1590
2014-11-06 21:38:07 -08:00
Phillip Webb d040bb72d3 Restore logback base.xml behavior
Update the base.xml logback configuration file so that it behaves in
the same way as Spring Boot 1.1.

Fixes gh-1845
2014-11-06 20:50:59 -08:00
Phillip Webb 58d660d10d Allow DAO ExceptionTranslator to proxy classes
Update the auto-configured PersistenceExceptionTranslationPostProcessor
to proxy target classes as well as interfaces. Also provide a config
property to disable registration all together.

Fixes gh-1844
2014-11-06 19:13:50 -08:00
Phillip Webb a1a643ca24 Merge pull request #1840 from BigMichi1/master
* pull1840:
  Provide Liquibase -> Commons Logging adapter
2014-11-06 13:27:46 -08:00
Michael Cramer f966b3b1b7 Provide Liquibase -> Commons Logging adapter
Add `CommonsLoggingLiquibaseLogger` implementation to adapt Liquibase's
`Logger` to Apache Commons Logging.

The `LiquibaseAutoConfiguration` class has also been updated to
automatically use the adapter

Fixes gh-1840
2014-11-06 13:26:06 -08:00
Nathan Voxland ce4400291b Upgrade to Liquibase 3.3.0
This commit updates Spring Boot to Liquibase 3.3.0 and makes the
necessary changes to Boot's PackageScanClassResolver.

Previously, when a class found by the scan could not be loaded a
warning message was logged. This commit lowers these to debug level,
bringing them into line with logging that the standard Liquibase
implementation does. It also avoids a warning always being logged at
startup due to Liquibase's WatchCommand$DynamicContentHandler which
depends on Jetty (an optional dependency of Liquibase).

Closes gh-1382
2014-11-06 18:24:32 +00:00
Stephane Nicoll a3d4e92d9f Fix resources directory location 2014-11-06 13:29:15 +00:00
Stephane Nicoll 78af5af5eb Add spring.provides for the hornetq starter
Fixes gh-1837
2014-11-06 13:28:30 +00:00
Phillip Webb 9af079721f Revert "Ensure meta-data file exists for spring-boot jar"
This reverts commit 6e04146457.

Fixes gh-1830
2014-11-05 21:04:46 -08:00
Phillip Webb 2696d37097 Protect against transitive additional meta-data
Update ConfigurationMetadataAnnotationProcessor to ensure that only
local `additional-spring-configuration-metadata.json` files are merged
with the final output.

See gh-1830
2014-11-05 21:03:10 -08:00
Phillip Webb 7e5bb9697c Call meta-data processor regardless of annotations
Update ConfigurationMetadataAnnotationProcessor so that it gets called
even if the source code doesn't include any @ConfigurationProperties
items.

See gh-1830
2014-11-05 21:01:25 -08:00
Phillip Webb ba0dd60de9 Rename charSet to charset
Rename AbstractTemplateViewResolverProperties.setCharSet/getCharSet to
setCharset/getCharset, deprecating the old method.

Fixes gh-1835
2014-11-05 16:57:05 -08:00
Phillip Webb ab7f73f365 Use dashed case for properties appendix
Additional items added since 1.1.x

Fixes gh-1834
2014-11-05 16:52:59 -08:00
Phillip Webb df1d035162 Merge branch '1.1.x'
Conflicts:
	spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
2014-11-05 16:51:33 -08:00
Phillip Webb 2f17c38822 Use dashed case for properties appendix
Fixes gh-1834
2014-11-05 16:50:21 -08:00
Phillip Webb 9d4ada7939 Add Tomcat 7 and Jetty 8 samples
Switch the Tomcat 8 and Jetty 9 samples to Tomcat 7 and Jetty 8. Since
Tomcat 8 and Jetty 9 are now the default versions the previous samples
are no longer relevant, however, we do need integration tests to check
that we remain compatible with Tomcat 7 and Jetty 8.

See gh-1832
2014-11-05 16:35:44 -08:00
Phillip Webb b6bacd5e8a Upgrade to Servlet 3.1, Tomcat 8 and Jetty 9
Upgrade to latest versions of Tomcat and Jetty and to the latest Servlet
API whilst will remaining compatible with Tomcat 7 and Jetty 8.

Fixes gh-1832, gh-369
2014-11-05 16:35:34 -08:00
Phillip Webb 004904af87 Fix meta-data JSON formatting error 2014-11-05 12:34:03 -08:00
Phillip Webb 48d651c753 Add Jetty 9 sample
See gh-369
2014-11-05 09:14:14 -08:00
Phillip Webb ea6162254d Update pidfile property and add documentation
Change the pidfile property from `spring.application.pidfile` to
`spring.pidfile` (to save confusion with SpringApplication properties).

Also added documentation and meta-data information.

See gh-1579
2014-11-05 08:29:17 -08:00
Phillip Webb 3d3ca42318 Merge branch '1.1.x' 2014-11-05 08:19:01 -08:00
Phillip Webb 57a4cb1aee Fix debug logging
Fix an issue where debug logging never occurred because it was guarded
incorrectly using isWarnEnabled().

Fixes gh-1780
2014-11-05 08:17:11 -08:00
Phillip Webb 10d1d5dfb4 Merge branch '1.1.x' 2014-11-05 08:11:54 -08:00
Phillip Webb e1894c1c4b Add check-template-location properties to appendix
Some were missing, some were named incorrectly.

See gh-1827
2014-11-05 08:10:59 -08:00
Phillip Webb 6e04146457 Ensure meta-data file exists for spring-boot jar
Rename 'additional-spring-configuration-metadata.json' to
'spring-configuration-metadata.json' and drop the annotation processor.

The project has no @ConfigurationProperties defined so the annotation
processor didn't kick in.

Fixes gh-1830
2014-11-05 07:50:48 -08:00
Phillip Webb 39037e0cab Use the Mongo starter for the sample application
See gh-1831
2014-11-05 07:47:25 -08:00
Stephane Nicoll dba4ad0768 Fix typo 2014-11-05 14:35:50 +01:00
Phillip Webb bec7b5f118 Merge pull request #1483 from liujiong1982/spring-boot-1412
* spring-boot-1412:
  Add fork option for mvn spring-boot:run

Closes gh-1483
2014-11-04 13:23:31 -08:00
David Liu 9bf1c89750 Add fork option for mvn spring-boot:run
Update RunMojo to include a `fork` option and change the default
to only fork if agent or jvmArguments are specified.

Fixes gh-1412
2014-11-04 13:22:02 -08:00
Phillip Webb 026b89f58c Support PID file location in Spring Environment
Update ApplicationPidFileWriter to support the Spring Environment,
picking up the `spring.application.pidfile` property if specified.

Fixes gh-1579
2014-11-04 11:18:48 -08:00
Phillip Webb f9fe8ed55e Merge pull request #1783 from Loki-Afro/gh-1777
* gh-1777:
  Add PropertiesPropertySourceLoader test
  Add XML support to PropertiesPropertySourceLoader
2014-11-04 09:33:14 -08:00