root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
10,515 Commits 24 Branches 369 Tags 282 MiB
Commit Graph

1739 Commits

Author SHA1 Message Date
Andy Wilkinson 98a2ae3b91 Merge branch '1.4.x' into 1.5.x 2017-02-21 16:12:06 +00:00
Andy Wilkinson 1abd91dc23 Start building against Spring Framework 4.3.7 snapshots 
See gh-8248
 2017-02-20 14:05:04 +00:00
Stephane Nicoll 4b0c64ed88 Upgrade to Unboundid LDAP SDK 3.2.1 
Closes gh-8333
 2017-02-20 12:05:01 +01:00
Madhura Bhave b4134e239e Add autoconfiguration for JWKTokenStore 
If `jwk.key-set-uri` is present.

Closes gh-4437
 2017-02-15 12:05:29 -08:00
Andy Wilkinson 4aecf19c92 Merge branch '1.4.x' into 1.5.x 2017-02-13 15:02:57 +00:00
Andy Wilkinson 9499658bc3 Revert "Start building against Spring Framework 4.3.7.BUILD-SNAPSHOT" 
This reverts commit 661940033a.

See gh-8248
 2017-02-13 15:01:25 +00:00
Stephane Nicoll ff4a4cf33a Merge branch '1.4.x' into 1.5.x 2017-02-12 14:02:37 +01:00
Stephane Nicoll 661940033a Start building against Spring Framework 4.3.7.BUILD-SNAPSHOT 
See gh-8248
 2017-02-12 14:01:18 +01:00
Stephane Nicoll 95e7fbeb1d Make sure `spring-boot-test-support` is not public 
The `spring-boot-test-support` module is internal and is not deployed so
we should not offer public dependency management for it.

Closes gh-8165
 2017-02-08 14:38:45 +01:00
Jack Stevenson 549f90e996 Provide dependency management for HikariCP-java7 
Closes gh-8206
 2017-02-07 09:09:55 +00:00
John Blum d83ed7f3b3 Upgrade to GemFire 8.2.2 
Closes gh-8201
 2017-02-07 08:59:10 +00:00
Madhura Bhave 5dafa3ae9c Fixup version numbers following release 2017-01-30 15:27:42 -08:00
Spring Buildmaster 5c12500366 Next Development Version 2017-01-30 20:10:13 +00:00
Andy Wilkinson a9656145de Fix up version numbers following release 2017-01-30 12:27:04 +00:00
Spring Buildmaster a2696bf873 Next Development Version 2017-01-30 11:40:24 +00:00
Stephane Nicoll bd0c1cb9c3 Fixup version numbers following release 2017-01-26 15:55:14 +01:00
Spring Buildmaster ed1ce140c0 Next Development Version 2017-01-26 14:20:39 +00:00
Stephane Nicoll 74ac585117 Upgrade to Spring Data Ingalls.RELEASE 
Closes gh-8113
 2017-01-26 12:59:00 +01:00
Stephane Nicoll a26ccb17f7 Upgrade to Spring Data Hopper.SR7 
Closes gh-8112
 2017-01-26 12:57:28 +01:00
Stephane Nicoll 265ebe784c Merge branch '1.4.x' into 1.5.x 2017-01-26 09:15:23 +01:00
Stephane Nicoll 8a3e82734e Start building against snapshots for Spring Data Hopper SR7 
See gh-8112
 2017-01-26 09:14:14 +01:00
Stephane Nicoll ad29a6ec07 Upgrade to Spring Integration 4.3.7.RELEASE 
Closes gh-8032
 2017-01-26 09:12:57 +01:00
Phillip Webb 2cf93f89f5 Polish 2017-01-25 16:45:59 -08:00
Andy Wilkinson a081c96523 Merge branch '1.4.x' into 1.5.x 2017-01-25 15:26:43 +00:00
Andy Wilkinson daf6be46f6 Revert "Upgrade to Groovy 2.4.8" 
This reverts commit 70cd5c42ed.

See gh-8083
 2017-01-25 15:24:33 +00:00
Andy Wilkinson 37cf31f450 Upgrade to Couchbase Java Client 2.3.7 
In version 2.3.6 and earlier, an attempt to create a Bucket or a
ClusterInfo would fail fast with a ConnectException in the cause of
the Couchbase server was done. In 2.3.7 this remains true for a
Bucket but is no longer the case for ClusterInfo. The latter now
retries for 75 seconds by default and when it eventually fails a
ConnectException is no longer part of the cause chain.

