Commit Graph

7126 Commits (cd6cacfb4f345cc860119c04dd722bb00eaa9bb6)
 

Author SHA1 Message Date
Andy Wilkinson cd6cacfb4f Merge branch '1.3.x' 9 years ago
Andy Wilkinson 7a4e061de5 Make DevTools DataSource auto-config back off without DataSourceProperties
Previously, if DataSourceAutoConfiguration had been explicitly excluded,
DevToolsDataSourceAutoConfiguration would cause refresh to fail due to
a missing DataSourceProperties bean. This commit corrects the condition
so that the auto-configuration is conditional on a DataSource bean and
a DataSourceProperties bean rather than only being conditional on one or
the other.

Closes gh-5269
9 years ago
Andy Wilkinson 2c619f8d93 Make launch script integration tests compatible with Spring Framework 4.3
Previously, the launch script integration tests used Jackson 2.1 to
align with the requirements of docker-java 2.x. This stopped working
when we upgraded to Spring Framework 4.3 which requires Jackson 2.6+.

This commit updates the launch script integration tests to use
docker-java 3.0.0-RC1 which is compatible with Jackson 2.6.x. An added
benefit is that 3.0 also adds support for copying an archive to a
container, allowing the custom command that performs this function to
be removed.

Closes gh-5278
9 years ago
Stephane Nicoll 1ca9cdabf7 Merge pull request #5204 from uweschaefer/master
* pr/5204:
  Polish contribution
  Add CONF_FOLDER property
9 years ago
Stephane Nicoll d93b09f497 Polish contribution
Closes gh-5204
9 years ago
Uwe Schaefer 9c3003071b Add CONF_FOLDER property
Closes gh-5203
9 years ago
Andy Wilkinson 0232bef85d Merge branch 'sfw-4.3' 9 years ago
Andy Wilkinson fa7dfb5109 Ignore tests that are broken by UNDERTOW-639 9 years ago
Andy Wilkinson 65234ce4a1 Start building against Spring Framework 4.3 snapshots
See gh-4900
9 years ago
Stephane Nicoll 9bf95c4215 Merge pull request #5254 from kdombeck/fix-logger-class
* pr/5254:
  Fix logger classname
9 years ago
Ken Dombeck 9f93559d44 Fix logger classname
Closes gh-5254
9 years ago
Stephane Nicoll 2e08502c4d Merge branch '1.3.x' 9 years ago
Stephane Nicoll 5680ffdedb Fixup version numbers following release 9 years ago
Spring Buildmaster 225d877ab9 Next Development Version 9 years ago
Stephane Nicoll ebf82e4c20 Fix hazelcast schema location
Closes gh-5237
9 years ago
Phillip Webb 023a09bcf6 Merge branch '1.3.x' 9 years ago
Phillip Webb 936a96746a Fix missing Javadoc @param 9 years ago
Phillip Webb 17c9fc585f Polish 9 years ago
Phillip Webb c93ea54ea3 Merge branch '1.3.x' 9 years ago
Phillip Webb 4fd778fed8 Polish CacheManagerCustomizers 9 years ago
Andy Wilkinson 8b587a87ef Upgrade to Spring Session 1.1.0.RELEASE
Closes gh-5252
9 years ago
Andy Wilkinson 3a5bb3391f Upgrade to Jedis 2.8.0
Closes gh-5251
9 years ago
Andy Wilkinson cf2d57a5db Upgrade to SnakeYAML 1.17
Closes gh-5250
9 years ago
Andy Wilkinson 83db70197e Upgrade to webjars-locator 0.30
Closes gh-5249
9 years ago
Andy Wilkinson fd4b126159 Upgrade to Json Assert 1.3.0
Closes gh-5248
9 years ago
Andy Wilkinson 33cca0fed1 Upgrade to mongo-java-driver 2.14.1
Closes gh-5247
9 years ago
Andy Wilkinson 8c11142cd8 Upgrade to mariadb-java-client 1.3.6
Closes gh-5246
9 years ago
Andy Wilkinson ccf7de904c Upgrade to Infinispan 8.1.2.Final
Closes gh-5245
9 years ago
Andy Wilkinson a3c118f76b Upgrade to Elasticsearch 1.7.5
Closes gh-5244
9 years ago
Andy Wilkinson 4bbf209c14 Upgrade to SolrJ 5.3.2
Closes gh-5243
9 years ago
Andy Wilkinson 06fb2d6d3e Upgrade to Log4j2 2.5
Closes gh-5242
9 years ago
Andy Wilkinson dd37ca8a81 Upgrade to ActiveMQ 5.13.1
Closes gh-5241
9 years ago
Andy Wilkinson e07330ef5f Upgrade to Joda Time 2.9.2
Closes gh-5240
9 years ago
Andy Wilkinson d5758ee3aa Upgrade to JMustache 1.12
Closes gh-5239
9 years ago
Andy Wilkinson 43b7771bf1 Upgrade to JsonPath 2.1.0
Closes gh-5238
9 years ago
Andy Wilkinson fcb5f03146 Upgrade to Hazelcast 3.6
Closes gh-5237
9 years ago
Andy Wilkinson dd2edee89a Upgrade to Gson 2.6.1
Closes gh-5236
9 years ago
Andy Wilkinson 8ae6ea0a06 Upgrade to appengine-api-1.0-sdk 1.9.32
Closes gh-5235
9 years ago
Andy Wilkinson 13ffaf878a Merge pull request #5197 from Charlie Harvey
* gh-5197:
  Add nifty-spring-boot-starter to list of third-party starters
9 years ago
Charles Harvey III 31c0f558ec Add nifty-spring-boot-starter to list of third-party starters
Closes gh-5197
9 years ago
Andy Wilkinson 56487d23d6 Merge branch '1.3.x' 9 years ago
Andy Wilkinson 7ba16e37e8 Merge pull request #5205 from Vedran Pavić
* gh-5205:
  Fix namespace declarations in Hazelcast xml's and make them consistent
9 years ago
Vedran Pavic 6801e8208d Fix namespace declarations in Hazelcast xml's and make them consistent 9 years ago
Stephane Nicoll 78f19ef852 Polish 9 years ago
Stephane Nicoll 7457596b15 Merge branch '1.3.x' 9 years ago
Stephane Nicoll ad57d99fe5 Cleanup HazelcastInstance in test
If a JCache provider is started with hazelcast and the default settings,
the underlying `HazelcastInstance` is disposed at the end of the
process, not when the `CacheManager` is closed.

This commit fixes the only test that use such setup.

See also https://github.com/hazelcast/hazelcast/issues/7606

Closes gh-5209
9 years ago
Stephane Nicoll 416b689359 Enable prefix by default on RedisCacheManager
An overhaul of the `RedisCacheManager` is expected in Hopper (to be
consumed by Spring Boot 1.4). One of those changes is to make sure every
key have a decent prefix by default.

This commit enables the use of prefix as it is disabled by default.

Closes gh-5175
9 years ago
Andy Wilkinson af32d6e8ee Allow LOG_FOLDER and PID_FOLDER defaults to be set at build time
This commit enhances the default launch script to allow the default
values for LOG_FOLDER and PID_FOLDER to be set at build time. They
can now be set using the logFolder and pidFolder properties
respectively.

Closes gh-4787
9 years ago
Andy Wilkinson 01b7a7d9d3 Add missing copyright headers 9 years ago
Andy Wilkinson 44ddfcc7fa Upgrade copyright headers of all files changed in 2016 9 years ago