Commit Graph

1451 Commits

Author SHA1 Message Date
Stephane Nicoll 45a253b754 Merge branch '1.5.x' 2016-10-31 16:08:23 +01:00
Stephane Nicoll 9fc8d61107 Merge branch '1.4.x' into 1.5.x 2016-10-31 16:08:10 +01:00
Stephane Nicoll 49b244b121 Upgrade to H2 1.4.193
Closes gh-7256
2016-10-31 16:07:55 +01:00
Andy Wilkinson 92462a06ad Merge branch '1.4.x' into 1.5.x 2016-10-24 14:11:25 +01:00
Andy Wilkinson 2b46a4876f Start building against Spring Framework 4.3.4 snapshots
Closes gh-7174
See gh-7213
2016-10-24 14:10:12 +01:00
Stephane Nicoll 0234191b0a Merge branch '1.5.x' 2016-10-24 11:12:12 +02:00
Stephane Nicoll 4855bfb152 Merge branch '1.4.x' into 1.5.x 2016-10-24 11:11:56 +02:00
Stephane Nicoll 74d3a6616b Upgrade to liquibase 3.5.3
Closes gh-7208
2016-10-24 10:36:16 +02:00
Andy Wilkinson 8832df3303 Merge branch '1.5.x' 2016-10-20 20:32:49 +01:00
Andy Wilkinson c2d97c9757 Merge branch '1.4.x' into 1.5.x 2016-10-20 20:32:34 +01:00
Andy Wilkinson 5ebfa4b139 Start building against Spring Integration 4.3.5 snapshots
See gh-7197
2016-10-20 20:30:52 +01:00
Andy Wilkinson 81d8e4ab89 Merge branch '1.5.x' 2016-10-19 10:32:30 +01:00
Andy Wilkinson de578cb004 Upgrade to Spring Web Services 2.4.0.RELEASE
Closes gh-7185
2016-10-19 10:31:53 +01:00
Andy Wilkinson f17be6e9f1 Merge branch '1.5.x' 2016-10-18 20:29:55 +01:00
Andy Wilkinson c58852e05b Start building against Spring Security 4.2.0 snapshots
See gh-7186
2016-10-18 20:29:24 +01:00
Stephane Nicoll cc14e04b5a Merge branch '1.5.x' 2016-10-15 08:10:30 +03:00
Artem Bilan c9aee66792 Upgrade to Spring Integration Java DSL 1.2.0.RELEASE
Closes gh-7166
2016-10-15 08:09:16 +03:00
Andy Wilkinson 471c13c28d Merge branch '1.5.x' 2016-10-14 14:09:19 +01:00
Andy Wilkinson 18db285ad2 Upgrade to Spring Retry 1.2.0.RC1
Closes gh-7136
2016-10-14 14:08:27 +01:00
Andy Wilkinson d1f164e1d3 Merge branch '1.5.x' 2016-10-13 09:56:16 +01:00
Andy Wilkinson 2137491d03 Add dependency management for spring-session-data-geode
Closes gh-7159
2016-10-13 09:55:45 +01:00
Andy Wilkinson e02de48c59 Merge branch '1.5.x' 2016-10-13 09:23:22 +01:00
Andy Wilkinson a286d61acd Start building against Spring Retry 1.2.0 snapshots
See gh-7136
2016-10-13 09:22:10 +01:00
Andy Wilkinson 4922975e00 Start building against Spring AMQP 1.6.4 snapshots
1.6.4 snapshots are required for compatibility with Spring Retry 1.2

See gh-7158
2016-10-13 09:22:10 +01:00
Stephane Nicoll c5cc626d48 Remove remote shell support
See gh-7044
2016-10-11 17:59:25 +02:00
Stephane Nicoll 8b61d15120 Remove deprecated support for commons-dbcp 1
See gh-6787
2016-10-05 15:51:14 +02:00
Stephane Nicoll 39534aea6b Merge branch '1.5.x'
# Conflicts:
#	spring-boot-dependencies/pom.xml
2016-10-04 13:02:53 +02:00
Stephane Nicoll 58050fb72f Merge branch '1.4.x' into 1.5.x
# Conflicts:
#	spring-boot-dependencies/pom.xml
2016-10-04 13:01:46 +02:00
Gary Russell ad3179b9ee Upgrade to Spring Integration 4.3.4, AMQP 1.6.3
Closes gh-7074
2016-10-04 12:59:41 +02:00
Andy Wilkinson d3d58bb2d2 Merge branch '1.5.x' 2016-09-29 21:09:41 +01:00
Andy Wilkinson 901aa2764b Merge branch '1.4.x' into 1.5.x 2016-09-29 21:09:18 +01:00
Andy Wilkinson cf4142dbc0 Prevent htmlunit from pulling in commons-logging
Update dependency management to exclude commons-logging and add
an enforcer rule to spring-boot-samples to try and prevent unwanted
commons-logging dependencies from sneaking back in again.

Closes gh-7067
2016-09-29 21:08:15 +01:00
Ken Dombeck 8034ae6e37 Prevent spring-session from pulling in commons-logging
Closes gh-7064
2016-09-29 21:06:05 +01:00
Andy Wilkinson f82dc8e043 Upgrade to JMS API 2.0
Closes gh-7049
2016-09-29 20:33:21 +01:00
Andy Wilkinson 241ab10160 Merge branch '1.5.x' 2016-09-29 15:49:04 +01:00
Andy Wilkinson 2a035d0748 Remove support for Velocity following its deprecation in 1.4
Closes gh-6971
2016-09-29 15:44:36 +01:00
Andy Wilkinson 464915d2cc Remove support for HornetQ following its deprecation in 1.4
See gh-6971
2016-09-29 15:44:36 +01:00
Stephane Nicoll 8b6d7eedc0 Merge branch '1.5.x' 2016-09-29 10:38:42 +02:00
Vedran Pavic c4aa78679a Upgrade Hazelcast to 3.7.1
In addition, dependency management for `hazelcast-hibernate5` module has
been added, and a separate dependency version was introduced for
`hazelcast-hibernate4` module.

Closes gh-7023
2016-09-29 10:37:29 +02:00
Andy Wilkinson 306d9473ab Merge branch '1.5.x' 2016-09-28 12:25:41 +01:00
Andy Wilkinson b186e3f1ef Merge branch '1.4.x' into 1.5.x 2016-09-28 12:25:32 +01:00
Andy Wilkinson 73f153daca Use a property for the version of the JMS API managed dependency
Closes gh-7042
2016-09-28 12:23:15 +01:00
Andy Wilkinson 63796a2a82 Merge branch '1.5.x' 2016-09-28 11:12:04 +01:00
Vedran Pavic f485660482 Upgrade Spring Session to 1.3.0.M2
Closes gh-6979
2016-09-28 11:07:11 +01:00
Andy Wilkinson 957a4dc5ba Merge branch '1.5.x' 2016-09-28 10:59:48 +01:00
Kazuki Shimizu c90eac5136 Add dependency management for jetty-proxy
Closes gh-7022
2016-09-28 10:59:27 +01:00
Andy Wilkinson 45d2bb4caf Merge branch '1.5.x' 2016-09-28 10:55:18 +01:00
Andy Wilkinson 22b33908c2 Upgrade to Spring Integration Java DSL 1.2.0.RC1
Closes gh-7000
2016-09-28 10:54:44 +01:00
Stephane Nicoll 1942cd1e81 Merge branch '1.5.x' 2016-09-26 12:45:32 +02:00
Stephane Nicoll 984b02dc7f Upgrade to Undertow 1.4.3.Final
Closes gh-7019
2016-09-26 12:43:24 +02:00