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

[JAX-RS] Use correct jackson date library when using Java 8 #7285

Merged
merged 1 commit into from
Jan 28, 2018

Conversation

deki
Copy link
Contributor

@deki deki commented Jan 1, 2018

PR checklist

  • Read the contribution guidelines.
  • Ran the shell 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). Windows batch files can be found in .\bin\windows\.
  • Filed the PR against the correct branch: 3.0.0 branch for changes related to OpenAPI spec 3.0. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.
    @bbdouglas (2017/07) @JFCote (2017/08) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09)

Description of the PR

fix for #7123, differentiation is already in use for Jersey

<version>${jackson-jaxrs-version}</version>
</dependency>
{{/java8}}
{{^java8}}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is joda ( {{#joda}} ) tag for joda

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it make sense to use it? What happens if both are enabled?

Look for {{^java8}} and you'll find several other files, where this is already in place, e.g.:
https://github.com/swagger-api/swagger-codegen/blob/master/modules/swagger-codegen/src/main/resources/JavaJaxRS/jacksonJsonProvider.mustache

@wing328 wing328 added this to the v2.4.0 milestone Jan 15, 2018
@wing328 wing328 changed the base branch from master to 2.4.0 January 15, 2018 08:26
@wing328 wing328 closed this Jan 22, 2018
@wing328 wing328 changed the base branch from 2.4.0 to master January 22, 2018 07:20
@wing328 wing328 reopened this Jan 22, 2018
@wing328
Copy link
Contributor

wing328 commented Jan 28, 2018

@deki I did some tests and the result looks good.

@wing328 wing328 merged commit 298ca8d into swagger-api:master Jan 28, 2018
@wing328 wing328 changed the title #7123 use correct jackson date library when using Java 8 [JAX-RS] Use correct jackson date library when using Java 8 Jan 28, 2018
@wing328
Copy link
Contributor

wing328 commented Jan 28, 2018

Added CI test to cover this issue moving forward: 87cdddc

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants