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
be33827f49
Simplify property validation sample and document need for static bean method
...
Closes gh-6627
2016-09-20 21:33:31 +01:00
ede1657d79
Include Jetty EL dependency in starter
...
Update spring-boot-starter-jetty to include an EL dependency.
Fixes gh-6692
2016-09-08 16:52:53 -07:00
10402a651f
Close context to ensure that logging system is cleaned up
...
See gh-6688
2016-08-25 20:41:43 +01:00
07a50bb16c
Update the samples to make use of auto-configured TestRestTemplate
...
Closes gh-6730
2016-08-25 12:07:40 +01:00
46e03529fb
Remove redundant bean declarations from some of the security samples
...
Closes gh-6740
2016-08-24 17:34:29 +01:00
96d5def17d
Add reference to Caffeine in cache sample
2016-08-17 10:13:46 +02:00
1b42e1aaa3
Recommend setting spring.thymeleaf.mode: HTML when using Thymeleaf 3
...
Closes gh-6552
2016-08-08 10:40:01 +01:00
c7a23eae56
Fixup version numbers following release
2016-07-28 14:38:17 -07:00
334baaeffd
Next development version
2016-07-28 19:54:01 +00:00
9627d0ed66
Polish
...
Closes gh-6487
2016-07-27 12:29:33 +01:00
296dc7132b
Allow JSON Testers to be `@Autowired`
...
Switch `@AutoConfigureJsonTesters` to use regular `@Autowired` injection
for JSON testers. Prior to this commit JSON Tester fields were
initialized directly which caused IDE issues and was also a little
confusing.
Fixes gh-6451
2016-07-26 21:41:37 -07:00
4a1e0d4544
Extend @AutoConfigureMockMvc print support
...
Update @AutoConfigureMockMvc to support extended print options including
`System.err` and `log.debug`. In addition the "default" print option
can now be overridden by adding `spring.test.mockmvc.print=...` to
`src/test/resources/application.properties`.
Fixes gh-6455
2016-07-25 13:17:26 -07:00
417fae4e27
Use the managed version for H2 in spring-boot-sample-actuator
...
Closes gh-6432
2016-07-20 11:29:43 +02:00
05ff4ed4e0
Upgrade to Tomcat 8.5.4 & remove tomcat-juli
...
Upgrade the managed Tomcat dependency to 8.5.4 and remove `tomcat-juli`
since it's now included in `tomcat-embed-core`.
Fixes gh-6192
2016-07-18 17:52:35 -07:00
Phillip Webb
Madhura Bhave
Andy Wilkinson
Stephane Nicoll
Vedran Pavic
Spring Buildmaster
Johnny Lim