Commit Graph

11430 Commits

Author SHA1 Message Date
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
Andy Wilkinson
f553de4486 Upgrade to Infinispan 8.2.10.Final
Closes gh-12498
2018-03-15 12:41:52 +00:00
Andy Wilkinson
394054c7b7 Upgrade to Tomcat 8.5.29
Closes gh-12497
2018-03-15 12:41:52 +00:00
Andy Wilkinson
85096824be Upgrade to Mysql 5.1.46
Closes gh-12496
2018-03-15 12:41:52 +00:00
Stephane Nicoll
81f3f6784b Merge pull request #12422 from igor-suhorukov
* pr/12422:
  Polish
2018-03-12 15:36:47 +01:00
igor-suhorukov
6bdfce5874 Polish
Closes gh-12422
2018-03-12 15:35:08 +01:00
Stephane Nicoll
ff1dd9e3d8 Fix command reference in doc
Closes gh-12434
2018-03-12 09:05:16 +01:00
Andy Wilkinson
44346b0771 Upgrade to Spring Batch 3.0.9.RELEASE
Closes gh-12409
2018-03-08 17:03:09 +00:00
Andy Wilkinson
4fa66da359 Revert "Start building against Dependency Management Plugin 1.0.5 snapshots"
Uses snapshots of the Dependency Management Plugin causes problems as
they are only published to our plugins-snapshot repository which may
not be configured in someone's build.

See gh-12406
2018-03-08 15:51:43 +00:00
Andy Wilkinson
3395d05c21 Start building against Dependency Management Plugin 1.0.5 snapshots
See gh-12406
2018-03-08 15:46:33 +00:00
Stephane Nicoll
f711c96d39 Upgrade maven wrapper to Maven 3.5.3
Closes gh-12402
2018-03-08 15:07:01 +01:00
Andy Wilkinson
51301dfc91 Upgrade to Spring Social 1.1.6.RELEASE
Closes gh-12386
2018-03-07 11:59:43 +00:00
Andy Wilkinson
08fe332a3f Upgrade to Groovy 2.4.14
Closes gh-12385
2018-03-07 11:59:42 +00:00
Andy Wilkinson
8849dbe5df Upgrade to Undertow 1.4.23.Final
Closes gh-12384
2018-03-07 11:59:42 +00:00
Andy Wilkinson
5b48f16494 Upgrade to Appengine Sdk 1.9.63
Closes gh-12383
2018-03-07 11:59:41 +00:00
Andy Wilkinson
101ed76559 Upgrade to Jackson 2.8.11.20180217
Closes gh-11475
2018-03-07 11:56:39 +00:00
Stephane Nicoll
f8c1821c2c Polish
See gh-12365
2018-03-06 17:41:49 +01:00
Stephane Nicoll
66d1f5cd0b Fix expansion of static-locations array
This commit fixes a NPE when the static-locations array of
`ResourceProperties` has to be expanded as the setter is cleaning the
values of the array and is affected by a non-intuitive behaviour of the
binder.

When the binder needs to set an element of an array and the size of the
array isn't large enough, the binder proceeds as follows:

* An array of the required size is created
* The content of the original array is copied over
* The setter of the property is invoked with the new array
* The setter of the property is invoked and the returned array is
mutated to set the requested value

While one would expect the array to contain the requested value when the
setter is invoked, this is not the case. Also, the array might contain
null values if a value at index 8 should be set and the array has a size
of 3.

All in all, `ResourceProperties#appendSlashIfNecessary` has to account
for `null` and an additional round of cleaning has to happen once
binding has completed.

Closes gh-12360
2018-03-06 15:19:59 +01:00
Madhura Bhave
758dca57f1 Clarify documentation for setting the LoggingSystem
Closes gh-12299
2018-03-05 12:45:15 -08:00
Andy Wilkinson
84387046b9 Start building against Spring Framework 4.3.15 snapshots
See gh-12344
2018-03-05 12:42:14 +00:00
Andy Wilkinson
eee891dbc8 Decode file: URLs passed into PropertiesLauncher via loader.path
Closes gh-12325
2018-03-05 11:52:25 +00:00
Stephane Nicoll
4e3d0f5b33 Fix parsing of value with comma
Closes gh-12297
2018-03-01 17:26:20 +01:00
Madhura Bhave
c2f7dd86dc Revert default for CRSF enabled to false
Fixes gh-12267
2018-02-28 08:54:43 -08:00
Andy Wilkinson
452492183d Polish
Closes gh-11991
2018-02-28 14:48:11 +00:00
Andy Wilkinson
3cc0055d3b Merge pull request #11991 from Rupert Madden-Abbott
* gh-11991:
  Polish "Fix handling of static resource jars with spaces in their paths"
  Fix handling of static resource jars with spaces in their paths
2018-02-28 10:40:59 +00:00
Andy Wilkinson
88423c504b Polish "Fix handling of static resource jars with spaces in their paths"
Closes gh-11991
2018-02-28 10:40:43 +00:00