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

8940 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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