Commit Graph

210 Commits

Author SHA1 Message Date
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
Gary Russell 341ca38d56 Update Spring-AMQP to 1.3.3.RELEASE 2014-05-17 12:33:59 -04:00
Dave Syer da2e25f90d Add Groovy template engine support for Spring MVC apps
Default suffix .tpl. If groovy-templates is on the classpath user
can now add templates and get them rendered and resolved in an MVC
app.

TODO: Macro helpers for message rendering etc.

See gh-878
2014-05-15 17:42:53 +01:00
Christian Dupuis f65af2d502 Update CRaSH dependency to 1.3.0-beta20
fixes #849
2014-05-15 17:35:54 +02:00
Stephane Nicoll e695e5d637 Revisit JMS support
Since ActiveMQ 5.8.0, the modules structure has been revisited and
activemq-core no longer exists. The activemq-broker is required to
create an embedded broker. Since Boot creates such broker by default
if ConnectionFactory is present, a condition has been added to do so
only when the necessary classes are present in the classpath.

The default embedded broker is now configured to disable message
persistence altogether as this requires an extra jar since 5.8.0, i.e.
activemq-kahadb-store.

Split the ActiveMQ auto configuration from the JmsTemplate auto
configuration so these are totally independent.
ActiveMQAutoConfiguration has been created to detect and configure
the ActiveMQ broker if necessary.

The brokerUrl parameter was ignored as long as the inMemory parameter
was true. The actual brokerUrl to use is now determined by the user
defined values of those parameters: if the brokerUrl is set, it is always
used. If no brokerUrl is set, the value of inMemory determines if an
embedded broker should be used (true) or a tcp connection to an
existing local broker (false).

JmsTemplateAutoConfiguration now creates a JmsTemplate only if a
ConnectionFactory is available.

Fixes gh-872, gh-882, gh-883
2014-05-15 16:18:41 +02:00
Phillip Webb 7227c0df5f Merge branch '1.0.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-05-15 15:09:24 +01:00
Phillip Webb 08a6efff46 Update Thymeleaf dependencies
- thymeleaf-layout-dialect 1.2.4
- thymeleaf 2.1.3

Fixes gh-866
2014-05-15 15:04:04 +01:00
Brett Wooldridge 15f38e773a Update HikariCP version to latest. 2014-05-15 14:55:40 +01:00
Christian Dupuis 549daaefa4 Update CRaSH dependency to 1.3.0-beta20
fixes #849
2014-05-14 15:45:47 +02:00
Dave Syer c65337c872 Upgrade Reactor again 2014-05-14 13:42:04 +01:00
Spring Buildmaster b38601a2f2 Next development version 2014-05-12 15:28:30 -07:00
Phillip Webb d09c557e4e Revert "Next development version"
This reverts commit 32d778e508.
2014-05-12 22:46:25 +01:00
Spring Buildmaster 32d778e508 Next development version 2014-05-12 13:40:01 -07:00
Phillip Webb af26a84a8f Use reactor 1.1.0.RELEASE rather than SNAPSHOT
Downgrade from 1.1.1.BUILD-SNAPSHOT to 1.1.0.RELEASE in order to
satisfy enforced release requirements.
2014-05-12 21:03:22 +01:00
Andy Wilkinson fec136e213 Merge branch '1.0.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-05-12 10:37:06 +01:00
Andy Wilkinson f761daf253 Upgrade to CRaSH 1.3.0-beta18
Closes #841
2014-05-12 10:35:20 +01:00
Phillip Webb 61221f84a9 Remove Spring Security BOM
Temporarily remove the Spring Security BOM import as version numbers
for the imported projects don't automatically get resolved by the
gradle plugin.

See gh-838
2014-05-11 09:33:31 +01:00
Phillip Webb 61232395d8 Fixup versions 2014-05-10 23:47:31 +01:00
Phillip Webb af3fb7f080 Fix maven warnings
Fix maven warnings caused by missing version information on the
root POM.
2014-05-10 23:04:24 +01:00
Andy Wilkinson d41a47f247 Update Spring Plugin to 1.1.0.RELEASE
Update to latest release of Spring Plugin and provide dependency
management for all of its modules

Closes #802
2014-05-09 11:06:53 +01:00
Phillip Webb 606ecf1f83 Merge branch '1.0.x' 2014-05-09 09:03:57 +01:00
Phillip Webb 8eca40a388 Add explicit hamcrest-core dependency
Add an explicit dependency to `hamcrest-core` in the
`spring-boot-starter-test` POM. This prevents version 1.1 from
accidentally being pulled in via junit.

Fixes gh-810
2014-05-09 09:01:59 +01:00
Andy Wilkinson f3a40e03bb Polish spring-boot-dependencies
Reorder dependencies so that they're consistently in alphabetical
order
2014-05-08 17:26:16 +01:00
Phillip Webb 02674b32af Remove spring-data release train BOM
Temporarily remove the spring-data release train BOM since it cannot
be resolved until it is published to maven central.

The previous solution of adding an additional repository has been
reverted as it will pollute POMS for users that inherit from the
spring-boot-starter-parent POM.
2014-05-08 13:57:32 +01:00
Phillip Webb 1c5ebc72c5 Revert "Fix dependency management failure"
This reverts commit 1ef3d3bda9.
2014-05-08 13:57:32 +01:00