Commit Graph

20786 Commits

Author SHA1 Message Date
Andy Wilkinson
82fd4ce9b9 Fix empty context path warning when using Jetty with WebFlux
Previously, the context path was set to an empty string. The led to
Jetty logging a warning about an empty context path and then using
/ instead.

This commit avoids the warning while leaving the context path's end
result unchanged by setting the context path to /.

Closes gh-17399
2019-07-02 17:24:34 +01:00
Andy Wilkinson
e57579461a Prevent endpoint's shutdown() method from being a destroy method
Closes gh-17407
2019-07-02 14:05:49 +01:00
Andy Wilkinson
5997886897 Add dependency management for Infinispan's Spring 5 modules
This commit adds dependency management for Infinispan's Spring 5
modules that are introduced in 9.4.9.Final. It also removes redundant
exclusions for the dependency management for its Spring 4 modules.

Closes gh-17346
2019-07-02 11:41:33 +01:00
Phillip Webb
206ba2ad86 Append chars not ints in getLettersAndDigits
Update `StringToEnumIgnoringCaseConverterFactory` so that the
`getLettersAndDigits` method correctly appends `char` elements
rather than `int` elements.

Closes gh-17327
2019-07-01 21:49:29 -07:00
Phillip Webb
88b6a3308c Escape additional '{reference}' elements in asciidoc
Escape lines that look like variable references but should actually be
included verbatim.

Closes gh-17386
2019-07-01 11:39:49 -07:00
Phillip Webb
a81f37dd68 Escape '{reference}' elements in asciidoc files
Escape lines that look like variable references but should actually be
included verbatim.

Closes gh-17386
2019-07-01 11:02:05 -07:00
Andy Wilkinson
34e0db2c25 Merge branch '2.0.x' into 2.1.x
Closes gh-17382
2019-07-01 15:57:21 +01:00
Andy Wilkinson
0c44584b44 Merge branch '1.5.x' into 2.0.x 2019-07-01 15:57:00 +01:00
Andy Wilkinson
b7884b50f6 Merge pull request #16894 from gavvvr
* gh-16894:
  Fix persistent session property name in reference docs

Closes gh-16894
2019-07-01 15:54:43 +01:00
Kirill Gavrilov
c1bf04c66f Fix persistent session property name in reference docs
See gh-16894
2019-07-01 15:54:13 +01:00
Andy Wilkinson
4083c721f2 Fix URL normalization when replacing /./ with /
Previously, a regular expression of /./ was used to replace /./ with
/.  The '.'' in the expression matches any single character so the
replacement was more broadly applicable than it should have been. For
example, /a/ would be replaced with /.

This commit uses Pattern.LITERAL to compile the regular expression
from the CURRENT_DIR (/./) contant. This allows the constant to be
used to check for occurances of /./ in the string before attempting
replacement, while also ensuring that the '.' is treated literally.

Closes gh-17341
2019-07-01 15:42:54 +01:00
Andy Wilkinson
3bbe723718 Merge branch '2.0.x' into 2.1.x
Closes gh-17378
2019-07-01 14:09:10 +01:00
Andy Wilkinson
1823f38203 Merge branch '1.5.x' into 2.0.x 2019-07-01 14:08:49 +01:00
Andy Wilkinson
bf271e415a Align print margin column with Java Format's line wrapping
Closes gh-17377
2019-07-01 14:08:14 +01:00
Andy Wilkinson
c982289431 Merge pull request #17289 from nosan
* gh-17289:
  Polish WebServiceTemplateBuilder

Closes gh-17289
2019-06-29 22:21:54 +01:00
Dmytro Nosan
ae184874e9 Polish WebServiceTemplateBuilder
See gh-17289
2019-06-29 22:19:03 +01:00
Andy Wilkinson
65b95f0d7b Merge pull request #17342 from izeye
* gh-17342:
  Fix typo in bomr.yaml

Closes gh-17342
2019-06-29 21:52:05 +01:00
Johnny Lim
4e1cc943f9 Fix typo in bomr.yaml
See gh-17342
2019-06-29 21:51:53 +01:00
Andy Wilkinson
8b4b6a32fa Merge pull request #17358 from izeye
* gh-17358:
  Remove System.out.println() in a test

Closes gh-17358
2019-06-29 21:19:02 +01:00
Johnny Lim
408035fb3f Remove System.out.println() in a test
See gh-17358
2019-06-29 21:18:44 +01:00
Andy Wilkinson
5030364db7 Merge pull request #17357 from izeye
* gh-17357:
  Add a missing quote in DebugLogbackConfigurator

