Commit Graph

6807 Commits (6d19d737a4fb696c878dbdceab46e2e2ce1eb155)
 

Author SHA1 Message Date
Andy Wilkinson 6117b6c5c8 Consistent use of tabs for indentation in pom files 9 years ago
Andy Wilkinson e4e9a71753 Merge branch '1.2.x' 9 years ago
Andy Wilkinson 8410e545b5 Upgrade copyright headers for 2016 9 years ago
Stephane Nicoll d8384c52df Add a reference to start.spring.io 9 years ago
Stephane Nicoll 72754c27b2 Allow to override BasicBatchConfigurer
Issue #4533 was supposed to make BasicBatchConfigurer public again but
unfortunately only the class visibility was changed. This commit makes
sure it can be overridden.

Closes gh-4888
9 years ago
Phil Webb 9f41323030 Update CONTRIBUTING.adoc
Update the Oomph instructions.
9 years ago
Andy Wilkinson a6c0f07376 Merge branch '1.2.x' 9 years ago
zhanhb fae3397f92 Upgrade to JavaMail 1.5.5
Closes gh-4844
9 years ago
Stephane Nicoll d51d84303f Merge pull request #4867 from kazuki43zoo/fix-invalid-port-in-doc
* pr/4867:
  Fix invalid port number in doc
9 years ago
Kazuki Shimizu 908c9562e5 Fix invalid port number in doc
Closes gh-4867
9 years ago
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.
9 years ago
Stephane Nicoll a835912c04 Merge branch '1.2.x' 9 years ago
Stephane Nicoll b94c7c6a1d Guard instantiation of Tomcat's ErrorPage
Closes gh-4839
9 years ago
Stephane Nicoll b1c2226e23 Merge branch '1.2.x'
# Conflicts:
#	spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/WebSocketAutoConfiguration.java
9 years ago
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
9 years ago
Stephane Nicoll a87a1f053f Polish documentation
Clarify that "spring.config.*" properties doesn't work in configuration
files.

Closes gh-4838
9 years ago
Stephane Nicoll a9a3de5a51 Merge pull request #4829 from joshiste/issue-4820
* pr/4829:
  Change redirect in initscript to support old bash
9 years ago
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
9 years ago
Stephane Nicoll cdc91330f2 Merge pull request #4837 from izeye/20151224
* pr/4837:
  Polish test
9 years ago
Johnny Lim c39df05652 Polish test
Closes gh-4837
9 years ago
Stephane Nicoll 3e25d99f4e Add test to validate `log42-spring.xml` location
See gh-4809
9 years ago
Andy Wilkinson c3328721a1 Merge branch '1.2.x' 9 years ago
Andy Wilkinson 835a11b52a Start building against Spring WS 2.2.5 snapshots
See gh-4789
9 years ago
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
9 years ago
Stephane Nicoll ecf56f0708 Fixup version numbers following release 9 years ago
Spring Buildmaster 8db59059a5 Next Development Version 9 years ago
Stephane Nicoll 7caf39400c Merge pull request #4806 from izeye/polish-20151218
* pr/4806:
  Fix typos
9 years ago
Johnny Lim c09a14a128 Fix typos
Closes gh-4806
9 years ago
Andy Wilkinson 01d0127476 Upgrade to Spring Data Gosling SR2A
Closes gh-4786
9 years ago
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
9 years ago
Stephane Nicoll 5abe8121c4 Upgrade to Spring Integration 4.2.4.RELEASE
Closes gh-4792
9 years ago
Phillip Webb f96dea7011 Polish 9 years ago
Stephane Nicoll 35efb251e0 Upgrade to Spring Framework 4.2.4.RELEASE
Closes gh-4644
9 years ago
Stephane Nicoll f208ccc3cd Merge branch '1.2.x' 9 years ago
Stephane Nicoll bb736e255b Fix SNAPSHOT version 9 years ago
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
9 years ago
Andy Wilkinson 408a302f44 Revert "Upgrade to Spring Data Gosling snapshots again"
This reverts commit 00ba7bea36.

See gh-4786
9 years ago
Phillip Webb 506ee897f3 Document how to configure root logging level
Fixes gh-2872
9 years ago
Phillip Webb 5d311d6203 Polish 9 years ago
Phillip Webb ec2064d981 Remove TODO
See gh-4796
9 years ago
Stephane Nicoll eaddb4f0db Merge branch '1.2.x' 9 years ago
Stephane Nicoll b719b0271c Upgrade to Spring Framework 4.1.9.RELEASE
Closes gh-4440
9 years ago
Andy Wilkinson bbe6f232dc Merge branch '1.2.x' 9 years ago
Andy Wilkinson c0c79ab906 Revert "Upgrade to Spring Web Services 2.2.4.RELEASE"
This reverts commit acb3fb5399.

See gh-4789
9 years ago
Phillip Webb ff2addb321 Fix checkstyle 9 years ago
Phillip Webb 91c801d6fe Add how-to log to file without console section
Fixes gh-4388
9 years ago
Phillip Webb 40abd13813 Be defensive about hiding log errors
Ensure that log configuration errors always get reported.
9 years ago
Phillip Webb 528fcf3d0b Refine server.server-header documentation
Fixes gh-4461
9 years ago
Phillip Webb 945b42588b Refine server.server-header documentation
Fixes gh-4461
9 years ago
Phillip Webb 4bdb2d34cc Merge pull request #4784 from kirill-vlasov
* pr/4784:
  Make loggers private static final
9 years ago