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,940 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

8940 Commits

Author SHA1 Message Date
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
Andy Wilkinson ae7faa233a Merge branch '1.5.x' 2016-09-29 15:09:14 +01:00
Andy Wilkinson 0232e3b16c Merge branch '1.4.x' into 1.5.x 2016-09-29 15:09:08 +01:00
Andy Wilkinson d08c84af42 Ensure that JtaAutoConfiguration runs before ArtemisAutoConfiguration 
Closes gh-7062
 2016-09-29 15:08:24 +01:00
Andy Wilkinson 0e018c6037 Merge branch '1.5.x' 2016-09-29 15:02:02 +01:00
Andy Wilkinson b4d052a7b3 Merge branch '1.4.x' into 1.5.x 2016-09-29 15:01:54 +01:00
Andy Wilkinson 33ea73996e Make auto-config for Narayana back off when Transaction SPI not on classpath 
Closes gh-7061
 2016-09-29 14:56:05 +01:00
Andy Wilkinson ec285f03c3 Merge branch '1.5.x' 2016-09-29 14:28:50 +01:00
Andy Wilkinson 26c9d5a7e2 Merge branch '1.4.x' into 1.5.x 2016-09-29 14:28:20 +01:00
Andy Wilkinson bacdc204ae Polish imports 2016-09-29 14:27:42 +01:00
Andy Wilkinson 3e058e038f Merge branch '1.5.x' 2016-09-29 13:12:24 +01:00
Andy Wilkinson cd45ce9104 Merge branch '1.4.x' into 1.5.x 2016-09-29 13:12:11 +01:00
Andy Wilkinson 1bb5dc205d Update samples to use Artemis in place of HornetQ 
Closes gh-7057
 2016-09-29 11:52:09 +01:00
Stephane Nicoll 8b6d7eedc0 Merge branch '1.5.x' 2016-09-29 10:38:42 +02:00
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 49a606fa91 Merge branch '1.5.x' 2016-09-28 17:00:56 +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 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
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 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