Commit Graph

20116 Commits

Author SHA1 Message Date
Stephane Nicoll
48c83b04b3 Merge pull request #16086 from izeye
* pr/16086:
  Rename Maven version property for PooledJMS
2019-03-04 15:12:50 +01:00
Johnny Lim
907058d845 Rename Maven version property for PooledJMS
Closes gh-16086
2019-03-04 15:12:28 +01:00
Stephane Nicoll
2099093978 Merge branch '2.0.x' into 2.1.x 2019-03-04 15:00:00 +01:00
Stephane Nicoll
b8cbd0c17f Merge branch '1.5.x' into 2.0.x 2019-03-04 14:55:10 +01:00
Stephane Nicoll
1e3f764383 Merge pull request #16070 from wonwoo
* pr/16070:
  Polish "Permit use of @JsonTest without Jackson"
  Permit use of @JsonTest without Jackson
2019-03-04 14:54:05 +01:00
Stephane Nicoll
329a6905d8 Polish "Permit use of @JsonTest without Jackson"
Closes gh-16070
2019-03-04 14:48:39 +01:00
fidel
36f7188334 Permit use of @JsonTest without Jackson
See gh-16070
2019-03-04 14:48:12 +01:00
Stephane Nicoll
a569f36a86 Merge pull request #16066 from dreis2211
* pr/16066:
  Polish "Use AssertJ facilities for expected exceptions"
  Use AssertJ facilities for expected exceptions
2019-03-04 09:24:07 +01:00
Stephane Nicoll
235fbfb4b6 Polish "Use AssertJ facilities for expected exceptions"
Closes gh-16066
2019-03-04 08:58:28 +01:00
dreis2211
be445f6346 Use AssertJ facilities for expected exceptions
See gh-16066
2019-03-04 08:45:42 +01:00
Andy Wilkinson
4fec6b9b7e Merge branch '2.0.x' into 2.1.x 2019-03-01 10:33:04 +00:00
Andy Wilkinson
cfbd56cb73 Merge branch '1.5.x' into 2.0.x 2019-03-01 10:21:20 +00:00
Andy Wilkinson
6ffa80870d Add Bomr metadata to prohibit unwanted upgrades
Closes gh-16064
2019-03-01 10:18:27 +00:00
Andy Wilkinson
59a6d695a0 Merge branch '2.0.x' into 2.1.x 2019-02-28 17:10:35 +00:00
Andy Wilkinson
824e44e9cc Merge branch '1.5.x' into 2.0.x 2019-02-28 17:07:00 +00:00
Andy Wilkinson
2326284e29 Add Bomr metadata for bom upgrades and verification
Closes gh-16060
2019-02-28 17:06:06 +00:00
Stephane Nicoll
8c18bc12f7 Merge pull request #16046 from nosan
* pr/16046:
  Polish "Fix NullPointerException with empty X-Forwarded-For header"
  Fix NullPointerException with empty X-Forwarded-For header
2019-02-28 14:58:27 +01:00
Stephane Nicoll
c224eebef3 Polish "Fix NullPointerException with empty X-Forwarded-For header"
Closes gh-16046
2019-02-28 14:56:42 +01:00
Dmytro Nosan
64a74c3bbb Fix NullPointerException with empty X-Forwarded-For header
See gh-16046
2019-02-28 14:51:25 +01:00
Stephane Nicoll
0c1efe3a1a Merge pull request #16027 from rupert654
* pr/16027:
  Polish "Add `jaxb-runtime` to TldSkipPatterns"
  Add `jaxb-runtime` to TldSkipPatterns
2019-02-28 14:44:12 +01:00
Stephane Nicoll
2a6791aa20 Polish "Add jaxb-runtime to TldSkipPatterns"
Closes gh-16027
2019-02-28 14:39:52 +01:00
Rupert Madden-Abbott
946ada62fb Add jaxb-runtime to TldSkipPatterns
See gh-16027
2019-02-28 14:37:45 +01:00
Stephane Nicoll
96cbf539f1 Merge pull request #16054 from XYUU
* pr/16054:
  Fix a colon format
2019-02-28 09:37:21 +01:00
XYUU
7aedb0a33d Fix a colon format
Closes gh-16054
2019-02-28 09:36:22 +01:00
Stephane Nicoll
059337fda6 Merge pull request #15978 from nosan
* pr/15978:
  Polish contribution
  Add an example showing how to use Spring REST Docs with WebTestClient
