Commit Graph

3711 Commits

Author SHA1 Message Date
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
Phillip Webb 907f60e871 Add PropertiesPropertySourceLoader test 2014-11-04 09:32:22 -08:00
Phillip Wirth ed12f97fda Add XML support to PropertiesPropertySourceLoader
Fixes gh-1777
Closes 1783
2014-11-04 09:32:02 -08:00
Phillip Webb f5a52ddd5a Optimize property sources pattern matching
Create a PropertyNamePatternsMatcher strategy interface that
PropertySourcesPropertyValues can use to determine when a property
can be used.

PropertiesConfigurationFactory uses DefaultPropertyNamePatternsMatcher
which is heavily optimized for frequent calls.

Fixes gh-1823
2014-11-04 09:12:30 -08:00
Phillip Webb adffb7a30f Guard default conversion service creation
Update ConfigurationPropertiesBindingPostProcessor to ensure that
the defaultConversionService is only created once.

Fixes gh-1822
2014-11-04 09:09:40 -08:00
Phillip Webb edaed415fb Polish 2014-11-04 09:09:26 -08:00
Stephane Nicoll 9dec27e7bf Permit to disable JTA using a single property
Disable JTA auto-configuration altogether with a simple property. This
can be useful if the environment is JTA capable but the application does
not require it.

Fixes gh-1457
2014-11-04 16:53:54 +01:00
Stephane Nicoll 814803046a polishing 2014-11-04 16:31:37 +01:00
Stephane Nicoll 47cd9e0765 Fix ConditionalOnJndi evaluation
Enable ConditionalOnJndi evaluation and add tests that validate it works
as expected

Fixes gh-1820
2014-11-04 15:42:30 +01:00
Stephane Nicoll cbd3c39640 Override StringHttpMessageConverter with UTF-8
Override the default StringHttpMessageConverter provided by the standard
Spring MVC configuration so that is uses UTF-8 instead of the aging
default of the servlet spec (that is ISO-8859-1)

Fixes gh-1800
2014-11-04 13:12:19 +01:00
Dave Syer 8be97fa47d Tweak docs on Maven resource filtering some more 2014-11-04 10:41:47 +00:00
Dave Syer d210810535 Tweak docs on Maven resource filtering
Fixes gh-1816
2014-11-04 10:29:55 +00:00
Phillip Webb 43c07e8b44 Protect against duplicate datasource MBeans
See gh-1590
2014-11-03 18:49:27 -08:00
Phillip Webb a973fd41f4 Polish 2014-11-03 18:49:20 -08:00
Dave Syer 9b6cb83be5 Add documentation for Servlet 2.5 and GAE
Fixes gh-1104
2014-11-03 17:04:57 +00:00
Dave Syer f304d46955 Add JMX MBean for Tomcat DataSource
If the DataSource is a Tomcat one we force it to register an MBean
if spring.jmx.enabled=true

Fixes gh-1590
2014-11-03 13:38:05 +00:00
Stephane Nicoll 0061f237b8 Add examples to the CLI
This commit updates the help command to also show some example(s) to
illustrate how the command can be used. The commit also defines useful
examples for the init command

Fixes gh-1809
2014-11-03 14:06:35 +01:00
Stephane Nicoll fb0d9d2a2e Fix build failure
This commit reworks a7e1ec8 to fix the build failure and update the
documentation regarding default maven filtering option with
spring-boot-starter-parent

Fixes gh-1199
2014-11-03 14:01:51 +01:00
Stephane Nicoll 6a18ece6a2 Explicit type takes precedence over build and format
Prior to this commit, specifying the --format and/or --build options
alongside --type did not use the explicit type as it should. This commit
ignores the --build and --format options if a type is explicitly set.

Fixes gh-1807
2014-11-03 13:12:06 +01:00
Andy Wilkinson a85e02fbb9 Update to Spring Data Evans SR1
Closes gh-1709
2014-11-03 11:31:58 +00:00
Dave Syer a7e1ec842d Use @*@ delimiters in Maven resource filtering
It *is* very useful to have filtering on by default, so that is now
the case (in spring-boot-starter-parent). Users can filter resources
by default by adding @*@ placeholders (so as not to clash with Spring
${} placeholders).

Fixes gh-1199
2014-11-03 11:12:11 +00:00
Stephane Nicoll 2e07f003c9 Init command takes the output as last argument
This commit moves the --output switch to a regular argument. This aligns
to other command, i.e. spring init my-project.zip would save the project
to "my-project.zip" in the current directory.

This commit also auto-detects the --extract option if the location ends
with a slash, i.e. spring init demo/ would extract the content of the
project in a demo directory that is local to the current directory.

Fixes gh-1802
2014-11-03 11:52:16 +01:00
Stephane Nicoll 96198e2999 polishing 2014-11-03 11:52:16 +01:00