ea8107b6a5
Merge branch '1.2.x'
2015-11-18 11:55:27 +00:00
dd4b9b1788
Merge pull request #4509 from izeye/else
...
* pr/4509:
Add missing else statement
2015-11-18 11:42:17 +00:00
fde70909ce
Add missing else statement
...
Closes gh-4509
2015-11-18 11:41:37 +00:00
5d8410f694
Merge pull request #4503 from izeye/polish-20151116
...
* pr/4503:
Polishing
2015-11-18 11:40:45 +00:00
da16d6d306
Polishing
...
Closes gh-4503
2015-11-18 11:40:19 +00:00
d4a7c09b4e
Polish
2015-11-18 11:21:23 +00:00
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
169fd53976
Fix typo
...
Closes gh-4515
2015-11-17 10:23:23 +00:00
14e7b10310
Fixup version numbers following release
2015-11-16 12:50:27 +01:00
3f6f57a80e
Next Development Version
2015-11-16 03:18:54 -08:00
64ec67e6a4
Upgrade to Mongodb Java Client 2.13.3
...
Closes gh-4498
2015-11-16 09:32:38 +00:00
c055a68874
Revert "Upgrade to Joda-time 2.9.1"
...
This reverts commit 21e40eac10
2015-11-16 09:32:01 +00:00
5def2ec75c
Revert "Upgrade to MariaDB 1.3.0"
...
This reverts commit 088c58b80a
2015-11-16 09:31:32 +00:00
17bb3ab8c8
Merge pull request #4501 from vpavic/fix-json-syntax
...
* pr/4501:
Fix bad JSON syntax
2015-11-15 22:10:28 +01:00
d2fecd3ad4
Fix bad JSON syntax
...
Closes gh-4501
2015-11-15 22:10:00 +01:00
10c54be2d5
Upgrade to Spring Framework 4.2.3.RELEASE
...
Closes gh-4492
2015-11-15 18:31:18 +01:00
e530ac8f65
Merge pull request #4495 from olivergierke/master
...
* pr/4495:
Upgrade to Spring Data Gosling SR1
2015-11-15 16:31:07 +01:00
45fb889771
Upgrade to Spring Data Gosling SR1
...
Closes #4465
2015-11-15 16:30:46 +01:00
3a34e88db5
Merge pull request #4493 from izeye/typo-20151115
...
* pr/4493:
Polish
2015-11-14 18:55:01 -08:00
4369493f8d
Polish
2015-11-14 18:54:50 -08:00
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
732658af89
Update documentation with new Jackson 2.6 feature
...
Update the "How To" section with a new Jackson value that was added in
2.6.
Closes gh-4491
2015-11-14 16:52:30 -08:00
32d30a0a26
Merge pull request #4488 from izeye/polish-20151114
...
* pr/4488:
Polish
2015-11-13 21:45:49 -08:00
903cdf3ddd
Polish
2015-11-13 21:45:43 -08:00
e7837a7025
Upgrade to Reactor 2.0.7
...
Closes gh-4394
2015-11-13 21:43:46 -08:00
05698e18e4
Polish
2015-11-13 21:42:56 -08:00
9a666d3366
Improve devtools documentation
...
Clarify known limitations and document how to use the
`META-INF/spring-devtools.properties` file.
Fixes gh-4235
Closes gh-3316
2015-11-13 21:35:15 -08:00
4aaab6c2a1
Remove obsolete docs folder
2015-11-13 20:20:35 -08:00
c4f653e8e3
Upgrade to Jackson 2.6.3
...
Closes gh-4170
2015-11-13 18:40:06 -08:00
f6b59fb65f
Merge pull request #4476 from izeye/typo-20151114
...
* pr/4476:
Polish
2015-11-13 18:07:40 -08:00
1e4f8fdd8e
Polish
2015-11-13 18:06:31 -08:00
6a05927e4f
Upgrade to Cassandra 2.1.9
...
Closes gh-4478
2015-11-13 18:05:40 -08:00
21e40eac10
Upgrade to Joda-time 2.9.1
...
Closes gh-4479
2015-11-13 18:02:33 -08:00
5b9b0a4d80
Upgrade to httpasyncclient to 4.1.1
...
Closes gh-4480
2015-11-13 18:01:51 -08:00
6203ed90c8
Upgrade to Jetty 9.2.14.v20151106
...
Closes gh-4481
2015-11-13 18:00:28 -08:00
088c58b80a
Upgrade to MariaDB 1.3.0
...
Closes gh-4482
2015-11-13 17:59:28 -08:00
82eab90bbc
Upgrade to SLF4J 1.7.13
...
Closes gh-4483
2015-11-13 17:58:45 -08:00
fb79b1f8aa
Upgrade to Spring AMQP 1.5.3
...
Closes gh-4484
2015-11-13 17:38:53 -08:00
b51b32bdeb
Upgrade to Spring WS 2.2.3
...
Closes gh-4485
2015-11-13 17:37:13 -08:00
2ac14748c9
Upgrade to JOOQ 3.7.1
...
Closes gh-4477
2015-11-13 17:37:07 -08:00
c67aba0098
Upgrade to Spring Social 1.1.3
...
Fixes gh-4464
2015-11-13 16:56:53 -08:00
e006e1795c
Merge remote-tracking branch 'springsource/1.2.x'
2015-11-13 16:52:04 -08:00
604ca52491
Revert "Upgrade to Spring Social 1.1.3"
...
This reverts commit 331a26a497
2015-11-13 16:50:30 -08:00
83e870a2dc
Merge branch '1.2.x'
2015-11-13 14:10:58 -08:00
331a26a497
Upgrade to Spring Social 1.1.3
...
Fixes gh-4464
2015-11-13 14:09:24 -08:00
e9440ad5b5
Formatting
2015-11-13 10:35:55 -08:00
3e8cafaf97
Add support for `spring-devtools.properties`
...
Allow `META-INF/spring-devtools.properties` files to be used by
application developers to declare is specific jars should be included
or excluded from the RestartClassLoader.
A typical example where this might be used is a company that develops
it's own set of internal JARs that are used by developers but not
usually imported into their IDE.
See gh-3316
2015-11-13 10:32:44 -08:00
78f739dbdd
Merge pull request #4463 from izeye/typo-20151113
...
* pr/4463:
Fix typos
2015-11-13 13:55:04 +01:00
0a85281a66
Fix typos
...
Closes gh-4463
2015-11-13 13:54:50 +01:00
b83368a503
Fix case for MockMvc
...
Closes gh-4459
2015-11-13 13:12:27 +01:00
Andy Wilkinson
Stephane Nicoll
Johnny Lim
Spring Buildmaster
zhanhb
Vedran Pavic
Oliver Gierke
Phillip Webb
NersesAM