Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,988 Commits 23 Branches 0 Tags
d0d01b92b9d16c2ddec40fa2103ca08f22bfcbcd
Commit Graph

8988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phillip Webb
d0d01b92b9 Fixup parent POM version 2016-10-03 22:54:06 -07:00
Phillip Webb
17bb3b51df Merge branch '1.5.x' 2016-10-03 22:53:10 -07:00
Phillip Webb
8fe755d281 Fixup parent POM version 2016-10-03 22:52:43 -07:00
Phillip Webb
6d11931421 Merge branch '1.4.x' into 1.5.x 2016-10-03 22:51:49 -07:00
Phillip Webb
bd341cbac8 Polish 2016-10-03 22:51:21 -07:00
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
cdeed8e934 Merge pull request #7089 from mbhave/gh-7065 
* pr/7089:
  Fix NoClassDefFoundError when Mockito is missing
 2016-10-03 22:27:42 -07:00
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
 2016-10-03 22:27:20 -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
Phillip Webb
f59cc25e2b Fix eclipse warnings 2016-10-03 21:51:16 -07:00
Stephane Nicoll
e6ab3cef73 Merge branch '1.5.x' 2016-10-03 12:29:14 +02:00
Stephane Nicoll
6977dcaf44 Merge branch '1.4.x' into 1.5.x 2016-10-03 12:28:58 +02:00
Stephane Nicoll
9f7e97b23f Improve war to executable app documentation 
Closes gh-7040
 2016-10-03 12:28:25 +02:00
Stephane Nicoll
58005542cf Merge branch '1.5.x' 2016-10-03 11:44:13 +02:00
Stephane Nicoll
e5bac8dadf Merge branch '1.4.x' into 1.5.x 2016-10-03 11:43:57 +02:00
Stephane Nicoll
a9b610c4fc Deprecate ResourceLoaderAware callback 
Closes gh-6986
 2016-10-03 11:42:46 +02: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
4c5c3c6d1b Merge branch '1.5.x' 2016-10-03 11:04:25 +02:00
Stephane Nicoll
42adeda6a3 Merge branch '1.4.x' into 1.5.x 2016-10-03 11:04:06 +02:00
Stephane Nicoll
dc067b0fc4 Update Ant sample’s spring-boot-antlib dependency during prepare 
Closes gh-6978
 2016-10-03 11:03:45 +02:00
Stephane Nicoll
669b09cbde Merge branch '1.5.x' 2016-10-03 10:42:18 +02:00
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
 2016-10-03 10:42:07 +02:00
Stephane Nicoll
8c1b736bb0 Fix list property to be mutable 
Closes gh-7068
 2016-10-03 10:40:46 +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
Stephane Nicoll
4dfdce5a49 Merge pull request #7081 from izeye:polish-20161002 
* pr/7081:
  Polish
 2016-10-02 11:08:13 +02:00
Johnny Lim
503d735fdd Polish 
Closes gh-7081
 2016-10-02 11:07:04 +02:00
Stephane Nicoll
df9fb51a92 Merge branch '1.5.x' 2016-10-01 13:21:11 +02:00
Stephane Nicoll
75f475f2c8 Merge branch '1.4.x' into 1.5.x 2016-10-01 13:20:45 +02:00
Stephane Nicoll
8feef4560b Merge pull request #6991 from Stummi:patch-1 
* pr/6991:
  Fix thymeleaf-layout-dialect.version in doc
 2016-10-01 13:20:18 +02:00
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
 2016-10-01 13:18:37 +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
d3d58bb2d2 Merge branch '1.5.x' 2016-09-29 21:09:41 +01:00
Andy Wilkinson
901aa2764b Merge branch '1.4.x' into 1.5.x 2016-09-29 21:09:18 +01:00
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
 2016-09-29 21:08:15 +01:00
Andy Wilkinson
b495ed4772 Merge pull request #7064 from Ken Dombeck 
* gh-7064:
  Prevent spring-session from pulling in commons-logging
 2016-09-29 21:07:29 +01:00
Ken Dombeck
8034ae6e37 Prevent spring-session from pulling in commons-logging 
Closes gh-7064
 2016-09-29 21:06:05 +01:00
Andy Wilkinson
f82dc8e043 Upgrade to JMS API 2.0 
Closes gh-7049
 2016-09-29 20:33:21 +01:00
Andy Wilkinson
4d64c9c93d Merge branch '1.5.x' 2016-09-29 16:29:42 +01:00
Andy Wilkinson
733cfe9f70 Merge branch '1.4.x' into 1.5.x 2016-09-29 16:29:35 +01:00
Andy Wilkinson
51eb1ac04d Declare embedded queue up front in samples that use Artemis 
Closes gh-7063
 2016-09-29 16:28:40 +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