Commit Graph

634 Commits

Author SHA1 Message Date
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
Sebastien Deleuze
e641b47b66 Upgrade to Undertow 1.1.1
Fixes gh-2066
2014-12-05 09:51:28 -08:00
Phillip Webb
778aa39016 Add Undertow WebSocket auto-configuration
Fixes gh-2028
2014-12-03 15:35:19 -08:00
Phillip Webb
6c96608b11 Upgrade to Spring Framework 4.1.3.BUILD-SNAPSHOT
Upgrade to the SNAPSHOT so that CI will catch any problems early.

See gh-2038
2014-12-02 17:29:51 -08:00
Phillip Webb
48db5457f1 Polish 2014-12-01 19:32:05 -08:00
Dave Syer
843e6d7cfa Add 2 more JsonParser implementations 2014-12-01 13:41:13 +00:00
Andy Wilkinson
27569f5845 Add an EL implementation to the Undertow Starter
Unlike the Tomcat and Jetty starters, the Undertow starter does not
provide an EL implementation. This leads to failures when you try to use
Hibernate Validator with the Undertow starter.

To bring the Undertow starter into line with the other two embedded
container starters, this commit adds Glassfish’s EL implementation to
the Undertow starter. This is the implementation that’s used by the
Jetty starter. If/when Undertow provides JSP support and, therefore,
starts using EL itself, we should align with it.

Closes gh-1979
2014-11-24 11:34:15 +00:00
Stephane Nicoll
0f64a04780 Add easy way to consume configuration metadata
Add a companion module that IDE developers can use to read configuration
metadata from multiple sources into a single repository.

ConfigurationMetadataRepository provides access to groups and items as
well as an harmonized view on "sources" (that is the POJOs that have
contributed to a given group).

Closes gh-1970
2014-11-21 16:02:04 +01:00
Andy Wilkinson
90af8bf54a Add auto-configuration for Jetty 9's WebSocket support
Closes gh-1269
2014-11-19 14:44:54 +00:00
Andy Wilkinson
1864d79077 Polish Undertow contribution
Closes gh-1779
2014-11-18 21:20:34 +00:00
sopov.ivan
c501b889af Add support for using Undertow as an embedded container
See gh-1779
2014-11-18 21:20:34 +00:00
Andy Wilkinson
33dfab08de Upgrade to Tomcat 7.0.57
Closes gh-1936
2014-11-18 10:45:11 +00:00
Andy Wilkinson
5bc48bee5a Upgrade to Spring AMQP 1.3.7.RELEASE
Closes gh-1906
2014-11-18 10:44:52 +00:00
Andy Wilkinson
1182495810 Upgrade to Spring Integration 4.0.5.RELEASE
Closes gh-1905
2014-11-18 10:44:32 +00:00
Andy Wilkinson
c80ff4c555 Upgrade to HikariCP 2.2.5
Closes gh-1897
2014-11-17 16:34:19 +00:00
Dave Syer
25428a32ad Change spring-cloud.version to include 'connectors' 2014-11-17 08:52:22 +00:00
Phillip Webb
345ced1675 Fixup version numbers following release 2014-11-11 18:05:23 -08:00
Spring Buildmaster
46b7738334 Next development version 2014-11-11 17:12:24 -08:00
Phillip Webb
3e565bf421 Upgrade to Spring Integration 4.1.0.RELEASE
Fixes gh-1848
2014-11-11 15:20:57 -08:00
Phillip Webb
8cac63e239 Drop hibernate-jpa-2.0-api managed dependency
Fixes gh-1898
2014-11-11 13:03:25 -08:00
Phillip Webb
5834bcb59f Revert "Upgrade to HikariCP 2.2.4"
This reverts commit 325d751225.

Conflicts:
	spring-boot-dependencies/pom.xml
