Add a new cli command to output version information by MiguelGL · Pull Request #3892 · swagger-api/swagger-codegen

MiguelGL · 2016-09-28T21:15:30Z

PR checklist

Read the contribution guildelines.
Ran the shell/batch script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh and ./bin/security/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates)
Filed the PR against the correct branch: master for non-breaking changes and 2.3.0 branch for breaking (non-backward compatible) changes.

Description of the PR

This is as per discussed in #3007. I am using maven resources filtering support to generate a resource file with the ${project.version} stamped on it.

Please note when running (from example from an IDE) from a non-maven env. this will lead to the
version be the literal ${project.version} string.

* better enum support for typescript angular2 * fix enum property for TS * fix non-array enum datatype for TS * update build name for TS fetch petstore client * restore TS fetch enum naming * [TS fetch]add test cases, fix enum integer naming

* Amending Path annotation Changed the Path annotation value from "/" to "/{{baseName}}" * jaxrs-cxf-petstore-server.sh script was not referencing cxf module directory. Included generated files following script run. Have amended Path annotation value to {{contextPath}} and removed public access modifier from template as this is redundant for Java interface definition.

[aspnet] Honor casing of properties from definition

…degen into kartenkarsten-patch-1

[Java] minor indentation fix for java enum models

eleif zu else if

…ams-for-auth Fix unknown parameter on api_client's update_params_for_auth method.

[Java][Spring] Add enum test cases and fix formParam's enum value

* show path * install go

* prefix go local var with localVar * remove pom from go, minor fix to headerParams

Right now, any generated code where the http basic authentication is required is broken, as it tries to access nonexistent field in the generated `Configuration` struct. The alternative is to fix `configuration.mustache` to replace the `UserName` field with `Username` field.

…ization Go: Replace `.Username` with `.UserName` in generated API methods.

* add more tests for go, fix numeric form/header parameters * update go sample

Update our fork

Removed CLI option declarations in JavaJAXRSSpecServerCodegen that also appear in AbstractJavaJAXRSServerCodegen.

…com/JackWink/swagger-codegen into JackWink-feature/jack/update-swift-alamofire

…ger-codegen into arikon-feature/js-fix-types

[Go] fix trailing comma in go api client

* add schema title, description to HTML output * Include title, description in petstore sample (and HTML output)

* Show correct default value on CLI option description Fixes #3861 * Changes after ./bin/jaxrs-petstore-server.sh

[Swfit] fix path parameter with baseName mustache tag

* fix jaxrs line break * fix java gradle bat line break * fix scala gradle line break * fix undertow crt line break * fix spring line break * fix undertow line break in pom * rollback undertwo petstore to use petstore.yaml

[Swift] Use thread safe manager dictionary

* feature(php-cs-fixer) add php-cs-fixer support * feature(php-cs-fixer) tweak Mustache templates to fit PSR2 * feature(php-cs-fixer) bin/php-petstore.sh output

…l-request-template Mention security script in pull request template

…3887) * fix duplicated description in spring model * fix duplicated description in jaxrs models * fix resteasy dependency

* feature(phpunit) fix PHPUnit invocation, add basic phpunit.xml.dist * fix(phpunit) add proper paths relative to phpunit.xml.dist

I am using maven resource filtering capabilities so that an existing version.properties resource file gets filtered upon build and populated with the project version tag. This resource is then read at runtime as required.

wing328 · 2016-09-29T03:14:04Z

Thanks for the PR but your commit (as shown in the Commits tab) is not linked to your Github account, which means this PR won't count as your contribution in https://github.com/swagger-api/swagger-codegen/graphs/contributors.

Let me know if you need help fixing it.

Ref: https://github.com/swagger-api/swagger-codegen/wiki/FAQ#how-can-i-update-commits-that-are-not-linked-to-my-github-account

# Conflicts: # .gitignore # modules/swagger-codegen-cli/pom.xml # modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/SwaggerCodegen.java # modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java # modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticDocCodegen.java # modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtml2Generator.java # modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtmlGenerator.java # samples/html/index.html

# Conflicts: # modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticDocCodegen.java # modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtml2Generator.java # modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtmlGenerator.java # samples/html/index.html

MiguelGL · 2016-09-29T08:39:00Z

I (thik I) fixed the account linking issue as per the instructions in the link (thanks!).

I can see this has sort of introduced a lot of noise, so just let me know if this still applies or maybe it's worth to reproduce the changes in another fork or something.

