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

Java libraries validation-api may use javax imports but dependency always uses jakarta namespace #19171

Merged
merged 3 commits into from
Jul 18, 2024
Merged

Java libraries validation-api may use javax imports but dependency always uses jakarta namespace #19171

merged 3 commits into from
Jul 18, 2024

Conversation

horaceli
Copy link
Contributor

@horaceli horaceli commented Jul 15, 2024

#18332 replaced instances of {{javaPackage}}.validation with jakarta.validation because all generated poms under Java/libraries use jakarta.validation:jakarta.validation-api:3.0.2 (which uses jakarta package namespace).

However a couple of moustache templates were missed out, so if useJakartaEe flag was disabled, some code would still require javax.validation.* while some would require jakarta.validation.* - this PR fixes that by aligning with the package included in the generated pom.

Note that this issue only affects jakarta.validation-api and not jakarta.annotation-api. Annotation API uses different versions in the pom depending on the userJakartaEe flag, e.g. https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache#L360

PR checklist

  • Read the contribution guidelines.
  • Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
  • Run the following to build the project and update samples:
    ./mvnw clean package 
    ./bin/generate-samples.sh ./bin/configs/*.yaml
    ./bin/utils/export_docs_generators.sh
    
    (For Windows users, please run the script in Git BASH)
    Commit all changed files.
    This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
    These must match the expectations made by your contribution.
    You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*.
    IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
  • File the PR against the correct branch: master (upcoming 7.6.0 minor release - breaking changes with fallbacks), 8.0.x (breaking changes without fallbacks)
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request. @martin-mfg

@horaceli horaceli changed the title Java libraries jakarta validation Java libraries uses javax imports but validation library uses jakarta namespace Jul 15, 2024
@horaceli horaceli changed the title Java libraries uses javax imports but validation library uses jakarta namespace Java libraries may use javax.validation-api imports but validation library always uses jakarta namespace Jul 15, 2024
@horaceli horaceli changed the title Java libraries may use javax.validation-api imports but validation library always uses jakarta namespace Java libraries validation-api may use javax imports but dependency always uses jakarta namespace Jul 15, 2024
@wing328
Copy link
Member

wing328 commented Jul 18, 2024

thanks for the fix.

I was able to repeat the issue and confirmed the fix

[INFO] --- source:3.2.0:jar-no-fork (attach-sources) @ openapi-java-client ---
[INFO] Building jar: C:\Users\wing3\AppData\Local\Temp\resteasy234a\target\openapi-java-client-1.0.0-sources.jar
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time:  14.329 s
[INFO] Finished at: 2024-07-18T16:59:21+08:00
[INFO] ------------------------------------------------------------------------

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.

2 participants