2014-11-11 12:53:36 -08:00
Phillip Webb
f55705be1b Upgrade maven-source-plugin to 2.4
Fixes gh-1872
2014-11-11 12:51:02 -08:00
Phillip Webb
4fa8a94dd4 Update to latest Maven plugins
Fixes gh-1899
2014-11-11 12:44:31 -08:00
Andy Wilkinson
7aaf7c65bd Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-11-11 17:43:17 +00:00
Andy Wilkinson
142c183b11 Fix the ordering of versions and dependencies in the dependencies pom 2014-11-11 17:41:48 +00:00
Andy Wilkinson
6770960737 Upgrade to Spring AMQP 1.4.0.RELEASE
Closes gh-1849
2014-11-11 16:52:20 +00:00
Andy Wilkinson
674e61d87d Add dependency management for some additional Hibernate modules
hibernate-jpamodelgen was requested by a Boot user. hibernate-ehcache
and hibernate-envers were requested by a Spring IO Platform user (see
spring-io/platform#11

Closes gh-1896
2014-11-11 16:40:24 +00:00
Andy Wilkinson
eecdb92728 Upgrade to Spring 4.0.8.RELEASE
Closes gh-1785
2014-11-11 12:31:07 +00:00
Andy Wilkinson
5194953030 Upgrade to Tomcat 8.0.15
Closes gh-1890
2014-11-11 12:30:12 +00:00
Andy Wilkinson
04f9872693 Upgrade to Jedis 2.5.2
Closes gh-1895
2014-11-11 11:26:47 +00:00
Andy Wilkinson
aefd53059a Upgrade to SnakeYAML 1.14
Closes gh-1894
2014-11-11 11:26:47 +00:00
Andy Wilkinson
15991b2fd0 Upgrade to Mockito 1.10.8
Closes gh-1892
2014-11-11 11:26:47 +00:00
Andy Wilkinson
8b1905bb01 Upgrade to Hibernate Validator 5.1.3
Closes gh-1891
2014-11-11 11:26:47 +00:00
Andy Wilkinson
14b16712ed Upgrade to Log4j 2 2.1
Closes gh-1889
2014-11-11 11:26:47 +00:00
Andy Wilkinson
a8fb5b10a7 Upgrade to Joda Time 2.5
Closes gh-1888
2014-11-11 11:26:47 +00:00
Andy Wilkinson
325d751225 Upgrade to HikariCP 2.2.4
Closes gh-1887
2014-11-11 11:26:46 +00:00
Andy Wilkinson
21354db647 Upgrade to H2 1.4.182
Closes gh-1886
2014-11-11 11:26:46 +00:00
Andy Wilkinson
0014f6dba7 Upgrade to Jackson 2.4.3
Closes gh-1885
2014-11-11 11:26:46 +00:00
Andy Wilkinson
7401e29f57 Upgrade to Spring Framework 4.1.2.RELEASE
Closes gh-1805
2014-11-11 11:26:46 +00:00
Andy Wilkinson
6eab4628f4 Merge branch '1.1.x' 2014-11-11 10:32:58 +00:00
Andy Wilkinson
21adc5066e Upgrade to Spring Mobile 1.1.3.RELEASE
Closes gh-1893
2014-11-11 10:32:17 +00:00
Andy Wilkinson
7d1606dcfa Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-11-11 10:13:51 +00:00
Andy Wilkinson
f07c090876 Upgrade to Mongo Java Driver 2.12.4
The exception message for a connection timeout has been updated to
include the timeout period. The tests for the sample have been updated
accordingly.

Closes gh-1884
2014-11-11 10:10:16 +00:00
Andy Wilkinson
7e95dba52e Upgrade to Jolokia 1.2.3
Closes gh-1883
2014-11-11 10:08:58 +00:00
Andy Wilkinson
a09e8f7538 Upgrade to HornetQ 2.4.5
Closes gh-1882
2014-11-11 10:08:37 +00:00
Andy Wilkinson
4e9da8c86e Upgrade to Hibernate 4.3.7
Closes gh-1881
2014-11-11 10:08:09 +00:00
Andy Wilkinson
55f976dd6b Upgrade to Freemarker 2.3.21
Closes gh-1880
2014-11-11 10:07:49 +00:00
Andy Wilkinson
effbfb6d14 Upgrade to Groovy 2.3.7
Closes gh-1879
2014-11-11 10:07:21 +00:00
Andy Wilkinson
3647e1b0ca Upgrade to AspectJ 1.8.4
Closes gh-1878
2014-11-11 10:06:57 +00:00
Andy Wilkinson
a250e60a3e Upgrade to Apache HTTPClient 4.3.6
Closes gh-1877
2014-11-11 10:06:32 +00:00
Andy Wilkinson
38e8942696 Upgrade to Thymeleaf Layout Dialect 1.2.7
Closes gh-1876
2014-11-11 10:04:10 +00:00
Andy Wilkinson
9b6ff220a1 Upgrade to MySQL Connector 5.1.34
Closes gh-1875
2014-11-11 10:03:29 +00:00
Andy Wilkinson
b99ffcc170 Merge branch '1.1.x' 2014-11-10 15:43:07 +00:00
Michael Cramer
322bdd62ef Update maven-javadoc-plugin to version 2.10.1
Closes gh-1863
2014-11-10 15:41:18 +00:00
Michael Cramer
f62664534d Update maven-dependency-plugin to version 2.9
Closes gh-1862
2014-11-10 15:40:42 +00:00
Andy Wilkinson
a9b88d6955 Document need for ServerEndpointExporter and show its use in a sample
Traditionally, a @ServerEndpoint-annotated bean is found by a servlet
container initialiser, however Boot does not run servlet container
initialisers when an embedded container is being used. To be able to use
@ServerEndpoint in a Boot app that uses embedded Tomcat a
ServerEndpointExporter bean must be declared.

This commit updates the documentation to describe this requirement and
also updates the WebSockets sample to illustrate the use of
ServerEndpointExporter. The version of Spring Framework has been updated
to 4.0.8.BUILD-SNAPSHOT. This picks up the fix for SPR-12340.

Closes gh-1722
2014-11-10 11:27:56 +00: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
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
Andy Wilkinson
a85e02fbb9 Update to Spring Data Evans SR1
Closes gh-1709
2014-11-03 11:31:58 +00:00
Stephane Nicoll
884c058e57 Add processor to generate configuration meta-data
Adds an annotation processor to generates a JSON meta-data file at
compile time from @ConfigurationProperties items. Each meta-data file
can include an array or 'properties' and 'groups'.

A 'property' is a single item that may appear in a Spring Boot
'application.properties' file with a given value. For example,
'server.port' and 'server.context-path' are properties. Each property
may optionally include 'type' and 'description' attributes to provide
the data type (e.g. `java.lang.Integer`, `java.lang.String`) and
some short documentation (taken from the field javadoc) about what the
property is for. For consistency, the type of a primitive is translated
to its wrapper counterpart, i.e. `boolean` becomes `java.lang.Boolean`.

A 'group' provides a higher level grouping of properties. For example
the 'server.port' and 'server.context-path' properties are in the
'server' group.

Both 'property' and 'group' items may additional have 'sourceType' and
'sourceMethod' attributes to indicate the source that contributed them.

Users may use `META-INF/additional-spring-configuration-metadata.json`
to manually provide additionally meta-data that is not covered by
@ConfigurationProperties objects. The contents of this file will be
read and merged with harvested items. The complete meta-data file is
finally written to `META-INF/spring-configuration-metadata.json`.

See gh-1001
2014-11-02 21:46:28 -08:00
Phillip Webb
830ce80824 Polish CLI init command
Rename a few classes and methods and extract some logic into helper
classes. Also change 2 char shortcuts to a single char.

Closes gh-1751
2014-11-01 09:05:47 -07:00
Dave Syer
49fbf215a1 Switch to Dropwizard metrics 3.1.0
Fixes gh-1775
2014-10-31 18:52:42 +00:00
Stephane Nicoll
b2fe2dd912 Add init command to the CLI
This commit adds a new command to the CLI that allows to initialize a new
project from the command line. It uses the Spring initializr service to
actually generate the project.

The command offers two main operations:

1. Listing the capabilities of the service (--list or -l). This basically
dumps the defaults of a given service and the list of dependencies and
project types it supports
2. Generating a project. By default, http://start.spring.io is used and
its configured defaults are applied. Running spring init would therefore
have the same effect as clicking the 'generate project' on the UI without
entering any extra information. No file is overwritten by default.

The generation can be customized with the following options:

* --boot-version (-bv) Spring Boot version the project should use
* --dependencies (-d) comma separated list of dependencies to add to the
generated project
* --java-version (-jv) Java version to use
* --packaging (-p) the packaging for the project (jar, war)
* --target the url of the service to use

The actual type of the project can be defined in several ways:

1. Using the --type (-t) option that identifies a type that is supported
by the service
2. A combination of --build and/or --format that can be used to uniquely
identify matching these tags. Build represents the build system to use
(e.g. maven or gradle) while --format defines the format of the generated
project.

The project is saved on disk with the name provided by the server through
the Content-Disposition header, if any. It is possible to force it with
the --output option. It is possible to overwrite existing files by adding
the --force (-f) flag.

The --extract (-x) option allows to extract the project instead of saving
the zip archive. By default, the project is extracted in the current
working directory but it is possible to specify an alternate directory
using the --output option.

Fixes gh-1751
2014-10-31 08:39:03 +01:00
Phillip Webb
4b45ce9e57 Upgrade to Spring 4.1.2.BUILD-SNAPSHOT 2014-10-30 13:54:25 -07:00
Andy Wilkinson
c8d7a6dc24 Merge branch '1.1.x' 2014-10-29 17:47:28 +00:00
Andy Wilkinson
9a491013c3 Update email addresses in pom files to use new pivotal.io domain
Closes gh-1774
2014-10-29 17:47:13 +00:00
Andy Wilkinson
ef2455938e Align new JavaMail dependencies with Spring IO Platform
Spring IO Platform already provides dependency management for JavaMail.
This commit updates Boot’s new JavaMail dependency management to align
with the Platform, thereby allowing the Platform to inherit Boot’s
dependency management instead of defining its own.
2014-10-29 17:05:48 +00:00
Stephane Nicoll
ccc5e65779 Add email support
This commit adds a new starter to auto-configure a MailSender when the
necessary classes are present and when the property "spring.mail.host" is
set.

The auto-configuration also accepts any arbitrary properties that
JavaMail might need using the "spring.mail.properties" prefix.

Fixes gh-1760
2014-10-29 15:39:05 +01:00
Andy Wilkinson
741d1f7273 Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-10-28 19:15:58 +00:00
Andy Wilkinson
812acec48f Upgrade to Spring Batch 3.0.2.RELEASE
Closes gh-1782
2014-10-28 19:14:34 +00:00
Andy Wilkinson
b1e7cd0be2 Rename spring-boot-starter-cloud in spring-boot-dependencies
Fixes #1781
2014-10-28 19:08:43 +00:00
Dave Syer
015377f9de Exclude log4j in a couple of places (see gh-1660)
also rename spring-cloud starter
2014-10-28 15:57:14 +00:00
Andy Wilkinson
cebfd44d16 Upgrade to Spring AMQP 1.4.0.RC1 2014-10-28 13:49:52 +00:00
Andy Wilkinson
43eda4ce5d Upgrade to Spring Integration 4.1.0.RC1
Closes gh-1765
2014-10-27 15:07:23 +00:00
Dave Syer
4cd3bf18e0 Revert "Updated liquibase dependency to 3.2."
This reverts commit d6621e62ad. I think
the test failure might be a bug in Liquibase:
https://liquibase.jira.com/browse/CORE-2094
2014-10-27 14:43:00 +00:00
Nathan Voxland
d6621e62ad Updated liquibase dependency to 3.2.
Fixes gh-1382
2014-10-27 11:49:33 +00:00
Dave Syer
576f5cfb06 Upgrade Jersey to 2.13
Fixes gh-1752
2014-10-27 11:09:02 +00:00
Andy Wilkinson
cf0018e88c Merge branch '1.1.x' 2014-10-22 12:42:10 +01:00
Andy Wilkinson
5e5e707945 Upgrade to Reactor 1.1.5.RELEASE
Closes gh-1742
2014-10-22 12:38:55 +01:00
Brett Wooldridge
9984939c47 Update HikariCP to 2.1.0, compile against the Java 6-compatible artifact
For those running applications on Java 8, dependency management for the
Java 8-compatible artifact is also provided.

Closes gh-1721
2014-10-16 15:21:57 +01:00
Andy Wilkinson
d4fa5fa1cf Merge branch '1.1.x' 2014-10-15 11:06:45 +01:00
Andy Wilkinson
7cb3ae43d4 Update to Tomcat 7.0.56
Closes gh-1710
2014-10-15 11:05:14 +01:00
Phillip Webb
3228cfa9bd Fixup version numbers following release 2014-10-10 15:53:54 -07:00
Spring Buildmaster
3e71a21b30 Next development version 2014-10-10 15:19:47 -07:00
Daniel Fullarton
1dbc94d0f7 Add a logging system, starter and sample for Log4j 2
Closes gh-1565
2014-10-08 15:30:00 +01:00
Andy Wilkinson
73b80dbeed Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-10-06 13:50:47 +01:00
Andy Wilkinson
e130c00e6c Upgrade to Spring Loaded 1.2.1.RELEASE
Closes gh-1474
2014-10-06 13:42:07 +01:00
Sebastien Deleuze
315213ea4e Support Jackson based XML serialization and Jackson2ObjectMapperBuilder
This commit introduces support for Jackson based XML serialization, using the
new MappingJackson2XmlHttpMessageConverter provided by Spring Framework
4.1. It is automatically activated when Jackson XML extension is detected on the
classpath.

Jackson2ObjectMapperBuilder is now used to create ObjectMapper and XmlMapper
instances with the following customized properties:
 - MapperFeature.DEFAULT_VIEW_INCLUSION is disabled
 - DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES is disabled

JodaModuleAutoConfiguration and Jsr310ModuleAutoConfiguration have been removed
since their behaviors are now handled directly by the ObjectMapper builder.

In addition to the existing @Bean of type ObjectMapper support, it is now
possible to customize Jackson based serialization properties by declaring
a @Bean of type Jackson2ObjectMapperBuilder.

Fixes gh-1237
Fixes gh-1580
Fixes gh-1644
2014-10-06 10:54:38 +01:00
Stephane Nicoll
24da6a504e Upgrade to Spring framework 4.1.1
Closes gh-1654
2014-10-02 16:07:33 +02:00
Dave Syer
339f3b7bf0 Add autoconfig support for Jersey (2)
Jersey 2 has some Spring support built in but it's a bit awkward to
use in a Boot app, so autoconfiguration seems appropriate. The tests
and sample show how to use it, but the short story is that any
@Component can define JAX-RS endpoints via @GET etc.

There's a sample for Jersey 1 as well (pay careful attention to
the plugin configuration if you want to build an executable jar)