This commit makes the auto-configured ClusterInfo depend on the
auto-configured Bucket. This means that the Bucket is always created
before the ClusterInfo, thereby ensuring that things fail gracefully
with useful diagnostics when the server is unavailable.

Closes gh-8092
 2017-01-25 14:55:28 +00:00
Stephane Nicoll 9a65968cb3 Merge branch '1.4.x' into 1.5.x 2017-01-25 15:53:16 +01:00
Stephane Nicoll feb496fecd Upgrade to Spring Framework 4.3.6.RELEASE 
Closes gh-7774
 2017-01-25 15:51:29 +01:00
Andy Wilkinson 5ee46742be Upgrade to Mariadb 1.5.7 
Closes gh-8098
 2017-01-24 21:27:42 +00:00
Andy Wilkinson 7ae9148caa Upgrade to Jooq 3.9.1 
Closes gh-8097
 2017-01-24 21:27:42 +00:00
Andy Wilkinson 99a48a9a8c Upgrade to Narayana 5.5.1.Final 
Closes gh-8096
 2017-01-24 21:27:42 +00:00
Andy Wilkinson e42ae87989 Upgrade to Jersey 2.25.1 
Closes gh-8095
 2017-01-24 21:27:42 +00:00
Andy Wilkinson 31f1ad9bb9 Upgrade to Artemis 1.5.2 
Closes gh-8094
 2017-01-24 21:27:41 +00:00
Andy Wilkinson ac4c29bc9f Upgrade to Hazelcast 3.7.5 
Closes gh-8093
 2017-01-24 21:27:41 +00:00
Andy Wilkinson 988ad6b911 Merge branch '1.4.x' into 1.5.x 2017-01-24 17:13:31 +00:00
Andy Wilkinson bd58a6de66 Upgrade to Jaybird 2.2.12 
Closes gh-8086
 2017-01-24 16:33:06 +00:00
Andy Wilkinson f8056f9888 Upgrade to Elasticsearch 2.4.4 
Closes gh-8085
 2017-01-24 16:33:06 +00:00
Andy Wilkinson 96f6f42b32 Upgrade to Jetty 9.3.16.v20170120 
Closes gh-8084
 2017-01-24 16:33:05 +00:00
Andy Wilkinson 70cd5c42ed Upgrade to Groovy 2.4.8 
Closes gh-8083
 2017-01-24 16:33:05 +00:00
Andy Wilkinson fcd5477334 Upgrade to Httpcore 4.4.6 
Closes gh-8082
 2017-01-24 16:33:04 +00:00
Andy Wilkinson a736102a4b Upgrade to Activemq 5.13.5 
Closes gh-8081
 2017-01-24 16:33:04 +00:00
Andy Wilkinson ec70046e27 Upgrade to Joda Time 2.9.7 
Closes gh-8080
 2017-01-24 16:33:03 +00:00
Andy Wilkinson b5cecd42d1 Upgrade to Undertow 1.3.26.Final 
Closes gh-8079
 2017-01-24 16:33:03 +00:00
Andy Wilkinson b43a8c2069 Upgrade to Jackson 2.8.6 
Closes gh-8078
 2017-01-24 16:33:02 +00:00
Andy Wilkinson fe17a0efa2 Upgrade to Logback 1.1.9 
Closes gh-69
 2017-01-24 16:22:55 +00:00
Andy Wilkinson 013d45a4d7 Upgrade to Jetty 9.4.1.v20170120 
Closes gh-7750
 2017-01-24 12:39:22 +00:00
Andy Wilkinson e3235f2370 Merge branch '1.4.x' into 1.5.x 2017-01-24 12:30:30 +00:00
Andy Wilkinson 1607f682db Start building against Spring Framework 4.3.6 snapshots 
See gh-7774
 2017-01-24 12:28:24 +00:00
Madhura Bhave ca435512c0 Introduce spring-boot-autoconfigure-processor 
Add an annotation processor that generates properties files for certain
auto-configuration class annotations. Currently attribute values from
@AutoConfigureOrder, @AutoConfigureBefore, @AutoConfigureAfter and
@ConditionalOnClass annotations are stored.

The properties file will allow optimizations to be added in the
`spring-boot-autoconfigure` project. Primarily by removing the need
to ASM parse as many `.class` files.

See gh-7573
 2017-01-23 22:14:56 -08:00
