Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.

...

Checking mergeability… Don’t worry, you can still create the pull request.

1 commit
55 files changed
13 contributors

Commits on Jan 23, 2020

pulling latest master (#1 )

* Create a FormParameter model object instead of BodyParameter for fields that are part of a multipart form (in=formData).

* Adapted behavior of ParameterMapper and added tests.

* Fix contract tests.

* Reduce diff from master contract files.

* Bump mixin-deep from 1.3.1 to 1.3.2 in /springfox-swagger-ui/src/web

Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](jonschlinkert/mixin-deep@1.3.1...1.3.2)

Signed-off-by: dependabot[bot] <[email protected]>

* [fix issue 3118] discriminator not set to discriminator from model

* fix discriminator usage in test templates

* #182

Fix sort ordering.

* #182

Fix checkstyle.

* #182

Fix resource listing.

* #182

Fix Webflux tests.

* Bump swagger-ui depdency

Security fix detailed in swagger-ui's release notes.
https://github.com/swagger-api/swagger-ui/releases/tag/v3.23.11

* Set the basePath using the request context path if present

This allows the X-Forwarded-Prefix header to work correctly

* Updated spring dependencies to spring 5.2.0 and spring boot 2.2.0, fixed changed interfaces

* Added documentationType in DocPluginManager tests

* Fixed typo (#3161)

* #2932 - Removed trailing space

* #2932 - Spring HATEOAS 1.0.0.RELEASE

* #2932 - Spring Data REST 3.2.0.RELEASE

* #2932 - fix hateos collectionModel rule

* Fixed checkstyle issues in ParameterMapper.java

Signed-off-by: Martin Kremers <[email protected]>

* More test cases for parameter Mapper spec

Signed-off-by: Martin Kremers <[email protected]>

* fix for issue #3178

replace  new FileInputStream(resource.getFile()) with #3178

* reéoved unused import

* added test for coverage

* #3189 - handle defaults in Spring placeholders

* #3189 - return default value if property not found in environment

* #2932: Fixed import for model test.

* #2932: Minor version upgrades of spring dependencies. Aligned contract tests with Spring HATEOAS 1.x. Fixed wrong client encoding used in tests.

* jackson 2.10.1

* Bump handlebars from 4.1.2 to 4.5.3 in /springfox-swagger-ui/src/web

Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.2 to 4.5.3.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](handlebars-lang/handlebars.js@v4.1.2...v4.5.3)

Signed-off-by: dependabot[bot] <[email protected]>

* Update test to pass when running on Windows.

* Upgrade to version of swagger which fixes css injection vulnerability as defined in https://github.com/tarantula-team/CSS-injection-in-Swagger-UI

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Bissell <[email protected]>
Co-authored-by: Maksim Orlov <[email protected]>
Co-authored-by: Steven Locke <[email protected]>
Co-authored-by: Jerry Collings <[email protected]>
Co-authored-by: JoGir <[email protected]>
Co-authored-by: Andree Wormuth <[email protected]>
Co-authored-by: Martin Kremers <[email protected]>
Co-authored-by: Olivier Gérardin <[email protected]>
Co-authored-by: Andreas Kluth <[email protected]>
Co-authored-by: sullis <[email protected]>
Co-authored-by: Dilip Krishnan <[email protected]>

13 people authored Jan 23, 2020