Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[kotlin] Fixing merge conflict and re-running CI for #4565 #4977

Merged

Conversation

@jimschubert
Copy link
Member

jimschubert commented Jan 11, 2020

This is local fixes for the merge conflict in #4565. Once CI passes, we can merge.

From original PR:

This PR contains commits from #4544
Related bug #4368

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project before.
  • Run the shell script(s) under ./bin/ (or Windows batch scripts under.\bin\windows) to update Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit, and these must match the expectations made by your contribution. You only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the code or mustache templates for a language ({LANG}) (e.g. php, ruby, python, etc).
  • File the PR against the correct branch: master, 4.3.x, 5.0.x. Default: master.
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.
nekkiy and others added 10 commits Nov 18, 2019
# Conflicts:
#	modules/openapi-generator/pom.xml
#	modules/openapi-generator/src/main/resources/kotlin-spring/dataClassOptVar.mustache
#	modules/openapi-generator/src/main/resources/kotlin-spring/dataClassReqVar.mustache
* master: (187 commits)
  [core] Initial FeatureSet structures and definitions (#3614)
  Add Cisco to the user list (#4971)
  comment out php slim4 in ensure-up-to-date
  update samples
  [Python] Allow models to have properties of type self (#4888)
  Add npmRepository option to javascript generators (#4956)
  [Slim4] Add ref support to Data Mocker (#4932)
  Fix auto-labeler for jax-rs (#4943)
  [doc] full generator details (#4941)
  comment out python flask 2 test (#4949)
  [jaxrs-spec][quarkus] update to version 1.1.1.Final (#4935)
  [cli] Full config help details (#4928)
  Add RequestFile to typescript-node model template (#4903)
  [csharp] enum suffix changes enumValueNameSuffix to enumValueSuffix (#4927)
  [C#] allow customization of generated enum suffixes (#4301)
  [Kotlin] Correct isInherited flag for Kotlin generators (#4254)
  [Rust Server] Fix panic handling headers (#4877)
  Initial CODEOWNERS (#4924)
  [scala] Support for Set when array has uniqueItems=true (#4926)
  remove nodejs server samples, scripts (#4919)
  ...
@jimschubert jimschubert added this to the 4.2.3 milestone Jan 11, 2020
@auto-labeler

This comment has been minimized.

Copy link

auto-labeler bot commented Jan 11, 2020

👍 Thanks for opening this issue!
🏷 I have applied any labels matching special text in your issue.

The team will review the labels and make any necessary changes.

@jimschubert jimschubert merged commit b680d7c into OpenAPITools:master Jan 12, 2020
5 of 6 checks passed
5 of 6 checks passed
ci/bitrise/4a2b10a819d12b67/pr Failed - openapi-generator
Details
Shippable Run 13565 status is SUCCESS.
Details
ci/circleci Your tests passed on CircleCI!
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/drone/pr Build is passing
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@jimschubert jimschubert deleted the jimschubert:nekkiy-fix-kotlinArrayEnumEmbedded branch Jan 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.