Stephane Nicoll 012f3d3509 Upgrade to Spring LDAP 2.3.1.RELEASE 
Closes gh-8055
 2017-01-22 11:08:33 +01:00
Andy Wilkinson 0ad4e0e70f Merge branch '1.4.x' into 1.5.x 2017-01-20 15:53:53 +00:00
Andy Wilkinson 9e2e824098 Upgrade to Tomcat 8.5.11 
Closes gh-7360
 2017-01-20 15:51:18 +00:00
Eddú Meléndez 5b57beca57 Upgrade to Spring LDAP 2.3.0.RELEASE 
Closes gh-8047
 2017-01-20 16:42:20 +01:00
Artem Bilan 00f3ed348e Upgrade to Spring AMQP 1.7.0.RELEASE 
Closes gh-8038
 2017-01-20 10:16:40 +01:00
Stephane Nicoll d9a0a55245 Upgrade to Spring AMQP 1.6.7.RELEASE 
Closes gh-8033
 2017-01-20 10:15:19 +01:00
Andy Wilkinson 3fcdd310d3 Upgrade to Neo4j OGM 2.1.1 
Closes gh-8025
 2017-01-19 12:30:55 +00:00
Quentin Caillard 0a46bff4b2 Correct typo in comment in spring-boot-dependencies 
Closes gh-8009
 2017-01-18 14:18:41 +00:00
Andy Wilkinson 69f362baca Use properties for versions of plugins managed in spring-boot-dependencies 
Closes gh-4952
 2017-01-17 16:43:36 +00:00
Eddú Meléndez 7c33125eb0 Simplify Jackson dependency management by importing its bom 
Closes gh-7436
 2017-01-17 15:59:22 +00:00
Stephane Nicoll a5d67b9be8 Upgrade to Git Commit ID Plugin 2.2.2 
Closes gh-7980
 2017-01-16 18:06:18 +01:00
Andy Wilkinson 1ce6e3392a Upgrade to Spring Retry 1.2.0.RELEASE 
Closes gh-7984
 2017-01-13 15:09:50 -05:00
Andy Wilkinson 689721de7a Merge branch '1.4.x' into 1.5.x 2017-01-12 11:09:36 -05:00
Andy Wilkinson 8b0ecab181 Add dependency management for spring-plugin-metadata 
Closes gh-7864
 2017-01-12 11:09:25 -05:00
Andy Wilkinson 5885afdf81 Add dependency management for Spring LDAP 
Closes gh-7964
 2017-01-12 07:43:07 -05:00
Stephane Nicoll 88db0eab11 Revert upgrade to HTMLUnit 2.23 
This commit reverts the upgrade from HTMLUnit 2.11 to 2.23. As of HTMLUnit
2.22, `websocket-client` is no longer provided and triggers the following
issue:

https://github.com/SeleniumHQ/htmlunit-driver/issues/22

See gh-7232
See gh-7895
 2017-01-06 15:28:45 +01:00
Stephane Nicoll fcbed8ffd9 Upgrade to Spring Data Ingalls RC1 
See gh-6785
 2017-01-06 11:52:12 +01:00
Phillip Webb 10de30ff11 Polish LDAP contribution 
See gh-7733
 2017-01-05 23:35:43 -08:00
Eddú Meléndez 6a84c369fd Add LDAP auto-configuration support 
Add auto-configuration support for spring-ldap and spring-data-ldap.

See gh-2645
See gh-7733
 2017-01-05 23:34:50 -08:00
Phillip Webb 565f75438e Polish 2017-01-05 11:04:07 -08:00
Dave Syer fe344df9c5 Change default order of OAuth2 resource server filter chain 
The default is now SecurityProperties.ACCESS_OVERRIDE_ORDER-1
(instead of 3), and the user can set it with
security.oauth2.resource.filter-order (as opposed to being hard
coded). The filter is provided by Spring OAuth2 so this change is
a BeanPostProcessor to call a setter on that object.

Fixes gh-5072
 2017-01-05 11:58:36 +00:00
Phillip Webb fac6b8da47 Upgrade to JSONassert 1.4.0 
Closes gh-7846
 2017-01-05 00:00:07 -08:00
Phillip Webb eb22220961 Upgrade to hibernate-validator 5.3.4 
Upgrade to `hibernate-validator` 5.3.4 and introduce a new
`MessageInterpolatorFactory` that creates a suitable
`MessageInterpolator` (taking into account missing EL dependencies).

Rework `ConfigurationPropertiesBindingPostProcessor` and
`ValidationAutoConfiguration` to make use of the new factory.

