Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,840 Commits 23 Branches 0 Tags
1c170b35ea5c888f55da791f061f94de69c0d31e
Commit Graph

6840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
89aba8b3d8 Merge branch '1.2.x' 2015-11-26 16:59:12 +01:00
Stephane Nicoll
8ede966708 Harmonize java.mail dependency management 
Closes gh-4588
 2015-11-26 16:58:47 +01:00
Stephane Nicoll
9c412232d5 Improve log message with active profiles 
Closes gh-4612
 2015-11-26 16:25:52 +01:00
Stephane Nicoll
1ff070f6e9 Fix broken build 2015-11-26 16:23:48 +01:00
Stephane Nicoll
091478e0fd Disable ehcache statistics if necessary 
`EhCacheStatisticsProvider` uses the `StatisticsGateway` API introduced
in ehcache 2.7 (march 2013). If an older ehcache version is present, we
should back-off as this class is not available.

Closes gh-4621
 2015-11-26 16:15:29 +01:00
Dave Syer
d6a424f94c Add support for UTF-8 in application.properties 
Fixes gh-4622
 2015-11-26 15:09:50 +00:00
Stephane Nicoll
9a60f740b0 Merge pull request #4617 from eddumelendez/mybatis-doc 
* pr/4617:
  Add reference to mybatis-spring-boot project
 2015-11-26 09:56:53 +01:00
Eddú Meléndez
74654f4877 Add reference to mybatis-spring-boot project 
Closes gh-4617
 2015-11-26 09:56:36 +01:00
Stephane Nicoll
a414ba8f9d Merge branch '1.2.x' 2015-11-25 09:55:56 +01:00
Stephane Nicoll
e5ea0252cd Upgrade to commons-collections 3.2.2 
Closes gh-4520
 2015-11-25 09:55:44 +01:00
Stephane Nicoll
ccd9feae97 Merge pull request #4608 from jadekler/batch_config_public 
* pr/4608:
  BasicBatchConfigurer is public again
 2015-11-25 09:52:06 +01:00
Jean de Klerk
91a10e12b6 BasicBatchConfigurer is public again 
Closes gh-4533
Closes gh-4608
 2015-11-25 09:51:33 +01:00
Stephane Nicoll
095e7291d8 Merge branch '1.2.x' 2015-11-23 10:45:10 +01:00
Stephane Nicoll
d9f09e46f8 Cherry-pick 398d06e 
Fixed initially in #3725

The target attribute is effectively checked for null beforehand so this
additional defensive check can be removed.

Closes gh-4567
 2015-11-23 10:43:44 +01:00
Stephane Nicoll
0c387a82b7 Add datasource meta-data for Commons DBCP2 
Closes gh-4562
 2015-11-23 10:41:56 +01:00
Stephane Nicoll
e57244d8bc Merge branch '1.2.x' 2015-11-23 09:42:27 +01:00
Dimitri
c605675b7a Fix wrong class reference 
Closes gh-4551
 2015-11-23 09:41:34 +01:00
Stephane Nicoll
67c75bb6bc Merge pull request #4571 from mkopylec/master 
* pr/4571:
  Add ref to reCAPCTHA Spring Boot Starter
 2015-11-22 14:10:31 +01:00
Mariusz Kopylec
51f352e8ba Add ref to reCAPCTHA Spring Boot Starter 
Closes gh-4571
 2015-11-22 14:09:53 +01:00
Stephane Nicoll
58b84936cf Merge pull request #4572 from izeye/polish-20151121 
* pr/4572:
  Polish
 2015-11-21 08:26:10 +01:00
Johnny Lim
8ec00c35bf Polish 
Closes gh-4572
 2015-11-21 08:12:21 +01:00
Stephane Nicoll
31d7ebc96e Merge pull request #4554 from izeye/polish-20151119 
* pr/4554:
  Polish
 2015-11-20 11:02:23 +01:00
Johnny Lim
efff4a0051 Polish 
Closes gh-4554
 2015-11-20 11:02:08 +01:00
Stephane Nicoll
30791599a5 Merge pull request #4561 from vpavic/update-docs 
* pr/4561:
  Fix incorrect default value for executable flag
 2015-11-20 10:52:31 +01:00
Vedran Pavic
fc868155ff Fix incorrect default value for executable flag 
Closes gh-4561
 2015-11-20 10:51:58 +01:00
Dave Syer
8708a07a98 Ensure RestTemplate interceptors remain mutable 
Fixes gh-4553
 2015-11-19 10:01:38 +00:00
Stephane Nicoll
3dda029c64 Merge pull request #4537 from izeye/polish-20151118 
* pr/4537:
  Polish
 2015-11-19 09:49:53 +00:00
Johnny Lim
36ed0f5c20 Polish 
Closes gh-4537
 2015-11-19 09:49:33 +00:00
Stephane Nicoll
6146817ba3 Polish 2015-11-18 12:36:41 +00:00
Andy Wilkinson
ea8107b6a5 Merge branch '1.2.x' 2015-11-18 11:55:27 +00:00
Stephane Nicoll
dd4b9b1788 Merge pull request #4509 from izeye/else 
* pr/4509:
  Add missing else statement
 2015-11-18 11:42:17 +00:00
Johnny Lim
fde70909ce Add missing else statement 
Closes gh-4509
 2015-11-18 11:41:37 +00:00
Stephane Nicoll
5d8410f694 Merge pull request #4503 from izeye/polish-20151116 
* pr/4503:
  Polishing
 2015-11-18 11:40:45 +00:00
Johnny Lim
da16d6d306 Polishing 
Closes gh-4503
 2015-11-18 11:40:19 +00:00
Stephane Nicoll
d4a7c09b4e Polish 2015-11-18 11:21:23 +00:00
Andy Wilkinson
2fe0819495 Isolate multiple Undertow deployments 
Previously, UndertowEmbeddedServletContainerFactory always used
Undertow’s default ServletContainer. This meant that if there were two
UndertowEmbeddedServletContainers created, they would share the same
ServletContainer and the second one that was created would overwrite
the deployment for the first. This resulted in a async request
handling failing as the attempt to look up the deployment for the
first embedded Undertow instance would incorrectly find the deployment
for the second.

This commit fixes the problem by ensuring that each 
UndertowEmbeddedServletContainerFactory uses a separate Undertow
ServletContainer instance.

Closes gh-4329
 2015-11-17 18:04:22 +00:00
Stephane Nicoll
169fd53976 Fix typo 
Closes gh-4515
 2015-11-17 10:23:23 +00:00
Stephane Nicoll
14e7b10310 Fixup version numbers following release 2015-11-16 12:50:27 +01:00
Spring Buildmaster
3f6f57a80e Next Development Version 2015-11-16 03:18:54 -08:00
zhanhb
64ec67e6a4 Upgrade to Mongodb Java Client 2.13.3 
Closes gh-4498
 2015-11-16 09:32:38 +00:00
Andy Wilkinson
c055a68874 Revert "Upgrade to Joda-time 2.9.1" 
This reverts commit 21e40eac10.

See gh-4479
 2015-11-16 09:32:01 +00:00
Andy Wilkinson
5def2ec75c Revert "Upgrade to MariaDB 1.3.0" 
This reverts commit 088c58b80a.

See gh-4482
 2015-11-16 09:31:32 +00:00
Stephane Nicoll
17bb3ab8c8 Merge pull request #4501 from vpavic/fix-json-syntax 
* pr/4501:
  Fix bad JSON syntax
 2015-11-15 22:10:28 +01:00
Vedran Pavic
d2fecd3ad4 Fix bad JSON syntax 
Closes gh-4501
 2015-11-15 22:10:00 +01:00
Stephane Nicoll
10c54be2d5 Upgrade to Spring Framework 4.2.3.RELEASE 
Closes gh-4492
 2015-11-15 18:31:18 +01:00
Stephane Nicoll
e530ac8f65 Merge pull request #4495 from olivergierke/master 
* pr/4495:
  Upgrade to Spring Data Gosling SR1
 2015-11-15 16:31:07 +01:00
Oliver Gierke
45fb889771 Upgrade to Spring Data Gosling SR1 
Closes #4465
 2015-11-15 16:30:46 +01:00
Phillip Webb
3a34e88db5 Merge pull request #4493 from izeye/typo-20151115 
* pr/4493:
  Polish
 2015-11-14 18:55:01 -08:00
Johnny Lim
4369493f8d Polish 2015-11-14 18:54:50 -08:00
Phillip Webb
5c19d3bff3 Merge pull request #4491 from NersesAM/NersesAM-doc-jackson-inclusion 
* pr/4491:
  Update documentation with new Jackson 2.6 feature
 2015-11-14 16:54:53 -08:00