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

17176 Commits

Author SHA1 Message Date
Andy Wilkinson 29e38f4af8 Merge branch '1.5.x' into 2.0.x 2018-08-13 11:35:46 +01:00
Andy Wilkinson 384cfd2ad8 Preserve ref and query when creating URL in loader's handler 
Closes gh-14011
 2018-08-13 11:30:15 +01:00
Stephane Nicoll f4b0101632 Merge branch '1.5.x' into 2.0.x 2018-08-13 13:10:05 +03:00
Stephane Nicoll 3a2c962215 Merge pull request #14046 from frohwerk:master 
* pr/14046:
  Fix freemarker documentation link
 2018-08-13 13:04:18 +03:00
frohwerk a9f4dbd160 Fix freemarker documentation link 
Closes gh-14046
 2018-08-13 13:03:46 +03:00
Andy Wilkinson 263e157ef0 Merge branch '1.5.x' into 2.0.x 2018-08-10 12:50:15 +01:00
Andy Wilkinson 37bd286985 Perform failure analysis of NoSuchMethodErrors 
Closes gh-14040
 2018-08-10 12:35:08 +01:00
Andy Wilkinson 718372edb2 Merge pull request #14019 from ayudovin 
* gh-14019:
  Polish "Fix NPE in FlywayEndpoint when migration.installedOn is null"
  Fix NPE in FlywayEndpoint when migration.installedOn is null
 2018-08-09 11:11:45 +01:00
Andy Wilkinson 27f5e46587 Polish "Fix NPE in FlywayEndpoint when migration.installedOn is null" 
Closes gh-14019
 2018-08-09 11:10:21 +01:00
artsiom 83fbdc6ea8 Fix NPE in FlywayEndpoint when migration.installedOn is null 
See gh-14019
 2018-08-09 11:10:02 +01:00
Madhura Bhave 26af0ca742 Increase wait timeout for bintray to 20 min 
Closes gh-13947
 2018-08-08 15:05:54 -07:00
Stephane Nicoll a023bd030a Add configurable timeout for Couchbase health indicator 
This commit makes sure to use a configurable timeout to check if the
Couchbase cluster is up, rather than relying on the default that can be
quite long.

Closes gh-13879
 2018-08-08 16:01:58 +02:00
Stephane Nicoll 21691f0b20 Merge branch '1.5.x' into 2.0.x 2018-08-08 14:46:55 +02:00
Stephane Nicoll 2135f7fda4 Merge pull request #14001 from izeye:gh-13935 
* pr/14001:
  Invoke Inflater.end() in ZipInflaterInputStream.close()
 2018-08-08 14:46:38 +02:00
Johnny Lim af2db82b22 Invoke Inflater.end() in ZipInflaterInputStream.close() 
Closes gh-14001
 2018-08-08 14:45:59 +02:00
Stephane Nicoll fbf3c48bf8 Fix setter detection in `configprops` endpoint 
Previously, the setter of a property whose second letter is upper-case (
such as `oAuth2Uri`) was not detected properly. The JavaBean spec states
that, in such a case, the first letter should not be capitalized (i.e.
the setter should be `setoAuth2Uri` rather than `setOAuth2Uri`).

This commit makes sure that Jackson uses standard bean names and fixes
the setter detection algorithm to take this case into account.

Closes gh-13878
 2018-08-08 11:13:03 +02:00
Stephane Nicoll 9e4ccbd1e6 Merge pull request #14015 from dreis2211:polish-onwebapplicationcondition 
* pr/14015:
  Polish OnWebApplicationCondition
 2018-08-08 09:52:17 +02:00
dreis2211 72707b9d58 Polish OnWebApplicationCondition 
Closes gh-14015
 2018-08-08 09:51:51 +02:00
Stephane Nicoll 481bc94cbf Merge pull request #14013 from dreis2211:fix-typo-4 
* pr/14013:
  Fix typo
 2018-08-08 09:35:27 +02:00
dreis2211 47ed48625c Fix typo 
Closes gh-14013
 2018-08-08 09:34:46 +02:00
Stephane Nicoll e68dc2d3c4 Prune 3rd party starters that are not compatible with Spring Boot 2 
Those can be re-added at any time there is Spring Boot 2 support

Closes gh-13510
 2018-08-07 17:31:03 +02:00
Stephane Nicoll f731f6aa39 Restore customization of HTTP trace request headers 
This commit restore the use of the `postProcessRequestHeaders` method
when overridden in a custom HttpExchangeTracer implementation.

Closes gh-13924
 2018-08-06 18:35:12 +02:00
Stephane Nicoll 737b4a275b Polish 2018-08-03 18:24:59 +02:00
Stephane Nicoll 0f095abded Polish 2018-08-03 13:47:23 +02:00
Stephane Nicoll 20ea16fe9f Merge branch '1.5.x' into 2.0.x 2018-08-03 09:37:01 +02:00
Stephane Nicoll b6dddcced8 Include @ in javadoc links for annotations 
See gh-13988
 2018-08-03 09:35:30 +02:00
