Merge 2.3.0 into sync_master_230 #5056
Conversation
* read directly from templates * refactor nodejs structure * dont inject into global scope * move to 2 spaces consistently
* [Swift3] fix format warnings * [Swift3] null enumerations should not cause failure success or failure on numm enumerations should be decided by users * update petstore * handle type mismatch and null respectively
(except clojure + scalatra, because those are broken, will fixed with later master merge.)
|
Looks like Sonatype's snapshot maven repository doesn't have the earlier-than-latest snapshots of swagger-parser anymore, and therefore AppVeyor build breaks. Possibly we can change to a release version, or to the latest snapshot (1.1.0-SNAPSHOT)? |
|
Use swagger-parser-1.0.28 |
|
@fehguy done ... though this seems to break at least BashClientCodegen. I'll try the effects of just the update in master and 2.3.0 branch. |
|
Okay, no problem in master (which actually already is on 1.0.28), and not on 2.3.0 (which is on 1.0.25 currently – though that one doesn't have BashClientCodegen), but already on the current sync_master_230. I'll try to identify the origin of the problem. |
|
Aha, master has an if-block here. I guess I'll cherry-pick that commit for this branch too. |
|
I applied the fixes on the branch for #5054, then merged into this one. |
4 participants
PR checklist
./bin/to update Petstore sample so that CIs can verify the change. (For instance, only need to run./bin/{LANG}-petstore.shand./bin/security/{LANG}-petstore.shif updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates)2.3.0branch for breaking (non-backward compatible) changes.Description of the PR
This merges the 2.3.0 branch into @wing328's sync_master_230 branch, solving some more conflicts on the way (as 2.3.0 did progress a bit more since the initial merge).
I just updated the swift3 + nodejs-server samples (which had conflicts), I guess updating some more should be done after merged.