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
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
8034ae6e37
Prevent spring-session from pulling in commons-logging
...
Closes gh-7064
2016-09-29 21:06:05 +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
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
0232e3b16c
Merge branch '1.4.x' into 1.5.x
2016-09-29 15:09:08 +01:00
d08c84af42
Ensure that JtaAutoConfiguration runs before ArtemisAutoConfiguration
...
Closes gh-7062
2016-09-29 15:08:24 +01:00
b4d052a7b3
Merge branch '1.4.x' into 1.5.x
2016-09-29 15:01:54 +01:00
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
26c9d5a7e2
Merge branch '1.4.x' into 1.5.x
2016-09-29 14:28:20 +01:00
bacdc204ae
Polish imports
2016-09-29 14:27:42 +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
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
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
cdd59707fc
Merge branch '1.4.x' into 1.5.x
2016-09-28 17:00:30 +02:00
bfd62aba10
Merge pull request #7030 from izeye:polish-20160927
...
* pr/7030:
Polish
2016-09-28 16:46:14 +02:00
30a677646f
Polish
...
Closes gh-7030
2016-09-28 16:45:19 +02:00
b186e3f1ef
Merge branch '1.4.x' into 1.5.x
2016-09-28 12:25:32 +01:00
73f153daca
Use a property for the version of the JMS API managed dependency
...
Closes gh-7042
2016-09-28 12:23:15 +01:00
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
f485660482
Upgrade Spring Session to 1.3.0.M2
...
Closes gh-6979
2016-09-28 11:07:11 +01:00
0b28844681
Merge pull request #7022 from Kazuki Shimizu
...
* gh-7022:
Add dependency management for jetty-proxy
2016-09-28 10:59:39 +01:00
c90eac5136
Add dependency management for jetty-proxy
...
Closes gh-7022
2016-09-28 10:59:27 +01:00
22b33908c2
Upgrade to Spring Integration Java DSL 1.2.0.RC1
...
Closes gh-7000
2016-09-28 10:54:44 +01:00
9210bf0822
Merge branch '1.4.x' into 1.5.x
2016-09-27 10:14:37 +02:00
a2794d75c3
Clarify couchbase cache requirements
...
Closes gh-6998
2016-09-27 10:12:59 +02:00
d5be773f0e
Merge pull request #7025 from izeye:fix-dir
...
* pr/7025:
Move Restarter in integration tests
2016-09-27 10:05:01 +02:00
723b46ade4
Move Restarter in integration tests
...
Closes gh-7025
2016-09-27 10:04:38 +02:00
542e935bb6
Fix typo
...
Closes gh-7026
2016-09-27 10:03:00 +02:00
984b02dc7f
Upgrade to Undertow 1.4.3.Final
...
Closes gh-7019
2016-09-26 12:43:24 +02:00
7dfa3a8c83
Harmonize Caffeine CacheManager bean name
...
Closes gh-6980
2016-09-26 10:47:09 +02:00
7d73abc04f
Merge branch '1.4.x' into 1.5.x
2016-09-26 10:36:02 +02:00
f1fddd243b
Document spring.http.encoding.mapping
...
Closes gh-7017
2016-09-26 10:35:45 +02:00
8971c8ba54
Merge branch '1.4.x' into 1.5.x
2016-09-23 13:56:53 +01:00
e1d53b65ba
Remove redundant git-commit-id-plugin configuration from loader-tools
...
Closes gh-7007
2016-09-23 13:56:38 +01:00
24c2e7d182
Merge branch '1.4.x' into 1.5.x
2016-09-23 08:00:22 +02:00
c81a83522c
Merge pull request #7002 from candrews:patch-3
...
* pr/7002:
Exclude `META-INF/build-info.properties` from restart
2016-09-23 07:59:59 +02:00
d94eedfd8a
Exclude `META-INF/build-info.properties` from restart
...
Prior to this commit any application configured to write
`META-INF/build-info.properties` could trigger unexpected application
restarts. The problem is particularly prevalent when using Eclipse M2E in
combination with Maven's `spring-boot-maven-plugin` `build-info` goal
and Gradle's `springBoot` `buildInfo()`.
Closes gh-7002
2016-09-23 07:58:39 +02:00
a9ca8ef769
Start building against Spring Integration Java DSL 1.2.0 snapshots
...
See gh-7000
2016-09-22 19:51:07 +01:00
a674357b15
Remove dependency management for cassandra-driver-dse
...
The 3.1 release of the Cassandra Driver does not include the
cassandra-driver-dse module.
See gh-5835
2016-09-22 14:40:35 +01: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
bdc949d1b7
Remove deprecated merge and locations attributes from @ConfigurationProperties
...
Closes gh-6972
2016-09-21 20:50:21 +01:00
c108da9d53
Upgrade to Spring Data Ingalls M1
...
Closes gh-6785
Closes gh-5835
2016-09-21 17:01:47 +01:00
5684924f60
Polish
2016-09-21 17:01:43 +02:00
Andy Wilkinson
Ken Dombeck
Stephane Nicoll
Vedran Pavic
Johnny Lim
Kazuki Shimizu
Craig Andrews