root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity
7,482 Commits 24 Branches 369 Tags 281 MiB
Commit Graph

7482 Commits

Author SHA1 Message Date
Stephane Nicoll f04b517adb Upgrade to Caffeine 2.2.2 
See gh-4903
 2016-02-29 14:09:54 +01:00
Stephane Nicoll 1f8b780333 Merge pull request #4903 from eddumelendez/gh-4899 
* pr/4903:
  Polish contribution
  Add Caffeine cache support
 2016-02-29 14:07:15 +01:00
Stephane Nicoll 6741f05af1 Polish contribution 
Closes gh-4903
 2016-02-29 14:07:01 +01:00
Eddú Meléndez 98cc68364a Add Caffeine cache support 
See gh-4899
 2016-02-29 14:07:01 +01:00
Andy Wilkinson 41f0a5cdca Merge branch '1.3.x' 2016-02-29 13:01:18 +00:00
Andy Wilkinson 4eda91d6db Allow logging.file and logging.path to refer to logging system properties 
Closes gh-5274
 2016-02-29 12:32:47 +00:00
Andy Wilkinson cd6cacfb4f Merge branch '1.3.x' 2016-02-29 11:42:01 +00:00
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
 2016-02-29 11:37:17 +00:00
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
 2016-02-29 11:26:42 +00:00
Stephane Nicoll 1ca9cdabf7 Merge pull request #5204 from uweschaefer/master 
* pr/5204:
  Polish contribution
  Add CONF_FOLDER property
 2016-02-29 11:42:38 +01:00
Stephane Nicoll d93b09f497 Polish contribution 
Closes gh-5204
 2016-02-29 11:42:27 +01:00
Uwe Schaefer 9c3003071b Add CONF_FOLDER property 
Closes gh-5203
 2016-02-29 11:36:59 +01:00
Andy Wilkinson 0232bef85d Merge branch 'sfw-4.3' 2016-02-26 18:25:06 +00:00
Andy Wilkinson fa7dfb5109 Ignore tests that are broken by UNDERTOW-639 2016-02-26 18:24:56 +00:00
Andy Wilkinson 65234ce4a1 Start building against Spring Framework 4.3 snapshots 
See gh-4900
 2016-02-26 18:24:56 +00:00
Stephane Nicoll 9bf95c4215 Merge pull request #5254 from kdombeck/fix-logger-class 
* pr/5254:
  Fix logger classname
 2016-02-26 16:54:12 +01:00
Ken Dombeck 9f93559d44 Fix logger classname 
Closes gh-5254
 2016-02-26 16:53:48 +01:00
Stephane Nicoll 2e08502c4d Merge branch '1.3.x' 2016-02-26 11:01:09 +01:00
Stephane Nicoll 5680ffdedb Fixup version numbers following release 2016-02-26 11:00:36 +01:00
Spring Buildmaster 225d877ab9 Next Development Version 2016-02-26 01:06:16 -08:00
Stephane Nicoll ebf82e4c20 Fix hazelcast schema location 
Closes gh-5237
 2016-02-26 09:11:37 +01:00
Phillip Webb 023a09bcf6 Merge branch '1.3.x' 2016-02-25 22:13:32 -08:00
Phillip Webb 936a96746a Fix missing Javadoc @param 2016-02-25 22:13:03 -08:00
Phillip Webb 17c9fc585f Polish 2016-02-25 21:32:09 -08:00
Phillip Webb c93ea54ea3 Merge branch '1.3.x' 2016-02-25 21:26:13 -08:00
Phillip Webb 4fd778fed8 Polish CacheManagerCustomizers 2016-02-25 20:05:16 -08:00
Andy Wilkinson 8b587a87ef Upgrade to Spring Session 1.1.0.RELEASE 
Closes gh-5252
 2016-02-25 20:55:49 +00:00
Andy Wilkinson 3a5bb3391f Upgrade to Jedis 2.8.0 
Closes gh-5251
 2016-02-25 20:55:49 +00:00
Andy Wilkinson cf2d57a5db Upgrade to SnakeYAML 1.17 
Closes gh-5250
 2016-02-25 20:55:48 +00:00
Andy Wilkinson 83db70197e Upgrade to webjars-locator 0.30 
Closes gh-5249
 2016-02-25 20:55:48 +00:00
Andy Wilkinson fd4b126159 Upgrade to Json Assert 1.3.0 
Closes gh-5248
 2016-02-25 20:55:48 +00:00
Andy Wilkinson 33cca0fed1 Upgrade to mongo-java-driver 2.14.1 
Closes gh-5247
 2016-02-25 20:55:47 +00:00
Andy Wilkinson 8c11142cd8 Upgrade to mariadb-java-client 1.3.6 
Closes gh-5246
 2016-02-25 20:55:47 +00:00
Andy Wilkinson ccf7de904c Upgrade to Infinispan 8.1.2.Final 
Closes gh-5245
 2016-02-25 20:55:47 +00:00
Andy Wilkinson a3c118f76b Upgrade to Elasticsearch 1.7.5 
Closes gh-5244
 2016-02-25 20:40:42 +00:00
Andy Wilkinson 4bbf209c14 Upgrade to SolrJ 5.3.2 
Closes gh-5243
 2016-02-25 20:40:42 +00:00
Andy Wilkinson 06fb2d6d3e Upgrade to Log4j2 2.5 
Closes gh-5242
 2016-02-25 20:40:42 +00:00
Andy Wilkinson dd37ca8a81 Upgrade to ActiveMQ 5.13.1 
Closes gh-5241
 2016-02-25 20:17:03 +00:00
Andy Wilkinson e07330ef5f Upgrade to Joda Time 2.9.2 
Closes gh-5240
 2016-02-25 20:16:33 +00:00
Andy Wilkinson d5758ee3aa Upgrade to JMustache 1.12 
Closes gh-5239
 2016-02-25 20:16:09 +00:00
Andy Wilkinson 43b7771bf1 Upgrade to JsonPath 2.1.0 
Closes gh-5238
 2016-02-25 20:15:35 +00:00
Andy Wilkinson fcb5f03146 Upgrade to Hazelcast 3.6 
Closes gh-5237
 2016-02-25 20:15:02 +00:00
Andy Wilkinson dd2edee89a Upgrade to Gson 2.6.1 
Closes gh-5236
 2016-02-25 20:13:07 +00:00
Andy Wilkinson 8ae6ea0a06 Upgrade to appengine-api-1.0-sdk 1.9.32 
Closes gh-5235
 2016-02-25 20:12:31 +00:00
Andy Wilkinson 13ffaf878a Merge pull request #5197 from Charlie Harvey 
* gh-5197:
  Add nifty-spring-boot-starter to list of third-party starters
 2016-02-25 20:10:28 +00:00
Charles Harvey III 31c0f558ec Add nifty-spring-boot-starter to list of third-party starters 
Closes gh-5197
 2016-02-25 20:09:08 +00:00
Andy Wilkinson 56487d23d6 Merge branch '1.3.x' 2016-02-25 20:00:34 +00:00
Andy Wilkinson 7ba16e37e8 Merge pull request #5205 from Vedran Pavić 
* gh-5205:
  Fix namespace declarations in Hazelcast xml's and make them consistent
 2016-02-25 20:00:21 +00:00
Vedran Pavic 6801e8208d Fix namespace declarations in Hazelcast xml's and make them consistent 2016-02-25 19:59:28 +00:00
Stephane Nicoll 78f19ef852 Polish 2016-02-25 15:15:16 +01:00