Commit Graph

4008 Commits

Author SHA1 Message Date
Andy Wilkinson 230048ae8b Prefer Jackson unless user explicity states preference for Gson
This commit rewords the changes made in d718a80 so that simply adding
Gson to the classpath isn't sufficient to stop Jackson being used
for HTTP JSON mapping. To use Gson, the user must now either remove
Jackson from the classpath (not an option if they also wish to use
the Actuator) or configure the spring.http.converters.preferred-mapper
property with a value gson.

Closes gh-2247
2015-02-05 10:56:26 +00:00
Andy Wilkinson e5d653dbd4 Update to Spring AMQP 1.4.3.RELEASE
Closes gh-2452
2015-02-04 18:12:57 +00:00
Andy Wilkinson f64081872c Merge branch '1.1.x' 2015-02-04 18:12:38 +00:00
Andy Wilkinson 9212574191 Upgrade to Spring AMQP 1.3.9.RELEASE
Closes gh-2453
2015-02-04 18:11:39 +00:00
Andy Wilkinson aca47ab67e Allow FaviconConfiguration to be disabled
Setting spring.favicon.enabled to false will now disable the
/**/favicon.ico handler mapping.

Closes gh-2377
2015-02-04 18:02:09 +00:00
Andy Wilkinson d718a80316 Make it easier to use Gson and the Actuator at the same time
Previously the recommendation when a user wanted to use Gson was to
exclude Jackson from the classpath and add Gson. This worked fine until
the user also want to use the Actuator which requires Jackson. To get
over this hurdle the user could leave Jackson on the classpath and
perform their own HttpMessageConverter configuration and register a
GsonHttpMessageConverter instead of or before any Jackson-based
converter. A little complicated, but it worked.

This commit makes things easier by updating the auto-configuration for
HTTP message converters to prefer Gson when both Gson and Jackson are
on the classpath, i.e. in the presence of both, a
GsonHttpMessageConverter will be auto-configured and a
MappingJackson2HttpMessageConverter won’t be. This allows an
application to easily use Gson while allowing the Actuator to continue
to use Jackson.

Closes gh-2247
2015-02-04 17:34:14 +00:00
Andy Wilkinson 68c7c65d52 Configure SnakeYAML so the timestamp-like strings do not become Dates
By default, SnakeYAML will convert a timestamp-like string into a
java.util.Date. This differs to properties file-based configuration
where the values are always strings. Dates are problematic as the
round trip (string -> Date -> string) can change the value. For example,
“2015-01-27” becomes “Tue Jan 27 00:00:00 GMT 2015”.

This commit updates YamlPropertySourceLoader to use a Yaml with a
custom Resolver subclass that suppresses the addition of the implicit
resolver for timestamps. Supressing the addition of the unwanted
resolver, rather than overriding addImplicitResolvers and registering
the resolvers that we do want, ensures that we get all of the other
default Resolvers in their default order.

Fixes gh-2422
2015-02-04 16:50:51 +00:00
Andy Wilkinson 54e90c03fc Polish the javadoc in spring-boot-cli
Add missing @param and @return elements
2015-02-04 14:00:44 +00:00
Andy Wilkinson 17f05467bc Document IDEA’s quirky classpath ordering and its effect on templates
Closes gh-2319
2015-02-04 11:35:21 +00:00
Phillip Webb 8e398dc6a7 Polish Javadoc
Update Javadoc to add missing @return and @param elements.
2015-02-03 11:35:06 -08:00
Andy Wilkinson e489ab9b29 Update docs to clarify ordering for profile-specific properties
Closes gh-2404
2015-02-03 14:12:04 +00:00
Andy Wilkinson a88f27168a Add support to the Gradle plugin for disabling direct use of resources
The Maven plugin allows spring-boot:run to be configured so that
resources are loaded from their output location rather than from
src/main/resources. This commit adds an equivalent configuration
option to the Gradle plugin. To disable source resources from being
added to the classpath in place of those in the output location
the configure the bootRun tasks like this:

bootRun {
	addResources = false
}

