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

8900 Commits

Author SHA1 Message Date
Stephane Nicoll 323c749352 Merge pull request #7023 from vpavic:gh-5101 
* pr/7023:
  Upgrade Hazelcast to 3.7.1
 2016-09-29 10:38:24 +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
Stephane Nicoll cdd59707fc Merge branch '1.4.x' into 1.5.x 2016-09-28 17:00:30 +02:00
Stephane Nicoll bfd62aba10 Merge pull request #7030 from izeye:polish-20160927 
* pr/7030:
  Polish
 2016-09-28 16:46:14 +02:00
Johnny Lim 30a677646f Polish 
Closes gh-7030
 2016-09-28 16:45:19 +02: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 4e377cc489 Merge pull request #6979 from Vedran Pavić 
* gh-6979:
  Upgrade Spring Session to 1.3.0.M2
 2016-09-28 11:11:58 +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 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 22b33908c2 Upgrade to Spring Integration Java DSL 1.2.0.RC1 
Closes gh-7000
 2016-09-28 10:54:44 +01: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 984b02dc7f Upgrade to Undertow 1.4.3.Final 
Closes gh-7019
 2016-09-26 12:43:24 +02:00
Stephane Nicoll 7dfa3a8c83 Harmonize Caffeine CacheManager bean name 
Closes gh-6980
 2016-09-26 10:47:09 +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 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 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 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 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 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 aaf435ff2a Suppress Neo4J-related deprecation warnings 
See gh-6976
 2016-09-21 20:57:05 +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 c108da9d53 Upgrade to Spring Data Ingalls M1 
Closes gh-6785
Closes gh-5835
 2016-09-21 17:01:47 +01: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
Stephane Nicoll bd7c20eb1c Deprecate Guava support 2016-09-21 14:59:02 +02:00
Stephane Nicoll 474c2e4641 Fix checkstyle rule 
See gh-6971
 2016-09-21 14:39:00 +02:00
Stephane Nicoll ce1e41dce3 Remove deprecated code 
This code removes code deprecated in 1.4 with the exception of code that
requires an update to Spring Framework 5.

Closes gh-6971
 2016-09-21 14:30:28 +02:00
Stephane Nicoll d514cc3dab Merge branch '1.4.x' 2016-09-21 11:12:59 +02:00
Stephane Nicoll 6bd670edbc Initiate 1.4.x branch 2016-09-21 11:11:24 +02:00
Stephane Nicoll 97083300d7 Fixup version numbers following release 2016-09-21 10:35:52 +02:00
Spring Buildmaster 7e9ed5e1a7 Next Development Version 2016-09-21 07:58:07 +00:00
Phillip Webb 51092af739 Polish 2016-09-20 14:32:09 -07:00
Phillip Webb 0b9667c26f Drop setResolvePlaceholders() 
Remove setResolvePlaceholders() from PropertySourcesPropertyValues
and instead rely only on the constructor.

See gh-6964
 2016-09-20 14:22:51 -07:00
Phillip Webb 7896ec5a7b Polish 2016-09-20 14:20:52 -07:00
Stephane Nicoll 7fd169cfd2 Merge branch '1.3.x' 2016-09-20 22:54:01 +02:00
Stephane Nicoll 04a72fcb78 Fixup version numbers following release 2016-09-20 22:53:40 +02:00
Andy Wilkinson be33827f49 Simplify property validation sample and document need for static bean method 
Closes gh-6627
 2016-09-20 21:33:31 +01:00