Fixes gh-1651
2014-10-02 11:22:00 +01:00
Andy Wilkinson
c601c09ecc Upgrade to Hibernate Validator 5.1.2.Final
Closes gh-1595
2014-10-01 17:28:29 +01:00
Henryk Konsek
7f20f5d4f8 Upgraded ActiveMQ version to 5.10.0
Fixes gh-1609
2014-09-26 13:08:03 -07:00
Phillip Webb
4f9258a345 Fixup version numbers following release 2014-09-25 21:37:40 -07:00
Spring Buildmaster
edb4b7ed7d Next development version 2014-09-25 21:02:37 -07:00
Phillip Webb
22378698fe Upgrade to Spring Framework 4.1.1.BUILD-SNAPSHOT 2014-09-17 21:37:23 -07:00
Andy Wilkinson
750c116078 Upgrade to Spring Integration 4.0.4 and Spring AMQP 1.3.6
Closes gh-1503
Closes gh-1505
2014-09-07 17:32:09 -05:00
Andy Wilkinson
fbeb8c966c Upgrade to Spring Data Evans
The missing bean condition on the auto-configuration classes for
Elasticsearch, Jpa, Mongo and Solr repositories have been tightened to
look for ElasticsearchRepositoryFactoryBean, JapRepositoryFactoryBean,
MonoRepositoryFactoryBean, and SolrRepositoryFactoryBean respectively.

