Commit Graph

227 Commits

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