Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

updated versions for release#3388

Merged
fehguy merged 8 commits intomasterswagger-api/swagger-codegen:masterfrom
release-prepareswagger-api/swagger-codegen:release-prepareCopy head branch name to clipboard
Jul 17, 2016
Merged

updated versions for release#3388
fehguy merged 8 commits intomasterswagger-api/swagger-codegen:masterfrom
release-prepareswagger-api/swagger-codegen:release-prepareCopy head branch name to clipboard

Conversation

@fehguy
Copy link
Contributor

@fehguy fehguy commented Jul 15, 2016

No description provided.

@cbornet
Copy link
Contributor

cbornet commented Jul 15, 2016

See #3004 for the parser upgrade

@fehguy
Copy link
Contributor Author

fehguy commented Jul 15, 2016

@cbornet that is a huge PR. I can try merging into this branch

@fehguy
Copy link
Contributor Author

fehguy commented Jul 15, 2016

@cbornet as @wing328 has tagged this to 2.3.0, I suggest we hold off. Objections?

@fehguy fehguy force-pushed the release-prepare branch from e6f6549 to d9aa1dd Compare July 15, 2016 21:39
@cbornet
Copy link
Contributor

cbornet commented Jul 15, 2016

No problem.
Then just pick fc51611 to solve the CI issue.

@cbornet
Copy link
Contributor

cbornet commented Jul 15, 2016

On the other hand, I think that upgrading the parser without merging my PR can lead to surprises as allOf will no longer set the parent and this is an issue when you have a discriminator (see Dog/Cat/Animal). So maybe wait my PR to upgrade the parser.

@fehguy
Copy link
Contributor Author

fehguy commented Jul 16, 2016

@wing328 what do you think? I'll update this PR to include the discriminator fixes from #3004 but not merge until we discuss.

@wing328
Copy link
Contributor

wing328 commented Jul 16, 2016

@fehguy yes, as discussed with @cbornet we plan to include #3004 in v2.3.0
(and as @fehguy have pointed out, it's a huge PR and I don't think we should include it in the v2.2.0 release. Personally I didn't have a chance to test #3004, which is not to say the PR is not ready)

@fehguy
Copy link
Contributor Author

fehguy commented Jul 16, 2016

OK I will have to adjust the PR then.

@fehguy fehguy force-pushed the release-prepare branch from 3016aa4 to d9aa1dd Compare July 16, 2016 04:04
@wing328
Copy link
Contributor

wing328 commented Jul 16, 2016

UPDATE: I'm drafting the release note, which is 50% done.

@cbornet
Copy link
Contributor

cbornet commented Jul 16, 2016

Maybe just pick 2ce9a11 which sets the interface that has a discriminator as parent. And check that the generated samples don't change (if not included, Cat & Dog will no longer extend Animal).

If a composed model (allOf) doesn't have any parent and one of its interface has a discriminator field, then set this interface as parent.

See #2096
See swagger-api/swagger-parser#246
@fehguy fehguy merged commit 46545c1 into master Jul 17, 2016
@fehguy fehguy deleted the release-prepare branch July 17, 2016 22:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.