In Spring Data Evans, when there are multiple repository types on the
classpath, a strict mode is entered to prevent the different
repositories from trampling over each other. A side-effect of this is
that for the Mongo domain types in the tests to be discovered they
must be explicitly annotated with @Document.

Closes gh-1338
2014-09-07 16:04:04 -05:00
David Liu
8e9e502b6a Add support for auto-configuration of Commons DBCP2
Closes gh-1292
Closes gh-1477
2014-09-07 10:43:48 -05:00
Andy Wilkinson
85ebc29639 Upgrade to latest Spring Integration and AMQP milestones
Closes gh-1493
Closes gh-1517
2014-09-05 16:44:27 +01:00
Phillip Webb
338288205b Fixup version numbers following release 2014-09-04 15:40:55 -07:00
Spring Buildmaster
d63e4b4329 Next development version 2014-09-04 12:15:18 -07:00
Stephane Nicoll
2d8ec0faab Upgrade to Spring framework 4.1.0
Fixes gh-1501
2014-09-04 14:36:27 +02:00
Stephane Nicoll
3f148683a1 Update to Spring framework 4.0.7
Fixes gh-1488
2014-09-04 11:10:33 +02:00
Ramnivas Laddad
413890de48 Add starter for spring-cloud
Fixes gh-1385
2014-09-03 19:39:16 -07:00
Phillip Webb
9a1c15a88d Upgrade to spring-cloud v1.1.0 2014-09-03 19:15:27 -07:00
Andy Wilkinson
bf249d4205 Provide dependency management for all of Spring Cloud
Closes #1462
2014-08-28 10:25:34 +01:00
Phillip Webb
ff870de0f0 Fix a few JTA issues
- Search for ConnectionFactories in java:/JmsXA and
  java:/XAConnectionFactory
- Remove javax.transaction:jta managed dependency
- Removed unused JtaProperties argument

Fixes gh-947
2014-08-27 10:09:34 -07:00
David Liu
f4ccaa874a Provide auto-configuration for Gson
Closes #1339
2014-08-27 16:57:21 +01:00
Andy Wilkinson
d16ae2afd4 Merge branch '1.1.x' 2014-08-27 13:34:28 +01:00
Andy Wilkinson
37aa532617 Upgrade to Spring Data Dijkstra SR4
Closes #1419
2014-08-27 13:34:03 +01:00
Andy Wilkinson
993a43ee8c Remove non-existent starter from dependencies pom 2014-08-27 09:47:25 +01:00
Josh Long
e1160922f9 Add Atomikos and Bitronix starter POMs
Add starters for Atomikos and Bitronix JTA libraries.

See gh-947
2014-08-26 22:34:04 -07:00
Phillip Webb
b91274c0db Add Bitronix support classes
Add support classes for the Bitronix JTA library, including:

- A Spring friendly ConnectionFactoryBean and DataSourceBean with
  support for setting a direct XA source.
- A PostProcessor to apply shutdown ordering automatically.

See gh-947
2014-08-26 22:33:45 -07:00
Phillip Webb
983ec0ebc8 Add Atomikos support classes
Add support classes for the Atomikos JTA library, including:

- A Spring friendly ConnectionFactoryBean and DataSourceBean.
- A PostProcessor to apply "depends-on" ordering automatically.
- A bindable properties class for type-safe configuration.

See gh-947
2014-08-26 22:33:37 -07:00
Phillip Webb
939af5e931 Revert "Add activemq-jms-pool managed dependency"
This reverts commit bbdfcd4faa.
2014-08-22 11:16:46 -07:00
Phillip Webb
d6fdc47724 Restore repositories section
Restore repositories section accidentally removed during the merge
2014-08-22 09:49:07 -07:00
Phillip Webb
8f883febd1 Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-08-22 09:47:30 -07:00
Phillip Webb
bbdfcd4faa Add activemq-jms-pool managed dependency
Fixes gh-1423
2014-08-22 09:41:18 -07:00
Phillip Webb
7d4fbacecd Fix invoker to not download remote artifacts
Updates to prevent the maven-invoker-plugin from downloading remote
snapshot jars. Possibly caused by the recent changes to the
spring-boot-dependencies POM.

