57450042bb
Merge branch '1.5.x'
2016-10-19 10:44:27 +01:00
7962818294
Merge branch '1.4.x' into 1.5.x
2016-10-19 10:44:20 +01:00
6ac041c43b
Update Thymeleaf 3 related versions in docs and sample
...
See gh-6991
Closes gh-7183
2016-10-19 10:43:38 +01:00
e49b5f241e
Merge branch '1.5.x'
2016-10-17 15:30:02 +01:00
57108a9faa
Try to make the tests for the Cassandra sample more robust
...
Cassandra sometimes takes a long time when dropping the test keyspace.
This results in the test failing due to an exception being thrown.
This commit attempts to make the tests more robust by catching and
logging any exceptions thrown during server cleanup.
2016-10-17 15:28:50 +01:00
01900c8342
Merge branch '1.5.x'
2016-10-11 23:42:14 -07:00
d818a09ed8
Polish
2016-10-11 23:38:14 -07:00
c5cc626d48
Remove remote shell support
...
See gh-7044
2016-10-11 17:59:25 +02:00
fe10ea73b0
Merge branch '1.4.x' into 1.5.x
2016-10-05 14:58:42 +01:00
ad3e5c04bb
Add a second, portal-compatible ID to the Gradle plugin
...
To be compatible with Gradle's plugin portal, plugins must have an
ID that uses a reverse domain name. This means that spring-boot is
not compatible.
This commit introduces a new ID, org.springframework.boot, and
deprecates the old ID.
Closes gh-6997
2016-10-05 14:58:26 +01:00
f137ec6a3a
Merge branch '1.5.x'
2016-10-05 14:58:02 +01:00
846f264da8
Merge branch '1.4.x' into 1.5.x
2016-10-05 14:57:51 +01:00
77f1da871f
Add a second, portal-compatible ID to the Gradle plugin
...
To be compatible with Gradle's plugin portal, plugins must have an
ID that uses a reverse domain name. This means that spring-boot is
not compatible.
This commit introduces a new ID, org.springframework.boot, and
deprecates the old ID.
Closes gh-6997
2016-10-05 14:54:23 +01:00
d0d01b92b9
Fixup parent POM version
2016-10-03 22:54:06 -07:00
17bb3b51df
Merge branch '1.5.x'
2016-10-03 22:53:10 -07:00
8fe755d281
Fixup parent POM version
2016-10-03 22:52:43 -07:00
6d11931421
Merge branch '1.4.x' into 1.5.x
2016-10-03 22:51:49 -07:00
bd341cbac8
Polish
2016-10-03 22:51:21 -07:00
53f50eda39
Merge branch '1.5.x'
2016-10-03 22:47:11 -07:00
a2315378d4
Formatting
2016-10-03 22:44:36 -07:00
f2b0fa284e
Merge branch '1.4.x' into 1.5.x
2016-10-03 22:38:22 -07:00
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
f59cc25e2b
Fix eclipse warnings
2016-10-03 21:51:16 -07:00
d3d58bb2d2
Merge branch '1.5.x'
2016-09-29 21:09:41 +01:00
901aa2764b
Merge branch '1.4.x' into 1.5.x
2016-09-29 21:09:18 +01:00
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
f82dc8e043
Upgrade to JMS API 2.0
...
Closes gh-7049
2016-09-29 20:33:21 +01:00
4d64c9c93d
Merge branch '1.5.x'
2016-09-29 16:29:42 +01:00
733cfe9f70
Merge branch '1.4.x' into 1.5.x
2016-09-29 16:29:35 +01:00
51eb1ac04d
Declare embedded queue up front in samples that use Artemis
...
Closes gh-7063
2016-09-29 16:28:40 +01:00
241ab10160
Merge branch '1.5.x'
2016-09-29 15:49:04 +01:00
2a035d0748
Remove support for Velocity following its deprecation in 1.4
...
Closes gh-6971
2016-09-29 15:44:36 +01:00
464915d2cc
Remove support for HornetQ following its deprecation in 1.4
...
See gh-6971
2016-09-29 15:44:36 +01:00
3e058e038f
Merge branch '1.5.x'
2016-09-29 13:12:24 +01:00
cd45ce9104
Merge branch '1.4.x' into 1.5.x
2016-09-29 13:12:11 +01:00
1bb5dc205d
Update samples to use Artemis in place of HornetQ
...
Closes gh-7057
2016-09-29 11:52:09 +01:00
8b6d7eedc0
Merge branch '1.5.x'
2016-09-29 10:38:42 +02:00
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
d117ec45b8
Merge branch '1.4.x' into 1.5.x
2016-09-22 07:53:27 +02:00
85fb273596
Fix spring-boot-antlib version
...
See gh-6978
2016-09-22 07:52:02 +02:00
aaf435ff2a
Suppress Neo4J-related deprecation warnings
...
See gh-6976
2016-09-21 20:57:05 +01:00
08842c1273
Suppress Neo4J-related deprecation warnings
...
See gh-6976
2016-09-21 19:52:18 +01:00
16a0f72df5
Merge branch '1.5.x'
2016-09-21 17:03:35 +01:00
c108da9d53
Upgrade to Spring Data Ingalls M1
...
Closes gh-6785
Closes gh-5835
2016-09-21 17:01:47 +01:00
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
6643ec3713
Next development version
2016-09-21 17:05:50 +02:00
5684924f60
Polish
2016-09-21 17:01:43 +02:00
6bd670edbc
Initiate 1.4.x branch
2016-09-21 11:11:24 +02:00
97083300d7
Fixup version numbers following release
2016-09-21 10:35:52 +02:00
7e9ed5e1a7
Next Development Version
2016-09-21 07:58:07 +00:00
Andy Wilkinson
Phillip Webb
Stephane Nicoll
Madhura Bhave
Vedran Pavic
Spring Buildmaster