Commit Graph

9143 Commits (81d8e4ab89e692e9fe25fdd5754f9189a28bc1bd)
 

Author SHA1 Message Date
Stephane Nicoll 58050fb72f Merge branch '1.4.x' into 1.5.x
# Conflicts:
#	spring-boot-dependencies/pom.xml
8 years ago
Stephane Nicoll dcb3f31901 Merge pull request #7074 from garyrussell:si433-14
* pr/7074:
  Upgrade to Spring Integration 4.3.4, AMQP 1.6.3
8 years ago
Gary Russell ad3179b9ee Upgrade to Spring Integration 4.3.4, AMQP 1.6.3
Closes gh-7074
8 years ago
Stephane Nicoll dfb3675937 Merge pull request #7085 from dstine:docs-typos
* pr/7085:
  Fix a typo
8 years ago
Dan Stine 0926b66123 Fix a typo
Closes gh-7085
8 years ago
Phillip Webb d0d01b92b9 Fixup parent POM version 8 years ago
Phillip Webb 17bb3b51df Merge branch '1.5.x' 8 years ago
Phillip Webb 8fe755d281 Fixup parent POM version 8 years ago
Phillip Webb 6d11931421 Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb bd341cbac8 Polish 8 years ago
Phillip Webb 53f50eda39 Merge branch '1.5.x' 8 years ago
Phillip Webb a2315378d4 Formatting 8 years ago
Phillip Webb f2b0fa284e Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb cdeed8e934 Merge pull request #7089 from mbhave/gh-7065
* pr/7089:
  Fix NoClassDefFoundError when Mockito is missing
8 years ago
Madhura Bhave 16fe332f51 Fix NoClassDefFoundError when Mockito is missing
Update MockReset class to check for the presence of the MockUtil class
before attempting to use it.

Fixes gh-7065
8 years ago
Phillip Webb 3326841a97 Formatting 8 years ago
Phillip Webb 39ed0d4dfb Polish 8 years ago
Phillip Webb f59cc25e2b Fix eclipse warnings 8 years ago
Stephane Nicoll e6ab3cef73 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 6977dcaf44 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 9f7e97b23f Improve war to executable app documentation
Closes gh-7040
8 years ago
Stephane Nicoll 58005542cf Merge branch '1.5.x' 8 years ago
Stephane Nicoll e5bac8dadf Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll a9b610c4fc Deprecate ResourceLoaderAware callback
Closes gh-6986
8 years ago
Stephane Nicoll f181421f67 Merge branch '1.5.x' 8 years ago
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
8 years ago
Stephane Nicoll 4c5c3c6d1b Merge branch '1.5.x' 8 years ago
Stephane Nicoll 42adeda6a3 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll dc067b0fc4 Update Ant sample’s spring-boot-antlib dependency during prepare
Closes gh-6978
8 years ago
Stephane Nicoll 669b09cbde Merge branch '1.5.x' 8 years ago
Stephane Nicoll 3d9c56fbf3 Merge branch '1.4.x' into 1.5.x
# Conflicts:
#	spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java
#	spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java
8 years ago
Stephane Nicoll 8c1b736bb0 Fix list property to be mutable
Closes gh-7068
8 years ago
Stephane Nicoll b95b57dbf5 Merge branch '1.5.x' 8 years ago
Stephane Nicoll e643fc5bd1 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 4dfdce5a49 Merge pull request #7081 from izeye:polish-20161002
* pr/7081:
  Polish
8 years ago
Johnny Lim 503d735fdd Polish
Closes gh-7081
8 years ago
Stephane Nicoll df9fb51a92 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 75f475f2c8 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 8feef4560b Merge pull request #6991 from Stummi:patch-1
* pr/6991:
  Fix thymeleaf-layout-dialect.version in doc
8 years ago
Michael Stummvoll 914becac0e Fix thymeleaf-layout-dialect.version in doc
Version 2.0.0 had serval bugs which broke compatibility to older
templates, so the guide should refer the fixed version instead.

Closes gh-6991
8 years ago
Stephane Nicoll 8f96278ce9 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 7ffa499949 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll e56119165e Close JestClient on shutdown
Closes gh-7051
8 years ago
Stephane Nicoll 8ed20068ca Fix list property to be mutable
Closes gh-7045
8 years ago
Andy Wilkinson d3d58bb2d2 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 901aa2764b Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson cf4142dbc0 Prevent htmlunit from pulling in commons-logging
Update dependency management to exclude commons-logging and add
an enforcer rule to spring-boot-samples to try and prevent unwanted
commons-logging dependencies from sneaking back in again.

Closes gh-7067
8 years ago
Andy Wilkinson b495ed4772 Merge pull request #7064 from Ken Dombeck
* gh-7064:
  Prevent spring-session from pulling in commons-logging
8 years ago
Ken Dombeck 8034ae6e37 Prevent spring-session from pulling in commons-logging
Closes gh-7064
8 years ago
Andy Wilkinson f82dc8e043 Upgrade to JMS API 2.0
Closes gh-7049
8 years ago