Phil Webb
9f41323030
Update CONTRIBUTING.adoc
...
Update the Oomph instructions.
2016-01-05 13:41:18 +00:00
Andy Wilkinson
a6c0f07376
Merge branch '1.2.x'
2016-01-04 17:18:19 +00:00
zhanhb
fae3397f92
Upgrade to JavaMail 1.5.5
...
Closes gh-4844
2016-01-04 17:17:39 +00:00
Stephane Nicoll
d51d84303f
Merge pull request #4867 from kazuki43zoo/fix-invalid-port-in-doc
...
* pr/4867:
Fix invalid port number in doc
2016-01-03 13:44:20 +01:00
Kazuki Shimizu
908c9562e5
Fix invalid port number in doc
...
Closes gh-4867
2016-01-03 13:43:46 +01:00
Dave Syer
9510938120
Make springIntegrationPublicMetrics conditional on bean by name not type
...
By type is too restrictive and surprising for users who wanted to add their
own MetricReaderPublicMetrics for other reasons.
2015-12-30 18:01:37 +00:00
Stephane Nicoll
a835912c04
Merge branch '1.2.x'
2015-12-28 14:35:49 +01:00
Stephane Nicoll
b94c7c6a1d
Guard instantiation of Tomcat's ErrorPage
...
Closes gh-4839
2015-12-28 14:35:35 +01:00
Stephane Nicoll
b1c2226e23
Merge branch '1.2.x'
...
# Conflicts:
# spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/WebSocketAutoConfiguration.java
2015-12-28 13:51:18 +01:00
Stephane Nicoll
12cefd2c2b
Only enable Tomcat's websocket support on Java7+
...
Tomcat's websocket support requires Java7 or later. That commit makes
sure to register its support only when such requirement is met.
Closes gh-4846
2015-12-28 13:49:12 +01:00
Stephane Nicoll
a87a1f053f
Polish documentation
...
Clarify that "spring.config.*" properties doesn't work in configuration
files.
Closes gh-4838
2015-12-25 08:21:09 +01:00
Stephane Nicoll
a9a3de5a51
Merge pull request #4829 from joshiste/issue-4820
...
* pr/4829:
Change redirect in initscript to support old bash
2015-12-24 11:45:34 +01:00
Johannes Edmeier
832ad2fe85
Change redirect in initscript to support old bash
...
`&>>` syntax is bash version 4. This fix allows to support older
versions.
Fixes gh-4820
Closes gh-4829
2015-12-24 11:44:55 +01:00
Stephane Nicoll
cdc91330f2
Merge pull request #4837 from izeye/20151224
...
* pr/4837:
Polish test
2015-12-24 07:44:52 +01:00
Johnny Lim
c39df05652
Polish test
...
Closes gh-4837
2015-12-24 07:43:48 +01:00
Stephane Nicoll
3e25d99f4e
Add test to validate log42-spring.xml
location
...
See gh-4809
2015-12-21 09:13:58 +01:00
Andy Wilkinson
c3328721a1
Merge branch '1.2.x'
2015-12-19 10:52:34 +00:00
Andy Wilkinson
835a11b52a
Start building against Spring WS 2.2.5 snapshots
...
See gh-4789
2015-12-19 10:51:12 +00:00
Dave Syer
d493d3afe7
Make Log4J logging system consistent with the others
...
when the logname is empty it replaces it with the root logger name.
Fixes gh-4808
2015-12-18 14:46:11 +00:00
Stephane Nicoll
ecf56f0708
Fixup version numbers following release
2015-12-18 15:07:13 +01:00
Spring Buildmaster
8db59059a5
Next Development Version
2015-12-18 05:43:02 -08:00
Stephane Nicoll
7caf39400c
Merge pull request #4806 from izeye/polish-20151218
...
* pr/4806:
Fix typos
2015-12-18 12:59:02 +01:00
Johnny Lim
c09a14a128
Fix typos
...
Closes gh-4806
2015-12-18 12:58:35 +01:00
Andy Wilkinson
01d0127476
Upgrade to Spring Data Gosling SR2A
...
Closes gh-4786
2015-12-18 11:56:10 +00:00
Phillip Webb
25a7294371
Make ExitCodeGenerators package-private
...
ExitCodeGenerators is not going to be immediately used by spring-task so
it can remain package-private for now.
See gh-4757
2015-12-17 18:16:49 +00:00
Stephane Nicoll
5abe8121c4
Upgrade to Spring Integration 4.2.4.RELEASE
...
Closes gh-4792
2015-12-17 17:41:28 +01:00
Phillip Webb
f96dea7011
Polish
2015-12-17 13:52:47 +00:00
Stephane Nicoll
35efb251e0
Upgrade to Spring Framework 4.2.4.RELEASE
...
Closes gh-4644
2015-12-17 14:46:06 +01:00
Stephane Nicoll
f208ccc3cd
Merge branch '1.2.x'
2015-12-17 14:16:28 +01:00
Stephane Nicoll
bb736e255b
Fix SNAPSHOT version
2015-12-17 14:15:14 +01:00
Andy Wilkinson
b79ee145d6
Configure worker for Undertow’s access log to use daemon threads
...
Previously, the worker used non-daemon threads which meant that they
prevented the JVM from shutting down. Ideally, we’d avoid this problem
by closing the worker and access log receiver as part of stopping
Undertow, however, due to an apparent bug in Undertow [1], it’s not
possible to do so cleanly.
This commit configures the access log worker to use daemon threads so
that they do not prevent the JVM from shutting down. Unfortunately,
this means that the threads will still be running after the context has
been closed but before the JVM shuts down but that appears to be
unavoidable due to the aforementioned Undertow bug.
Closes gh-4793
[1] https://issues.jboss.org/browse/UNDERTOW-597
2015-12-17 11:30:34 +00:00
Andy Wilkinson
408a302f44
Revert "Upgrade to Spring Data Gosling snapshots again"
...
This reverts commit 00ba7bea36
.
See gh-4786
2015-12-17 11:30:34 +00:00
Phillip Webb
506ee897f3
Document how to configure root logging level
...
Fixes gh-2872
2015-12-17 10:55:46 +00:00
Phillip Webb
5d311d6203
Polish
2015-12-17 09:51:33 +00:00
Phillip Webb
ec2064d981
Remove TODO
...
See gh-4796
2015-12-17 09:51:33 +00:00
Stephane Nicoll
eaddb4f0db
Merge branch '1.2.x'
2015-12-17 10:21:29 +01:00
Stephane Nicoll
b719b0271c
Upgrade to Spring Framework 4.1.9.RELEASE
...
Closes gh-4440
2015-12-17 10:20:17 +01:00
Andy Wilkinson
bbe6f232dc
Merge branch '1.2.x'
2015-12-17 08:35:31 +00:00
Andy Wilkinson
c0c79ab906
Revert "Upgrade to Spring Web Services 2.2.4.RELEASE"
...
This reverts commit acb3fb5399
.
See gh-4789
2015-12-17 08:34:15 +00:00
Phillip Webb
ff2addb321
Fix checkstyle
2015-12-16 22:54:01 +00:00
Phillip Webb
91c801d6fe
Add how-to log to file without console section
...
Fixes gh-4388
2015-12-16 22:25:13 +00:00
Phillip Webb
40abd13813
Be defensive about hiding log errors
...
Ensure that log configuration errors always get reported.
2015-12-16 22:25:13 +00:00
Phillip Webb
528fcf3d0b
Refine server.server-header documentation
...
Fixes gh-4461
2015-12-16 22:25:12 +00:00
Phillip Webb
945b42588b
Refine server.server-header documentation
...
Fixes gh-4461
2015-12-16 21:11:49 +00:00
Phillip Webb
4bdb2d34cc
Merge pull request #4784 from kirill-vlasov
...
* pr/4784:
Make loggers private static final
2015-12-16 21:04:00 +00:00
Kirill Vlasov
ec2f33f986
Make loggers private static final
...
Apply consistency across all static loggers.
Closes gh-4784
2015-12-16 21:02:53 +00:00
Phillip Webb
0b1dc94b93
Merge pull request #4783 from kirill-vlasov
...
* pr/4783:
Use Collections.isEmpty() instead of .size() == 0
2015-12-16 21:01:42 +00:00
Kirill Vlasov
786aacf2e9
Use Collections.isEmpty() instead of .size() == 0
...
Ensure that Collections.isEmpty() is used to check if there are no
elements in a collections. This is more explicit and can be faster than
calling .size().
Closes gh-4783
2015-12-16 20:59:33 +00:00
Andy Wilkinson
6113643cbe
Merge branch '1.2.x'
2015-12-16 20:06:51 +00:00
Andy Wilkinson
43a16146ef
Upgrade to Spring Integration 4.1.8.RELEASE
...
Closes gh-4719
2015-12-16 20:05:04 +00:00