Thanks.

wing328 · 2016-09-29T08:41:14Z

@MiguelGL If it's not taking you too much time, please submit a new one as the rebase seems to have add commits not related to this change.

MiguelGL · 2016-09-29T08:42:24Z

Sure, i Will.

El jue., 29 sept. 2016 10:41, wing328 notifications@github.com escribió:

@MiguelGL https://github.com/MiguelGL If it's not taking you too much
time, please submit a new one as the rebase seems to have add commits not
related to this change.

—
You are receiving this because you were mentioned.

Reply to this email directly, view it on GitHub
#3892 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AAnMhYf2adgWPCYNcKO5yxQATDVPiv8fks5qu3mygaJpZM4KJUsR
.

). I am using maven resource filtering capabilities so that an existing version.properties resource file gets filtered upon build and populated with the project version tag. This resource is then read at runtime as required.

MiguelGL · 2016-09-29T09:23:27Z

I am closing this PR in favour of a new fresh one.

… (#3899) * Properly git-ignore all nbactions.xml files. * Add a command line action to print the program version (#3892). I am using maven resource filtering capabilities so that an existing version.properties resource file gets filtered upon build and populated with the project version tag. This resource is then read at runtime as required. * Using a different version tag when unreadable.

* upstream/master: (79 commits) add undertow Add a new cli command to output version information (2nd attempt) swagger-api#3892 (swagger-api#3899) fix python flask controller without tag (default_controller) [aspnet5] Fix basePath application to operations (swagger-api#3911) Bugfix/issue 3723 (swagger-api#3726) Cgardens nested object regex (swagger-api#3879) [Cpprest] Fixing issue swagger-api#3773 (swagger-api#3876) escape callback parameter for java(okhttp) and python fix warning in html generator [PHP] fix PHPUnit invocation, add basic phpunit.xml.dist (swagger-api#3864) [Java] Remove duplicated model description in Spring, JAX-RS models (swagger-api#3887) [PHP] Better PSR2 compatibility (swagger-api#3863) Mention security script in pull request template [Swift] Use thread safe manager dictionary Replace ^M with new line (\r) in mustache template (swagger-api#3865) [swfit] fix url param with base name [JaxRS]Show correct default value on CLI option description (swagger-api#3862) add title, description to HTML output (swagger-api#3860) fix trailing comma in go api client fix typescript-fetch base path by removing ending slash ...

wing328 and others added 30 commits August 9, 2016 10:49

[TypeScript] fix array enum (#3538)

3ac1c2e

* better enum support for typescript angular2 * fix enum property for TS * fix non-array enum datatype for TS * update build name for TS fetch petstore client * restore TS fetch enum naming * [TS fetch]add test cases, fix enum integer naming

Merge pull request #3550 from jimschubert/aspnet/models-casing

760feef

[aspnet] Honor casing of properties from definition

Merge branch 'patch-1' of https://github.com/kartenkarsten/swagger-co…

139437a

…degen into kartenkarsten-patch-1

minor indentation fix for java enum models

5f72d85

update sampel for spring petstore

51576cc

Merge branch 'beingcoder-top-enum-error-securityscope-newline-error'

1880120

Merge branch 'master' of https://github.com/swagger-api/swagger-codegen

df57f4a

Fix unknown parameter on api_client's update_params_for_auth method.

e4003ea

Merge pull request #3559 from wing328/java_jersey_indent

8bff0d3

[Java] minor indentation fix for java enum models

add new java client files

ce0f78d

fix form enum parameters for spring generator, add more test cases

7ff9ab0

typo

d5ad1cf

eleif zu else if

sample update

c965b43

Merge pull request #3564 from cliffano/fix-incorrect-param-update-par…

2450f67

…ams-for-auth Fix unknown parameter on api_client's update_params_for_auth method.

Merge pull request #3562 from wing328/add_enum_endpoint

9df4689

[Java][Spring] Add enum test cases and fix formParam's enum value

[Go] Fix CI tests (#3569)

884dfdd

* show path * install go

[Go] prefix go local var with localVar (#3570)

e728b84

* prefix go local var with localVar * remove pom from go, minor fix to headerParams

[htmlDoc2] curl sample - conditionally add 'apiKey'. (#3561)

7403f5b

Merge pull request #3573 from ivucica/ivucica_go_fix-username-capital…

098c7dc

…ization Go: Replace `.Username` with `.UserName` in generated API methods.

[Go] Add more test cases and fix numeric form/header parameters (#3574)

b46b0c2

* add more tests for go, fix numeric form/header parameters * update go sample

Merge pull request #1 from swagger-api/master

484d989

Update our fork

Issue 3572 Remove dupe options in jaxrs-spec

8da96db

Removed CLI option declarations in JavaJAXRSSpecServerCodegen that also appear in AbstractJavaJAXRSServerCodegen.

Fix Javascript types

f37e142

Merge branch 'feature/jack/update-swift-alamofire' of https://github.…

979c5d2

…com/JackWink/swagger-codegen into JackWink-feature/jack/update-swift-alamofire

Merge branch 'JackWink-feature/jack/update-swift-alamofire'

14447e6

Merge branch 'feature/js-fix-types' of https://github.com/arikon/swag…

db6b873

…ger-codegen into arikon-feature/js-fix-types

update JS test cases

bdd9c2b

Merge branch 'arikon-feature/js-fix-types'

4718903

wing328 and others added 16 commits September 24, 2016 01:16

Merge pull request #3857 from wing328/go_fix_trailing_comma

f3902a5

[Go] fix trailing comma in go api client

add title, description to HTML output (#3860)

11efd2b

* add schema title, description to HTML output * Include title, description in petstore sample (and HTML output)

[JaxRS]Show correct default value on CLI option description (#3862)

c727e31

* Show correct default value on CLI option description Fixes #3861 * Changes after ./bin/jaxrs-petstore-server.sh

[swfit] fix url param with base name

3513c35

Merge pull request #3868 from wing328/swift_fix_url_param

b1607b0

[Swfit] fix path parameter with baseName mustache tag

Replace ^M with new line (\r) in mustache template (#3865)

e6a1e18

* fix jaxrs line break * fix java gradle bat line break * fix scala gradle line break * fix undertow crt line break * fix spring line break * fix undertow line break in pom * rollback undertwo petstore to use petstore.yaml

[Swift] Use thread safe manager dictionary

bec7c48

Mention security script in pull request template

d435448

Merge pull request #3873 from ButterflyNetwork/swift-thread-safe-manager

0cbfa04

[Swift] Use thread safe manager dictionary

[PHP] Better PSR2 compatibility (#3863)

72d6afc

* feature(php-cs-fixer) add php-cs-fixer support * feature(php-cs-fixer) tweak Mustache templates to fit PSR2 * feature(php-cs-fixer) bin/php-petstore.sh output

Merge pull request #3875 from arnested/mention-security-script-in-pul…

87708d7

…l-request-template Mention security script in pull request template

[Java] Remove duplicated model description in Spring, JAX-RS models (#…

00110e9

…3887) * fix duplicated description in spring model * fix duplicated description in jaxrs models * fix resteasy dependency

[PHP] fix PHPUnit invocation, add basic phpunit.xml.dist (#3864)

5bd1069

* feature(phpunit) fix PHPUnit invocation, add basic phpunit.xml.dist * fix(phpunit) add proper paths relative to phpunit.xml.dist

Excluding all nbactions.xml files.

1d14780

Add a command line action to print the program version.

93db4de

I am using maven resource filtering capabilities so that an existing version.properties resource file gets filtered upon build and populated with the project version tag. This resource is then read at runtime as required.

Make CLI description include version information.

5506f3b

wing328 added the Enhancement: Feature label Sep 29, 2016

wing328 added this to the v2.2.2 milestone Sep 29, 2016

MiguelGL added 3 commits September 29, 2016 10:03

Merge branch 'master' into version-cli-command

6301079

MiguelGL closed this Sep 29, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add a new cli command to output version information#3892

Add a new cli command to output version information#3892
MiguelGL wants to merge 5976 commits intoswagger-api:masterfrom
MiguelGL:version-cli-command

MiguelGL commented Sep 28, 2016

Uh oh!

wing328 commented Sep 29, 2016

Uh oh!

MiguelGL commented Sep 29, 2016

Uh oh!

wing328 commented Sep 29, 2016

Uh oh!

MiguelGL commented Sep 29, 2016

Uh oh!

MiguelGL commented Sep 29, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Conversation

MiguelGL commented Sep 28, 2016

PR checklist

Description of the PR

Uh oh!

wing328 commented Sep 29, 2016

Uh oh!

MiguelGL commented Sep 29, 2016

Uh oh!

wing328 commented Sep 29, 2016

Uh oh!

MiguelGL commented Sep 29, 2016

Uh oh!

MiguelGL commented Sep 29, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants