Commit Graph

2072 Commits (5dfe801fd737559ec6f294afa86e86515e4fd0a8)

Author SHA1 Message Date
Stephane Nicoll 5a2eae5628 Merge branch '1.5.x' 8 years ago
Stephane Nicoll ed333a67b4 Expose Spring Data Rest RepositoryDetectionStrategy
Closes gh-7113
8 years ago
Stephane Nicoll 640a77fcfa Merge branch '1.5.x' 8 years ago
Stephane Nicoll 02b0e3955c Merge branch '1.4.x' into 1.5.x 8 years ago
Johnny Lim 1c4c0c6119 Fix String.format() usages
Closes gh-7120
8 years ago
Andy Wilkinson c465fcefad Merge branch '1.5.x' 8 years ago
Andy Wilkinson 9b8f33df6d Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 20a2db79bd Separate conditions that did and did not match in auto-config report
Closes gh-7098
8 years ago
Stephane Nicoll b54566c0cd Merge branch '1.5.x' 8 years ago
Stephane Nicoll f82e91df39 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 03961e6692 Polish contribution
Closes gh-7004
8 years ago
Rob Fletcher 7fcb197092 Allow configuration to specify randomly generated database name
See gh-7004
8 years ago
Stephane Nicoll 2ff41ce9cc Merge branch '1.5.x' 8 years ago
Stephane Nicoll 200e246238 Merge branch '1.4.x' into 1.5.x 8 years ago
Johnny Lim 91254f2110 Remove unused parameters in String.format()
Closes gh-7111
8 years ago
Stephane Nicoll 8b61d15120 Remove deprecated support for commons-dbcp 1
See gh-6787
8 years ago
Stephane Nicoll 543498f040 Merge branch '1.5.x' 8 years ago
Stephane Nicoll cf28663cd7 Deprecate commons-dbcp 1
Closes gh-6787
8 years ago
Stephane Nicoll 0d5985b8dd Merge branch '1.5.x' 8 years ago
Stephane Nicoll 07690bab25 Allow customization of the auto-configured JmsTemplate
Closes gh-6825
8 years ago
Phillip Webb 53f50eda39 Merge branch '1.5.x' 8 years ago
Phillip Webb a2315378d4 Formatting 8 years ago
Phillip Webb f2b0fa284e Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb 3326841a97 Formatting 8 years ago
Phillip Webb 39ed0d4dfb Polish 8 years ago
Stephane Nicoll f181421f67 Merge branch '1.5.x' 8 years ago
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
8 years ago
Stephane Nicoll b95b57dbf5 Merge branch '1.5.x' 8 years ago
Stephane Nicoll e643fc5bd1 Merge branch '1.4.x' into 1.5.x 8 years ago
Johnny Lim 503d735fdd Polish
Closes gh-7081
8 years ago
Stephane Nicoll 8f96278ce9 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 7ffa499949 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll e56119165e Close JestClient on shutdown
Closes gh-7051
8 years ago
Stephane Nicoll 8ed20068ca Fix list property to be mutable
Closes gh-7045
8 years ago
Andy Wilkinson f82dc8e043 Upgrade to JMS API 2.0
Closes gh-7049
8 years ago
Andy Wilkinson 241ab10160 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 2a035d0748 Remove support for Velocity following its deprecation in 1.4
Closes gh-6971
8 years ago
Andy Wilkinson 464915d2cc Remove support for HornetQ following its deprecation in 1.4
See gh-6971
8 years ago
Andy Wilkinson ae7faa233a Merge branch '1.5.x' 8 years ago
Andy Wilkinson 0232e3b16c Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson d08c84af42 Ensure that JtaAutoConfiguration runs before ArtemisAutoConfiguration
Closes gh-7062
8 years ago
Andy Wilkinson 0e018c6037 Merge branch '1.5.x' 8 years ago
Andy Wilkinson b4d052a7b3 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 33ea73996e Make auto-config for Narayana back off when Transaction SPI not on classpath
Closes gh-7061
8 years ago
Stephane Nicoll 8b6d7eedc0 Merge branch '1.5.x' 8 years ago
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
8 years ago
Stephane Nicoll 49a606fa91 Merge branch '1.5.x' 8 years ago
Stephane Nicoll cdd59707fc Merge branch '1.4.x' into 1.5.x 8 years ago
Johnny Lim 30a677646f Polish
Closes gh-7030
8 years ago
Andy Wilkinson 63796a2a82 Merge branch '1.5.x' 8 years ago