Commit Graph

20409 Commits

Author SHA1 Message Date
Stephane Nicoll 967eecfbf8 Remove redundant dependency management for dom4j:dom4j
Closes gh-15199
2019-02-19 13:31:09 +01:00
Stephane Nicoll 866aa40d6a Polish 2019-02-19 13:21:35 +01:00
Stephane Nicoll 80f41132ce Exclude `spring-boot-docs` from Artifactory deployment
Closes gh-15809
2019-02-19 13:20:57 +01:00
Stephane Nicoll eee07efee1 Switch Logback's file size properties to DataSize
This commit changes the target type of file size-based properties to
`DataSize` and tolerates Logback's specific format.

Closes gh-15930
2019-02-19 11:16:31 +01:00
Andy Wilkinson e6764bdc5a Merge branch '2.1.x' 2019-02-19 09:39:38 +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 f9a55f72fe Merge pull request #15987 from izeye
* pr/15987:
  Polish
2019-02-19 09:15:41 +01:00
Johnny Lim 55f5f2f910 Polish
Closes gh-15987
2019-02-19 09:14:40 +01:00
Stephane Nicoll ddfdc48161 Merge branch '2.1.x' 2019-02-18 21:25:25 +01: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
Stephane Nicoll 35fc9297cd Merge pull request #15951 from filiphr
* pr/15951:
  Add support for task scheduling shutdown related properties
  Polish "Add support for task executor shutdown related properties"
  Add support for task executor shutdown related properties
2019-02-18 21:14:05 +01:00
Stephane Nicoll fa49dfcaaf Add support for task scheduling shutdown related properties
See gh-15951
2019-02-18 21:13:32 +01:00
Stephane Nicoll d2cbf08f09 Polish "Add support for task executor shutdown related properties"
Closes gh-15951
2019-02-18 21:13:32 +01:00
Filip Hrisafov 3b47ba21a8 Add support for task executor shutdown related properties
See gh-15951
2019-02-18 21:13:32 +01:00
Andy Wilkinson 9540905e73 Merge branch '2.1.x' 2019-02-18 17:30:02 +00: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 ff6ef1e55d Merge branch '2.1.x' 2019-02-18 16:49:42 +01:00
Stephane Nicoll 20c39dc554 Document missing keys mapped on third party types
Closes gh-15980
2019-02-18 16:48:51 +01:00
Brian Clozel 2a2bfb9915 Auto-generate the "Common application properties"
Prior to this commit, the application properties listed in the reference
documentation would be manually managed and updated.

This commit adds a new `spring-boot-configuration-docs` project that
extracts that information from the available JSON metadata and writes
Asciidoctor tables ready for inclusion in the reference documentation.

The `generateConfigurationPropertyTables.groovy` is using this library
and configures the sections and how namespaces should be organized.

Fixes gh-8237
2019-02-18 15:46:15 +01:00
Andy Wilkinson add8c6f295 Align HypermediaAutoConfigurationTests with latest HATEOAS API changes
See gh-15939
2019-02-18 09:41:11 +00:00
Stephane Nicoll b28c31d6c3 Merge branch '2.1.x' 2019-02-15 14:14:28 +01:00
Spring Buildmaster 3370d65ced Next development version (v2.1.4.BUILD-SNAPSHOT) 2019-02-15 11:19:26 +00:00
Stephane Nicoll 6e8cc49a1e Merge branch '2.1.x' 2019-02-15 09:39:51 +01:00
Stephane Nicoll 5916393b20 Upgrade to Spring Integration 5.1.3
Closes gh-15866
2019-02-15 09:38:34 +01:00
Madhura Bhave 9bc9639954 Merge branch '2.1.x' 2019-02-14 21:54:37 -08:00
Madhura Bhave 012a956454 Fix typo in doc 2019-02-14 19:39:01 -08:00
Andy Wilkinson bd504e68fc Merge branch '2.1.x' 2019-02-14 15:21:30 +00:00
Andy Wilkinson 33b9321071 Track condition evaluation per-context when determining delta
Closes gh-15766
2019-02-14 15:11:18 +00:00
Stephane Nicoll a22ba0f801 Merge pull request #15954 from nosan
* pr/15954:
  Polish "Expose Tomcat AccessLog Max days property"
  Expose Tomcat AccessLog Max days property
2019-02-14 16:01:35 +01:00
Stephane Nicoll 71df2f311b Polish "Expose Tomcat AccessLog Max days property"
Closes gh-15954
2019-02-14 16:01:21 +01:00
Dmytro Nosan 596f0c28c0 Expose Tomcat AccessLog Max days property
See gh-15954
2019-02-14 16:01:21 +01:00
Andy Wilkinson be40d000ba Merge branch '2.1.x' 2019-02-14 14:46:59 +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 8939a7eec3 Merge branch '2.1.x' 2019-02-14 15:35:18 +01: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
Michael Simons de7812aa3a Stop using imports from shaded dependencies
See gh-15950
2019-02-14 15:34:03 +01:00
Andy Wilkinson 8bcc0caa06 Merge branch '2.1.x' 2019-02-14 14:25:55 +00:00
Andy Wilkinson 90f059cf3a Upgrade to Spring Session Bean-SR3
Closes gh-15868
2019-02-14 14:25:51 +00:00
Stephane Nicoll c1cccc886a Merge branch '2.1.x' 2019-02-14 15:22:35 +01:00
Stephane Nicoll f87b58f5f2 Merge pull request #15943 from sdeleuze
* pr/15943:
  Polish "Add a link to SpringMockK in the Kotlin documentation"
  Add a link to SpringMockK in the Kotlin documentation
2019-02-14 15:22:15 +01:00
Stephane Nicoll cd322d7b9c Polish "Add a link to SpringMockK in the Kotlin documentation"
Closes gh-15943
2019-02-14 15:22:02 +01:00
Sebastien Deleuze da6de215a6 Add a link to SpringMockK in the Kotlin documentation
See gh-15943
2019-02-14 15:21:12 +01:00
Andy Wilkinson 3a4a431eaa Provide a configuration option to enable lazy initialization
Closes gh-15870
2019-02-14 12:41:49 +00:00
Andy Wilkinson 6519e85b5a Merge branch '2.1.x' 2019-02-14 08:23:38 +00:00
Andy Wilkinson 027f9182a8 Generate Javadoc with same source level as used for compilation
This works around a change in javadoc generation in JDK 11.0.2. See
https://bugs.openjdk.java.net/browse/JDK-8212233 for details.
2019-02-14 08:23:20 +00:00
Madhura Bhave a838aac17d Merge branch '2.1.x' 2019-02-13 18:50:04 -08:00