Stephane Nicoll 37be894844 Merge pull request #13991 from izeye:convert-sla 
* pr/13991:
  Return null immediately when sla is null in convertSla()
 2018-08-03 09:24:19 +02:00
Johnny Lim 7b6b91aae7 Return null immediately when sla is null in convertSla() 
Closes gh-13991
 2018-08-03 09:23:22 +02:00
Madhura Bhave 16aff4cd2c Refactor PropertySourcesDeducer 
Prior to the changes that fixed #12451,
`FilteredPropertySources` and `CompositePropertySources` were required
by the `PropertySourcesDeducer` to ensure that configuration properties binding
could see changes to the environment even when there was a
PropertySourcesPlaceholderConfigurer in the context. #12451 changed the way
property sources are adapted by `SpringConfigurationPropertySources`, removing the
need for `FilteredPropertySources` and `CompositePropertySources`.

Fixes gh-13738
 2018-08-02 15:00:01 -07:00
Madhura Bhave 7e2494ebdd Set environment active profiles according to processing order 
Fixes gh-13965
 2018-08-02 11:01:22 -07:00
Stephane Nicoll e4442f4b14 Merge branch '1.5.x' into 2.0.x 2018-08-02 19:17:18 +02:00
Stephane Nicoll b97c188aa3 Merge pull request #13985 from rajadilipkolli:patch-1 
* pr/13985:
  Upgrade maven wrapper to Maven 3.5.4
 2018-08-02 19:17:00 +02:00
Raja Kolli e4dd7ac959 Upgrade maven wrapper to Maven 3.5.4 
Closes gh-13985
 2018-08-02 19:15:39 +02:00
Stephane Nicoll 2074346447 Merge pull request #13982 from cmakinen:cloudwatch-depManagement 
* pr/13982:
  Add dependency management for micrometer-registry-cloudwatch
 2018-08-02 16:19:55 +02:00
cmakinen 07d96689c6 Add dependency management for micrometer-registry-cloudwatch 
Closes gh-13982
 2018-08-02 16:19:15 +02:00
Stephane Nicoll 1f4124b695 Merge pull request #13963 from izeye:polish-20180801 
* pr/13963:
  Polish
 2018-08-01 11:05:28 +02:00
Johnny Lim 94468e5865 Polish 
See gh-13963
 2018-08-01 11:04:59 +02:00
Stephane Nicoll 4e45f36bd1 Clean basePath if necessary 
This commit makes sure that ServletEndpointRegistrar does not add a
duplicate `/` if the basePath is suffixed with it already

Close gh-13964
 2018-08-01 10:58:40 +02:00
Stephane Nicoll 9de3d33e65 Merge pull request #13961 from dreis2211:optimize-stringbuilder-appends 
* pr/13961:
  Optimize some StringBuilder.append() calls
 2018-08-01 08:45:09 +02:00
dreis2211 66b1742f96 Optimize some StringBuilder.append() calls 
Closes gh-13961
 2018-08-01 08:41:03 +02:00
Stephane Nicoll d31f68380a Deprecate PooledConnectionFactory properties 
This commit deprecated the properties of `PooledConnectionFactory` that
are no longer supported by an alternative that is a JMS 2 compliant.

This commit also adds a note to warn users that this pool implementation
is not JMS 2 compliant.

Closes gh-13956
 2018-07-31 16:17:43 +02:00
Stephane Nicoll be2c7bf6ea Merge pull request #13933 from mhewedy:patch-1 
* pr/13933:
  Add classpath prefix to the flyway location
 2018-07-31 14:29:40 +02:00
Muhammad Hewedy 2f69785c6a Add classpath prefix to the flyway location 
Closes gh-13933
 2018-07-31 14:28:59 +02:00
Stephane Nicoll 2c4e451fde Merge pull request #13952 from izeye:remove-print-stack-trace 
* pr/13952:
  Remove ex.printStackTrace() in tests
 2018-07-31 08:17:36 +02:00
Johnny Lim d4fba783fb Remove ex.printStackTrace() in tests 
Closes gh-13952
 2018-07-31 08:16:40 +02:00
Stephane Nicoll 3d85873a8a Merge branch '1.5.x' into 2.0.x 2018-07-30 19:41:09 +02:00
Stephane Nicoll e51c26efdc Fixup version numbers following release 2018-07-30 19:40:55 +02:00
Spring Buildmaster b4afcd652c Next development version (v2.0.5.BUILD-SNAPSHOT) 2018-07-30 15:09:18 +00:00
Spring Buildmaster 73bf744cb0 Next Development Version 2018-07-30 13:37:38 +00:00
Andy Wilkinson 06b4007ce4 Avoid installing unwanted ConsoleHandler when cleaning up 
Closes gh-13470
 2018-07-30 13:00:34 +01:00