See gh-1413
2014-08-21 00:52:00 -07:00
Phillip Webb
75578e833a Add repositories section to dependencies POM
Inadvertently missed on commit 7732135a2b

Fixes gh-1413
2014-08-20 18:35:07 -07:00
Andy Wilkinson
8e5556bcfa Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-08-19 13:11:15 +01:00
Andy Wilkinson
fbd429c6c1 Upgrade to HTTP Client 4.3.5
Closes #1409
2014-08-19 12:13:28 +01:00
Andy Wilkinson
7ea61f6d72 Upgrade to org.apache.httpcomponents:httpasyncclient 4.0.2
Closes #1408
2014-08-19 12:13:28 +01:00
Andy Wilkinson
0eaee3e833 Upgrade to mysql-connector-java 5.1.32
Closes #1407
2014-08-19 12:13:28 +01:00
Andy Wilkinson
0917760522 Upgrade to Jackson 2.3.4
Closes #1406
2014-08-19 12:13:28 +01:00
Andy Wilkinson
c1d6e5e897 Upgrade to Tomcat 7.0.55
Closes #1405
2014-08-19 12:13:21 +01:00
Andy Wilkinson
601794c617 Upgrade to Spring Integration 4.0.3
Closes #1404
2014-08-19 11:55:09 +01:00
Andy Wilkinson
0e3d49512f Upgrade to Reactor 1.1.4 and Reactor Spring 1.1.3
Closes #1402
Closes #1403
2014-08-19 11:54:11 +01:00
Andy Wilkinson
e3769889f5 Upgrade to mongo-java-driver 2.12.3
Closes #1401
2014-08-19 11:52:04 +01:00
Andy Wilkinson
77147bfe5c Upgrade to HornetQ 2.4.3.Final
Closes #1400
2014-08-19 11:51:14 +01:00
Andy Wilkinson
58061bd852 Upgrade to AspectJ 1.8.2
Closes #1399
2014-08-19 11:47:34 +01:00
Andy Wilkinson
2892247491 Upgrade to Spring Security 3.2.5
Closes #1398
2014-08-19 11:30:28 +01:00
Andy Wilkinson
2668e152ff Upgrade to Hibernate 4.3.6
Closes #1389
2014-08-19 11:29:29 +01:00
Mattias Severson
326516a305 Delete duplicate version numbers of Maven plugins
The Maven plugin version numbers are defined in the pluginManagement
of the spring-boot-dependencies pom.xml. Consequently, they can be
deleted in the spring-boot-starter-parent pom.xml to avoid version
conflicts and duplicated version management.
2014-08-19 11:25:52 +02:00
Andy Wilkinson
ecdd291254 Upgrade to Joda Time 2.4
Closes #1388
2014-08-18 10:14:03 +01:00
Andy Wilkinson
5338dc2ade Upgrade to Jackson 2.4.2
Closes #1387
2014-08-18 09:56:56 +01:00
Ramnivas Laddad
912d5cf40b Add auto-configuration for Spring Cloud
Enable if all of the following are true:
- spring-cloud is on the classpath
- There is no Cloud bean present
  (usually done by extending AbstractCloudConfig)
- The "cloud" profile is active

Fixes gh-1302

Autoconfigure spring-cloud
2014-08-14 20:47:59 -07:00
Phillip Webb
cac3865ffa Fixup version numbers following release 2014-08-07 13:11:16 -07:00
Spring Buildmaster
74d0c5185a Next development version 2014-08-07 11:59:17 -07:00
Stephane Nicoll
df9200d432 Add JCache API dependency management
The dependency is currently declared in Spring IO Platform from where
it can be removed once it's using a version of Boot that contains
this change. To make the migration of the dependency management from
the Platform to Boot seamless, the dependency is versioned using a
property with the same name as is currently used by the Platform:
javax-cache.version

Closes #1347
2014-08-07 14:40:01 +01:00
Andy Wilkinson
636cc5424f Merge branch '1.1.x' 2014-07-29 15:50:27 +01:00
Andy Wilkinson
b7299708f8 Upgrade to Spring HATEOAS 0.16.0
Closes #1307
2014-07-29 15:50:09 +01:00
Andy Wilkinson
3639fe2441 Merge branch '1.1.x' 2014-07-29 15:38:05 +01:00
Andy Wilkinson
b69a5dab80 Upgrade to Spring Data Dijkstra SR3
Closes #1305
2014-07-29 15:37:50 +01:00
Andy Wilkinson
6c718c24d8 Merge branch '1.1.x' 2014-07-29 11:39:53 +01:00
Andy Wilkinson
86d47f62db Upgrade to Groovy 2.3.6
Closes #1304
2014-07-29 11:24:42 +01:00
Max Bruchmann
ee40fb8cf1 Add auto-configuration for Thymeleaf data dialect
Closes #1120
2014-07-29 11:12:02 +01:00
Andy Wilkinson
29b388e6a9 Merge branch '1.1.x' 2014-07-28 15:33:54 +01:00
Andy Wilkinson
cba50b8ee7 Upgrade to Groovy 2.3.5
Closes #1299
2014-07-28 15:32:44 +01:00
Andy Wilkinson
3145edff3a Upgrade to Spring 4.1.0 and use Yaml support that migrated from Boot
Closes #813
2014-07-17 14:39:18 +01:00
Andy Wilkinson
db2b20879d Merge branch '1.1.x' 2014-07-15 14:38:02 +01:00
Andy Wilkinson
672d713f99 Add dependency management for spock-spring and document its use
Closes #1234
2014-07-15 14:36:56 +01:00
Andy Wilkinson
41ca0f604a Merge branch '1.1.x' 2014-07-15 14:23:17 +01:00
Andy Wilkinson
847627810a Merge branch '1.1.x' 2014-07-15 13:54:34 +01:00
Andy Wilkinson
124418f83f Upgrade to HikariCP 1.4.0
Closes #1220
2014-07-15 13:53:28 +01:00
Andy Wilkinson
6cac7926d9 Upgrade to Groovy 2.3.4
Closes #1224
2014-07-15 13:52:40 +01:00
Lukasz Kryger
51196e01d5 Dependencies for json-path in BOM 2014-07-15 09:31:29 +01:00
Stephane Nicoll
249e09d9bc Switch master to 1.2.0.BUILD-SNAPSHOT 2014-07-11 10:44:05 +02:00
Phillip Webb
3c7d825658 Fixup version numbers following release 2014-07-08 03:07:03 -07:00
Spring Buildmaster
40327e1ae6 Next development version 2014-07-08 02:33:36 -07:00
Phillip Webb
54f1b29db5 Upgrade to Spring Framework 4.0.6
Fixes gh-1217
2014-07-08 00:41:00 -07:00
Andy Wilkinson
6a0eb90007 Upgrade to Spring Batch 3.0.1
Due to a mistake in Spring Batch 3.0.0 it has been necessary to
introduce a breaking API change (the addition of
BatchConfigurer.getJobExplorer()) in the 3.0.1 release. This commit
updates Boot to use 3.0.1 and modifies the Batch auto-configuration
and associated tests to implement the new method.
2014-07-08 00:03:30 -07:00
Oliver Gierke
075eb9f30c Upgrade to Spring Data Dijkstra SR1
Upgraded to Dijkstra SR1 BOM as well as Spring HATEOAS 0.14.0.RELEASE
(required by Dijkstra SR1).

Closes #1197
Fixes #1190
2014-07-01 08:56:17 +01:00
Andy Wilkinson
54849f83c4 Upgrade to Spring AMQP 1.3.5
Closes #1193
2014-06-30 15:05:58 +01:00
Phillip Webb
cc61d92b88 Fixup build following release 2014-06-27 07:00:57 -07:00
Spring Buildmaster
981669b7c0 Next development version 2014-06-26 14:09:54 -07:00
Phillip Webb
200cd535c2 Revert "Next development version"
This reverts commit 67189477fe.
2014-06-26 11:03:09 -07:00
Spring Buildmaster
67189477fe Next development version 2014-06-26 10:51:35 -07:00
Andy Wilkinson
fda24b8499 Upgrade to Jedis 2.4.2
Closes #1162
2014-06-25 10:31:46 +01:00
Andy Wilkinson
752e3c58ec Upgrade to H2 1.3.176
Closes #1161
2014-06-25 10:31:45 +01:00
Andy Wilkinson
834af12725 Upgrade to HikariCP 1.3.9
Closes #1160
2014-06-25 10:31:25 +01:00
Andy Wilkinson
646458dd51 Upgrade to WSDL4J 1.6.3
Closes #1159
2014-06-25 10:30:24 +01:00
Andy Wilkinson
7ae58eb21a Upgrade to mongo-java-driver 2.12.2
Closes #1158
2014-06-25 10:30:24 +01:00
Andy Wilkinson
80cf7a106d Upgrade to Jolokia 1.2.2
Closes #1157
2014-06-25 10:30:24 +01:00
Andy Wilkinson
2f414bedce Upgrade to Hibernate 4.3.5
Closes #1156
2014-06-25 10:30:24 +01:00
Andy Wilkinson
2ddc34350b Upgrade to CRaSH 1.3.0
Closes #1155
2014-06-25 10:30:12 +01:00
Andy Wilkinson
3352327442 Upgrade to AspectJ 1.8.1
Closes #1154
2014-06-25 10:14:56 +01:00
Andy Wilkinson
9cd54196ec Upgrade HTTP components to 4.3.4
Closes #1153
2014-06-25 10:14:19 +01:00
Andy Wilkinson
f326d1f18f Upgrade to thymeleaf-layout-dialect 1.2.5
Closes #1152
2014-06-25 10:13:36 +01:00
Andy Wilkinson
834c9e78b7 Upgrade to mysql-connector-java 5.1.31
Closes #1151
2014-06-25 10:12:54 +01:00
Andy Wilkinson
c3eae015e9 Upgrade to Groovy 2.3.3
Closes #1150
2014-06-25 10:09:45 +01:00
Phillip Webb
91bbd20ca0 Fixup version numbers following release 2014-06-24 14:53:08 -07:00
Spring Buildmaster
542f3cbda8 Next development version 2014-06-24 13:53:56 -07:00
Phillip Webb
3a8a127285 Implement simpler exclusion logic for Gradle
Simplify the exclusion logic used in Gradle by implementing implicit
exclusions rather than trying to detect transitive excludes.

This commit reverts much of the code originally included to fix gh-1047
which adds far too much complexity to the build and still doesn't solve
the underlying issue.

Fixes gh-1103
2014-06-16 16:54:48 -07:00
Phillip Webb
143e1918b7 Fixup versions following release 2014-06-11 12:16:08 -07:00
Spring Buildmaster
4ca26a21dc Next development version 2014-06-11 10:46:27 -07:00
Phillip Webb
9e93719922 Fixup version numbers following release 2014-06-10 14:20:41 -07:00
Spring Buildmaster
05ed7b3bcd Next development version 2014-06-10 12:40:35 -07:00
Phillip Webb
3007a777d0 Roll back to 1.1.0.BUILD-SNAPSHOT 2014-06-10 09:00:08 -07:00
Phillip Webb
5adbf32c18 Fixup version numbers following release 2014-06-09 22:13:54 -07:00
Spring Buildmaster
c650f2391e Next development version 2014-06-09 21:55:19 -07:00
Phillip Webb
6a55c7af2e Add additional modules to prepare profile
Require for the initial build of a new version.
2014-06-09 20:50:56 -07:00
Andy Wilkinson
b585afe537 Polishing 2014-06-09 21:17:19 +01:00
Maciej Walkowiak
95a6ce9e48 Spring Web Services Starter
- upgraded Spring WS to 2.2.0.RELEASE
- replaced default MVC DispatcherServlet with MessageDispatcherServlet
- migrated XML based config with nww Spring WS Java config

Fixes: gh-412
2014-06-09 21:17:19 +01:00
Marten Deinum
e2a449da97 Spring Web Services Starter and Sample Project
Fixes gh-412
2014-06-09 21:17:19 +01:00
Phillip Webb
933c6b3a43 Remove superfluous commons-logging excludes
Update all starter POMs to remove commons-logging dependencies that are
not longer required when using the Spring Boot Gradle plugin.

Mainly reverts code from 196f92bd42

See gh-1047
2014-06-09 00:41:30 -07:00
Phillip Webb
28090e8a5f Generate and attach dependency-tree
Update spring-boot-versions to generate a dependency-tree file and
attach it as an artifact. The file is generated by creating a temporary
POM and calling the invoker plugin.

The spring-boot-versions POM now depends on all spring-boot-starter-*
POMs to ensure that they have been installed before the dependency
tree is processes.

See gh-1047
2014-06-09 00:22:09 -07:00
Roy Clarkson
8f32b87c81 Improve Spring Mobile Auto-configuration
- Upgrade Spring Mobile dependency to 1.1.2
- Rename SitePreferenceAutoConfiguration "enabled" property
- Add Auto-configuration for LiteDeviceDelegatingViewResolver
- Update docs

Fixes gh-1049
2014-06-07 07:01:36 +01:00
Oliver Gierke
6f98c63ac0 Add auto-configuration for Jackson's JodaTime and JSR-310 modules
We now register the Jackson JodaTime module with Jackson ObjectMappers
if it is on the classpath. We also register the JSR-310 module if it's
on the classpath and the application is running Java 8 or better.

Extracted the Jackson specific configuration previously residing in
HttpMessageConvertersAutoConfiguration into a JacksonAutoConfiguration
class.

Added the Jackson JSR-310 module as a managed Boot dependency.
2014-06-06 13:22:12 +01:00
Henryk Konsek
923b067e84 Added Janino to BOM. 2014-06-05 16:23:25 +02:00
Andy Wilkinson
196f92bd42 Exclude commons-logging to the extent that even Gradle’s happy
Gradle hasn’t different exclusion semantics to Maven. In Maven you can
exclude spring-core’s commons-logging dependency once and it’ll be
honoured even if you have multiple transitive routes to commons-logging
via spring-core. In Gradle you have to exclude commons-logging from
everything that has a transitive spring-core dependency. To make matters
worse this doesn’t only apply to dependencies and exclusions declared in
build.gradle but also to dependencies and exclusions declared in the pom
files of the artifacts that a Gradle build depends upon.

In short, to make our starters work as intended with Gradle, this commit
adds many, many exclusions for commons-logging. It also removes
commons-logging exclusions from spring-boot-dependencies’
<dependencyManagement> as they have no effect with Gradle and their
presence can cause us to miss required exclusions in a starter

Fixes #987
2014-06-04 17:40:36 +01:00
Andy Wilkinson
9b44c322d4 Update dependencies to latest maintenance releases
Despite Javassist 3.18.2-GA being available, it has not be upgraded.
This is to keep it in sync with Hibernate.
2014-06-03 17:03:26 +01:00
Artur Konczak
99940337a9 Add support for Elasticsearch
Add auto-configuration and starters for Elasticsearch.

Fixes gh-408
2014-06-01 12:54:42 +01:00
Phillip Webb
c719ab7aee Exclude commons-logging from starter POMs
Update all relevant starter POMs to include a `spring-core` dependency
with an exclusion on `commons-logging`. This prevents `commons-logging`
and `jcl-over-slf4j` from both being on the classpath.

Also add enforcer rules to ensure that commons-logging doesn't sneak
back in, and that there is no dependency convergence. (some additional
libraries were required in spring-boot-dependencies)

Tested with a sample maven project as well as using the `spring jar`
command.

Fixes gh-985
2014-05-31 01:10:06 +01:00
Stephane Nicoll
5a69bb9267 Add HornetQ JMS support
Provide auto-configuration support for HornetQ JMS broker, along with
an additional starter POM.

The connection factory connects to a broker available on the local
machine by default. A configuration switch allows to enable an embedded
mode that starts HornetQ as part of the application.

In such a mode, the spring.hornetq.embedded.* properties provide
additional options to configure the embedded broker. In particular,
message persistence and data directory locations can be specified. It is
also possible to define the queue(s) and topic(s) to create on startup.

Fixes: gh-765
2014-05-30 23:26:07 +01:00
Dave Syer
5557061ba1 Add social-* starters to dependency bom 2014-05-30 15:11:24 +01:00
Andy Wilkinson
51518a2041 Upgrade to Spring Integration 4.0.2 and Spring AMQP 1.3.4
Closes #994
2014-05-30 09:23:53 +01:00
Andy Wilkinson
bbf8ddc97c Provide dependency management for all of Spring Social 2014-05-30 09:06:49 +01:00
Phillip Webb
bdcb9407eb Restore commons-logging dependency for spring-boot
Restore the dependency on commons-logging (transitively via spring-core)
for spring-boot. This means that we are not tied directly to SLF4J, but
it is still an option that can be used via `jcl-over-slf4j`.

The `spring-boot-starter-parent` continues to replace `commons-logging`
with `jcl-over-slf4j`.

Fixes gh-981
2014-05-28 23:03:26 +01:00
Andy Wilkinson
7a8be3d600 Use Spring Framework bom and fully exclude commons-logging
Closes #955
Closes #978
2014-05-28 20:12:29 +01:00
Dave Syer
dba9667e93 Add spring-boot-starter-groovy-templates
Fixes gh-974
2014-05-28 16:13:16 +01:00
Andy Wilkinson
ee12840bf7 Remove redundant Quartz exclusion
Quartz is an optional dependency of spring-context-support so there's
no need to exclude it

