Commit Graph

475 Commits

Author SHA1 Message Date
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
Drummond
0025be8771 Upgrade to Flyway 3.1
The 3.1 release includes an important fix to restore JDK 6
compatibility with the Gradle plugin [1].

Closes gh-2260

[1] https://github.com/flyway/flyway/issues/779
2015-01-20 17:39:48 +00:00
Chris Schaefer
6975b206bc Upgrade Spring Cloud Connectors to 1.1.1.RELEASE
Closes gh-2373
2015-01-20 17:32:10 +00:00
Andy Wilkinson
69ea4beb8a Add auto-configuration for Jetty’s GzipFilter
Jetty’s GzipFilter is a container-agnostic Filter that can be used to
provide gzip and deflate encoding of HTTP responses. This commit adds
auto-configuration for GzipFilter that is enabled when
org.eclipse.jetty:jetty-servlets is on the classpath. The filter can
be configured using spring.http.gzip.*

See gh-2031
2015-01-16 12:07:28 +00:00
Andy Wilkinson
492cf4ef54 Add jersey-bean-validation to spring-boot-starter-jersey
A dependency on org.glassfish.jersey.ext:jersey-bean-validation has
been added to spring-boot-starter-jersey. jersey-bean-validation’s EL
dependencies have been excluded in favour of those provided by
spring-boot-starter-tomcat (or starter-jetty or starter-undertow should
the user choose to use a different embedded container).

