root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity
20,407 Commits 23 Branches 348 Tags 288 MiB
Commit Graph

20407 Commits

Author SHA1 Message Date
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
Stephane Nicoll 20c39dc554 Document missing keys mapped on third party types 
Closes gh-15980
 2019-02-18 16:48:51 +01:00
Spring Buildmaster 3370d65ced Next development version (v2.1.4.BUILD-SNAPSHOT) 2019-02-15 11:19:26 +00:00
Stephane Nicoll 5916393b20 Upgrade to Spring Integration 5.1.3 
Closes gh-15866
 2019-02-15 09:38:34 +01:00
Madhura Bhave 012a956454 Fix typo in doc 2019-02-14 19:39:01 -08:00
Andy Wilkinson 33b9321071 Track condition evaluation per-context when determining delta 
Closes gh-15766
 2019-02-14 15:11:18 +00:00
Andy Wilkinson 1be794fe65 Retry upload for any SocketException not just a ConnectException 
Previously, DevTools would retry the upload of the changes to an
application in the event of a ConnectException. If a different
network-level failure occurred, it would not be retried and would
cause the file watching thread to die.

This commit attempts to make things more robust by retrying all
SocketExceptions and not just ConnectExceptions. A warning is
logged when a failure occurs. A separate debug message that
includes the exception is also logged.

Closes gh-10317
 2019-02-14 14:46:52 +00:00
Stephane Nicoll ad82e8d11d Merge pull request #15950 from michael-simons 
* pr/15950:
  Prevent imports on org.testcontainers.shaded.*
  Polish "Stop using imports from shaded dependencies"
  Stop using imports from shaded dependencies
 2019-02-14 15:34:23 +01:00
Stephane Nicoll 10f58b3f7b Prevent imports on org.testcontainers.shaded.* 
See gh-15950
 2019-02-14 15:34:03 +01:00
Stephane Nicoll f3e142cb7c Polish "Stop using imports from shaded dependencies" 
Closes gh-15950
 2019-02-14 15:34:03 +01:00