This is a baby-step towards using the Spring Framework bom (#955)
2014-05-28 15:37:12 +01:00
Andy Wilkinson
27b31acd05 Provide dependency management for all of Spring Social Facebook 2014-05-28 13:54:26 +01:00
Andy Wilkinson
195a3dd80d Use latest versions of Spring Social Facebook and LinkedIn 2014-05-28 13:39:26 +01:00
Craig Walls
f006b1231c Add Spring Social autoconfiguration 2014-05-28 13:30:41 +01:00
Andy Wilkinson
5807c8747e Upgrade to Groovy 2.3.2
Closes #971
2014-05-28 13:27:30 +01:00
Dave Syer
f746cd5dc2 Upgrade to reactor 1.1.1 (fixes gh-845) 2014-05-28 09:38:38 +01:00
Phillip Webb
d4d3ffa93c Unify versions in POMs started by the invoker
Unify the versions used in integration tests launched by the
maven-invoker-plugin. Allows for already cached local copies to be
used, hopefully speeding up the build.
2014-05-27 21:25:34 +01:00
Andy Wilkinson
96c92fd3b8 Merge branch '1.0.x' 2014-05-27 15:03:57 +01:00
Andy Wilkinson
362df05f65 Upgrade to Tomcat 7.0.54
Closes #960
2014-05-27 15:02:50 +01:00
Spring Buildmaster
b643600060 Next development version 2014-05-26 18:24:01 -07:00
Phillip Webb
4fd4e2f7cb Downgrade to Reactor 1.1.0
Downgrade the Reactor version since we cannot depend on snapshots for
the M2 release.

See gh-845
2014-05-26 22:07:16 +01:00
Andy Wilkinson
e7f7b1c2b0 Add dependency management for remaining Spring Framework modules
spring-instrument-tomcat is deliberately not included as it is only
required with Tomcat 6 and Boot uses Tomcat 7
2014-05-23 19:07:45 +01:00
Phillip Webb
1a475102de Polish 2014-05-22 20:33:08 +01:00
Andy Wilkinson
94a255074f Upgrade to Spring Batch 3.0.0.RELEASE
Closes #906
2014-05-22 20:19:54 +01:00
Andy Wilkinson
e1a2968899 Upgrade to Spring Integration 4.0.1.RELEASE and use its bom
Closes #792
2014-05-22 17:51:55 +01:00
Andy Wilkinson
e45ef06b56 Polish Spring Data Solr integration 2014-05-22 17:29:12 +01:00
Christoph Strobl
6ed69709d7 Add auto configuration support for Spring Data Solr
Registers required components in application context if not available to
set up environment for usage with Spring Data Solr. Will listen on
SolrServer and SolrRepositories for configuration.

By default an HttpSolrServer is registered unless a zkHost (zookeeper
host) is defined. In that case an instance of CloudSolrServer will be
created.

By default multicore support is enabled, creating instances of
SolrServer for each core defined via @SolrDocument.
2014-05-22 17:29:12 +01:00
Andy Wilkinson
cf5c1d1b70 Merge branch '1.0.x' 2014-05-22 12:25:20 +01:00
Andy Wilkinson
8fa2286dd3 Upgrade to Spring Security 3.2.4.RELEASE 2014-05-22 12:24:14 +01:00
Dave Syer
86ff5315b4 Update to Jedis 2.4.1 means commons-pool2
Fixes gh-918
2014-05-21 11:30:43 +01:00
Andy Wilkinson
d7b100d94c Upgrade to RELEASE version of Spring Data Dijkstra release train
Closes #815
2014-05-21 09:45:33 +01:00
Andy Wilkinson
d9eeb782b8 Upgrade to Spring HATEOAS 0.12.0.RELEASE
Closes #801
2014-05-21 09:41:37 +01:00
Andy Wilkinson
00b18b114a Merge branch '1.0.x' 2014-05-21 09:14:07 +01:00
Andy Wilkinson
b9c80433bc Upgrade to Spring 4.0.5
Closes #891
2014-05-21 09:11:34 +01:00
Andy Wilkinson
e40acd81e4 Polish dependency management again
Remove declarations for the Spring OAuth modules that should have
been removed as part of eeefbdd5
2014-05-20 17:38:19 +01:00
Andy Wilkinson
307fbba9e4 Use spring-boot-dependencies as spring-boot-dependency-tools' parent
Previously spring-boot-dependency-tools used spring-boot-tools as its
parent. This meant that it inherited spring-boot-parents' dependency
management that we did not want to expose to applications. The
solution to this was to generate the effective pom and then filter
out any thing that did not appear in spring-boot-dependencies' pom.
This filtering had to unwanted side-effect of breaking bom imports:
the effective pom would contain the dependency management from the
imported bom, but this would be filtered out as the entries didn't
appear in spring-boot-dependencies' pom.

This commit updates spring-boot-dependency-tools to use
spring-boot-dependencies as its parent. This means that its effective
pom contains the desired dependency management and nothing more,
allowing the filtering logic to be removed.

The use of Spring Security's bom has been reinstated as it will now
work as intended and versions for its modules will be available in the
CLI and via the Gradle plugin.

Closes #825
Fixes #838
2014-05-20 14:33:19 +01:00
Andy Wilkinson
eeefbdd5f8 Polish dependency management
- Remove dependency management for projects that Boot does not have a
  runtime dependency upon
- Provide dependency management for all of Spring Batch’s modules
2014-05-20 13:48:47 +01:00
Dave Syer
2648f3cfd6 Update Spring Batch to 3.0.0.RC2
Fixes gh-800
2014-05-20 11:43:01 +01:00
Dave Syer
e964b9eb34 Improved integration with Groovy 2.3.1
Groovy 2.3.1 has a new template loader abstraction that handles
compiler caching (better performance by factor of 10).
2014-05-19 18:23:03 +01:00
Dave Syer
77ae790363 Update Spring OAuth version to latest 2014-05-19 13:09:03 +01:00
Andy Wilkinson
2378fe0900 Add support for using Velocity templates 2014-05-19 12:01:20 +01:00