Fixes gh-7598
 2017-01-04 18:28:32 -08:00
Phillip Webb d80f22c227 Exclude cdi-api from hibernate-core 
Update the `hibernate-core` managed dependency to exclude `cdi-api`.

Fixes gh-7879
 2017-01-04 18:27:08 -08:00
Phillip Webb 3bbd638d74 Polish formatting 2017-01-04 18:24:41 -08:00
Artem Bilan a488574afc Upgrade to Spring Kafka 1.1.2 
Fixes gh-7871
Closes gh-7873
 2017-01-04 15:47:11 -08:00
Quentin Caillard 5c210666f5 Upgrade to Jersey 2.25 
See gh-7763
 2017-01-04 11:24:23 +00:00
Stephane Nicoll bf7271afa5 Upgrade to Couchbase Cache Client 2.1.0 
As of 2.1 cache expiration times are to be set in seconds. This commit
migrates to the new method, yet keeping the milliseconds unit.

Closes gh-7824
 2017-01-04 10:46:17 +01:00
Phillip Webb b8d1fe3c84 Upgrade to Spring HATEOAS 0.23.0 
Closes gh-7810
 2017-01-03 15:57:10 -08:00
Andy Wilkinson 23369fa51a Upgrade to Sqlite Jdbc 3.15.1 
Closes gh-7849
 2017-01-03 21:44:44 +00:00
Andy Wilkinson 1672f05726 Upgrade to Spring Security Jwt 1.0.7.RELEASE 
Closes gh-7405
 2017-01-03 21:44:13 +00:00
Andy Wilkinson a02bdc95bd Upgrade to Spring Integration Java Dsl 1.2.1.RELEASE 
Closes gh-7847
 2017-01-03 20:48:03 +00:00
Andy Wilkinson d3cdcadb0e Upgrade to Mongodb 3.4.1 
Closes gh-7845
 2017-01-03 20:48:03 +00:00
Andy Wilkinson 81d509789f Upgrade to Mariadb 1.5.6 
Closes gh-7844
 2017-01-03 20:48:03 +00:00
Andy Wilkinson d80ee3e748 Upgrade to Jooq 3.9.0 
Closes gh-7843
 2017-01-03 20:48:03 +00:00
Andy Wilkinson 436b289592 Upgrade to Narayana 5.5.0.Final 
Closes gh-7842
 2017-01-03 20:48:02 +00:00
Andy Wilkinson 17948e9462 Upgrade to Jboss Transaction Spi 7.5.0.Final 
Closes gh-7841
 2017-01-03 20:48:02 +00:00
Andy Wilkinson 24bd5ade8a Upgrade to Javassist 3.21.0-GA 
Closes gh-7840
 2017-01-03 20:48:02 +00:00
Andy Wilkinson c3cf3d3788 Upgrade to Jaybird 2.2.12 
Closes gh-7839
 2017-01-03 20:48:02 +00:00
Andy Wilkinson 18ed6a5877 Upgrade to Ehcache3 3.2.0 
Closes gh-7838
 2017-01-03 20:48:02 +00:00
Andy Wilkinson 6b67ca7f8d Upgrade to Assertj 2.6.0 
Closes gh-7837
 2017-01-03 20:48:01 +00:00
Andy Wilkinson c626332393 Upgrade to Derby 10.13.1.1 
Closes gh-7836
 2017-01-03 20:48:01 +00:00
Andy Wilkinson 045dd7cf46 Upgrade to Artemis 1.5.1 
Closes gh-7835
 2017-01-03 20:48:01 +00:00
Andy Wilkinson 2b6baace18 Upgrade to Activemq 5.14.3 
Closes gh-7834
 2017-01-03 20:48:01 +00:00
Andy Wilkinson e5a8300534 Upgrade to Joda Time 2.9.7 
Closes gh-7833
 2017-01-03 20:48:01 +00:00
Andy Wilkinson e647b0f710 Upgrade to Undertow 1.4.8.Final 
Closes gh-7832
 2017-01-03 20:48:01 +00:00
Andy Wilkinson d996a1d571 Upgrade to Hikaricp 2.5.1 
Closes gh-7831
 2017-01-03 20:48:00 +00:00
Andy Wilkinson adb78dd88d Upgrade to Jmustache 1.13 
Closes gh-7830
 2017-01-03 20:48:00 +00:00
