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
8,988 Commits 24 Branches 369 Tags 282 MiB
Commit Graph

2052 Commits

Author SHA1 Message Date
Phillip Webb 53f50eda39 Merge branch '1.5.x' 2016-10-03 22:47:11 -07:00
Phillip Webb a2315378d4 Formatting 2016-10-03 22:44:36 -07:00
Phillip Webb f2b0fa284e Merge branch '1.4.x' into 1.5.x 2016-10-03 22:38:22 -07:00
Phillip Webb 3326841a97 Formatting 2016-10-03 22:19:35 -07:00
Phillip Webb 39ed0d4dfb Polish 2016-10-03 21:58:13 -07:00
Stephane Nicoll f181421f67 Merge branch '1.5.x' 2016-10-03 11:29:56 +02:00
Stephane Nicoll 8ad477537e Fail fast if both uri and client attributes are set 
Previously, an URI and individual client attributes can be set to
configure the mongo client. In such a scenario, the URI is ignored.

This commit changes the URI to be "null" and the creation of the client
to fail if both the uri and client attributes are set. If no client
attributes are set, the uri is used as before.

Closes gh-6739
 2016-10-03 11:29:20 +02:00
Stephane Nicoll b95b57dbf5 Merge branch '1.5.x' 2016-10-02 11:08:53 +02:00
Stephane Nicoll e643fc5bd1 Merge branch '1.4.x' into 1.5.x 2016-10-02 11:08:33 +02:00
Johnny Lim 503d735fdd Polish 
Closes gh-7081
 2016-10-02 11:07:04 +02:00
Stephane Nicoll 8f96278ce9 Merge branch '1.5.x' 2016-09-30 10:53:03 +02:00
Stephane Nicoll 7ffa499949 Merge branch '1.4.x' into 1.5.x 2016-09-30 10:52:44 +02:00
Stephane Nicoll e56119165e Close JestClient on shutdown 
Closes gh-7051
 2016-09-30 10:51:48 +02:00
Stephane Nicoll 8ed20068ca Fix list property to be mutable 
Closes gh-7045
 2016-09-30 10:34:25 +02: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
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
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
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
Johnny Lim 30a677646f Polish 
Closes gh-7030
 2016-09-28 16:45:19 +02: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
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
Andy Wilkinson aaf435ff2a Suppress Neo4J-related deprecation warnings 
See gh-6976
 2016-09-21 20:57:05 +01:00
Andy Wilkinson 08842c1273 Suppress Neo4J-related deprecation warnings 
See gh-6976
 2016-09-21 19:52:18 +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 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 bd7c20eb1c Deprecate Guava support 2016-09-21 14:59:02 +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 6bd670edbc Initiate 1.4.x branch 2016-09-21 11:11:24 +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
Eddú Meléndez bc55b6e0d4 Add contextPath LocalHostUriTemplateHandler URIs 
Update `LocalHostUriTemplateHandler` so that the `server.context-path`
property is also considered when building the URL.

Fixes gh-6904
Closes gh-6919
 2016-09-17 19:33:06 -07:00
Phillip Webb 0eab3e0c5a Drop printed link to reference documentation 
Tweak the fix from 50c68a49 to no longer print a link the reference
documentation.

See gh-6593
 2016-09-16 17:52:25 -07:00
Phillip Webb 825dd0a26c Merge branch '1.3.x' 2016-09-16 15:07:18 -07:00
Phillip Webb b97e0bd471 Allow HttpPutFormContentFilter to be disabled 
Add `spring.mvc.formcontent.putfilter.enabled` property to allow the
HttpPutFormContentFilter to be disabled.

Fixes gh-6519
 2016-09-16 14:14:21 -07:00
Phillip Webb a2e4127d4f Fix multi-annotation nested condition logic 
Update `AbstractNestedCondition` to correctly group nested conditions
on members.

Fixes gh-6672
 2016-09-16 13:31:55 -07:00