Closes gh-2431
2015-02-03 10:52:10 +00:00
Phillip Webb c02b99b257 Rename CodahaleMetricWriter
Deprecate CodahaleMetricWriter and create DropwizardMetricWriter to
reflect the renamed project.

Fixes gh-2442
2015-02-02 22:19:06 -08:00
Phillip Webb e1a80fa496 Fix broken reference documentation link 2015-02-02 21:30:49 -08:00
Phillip Webb 3d9cf06c31 Log OnBeanCondition.addDeducedBeanType errors
Update addDeducedBeanType.addDeducedBeanType to log any exceptions at
debug level.

Fixes gh-2436
2015-02-02 20:55:47 -08:00
Phillip Webb 0696695e16 Add package javadoc 2015-02-02 17:05:38 -08:00
Phillip Webb ccdbfd274f Fix Java 8 Javadoc compatibility
Update Javadocs to fix errors caused by Java 8 aggressive linting.

Fixes gh-2233
2015-02-02 17:05:37 -08:00
Andy Wilkinson 93d533dfa6 Document auto-configuration support for Spring HATEOAS
Closes gh-2426
2015-02-02 16:53:52 +00:00
Stephane Nicoll dfdb801533 Fix use of deprecated API. 2015-02-02 11:34:49 +01:00
Phillip Webb 4b9cb6afee Revert "Disable javadoc linting when building with JDK 8+"
This reverts commit 78432fc745.
2015-02-01 21:38:11 -08:00
Phillip Webb 072f873f34 Polish 2015-02-01 21:37:17 -08:00
Phillip Webb 3328c1369f Merge branch '1.1.x'
Conflicts:
	spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java
2015-02-01 20:28:11 -08:00
Phillip Webb 555827cad7 Polish 2015-02-01 20:00:11 -08:00
Stephane Nicoll 763a735bd5 Merge branch '1.1.x'
Conflicts:
	spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportProperties.java
	spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java
2015-01-29 16:45:00 +01:00
Stephane Nicoll d64cc082db Harmonize property name
The property default format is lower case using hyphen. The JMX default
domain property has been harmonized to that format.

Fixes gh-2427
2015-01-29 16:42:24 +01:00
Andy Wilkinson c9186c45a2 Merge branch '1.1.x' 2015-01-29 13:39:16 +00:00
Andy Wilkinson c346e996ed Ignore temporary .writing files when finding output files
Spring Integration's FileWritingMessageHandler uses a .writing file
while it's in the process of writing a message to disk and then
performs a rename (depending on the OS and filesystem this may or may
not be atommic) to create the .msg file. Prior to this commit the
test was finding the temporary .writing files and examining them. This
could lead to a FileNotFoundException being thrown as the temporary
file was deleted while the test was trying to read its contents.

This commit updates the test to only look for files with a .msg suffix

Fixes gh-2428
2015-01-29 13:32:01 +00:00
Andy Wilkinson c37633d867 Merge branch '1.1.x' 2015-01-29 12:43:39 +00:00
Andy Wilkinson c3020e9eff Add a single how to for creating a deployable war file
This commit updates the documentation to describe the three steps
involved in producing a deployable war file in a single place.

Closes gh-2185
2015-01-29 12:42:41 +00:00
Andy Wilkinson c60fab92ce Upgrade to Spring Data Evans SR2
Closes gh-2424
2015-01-29 10:29:48 +00:00
Andy Wilkinson 0cb92b452d Merge branch '1.1.x' 2015-01-29 10:29:14 +00:00
Andy Wilkinson b2a059a385 Upgrade to Spring Data Dijkstra SR5
Closes gh-2423
2015-01-29 10:28:16 +00:00
Andy Wilkinson afe3bc0938 Merge branch 'gh-2313' 2015-01-28 15:28:44 +00:00
Andy Wilkinson 23c175f674 Polish metadata annotation processor’s incremental build support
The main change in this commit is to introduce a new BuildHandler
abstraction. A BuildHandler is responsible for producing the metadata
for a build. Two implementations are provided; one for standard builds
and one for incremental builds. This change means that the annotation
processor is no longer concerned with the two different build types
and can use the same logic in each case.