Closes gh-2315
2015-01-15 09:50:05 +00:00
Andy Wilkinson
c0ef7d1815 Upgrade to Spring AMQP 1.4.2.RELEASE 2015-01-14 13:34:20 +00:00
Andy Wilkinson
b97fc63234 Upgrade to Spring Integration 4.1.2.RELEASE
Closes gh-2352
2015-01-14 13:34:06 +00:00
Andy Wilkinson
dcc07ad6c9 Upgrade to Mockito 1.10.19
Closes gh-2337
2015-01-14 13:33:47 +00:00
Andy Wilkinson
1ab510e53c Upgrade to H2 1.4.184
Closes gh-2334
2015-01-14 13:33:22 +00:00
Andy Wilkinson
bb058934a6 Upgrade to Gson 2.3.1
Closes gh-2333
2015-01-14 13:32:40 +00:00
Andy Wilkinson
de2087ff2e Merge branch '1.1.x' 2015-01-14 12:29:06 +00:00
Andy Wilkinson
92c8b75a73 Upgrade to Spring Integration 4.0.6.RELEASE
Closes gh-2358
2015-01-14 11:39:03 +00:00
Andy Wilkinson
3ef768e76d Upgrade to Spring AMQP 1.3.8.RELEASE
Closes gh-2357
2015-01-14 11:38:45 +00:00
Andy Wilkinson
912060698d Upgrade to SLF4J 1.7.10
Closes gh-2336
2015-01-14 11:38:22 +00:00
Andy Wilkinson
ca1716e9d6 Upgrade to Hibernate 4.3.8
Closes gh-2335
2015-01-14 11:38:02 +00:00
Dave Syer
2729c747ca Add jmustache support
The package names changed a bit from the prototype project, but wuth vanilla
autconfiguration usage that shouldn't matter. Follows closely the Groovy
templates support. Templates live in classpath:/templates/*.html by default.

Fixes gh-2242
2015-01-09 13:50:39 +00:00
Phillip Webb
9dd4d43cec Fixup version numbers following release 2015-01-08 00:19:04 -08:00
Spring Buildmaster
60725cd8bd Next development version 2015-01-07 23:37:07 -08:00
Phillip Webb
f369a72264 Merge branch '1.1.x' 2015-01-03 12:29:38 -08:00
Phillip Webb
20dbf4ab15 Remove duplicate jetty-util dependency
See gh-2180
2015-01-03 12:29:00 -08:00
Phillip Webb
a36c3b977c Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2015-01-02 16:22:49 -08:00
Phillip Webb
67302db9e5 Add dependency management for all Jetty modules
Update spring-boot-dependencies to include all Jetty modules. The helps
to prevent issues when modules are pulled in transitively (for example
via solr).

Fixes gh-2180
2015-01-02 16:21:47 -08:00
Stephane Nicoll
1567c00ef0 Upgrade to Spring Framework 4.0.9
Closes gh-2259
2014-12-30 16:33:49 +01:00
Stephane Nicoll
2b3061b31f Upgrade to Spring 4.1.4
Closes gh-2249
2014-12-30 14:54:25 +01:00
Stephane Nicoll
95cf63f685 Switch to Spring snapshot
See gh-2249
2014-12-29 10:20:09 +01:00
Stephane Nicoll
4a314321d7 Merge branch '1.1.x' 2014-12-23 11:54:54 +01:00
Stephane Nicoll
ed1db855c0 Upgrade to Thymeleaf 2.1.4
Closes gh-2215
2014-12-23 11:51:26 +01:00
Phillip Webb
d4fb8ad6a8 Polish POM artifact order 2014-12-22 11:23:18 -08:00
Andy Wilkinson
e72f3c0215 Upgrade to Jetty 8.1.16.v20140903
Closes gh-2199
2014-12-18 15:43:40 +00:00
Michael Cramer
3b858edfa9 Auto-configure for Thymeleaf conditionalcomments
Add auto-configuration for thymeleaf-extras-conditionalcomments which
allows parsing of conditional comments for IE.

Example:

	<!--[if lt IE 8]>
		<link rel="stylesheet" th:href="@{/styleIE.css}"
		type="text/css"/>
	<![endif]-->

Without this dialect all Thymeleaf attributes are ignored inside the
comment.

Fixes gh-2113
2014-12-17 16:23:28 -08:00
Phillip Webb
a663f07375 Upgrade to Jersey 2.14
Closes gh-2166
2014-12-17 16:02:12 -08:00
Stephane Nicoll
cdbc0c7f46 Harmonize JTA dependency
Mixing Hibernate and a JTA provider may lead to duplicate JTA
dependencies as the API is published with different coordinates.

The following has been applied:

* We now use `javax.transaction:javax.transaction-api` everywhere.
* The `data-jpa` starter has been updated to replace the JBoss JTA
  dependency with the standard one.
* The `jta-bitronix` starter has been updated to use JTA 1.2 instead of
  JTA 1.1 (unfortunately, JTA 1.1 is published with different
  coordinates).
* The `jta-atomikos` starter has been updated to define a dependency on
  JTA as the current version does not do it at all.
* The HornetQ JMS server is also relying on JTA but that dependency
  should have been optional. It has been excluded for the time being as
  it was using (yet) another set of coordinates.

Fixes gh-2092
2014-12-17 15:53:48 -08:00
Michael Cramer
6806689c08 Upgrade to Spring Integration 4.1.1.RELEASE
Closes gh-2155
2014-12-15 09:58:06 +00:00
Michael Cramer
790e5fcf67 Upgrade to H2 1.4.183
Closes gh-2154
2014-12-15 09:58:05 +00:00
Michael Cramer
24ba436e2b Upgrade to Spring AMQP 1.4.1.RELEASE
Closes gh-2152
2014-12-15 09:58:05 +00:00
Andy Wilkinson
cfd17eb479 Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-12-15 09:37:01 +00:00
Michael Cramer
ef64186bb9 Upgrade to SLF4J 1.7.8
Closes gh-2151
2014-12-15 09:34:19 +00:00
Phillip Webb
a6adeab319 Fixup version numbers following release 2014-12-10 19:50:05 -08:00
Phillip Webb
43fb5b63a8 Fixup version numbers following release 2014-12-10 19:49:23 -08:00
Spring Buildmaster
63e6a25097 Next development version 2014-12-10 18:06:30 -08:00
Spring Buildmaster
1a788c1741 Next development version 2014-12-10 16:35:50 -08:00
Andy Wilkinson
d0d640b3e5 Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-12-10 16:03:45 +00:00
Andy Wilkinson
42e2b9a41d Upgrade to Groovy 2.3.8
Closes gh-2021
2014-12-10 15:52:11 +00:00
Andy Wilkinson
3bb8e5af9e Remove redundant dep management for spring-boot-configuration-metadata
The module’s artifact id is spring-boot-configuration-processor for
which dependency management is also provided.
2014-12-10 10:57:13 +00:00
Stephane Nicoll
d59718447b Upgrade to Spring Framework 4.1.3
Closes gh-2038
2014-12-09 12:29:11 +01:00
Phillip Webb
4fc8a183f2 Add Jersey Jackson support
Fixes gh-2091
2014-12-08 19:13:57 -08:00
Phillip Webb
52fd5dde58 Update cargo configuration to also set AJP ports
Fixes gh-1736
2014-12-06 00:35:18 -08:00
Phillip Webb
c332e5834a Add managed jackson-datatype-jdk8 dependency
Fixes gh-1750
2014-12-05 11:52:42 -08:00
Phillip Webb
f3a0cebaaf Upgrade to JUnit 4.12
Closes gh-2061
2014-12-05 11:28:48 -08:00
Phillip Webb
88f64c7ad3 Upgrade to Jackson 2.4.4
Closes gh-2062
2014-12-05 11:27:59 -08:00