2019-02-27 16:04:34 +01:00
Stephane Nicoll
ce17a923dd Polish contribution
Closes gh-15978
2019-02-27 16:03:28 +01:00
Dmytro Nosan
cf89ebcf92 Add an example showing how to use Spring REST Docs with WebTestClient
See gh-15978
2019-02-27 16:03:15 +01:00
Stephane Nicoll
38a20f2719 Merge pull request #16047 from clevertension
* pr/16047:
  Polish contribution
  Fix NamedParameterJdbcTemplate precedence with database migration tools
2019-02-27 15:19:13 +01:00
Stephane Nicoll
eebd906c8a Polish contribution
Closes gh-16047
2019-02-27 15:10:43 +01:00
Dan Zheng
2c4afb3bd8 Fix NamedParameterJdbcTemplate precedence with database migration tools
See gh-16047
2019-02-27 15:10:20 +01:00
Stephane Nicoll
2236e959b6 Merge pull request #16018 from nosan
* pr/16018:
  Polish "Debug mode is not logging web and sql related loggers"
  Debug mode is not logging web and sql related loggers
2019-02-27 13:45:13 +01:00
Stephane Nicoll
978f80122b Polish "Debug mode is not logging web and sql related loggers"
Closes gh-16018
2019-02-27 13:37:18 +01:00
Dmytro Nosan
c3430d5883 Debug mode is not logging web and sql related loggers
See gh-16018
2019-02-27 13:25:08 +01:00
Stephane Nicoll
130ef102d8 Merge pull request #16005 from larsgrefer
* pr/16005:
  Polish "Update instructions on how to use JAXB as XML renderer"
  Update instructions on how to use JAXB as XML renderer
2019-02-26 16:58:48 +01:00
Stephane Nicoll
c47edd15af Polish "Update instructions on how to use JAXB as XML renderer"
Closes gh-16005
2019-02-26 16:57:47 +01:00
Lars Grefer
221ff8d69f Update instructions on how to use JAXB as XML renderer
See gh-16005
2019-02-26 16:50:30 +01:00
Andy Wilkinson
53326695ea Polish 2019-02-21 08:13:54 +00:00
Madhura Bhave
f8e5b9ba47 Fix formatting 2019-02-20 18:41:26 -08:00
Madhura Bhave
c3e47541ad EndpointRequest should check that the request is to the mgmt context
Fixes gh-15702
2019-02-20 16:08:26 -08:00
Andy Wilkinson
59430a2642 Only include zips in BOOT-INF/lib, WEB-INF/lib, and WEB-INF/lib-provided
Closes gh-16001
2019-02-20 18:15:27 +00:00
Andy Wilkinson
e922cba5e5 Merge pull request #16004 from Robert Thornton
* gh-16004:
  Polish "Use kotlin_module not kotlin-module to identify Kotlin module metadata"
  Use kotlin_module not kotlin-module to identify Kotlin module metadata

Closes gh-16004
2019-02-20 17:28:13 +00:00
Andy Wilkinson
55fe26b075 Polish "Use kotlin_module not kotlin-module to identify Kotlin module metadata"
See gh-16004
2019-02-20 17:19:03 +00:00
Robert Thornton
cb6362df82 Use kotlin_module not kotlin-module to identify Kotlin module metadata
See gh-16004
2019-02-20 17:19:03 +00:00
Stephane Nicoll
91a005f578 Resolve generic types in generated metadata
Closes gh-15850
2019-02-20 13:24:40 +01:00
Andy Wilkinson
51776af45d Include source of NoSuchMethodError in its failure analysis
Closes gh-15995
2019-02-19 12:34:52 +00:00
Andy Wilkinson
55426208ab Provide type information for optional thread dump endpoint response fields
Closes gh-15989
2019-02-19 09:12:54 +00:00
Stephane Nicoll
0335a28630 Merge pull request #15984 from isank
* pr/15984:
  Polish contribution
  Order TaskExecution auto-config before TaskScheduling auto-config
2019-02-18 21:19:18 +01:00
Stephane Nicoll
42c246cacb Polish contribution
Closes gh-15984
2019-02-18 21:18:51 +01:00
isank
e546ed4834 Order TaskExecution auto-config before TaskScheduling auto-config
See gh-15984
2019-02-18 21:18:09 +01:00
Andy Wilkinson
68e3de0357 Use name from header not alias when checking entry has expected name
Previously, an entry’s potentially aliased name would be used when
checking that it has a particular name. The alias would always be
applied, irrespective of the name in the header. As a result, when
there was a clashing hash and an entry with a particular index did
not have the expected name, this would be concealed by the alias
being applied and the name check being done with the alias.

This commit reworks JarEntry to store the name in its header in
addition to its alias, if any. When checking that the entry has the
expected name, the unaliased name is passed in and the entry compares
it with the name from the header rather than the alias.

Closes gh-15981
2019-02-18 17:29:25 +00:00