Commit Graph

11355 Commits

Author SHA1 Message Date
Stephane Nicoll ba5ed5b97c Upgrade to Spring Framework 4.3.16
Closes gh-12806
2018-04-09 19:43:31 +02:00
Andy Wilkinson cd0e4fe945 Sanitize sun.java.command by default
Closes gh-12796
2018-04-09 17:44:51 +01:00
Andy Wilkinson a06de4d997 Stop error page filter from commiting response prematurely
Previously, the error page filter used sendError to set the response
status when handling an exception and before forwarding the request
to the error controller. Following the fix for gh-11814, this meant
that the error controller was unable to write its response and the
containers default error page was returned instead.

This commit updates the error page filter to use setStatus rather than
sendError. This ensures that the response has the correct status code
while allowing the error controller to write its body. Tests have
been added to the Tomcat deployment test suite to verify that the
error page filter behaves as intended when dealing with a sent error
and an exception for requests accepting HTML, JSON, or anything.

Closes gh-12787
2018-04-09 16:14:27 +01:00
Stephane Nicoll 3634a1d9d1 Fixup version numbers following release 2018-04-05 11:23:15 +02:00
Spring Buildmaster ade4760842 Next Development Version 2018-04-05 09:01:52 +00:00
Andy Wilkinson 61ab4f6ca8 Upgrade to Spring Kafka 1.1.8.RELEASE
Closes gh-12772
2018-04-05 07:42:19 +01:00
Andy Wilkinson 88a18a635a Upgrade to Spring Amqp 1.7.7.RELEASE
Closes gh-12771
2018-04-05 07:42:18 +01:00
Andy Wilkinson 89638d6807 Upgrade to Freemarker 2.3.28
Closes gh-12770
2018-04-05 07:42:17 +01:00
Andy Wilkinson e066558601 Upgrade to Dependency Management Plugin 1.0.5.RELEASE
Closes gh-12406
2018-04-05 07:10:38 +01:00
Phillip Webb 6b59814cbc Switch error views to use SimpleEvaluationContext
Update `ErrorMvcAutoConfiguration` to use `SimpleEvaluationContext`
rather than `StandardEvaluationContext`.

Fixes gh-12507
2018-04-04 15:34:02 -07:00
Phillip Webb 624a5f8260 Apply URL decoding for nested jar entry names
Update `JarURLConnection` to apply URL decoding to nested jar entry
names.

Fixes gh-12765
2018-04-04 14:49:06 -07:00
Phillip Webb f08c496858 Upgrade to Spring Integration 4.3.15
Closes gh-12692
2018-04-04 12:33:45 -07:00
Phillip Webb 3563baf36b Update to Spring Data Ingalls SR11
Closes gh-12695
2018-04-04 12:33:04 -07:00
Phillip Webb dd0866000f Revert "Add text/plain error response support"
This reverts commit 23892e33d6.
2018-04-04 12:06:13 -07:00
Phillip Webb 7242ddae3c Polish 2018-04-04 12:05:08 -07:00
Andy Wilkinson c4923d6273 Ignore existing output when asserting captured log output
Closes gh-12734
2018-04-04 14:14:45 +01:00
Andy Wilkinson ac88a60071 Ensure error is sent before Writer or OutputStream is used
Previously, ErrorPageFilter's ErrorResponseWrapper would delaying
sending an error back to the client. In cases where the response's
Writer or OutputStream was accessed and flushed or closed, this could
lead to the wrong response status being sent.

This commit updates ErrorResponseWrapper so that it will send any
capture error to the client before returning the response's Writer or
OutputStream. This ensures that closing the Writer or OutputStream
does not cause the response to be committed with the default response
status rather than the previously captured error status.

Such responses will now include the correct status, but will not be
forwarded to the error controller. Such forwarding is not possible
due to the response already having been committed.

Closes gh-11814
2018-04-04 13:49:08 +01:00
Stephane Nicoll 1805cc5696 Clarify optional use of ComponentScan
Closes gh-12739
2018-04-04 11:16:11 +02:00
Stephane Nicoll 249af7d5aa Upgrade to Spring Framework 4.3.15
Closes gh-12344
2018-04-03 22:58:13 +02:00
Andy Wilkinson 288e71b6c1 Upgrade to GemFire 8.2.9
Closes gh-12748
2018-04-03 17:37:01 +01:00
Andy Wilkinson dee8750aff Stop Jetty in Jetty8JettyEmbeddedServletContainerFactoryTests
Closes gh-12734
2018-04-03 15:53:00 +01:00
Andy Wilkinson edc00eef24 Ensure that Tomcat is completely stopped when its initialization fails
Closes gh-12736
2018-04-03 15:53:00 +01:00
Andy Wilkinson 30de75c75c Ensure that Jetty is completely stopped when it fails to start
Closes gh-12735
2018-04-03 15:53:00 +01:00
Andy Wilkinson 399455f65a Merge pull request #12715 from Wenwei Liao
* gh-12715:
  Polish "Use modifiable set for @ServletComponentScan with no packages"
  Use modifiable set for @ServletComponentScan with no packages
