Commit Graph

50613 Commits

Author SHA1 Message Date
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
Andy Wilkinson
0b28844681 Merge pull request #7022 from Kazuki Shimizu
* gh-7022:
  Add dependency management for jetty-proxy
2016-09-28 10:59:39 +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
ea9faa5f6a Merge branch '1.5.x' 2016-09-27 10:14:57 +02:00
Stephane Nicoll
9210bf0822 Merge branch '1.4.x' into 1.5.x 2016-09-27 10:14:37 +02:00
Stephane Nicoll
a2794d75c3 Clarify couchbase cache requirements
Closes gh-6998
2016-09-27 10:12:59 +02:00
Stephane Nicoll
d5be773f0e Merge pull request #7025 from izeye:fix-dir
* pr/7025:
  Move Restarter in integration tests
2016-09-27 10:05:01 +02:00
Johnny Lim
723b46ade4 Move Restarter in integration tests
Closes gh-7025
2016-09-27 10:04:38 +02:00
Stephane Nicoll
542e935bb6 Fix typo
Closes gh-7026
2016-09-27 10:03:00 +02: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
Stephane Nicoll
133739b222 Merge branch '1.5.x' 2016-09-26 10:47:31 +02:00
Stephane Nicoll
7dfa3a8c83 Harmonize Caffeine CacheManager bean name
Closes gh-6980
2016-09-26 10:47:09 +02:00
Stephane Nicoll
3ac13a4af0 Merge branch '1.5.x' 2016-09-26 10:36:22 +02:00
Stephane Nicoll
7d73abc04f Merge branch '1.4.x' into 1.5.x 2016-09-26 10:36:02 +02:00
Stephane Nicoll
f1fddd243b Document spring.http.encoding.mapping
Closes gh-7017
2016-09-26 10:35:45 +02:00
Andy Wilkinson
264007113f Merge branch '1.5.x' 2016-09-23 13:57:04 +01:00
Andy Wilkinson
8971c8ba54 Merge branch '1.4.x' into 1.5.x 2016-09-23 13:56:53 +01:00
Andy Wilkinson
e1d53b65ba Remove redundant git-commit-id-plugin configuration from loader-tools
Closes gh-7007
2016-09-23 13:56:38 +01:00
Stephane Nicoll
d897bf7354 Merge branch '1.5.x' 2016-09-23 08:00:42 +02:00
Stephane Nicoll
24c2e7d182 Merge branch '1.4.x' into 1.5.x 2016-09-23 08:00:22 +02:00
Stephane Nicoll
c81a83522c Merge pull request #7002 from candrews:patch-3
* pr/7002:
  Exclude `META-INF/build-info.properties` from restart
2016-09-23 07:59:59 +02:00
Craig Andrews
d94eedfd8a Exclude META-INF/build-info.properties from restart
Prior to this commit any application configured to write
`META-INF/build-info.properties` could trigger unexpected application
restarts. The problem is particularly prevalent when using Eclipse M2E in
combination with Maven's `spring-boot-maven-plugin` `build-info` goal
and Gradle's `springBoot` `buildInfo()`.

Closes gh-7002
2016-09-23 07:58:39 +02:00
Andy Wilkinson
39c1005ade Merge branch '1.5.x' 2016-09-22 19:51:38 +01:00
Andy Wilkinson
a9ca8ef769 Start building against Spring Integration Java DSL 1.2.0 snapshots
See gh-7000
2016-09-22 19:51:07 +01:00
Andy Wilkinson
2745c565aa Merge branch '1.5.x' 2016-09-22 14:40:59 +01:00
Andy Wilkinson
a674357b15 Remove dependency management for cassandra-driver-dse
The 3.1 release of the Cassandra Driver does not include the
cassandra-driver-dse module.

See gh-5835
2016-09-22 14:40:35 +01:00
Stephane Nicoll
04bcade3de Merge branch '1.5.x' 2016-09-22 07:54:00 +02:00
Stephane Nicoll
d117ec45b8 Merge branch '1.4.x' into 1.5.x 2016-09-22 07:53:27 +02:00
Stephane Nicoll
85fb273596 Fix spring-boot-antlib version
See gh-6978
2016-09-22 07:52:02 +02:00
Andy Wilkinson
7efe90848b Merge branch '1.5.x' 2016-09-21 20:57:14 +01:00
Andy Wilkinson
aaf435ff2a Suppress Neo4J-related deprecation warnings
See gh-6976
2016-09-21 20:57:05 +01:00
Andy Wilkinson
1d1714ee8b Merge branch '1.5.x' 2016-09-21 20:51:08 +01:00
Andy Wilkinson
bdc949d1b7 Remove deprecated merge and locations attributes from @ConfigurationProperties
Closes gh-6972
2016-09-21 20:50:21 +01:00
Andy Wilkinson
bd8a9bb310 Polish
See gh-6971 and commit ce1e41d
2016-09-21 19:54:55 +01:00
Andy Wilkinson
08842c1273 Suppress Neo4J-related deprecation warnings
See gh-6976
2016-09-21 19:52:18 +01:00
Andy Wilkinson
beca5e486e Polish 2016-09-21 18:54:39 +01:00
Andy Wilkinson
0cdbbd49b5 Address warnings caused by deprecations in Spring Framework 5
See gh-6977
2016-09-21 17:34:54 +01:00
Andy Wilkinson
312292b93e Update Animal Sniffer and related annotations for Java 8 baseline
Closes gh-6981
2016-09-21 17:20:49 +01:00
Andy Wilkinson
16a0f72df5 Merge branch '1.5.x' 2016-09-21 17:03:35 +01:00
Andy Wilkinson
c108da9d53 Upgrade to Spring Data Ingalls M1
Closes gh-6785
Closes gh-5835
2016-09-21 17:01:47 +01:00
Stephane Nicoll
9bc77254a7 Start building against Spring Framework 5 snapshot
This commit enables compatibility build against Spring Framework 5.

The Velocity and Guava support that are deprecated in the 1.x line have
been removed and few other classes contain minor change to comply to non
backward compatible changes in Spring Framework 5.

This commit also switches the required java version to 8.

Closes gh-6977
2016-09-21 17:37:02 +02:00
Stephane Nicoll
6643ec3713 Next development version 2016-09-21 17:05:50 +02:00
Stephane Nicoll
5684924f60 Polish 2016-09-21 17:01:43 +02:00
Andy Wilkinson
6fb44b2410 Fix TestCommandIntegrationTests after removal of deprecated test support
See gh-6971
See gh-6973
2016-09-21 15:15:35 +01:00
Stephane Nicoll
046475a69e Remove deprecated spring-boot-starter-redis 2016-09-21 15:00:24 +02:00
Stephane Nicoll
fc00e4cbe0 Remove deprecated spring-boot-starter-ws 2016-09-21 14:59:52 +02:00