Commit Graph

501 Commits

Author SHA1 Message Date
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
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