2018-04-03 10:50:36 +01:00
Andy Wilkinson 6078fdaed8 Polish "Use modifiable set for @ServletComponentScan with no packages"
Closes gh-12715
2018-04-03 10:47:28 +01:00
Wenwei Liao 7bec780281 Use modifiable set for @ServletComponentScan with no packages
Previously, when a project contained multiple `@ServletComponentScan`
annotated classes in classpath, and at least one annotation don't
explicitly specify `basePackages` and `basePackageClass` attribute,
the application could fail to start with an
UnsupportedOperationException. The failure occurred due to the
creating of an unmodifiable set when no base packages are configured
and a subsequent attempt to add base packages to that sit.

This commit fixes the issue by removing the use of an unmodifiable set
when `@ServletComponentScan` with no base packages in processed before
any other `@ServletComponentScan` annotations.

See gh-12715
2018-04-03 10:47:18 +01:00
Andy Wilkinson 2fd177f923 Upgrade to Spring Security 4.2.5.RELEASE
Closes gh-12731
2018-04-03 09:06:36 +01:00
Andy Wilkinson 3b2ecd7884 Upgrade to Groovy 2.4.15
Closes gh-12730
2018-04-03 09:06:36 +01:00
Phillip Webb a20df82067 Polish 2018-04-02 09:51:42 -07:00
Phillip Webb ecfc8d73f1 Be defensive when clearing caches for restart
Update `Restarter` to be much more defensive when attempting to clear
caches. We now use `clearCache()` methods whenever possible, and only
fall back to field access when absolutely necessary. In addition field
access now ignore any exceptions.

Fixes gh-12719
2018-04-02 09:43:03 -07:00
Andy Wilkinson 4e0afaf4c2 Start building against Spring Data Ingalls SR11 snapshots
See gh-12695
2018-03-30 08:36:21 +01:00
Andy Wilkinson 87da2e70d9 Start building against Spring Integration 4.3.15 snapshots
See gh-12692
2018-03-30 08:28:11 +01:00
Andy Wilkinson cb44a219b2 Provide additional dependency management for Infinispan
Closes gh-12526
2018-03-29 11:59:53 +01:00
Stephane Nicoll 610ffed938 Merge pull request #12629 from oflebbe:1.5.x
* pr/12629:
  Polish "Use secure connection to repositories"
  Use secure connection to repositories
2018-03-27 18:40:09 +02:00
Stephane Nicoll ade6d86b65 Polish "Use secure connection to repositories"
Closes gh-12629
2018-03-27 18:02:52 +02:00
Olaf Flebbe 7a5ae32c46 Use secure connection to repositories
See gh-12629
2018-03-27 17:49:14 +02:00
Stephane Nicoll 4d4b91a51e Clarify use of persistence.xml in doc
Closes gh-12636
2018-03-27 16:12:06 +02:00
Stephane Nicoll 345b2c5def Merge pull request #12535 from dreis2211:intellij-modified-classpath-runner
* pr/12535:
  Fix ModifiedClassPathRunner tests if run via IDEA
2018-03-27 15:44:38 +02:00
dreis2211 efc9dcc22b Fix ModifiedClassPathRunner tests if run via IDEA
IntelliJ can shorten the classpath to a single classpath.jar in order to
circumvent errors originating from a too long classpath. This breaks the
filtering inside ModifiedClassPathRunner as the classpath contains only a
single jar to match against. This can be fixed by applying a similar
mechanism already provided for Surefire manifest-only booter JARs, which
extracts the real classpath from the JAR's Manifest file.

See gh-12535
2018-03-27 15:41:20 +02:00
Andy Wilkinson 625c4e61dc Upgrade to Jetty 9.4.9.v20180320
Closes gh-12614
2018-03-23 20:28:12 -04:00
Andy Wilkinson 6ed02761f1 Upgrade to H2 1.4.197
Closes gh-12613
2018-03-23 20:28:12 -04:00
Andy Wilkinson 0c0245014c Recommend using compileOnly rather than the propdeps plugin
Closes gh-12573
2018-03-23 17:11:42 -04:00
Andy Wilkinson 1145eec2b2 Merge pull request #12554 from Johnny Lim
* gh-12554:
  Polish "Use this.out in SummaryProgressReporter.finished()"
  Use this.out in SummaryProgressReporter.finished()
2018-03-23 17:04:23 -04:00
Andy Wilkinson 143ec20296 Polish "Use this.out in SummaryProgressReporter.finished()"
See gh-12554
2018-03-23 17:04:06 -04:00
Johnny Lim 5467005513 Use this.out in SummaryProgressReporter.finished()
Closes gh-12554
2018-03-23 17:02:46 -04:00
Phillip Webb a8f366a554 Fix copyright header for edited files 2018-03-16 15:07:23 -07:00
Phillip Webb 23892e33d6 Add text/plain error response support
Refine `BasicErrorController` mappings so that only JSON and XML get
structured responses. A simple string response is returned for all
other media types.

Fixes gh-12513
2018-03-16 14:30:42 -07:00
Phillip Webb e975dbe3f0 Only use jar shortcut for matching URLs
Update JAR `Handler` logic so that the existing `jarFile` is only used
if the requested URL starts with the same path. Prior to this commit it
was possible to construct a URL with another URL as context. This could
mean that the `handler` was shared and the already resolved `jarFile`
contained in the handler wasn't necessarily suitable.

Fixes gh-12483
2018-03-16 11:56:34 -07:00
Phillip Webb e40acf2447 Polish 2018-03-15 19:38:55 -07:00
Andy Wilkinson cfcc387593 Add dependency management for Spring AMQP's testing modules
Closes gh-12393
2018-03-15 12:51:02 +00:00