Andy Wilkinson b6e6a36387 Upgrade to Hazelcast Hibernate5 1.1.3 
Closes gh-7829
 2017-01-03 20:48:00 +00:00
Andy Wilkinson dc28a404eb Upgrade to Hazelcast Hibernate4 3.7.1 
Closes gh-7828
 2017-01-03 20:48:00 +00:00
Andy Wilkinson aa942857cb Upgrade to Hazelcast 3.7.4 
Closes gh-7827
 2017-01-03 20:48:00 +00:00
Andy Wilkinson 46de3e5a24 Upgrade to Gson 2.8.0 
Closes gh-7826
 2017-01-03 20:48:00 +00:00
Andy Wilkinson d9ad516eed Upgrade to Cassandra Driver 3.1.3 
Closes gh-7825
 2017-01-03 20:47:59 +00:00
Andy Wilkinson 6f13f228db Upgrade to Couchbase Client 2.3.6 
Closes gh-7823
 2017-01-03 20:11:52 +00:00
Phillip Webb f4f1a7f929 Revert "Upgrade to Spring HATEOAS 0.22.0" 
This reverts commit fb4099dfb1.
 2017-01-02 19:58:22 -08:00
Craig Andrews fb4099dfb1 Upgrade to Spring HATEOAS 0.22.0 
Closes gh-7807
 2017-01-02 19:49:56 -08:00
Artem Bilan 86ad50f77b Upgrade to Spring AMQP 1.7.0.RC1 
Closes gh-7776
 2016-12-29 09:19:39 +01:00
Stephane Nicoll 05ebed774c Revert upgrade to Jersey 2.25 
See gh-7763
 2016-12-27 17:36:17 +01:00
Quentin Caillard 49c77b868d Upgrade to Jersey 2.25 
Closes gh-7763
 2016-12-27 17:20:19 +01:00
Stephane Nicoll f0be1d9d97 Upgrade to Spring Security 4.2.1.RELEASE 
Closes gh-7745
 2016-12-25 09:32:19 +01:00
Phillip Webb a23591e047 Support Jetty 9.4 and upgrade to 9.4.0.v20161208 
Update `JettyEmbeddedServletContainerFactory` to support Jetty 9.4
directly and Jetty 9.3 via reflection. The primary difference between
Jetty 9.3 and 9.4 are the session management classes. Websocket suppport
has also been updates, but this is handled transparently by the
Spring Framework support.

Fixes gh-7599
 2016-12-24 11:22:38 -08:00
Phillip Webb c3edf9e341 Fixup version numbers following release 2016-12-22 19:03:09 -08:00
Spring Buildmaster 9057f9ae1f Next development version 2016-12-23 00:15:23 +00:00
Stephane Nicoll e2e690d31c Exclude xml-apis 
This commit excludes the transitive dependencies on xml-apis when using
Hibernate. Such dependency is no longer required on modern JDKs

Closes gh-7554
 2016-12-22 16:12:55 +01:00
Kazuki Shimizu 8ed769ae34 Update to Spring Secuirty 4.1.4 
Closes gh-7721
 2016-12-21 11:42:56 -08:00
Phillip Webb 2c00b4f76e Upgrade to Spring Data Hopper SR6 
Closes gh-7602
 2016-12-21 11:42:56 -08:00
Stephane Nicoll 33a655791c Merge branch '1.4.x' into 1.5.x 2016-12-21 18:49:34 +01:00
Stephane Nicoll a2cf7bed63 Upgrade to Spring Integration 4.3.6.RELEASE 
Closes gh-7710
 2016-12-21 18:47:48 +01:00
Stephane Nicoll 8becbcd6af Upgrade to Spring AMQP 1.6.6.RELEASE 
Closes gh-7707
 2016-12-21 18:47:36 +01:00
Stephane Nicoll d87d3fde02 Merge branch '1.4.x' into 1.5.x 2016-12-21 13:29:15 +01:00
Stephane Nicoll d4b8755a7d Start building against Spring AMQP snapshots 
See gh-7707
 2016-12-21 13:25:33 +01:00
Stephane Nicoll 1673ce4a31 Start building against Spring Integration snapshots 
See gh-7710
 2016-12-21 13:24:46 +01:00
Stephane Nicoll 718ede943b Upgrade to Spring Framework 4.3.5.RELEASE 
Closes gh-7601
 2016-12-21 13:18:53 +01:00