Closes gh-17357
2019-06-29 21:15:00 +01:00
Johnny Lim
8dea74a2e9 Add a missing quote in DebugLogbackConfigurator
See gh-17357
2019-06-29 21:14:42 +01:00
Andy Wilkinson
f4e7b80651 Merge branch '2.0.x' into 2.1.x
See gh-17361
2019-06-29 20:38:18 +01:00
Andy Wilkinson
761856ac70 Merge branch '1.5.x' into 2.0.x 2019-06-29 20:29:16 +01:00
Andy Wilkinson
f9bd472192 Polish upgrade to spring-javaformat 0.0.15
See gh-17359
2019-06-29 20:27:47 +01:00
Phillip Webb
92bff3c328 Merge branch '2.0.x' into 2.1.x 2019-06-28 23:42:28 -07:00
Phillip Webb
cfeb0239b7 Merge branch '1.5.x' into 2.0.x 2019-06-28 23:28:34 -07:00
Phillip Webb
d91f27e11f Fix Javadoc @Since checkstle violations
Apply consistent `@Since` tags and retrofit the existing code using a
best guess from the git history.

Closes gh-17360
2019-06-28 22:41:15 -07:00
Phillip Webb
6425fb6ec8 Merge branch '2.0.x' into 2.1.x
Closes gh-17361
2019-06-28 21:34:35 -07:00
Phillip Webb
4f079803d2 Merge branch '1.5.x' into 2.0.x
Closes gh-17359
2019-06-28 21:29:20 -07:00
Phillip Webb
dc5c5702f8 Enforce stricter javadoc @Since rules
See gh-17360
2019-06-28 21:16:27 -07:00
Phillip Webb
9433ad2222 Ignore SpringMethodVisibility check
Ignore the new `SpringMethodVisibility` on released versions since
the required changes can introduce subtle bugs.

See gh-17359
2019-06-28 21:15:01 -07:00
Phillip Webb
b0fffbe42e Upgrade to spring-javaformat 0.0.15
Closes gh-17359
2019-06-28 21:14:00 -07:00
Phillip Webb
9aa4887376 Merge branch '2.0.x' into 2.1.x 2019-06-28 14:14:52 -07:00
Phillip Webb
ed3e1e076d Fix AbstractFilterRegistrationBean merge error
Merging 1.5.x accidentally broke `AbstractFilterRegistrationBean`
2019-06-28 14:13:59 -07:00
Phillip Webb
de35efd1ef Merge branch '2.0.x' into 2.1.x 2019-06-28 12:21:57 -07:00
Phillip Webb
bb34846630 Merge branch '1.5.x' into 2.0.x 2019-06-28 12:19:46 -07:00
Phillip Webb
6d01bc915b Make intermediate classes of public classes public
Backport gh-12590 to 1.5.x and also pick up a few classes that were
missed. This commit also makes a few properties bound classes public.

Closes gh-17337
2019-06-28 12:18:07 -07:00
Andy Wilkinson
91786bc712 Merge branch '2.0.x' into 2.1.x
Closes gh-17334
2019-06-27 11:39:17 +01:00
Andy Wilkinson
256a0d636d Merge branch '1.5.x' into 2.0.x 2019-06-27 11:39:02 +01:00
Andy Wilkinson
1ee8c53b90 Upgrade to spring-javaformat 0.0.14
Closes gh-17331
2019-06-27 11:10:13 +01:00
Andy Wilkinson
096951d531 Merge branch '2.0.x' into 2.1.x
Closes gh-17305
2019-06-27 10:41:37 +01:00
Andy Wilkinson
57bc03ac57 Merge branch '1.5.x' into 2.0.x 2019-06-27 10:22:02 +01:00
Madhura Bhave
74912ee126 Remove setting.xml from .gitignore
Closes gh-17309
2019-06-26 11:50:51 -07:00
Andy Wilkinson
3fb06ee29e Merge branch '2.0.x' into 2.1.x
Closes gh-17320
2019-06-26 17:39:13 +01:00
Andy Wilkinson
4973a2b217 Merge branch '1.5.x' into 2.0.x 2019-06-26 17:37:39 +01:00
Andy Wilkinson
72f7985219 Drop back to Eclipse 2019-03 to avoid m2e regression
Closes gh-15200
2019-06-26 17:31:00 +01:00
Andy Wilkinson
0cfcfb104e Link to Apache Licence in Maven Plugin docs rather than inlining it
Closes gh-17317
2019-06-26 17:31:00 +01:00
Madhura Bhave
26b61e6f8d Fix deprecation warnings in pipeline.yml
Closes gh-17310
2019-06-25 17:48:57 -07:00
Phillip Webb
02e705c8e4 Relax nohttp requirement for service.wsdl
Unfortunately https references cause eclipse errors so we need to
relax the requirement for this file.

Fixes gh-17307
2019-06-25 11:17:27 -07:00