The code for reading and writing metadata files has also been moved
out into a separate class, MetadataStore, to allow it to be easily
utilised from multiple places.

Closes gh-2313
2015-01-28 15:27:45 +00:00
Kris De Volder 8df43a8a79 Update the metadata annotation processor to support incremental builds
This commit udpdates the metadata annotation processor so that change
data from an incremental build is merged with the metadata from the
previous build.

Closes gh-2321
2015-01-28 15:26:02 +00:00
Stephane Nicoll ccb2828945 Narrow down the target type of logging.level
While `logging.level` is managed in a dedicated way in
`LoggingApplicationListener`, the value of the map are String values
representing the level to apply. The meta-data now exposes that type
instead of raw `java.lang.Object`

Closes gh-2388
2015-01-28 15:47:17 +01:00
Stephane Nicoll cd83c1c1b2 Merge branch '1.1.x' 2015-01-28 15:43:52 +01:00
Stephane Nicoll 389b8641b7 Fix documentation inconsistency
Closes gh-2416
2015-01-28 15:43:30 +01:00
Stephane Nicoll 5e36473939 Fix documentation typo 2015-01-27 17:36:22 +01:00
Andy Wilkinson 528a632fd1 Allow XA DataSource and ConnFactory pools to be configured via the env
This commit adds support for configuring the XA DataSource and
ConnectionFactory pools created by Atomikos and Bitronix via the
environment. The property prefixes vary depending on the transaction
manager that’s in use. They are:

Bitronix:
 - spring.jta.bitronix.datasource
 - spring.jta.bitronix.connectionfactory

Atomikos:
 - spring.jta.atomikos.datasource
 - spring.jta.atomikos.connectionfactory

The configuration processor has been updated to ignore
javax.jms.XAConnectionFactory and javax.sql.XADataSource as neither of
these types can be created via property binding.

Closes gh-2027
2015-01-27 10:55:56 +00:00
Andy Wilkinson 37ffa6dc85 Upgrade to Tomcat 8.0.18
Closes gh-2415
See gh-1920
2015-01-26 16:26:34 +00:00
Andy Wilkinson 4802640399 Reference latest version of Tomcat 7 in the documentation 2015-01-26 14:42:55 +00:00
Andy Wilkinson 8e8bf8e177 Uses the latest version of Tomcat 7 in the sample 2015-01-26 14:38:30 +00:00
Stephane Nicoll f5f0952837 Merge branch '1.1.x' 2015-01-26 03:28:17 +01:00
Stephane Nicoll e70c18d05b Fix name of solr health indicator
Fixes gh-2410
2015-01-26 03:27:53 +01:00
Stephane Nicoll 4bee1b0e1b Fix wrong help page for archive detection logic
Fixes gh-2355
2015-01-23 17:24:14 +01:00
Andy Wilkinson f96adaf3ac Add some documentation about Java 6 compatibility
Document the need to use a different JTA 1.2 API jar and Tomcat 7 or
Jetty 8 if you’re running on Java 6.

Closes gh-2347
2015-01-22 16:45:46 +00:00
Andy Wilkinson 49bc12d564 Make spring-plugin-core a compile dependency so EntityLinks can be used
See gh-2396
2015-01-22 16:03:58 +00:00
Andy Wilkinson 01344c8617 Add a starter for building a RESTful service with Spring HATEOAS
Closes gh-2396
2015-01-22 15:22:50 +00:00
Andy Wilkinson ea7b5c6e3c Improve support for alternative Log4j 2 configuration file formats
This commit adds support for configuring Log4j 2 with YAML. It also
improves the existing support for configuring Log4j 2 with JSON.

Previously, Log4J2LoggingSystem returned a hard-coded list of standard
config locations that includes both JSON and XML file suffixes. Log4j 
2’s support for JSON configuration files requires Jackson’s ObjectMapper
to be on the classpath so, in its absence, the standard config locations
were incorrect.

This commit updates Log4J2LoggingSystem to return an array of standard
config locations based on what’s on the classpath. It also updates the
documentation to describe the additional dependencies that are required
to enable YAML or JSON-based configuration.

Closes gh-2239
2015-01-22 15:06:20 +00:00