Stephane Nicoll b084e1824c Merge branch '1.4.x' into 1.5.x 2016-12-20 15:09:18 +01:00
Stephane Nicoll bc63d5a918 Revert upgrade to Aspectj 1.8.10 
See gh-7681
 2016-12-20 15:06:55 +01:00
Phillip Webb 87547f208a Add test for @SpyBean for generic bean definition 
Add an integration test to check that @SpyBean can be used with on a
bean definition that returns a generic type.

Closes gh-7625
 2016-12-19 15:58:25 -08:00
Stephane Nicoll 053783abdd Merge branch '1.4.x' into 1.5.x 2016-12-19 11:06:25 +01:00
Stephane Nicoll baaf8e01b5 Start building against Spring Framework 4.3.5 snapshots 
See gh-7601
 2016-12-19 11:04:48 +01:00
Andy Wilkinson 647057403e Merge branch '1.4.x' into 1.5.x 2016-12-16 20:53:44 +00:00
Andy Wilkinson 80a6f42a04 Upgrade to Thymeleaf Extras Springsecurity4 2.1.3.RELEASE 
Closes gh-7686
 2016-12-16 20:20:27 +00:00
Andy Wilkinson b6a64c55e3 Upgrade to Slf4j 1.7.22 
Closes gh-7685
 2016-12-16 20:20:27 +00:00
Andy Wilkinson 3e9fdcc579 Upgrade to Jooq 3.8.6 
Closes gh-7684
 2016-12-16 20:20:27 +00:00
Andy Wilkinson dfb3493123 Upgrade to Infinispan 8.2.5.Final 
Closes gh-7683
 2016-12-16 20:20:26 +00:00
Andy Wilkinson 3ead8c03e8 Upgrade to Elasticsearch 2.4.3 
Closes gh-7682
 2016-12-16 20:20:26 +00:00
Andy Wilkinson d9a77f0372 Upgrade to Aspectj 1.8.10 
Closes gh-7681
 2016-12-16 20:20:26 +00:00
Andy Wilkinson 6736b2b2cc Upgrade to Joda Time 2.9.6 
Closes gh-7680
 2016-12-16 20:20:26 +00:00
Andy Wilkinson 0afb5f4392 Upgrade to Jest 2.0.4 
Closes gh-7679
 2016-12-16 20:20:25 +00:00
Andy Wilkinson cda3ced402 Upgrade to Hazelcast 3.6.7 
Closes gh-7678
 2016-12-16 20:20:25 +00:00
Andy Wilkinson 9f41129ebd Upgrade to Appengine 1.9.48 
Closes gh-7677
 2016-12-16 20:20:25 +00:00
Andy Wilkinson 7d87adb036 Upgrade to Caffeine 2.3.5 
Closes gh-7676
 2016-12-16 20:20:24 +00:00
Andy Wilkinson 0c8a2cc32f Upgrade to Jackson 2.8.5 
Closes gh-7675
 2016-12-16 20:20:24 +00:00
Vedran Pavic 64eb69edd7 Upgrade Spring Session to 1.3.0.RELEASE 2016-12-16 17:07:41 +01:00
Raja Dilip Kolli caf5327149 Upgrade to Lombok 1.16.12 
Closes gh-7590
 2016-12-15 14:27:53 +01:00
Raja Dilip Kolli 4ce91a5366 Upgrade to Lombok 1.16.12 
Closes gh-7590
 2016-12-15 14:12:38 +01:00
Stephane Nicoll 1d8783b5b3 Add dependency management for javax.validation 
Closes gh-7641
 2016-12-15 14:10:45 +01:00
Stephane Nicoll ac866707d5 Merge branch '1.4.x' into 1.5.x 2016-12-15 14:02:51 +01:00
Stephane Nicoll a2d46dc16c Upgrade to Logback 1.1.8 
Closes gh-7638
 2016-12-15 14:01:03 +01:00
Stephane Nicoll 601b5ced49 Upgrade to Neo4j 2.0.6 
Closes gh-7650
 2016-12-15 13:37:39 +01:00
Andy Wilkinson 78517a6571 Merge branch '1.4.x' into 1.5.x 2016-12-14 16:35:19 +00:00
Andy Wilkinson 4d5fb97127 Revert "Start building against Spring Framework 4.3.5 snapshots" 
This reverts commit 727d626292. Sigh,
although the SPR issue is complete the change hasn't been backported
yet.
 2016-12-14 16:33:55 +00:00
Andy Wilkinson 99edb0cec0 Merge branch '1.4.x' into 1.5.x 2016-12-14 15:00:50 +00:00