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

Change Helidon MP release in generated project from 1.x to 2.x #11076

Merged
merged 4 commits into from
Jan 24, 2022
Merged

Change Helidon MP release in generated project from 1.x to 2.x #11076

merged 4 commits into from
Jan 24, 2022

Conversation

tjquinno
Copy link
Contributor

@tjquinno tjquinno commented Dec 8, 2021

Resolves #11043

  • Updates Helidon-specific templates to work with Helidon 2.x.
  • Corrects a previously unreported bug which incorrectly placed beans.xml in the generated project.
  • Adds ability to specify Helidon version to use as an additional property
  • Adds the missing docs/generator/java-helidon.md

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/utils/export_docs_generators.sh
    
    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*.
    For Windows users, please run the script in Git BASH.
  • File the PR against the correct branch: master (5.3.0), 6.0.x
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

Attention: @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) @lwlee2608 (2019/10)

@tjquinno tjquinno marked this pull request as draft December 8, 2021 20:13
@tjquinno
Copy link
Contributor Author

tjquinno commented Dec 8, 2021

BTW I have marked this as a draft because we are about to issue a new release, and this PR references that new release. I need to make sure the PR is not merged before our release but otherwise it is ready for review.

@agilob
Copy link
Contributor

agilob commented Dec 9, 2021

I was thinking there should be microprofile generator that uses library flag (java already has it) to decide whether to generate helidon, quarkus or openliberty. It would act a lot like https://start.microprofile.io/. long term such approach would simply managing multiple profiles or one generator under microprofile name. What do you think about such approach?

@tjquinno
Copy link
Contributor Author

tjquinno commented Dec 9, 2021

Not sure I understand.

The existing Helidon 1.x support in the generator works exactly that way. It layers on the java category of generators. Users specify the library as helidon.

Users would do the same after this change but would get projects based on Helidon 2.x instead of 1.x.

@agilob
Copy link
Contributor

agilob commented Dec 9, 2021

A new generator that is java-microprofile, rather java-helidon, and the generator has options for helidon, quarkus, etc.

@tjquinno
Copy link
Contributor Author

tjquinno commented Dec 9, 2021

Got it. Now I understand what you meant.

And I misspoke. The Helidon 1.x support--like several others (Quarkus, OpenLiberty, Thorntail)--layers on JavaJaxRS/spec. Ultimately, MicroProfile itself layers on JAX-RS so this seems pretty much equivalent to what you described.

@wing328 wing328 marked this pull request as ready for review December 17, 2021 04:05
@@ -168,7 +168,7 @@ export class DefaultService {
}

return this.httpClient.put<any>(`${this.configuration.basePath}/`,
body,
UNKNOWN_PARAM_NAME,
Copy link
Member

Choose a reason for hiding this comment

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

@tjquinno Is your change based on the latest master?

Can you pleas regenerate the samples by running ./bin/utils/ensure-up-to-date ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@wing328 It was when I started it, and again when I rebased a week ago. But it seems in the time since my branch has fallen behind so I will rebase it and rerun.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@wing328 Just pushed to update a generated file. Please re-approve the workflow when you can.

@@ -0,0 +1,304 @@
---
Copy link
Member

Choose a reason for hiding this comment

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

Is this file added manually?

Files under docs/generators are supposed to be auto-generated.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is auto-generated. I added the generated file to git manually, as with new or updated generated samples file. I guess that's incorrect? I'll remove it from the PR then.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@wing328 Can you or someone please trigger the workflow again after my latest push? Thanks.

@wing328
Copy link
Member

wing328 commented Jan 24, 2022

Tested locally and the result is good

[INFO] 
[INFO] --- maven-jar-plugin:3.0.2:jar (default-jar) @ openapi-jaxrs-server ---
[INFO] Building jar: /private/tmp/jaxrs-spec/target/openapi-jaxrs-server.jar
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time:  01:16 min
[INFO] Finished at: 2022-01-24T17:19:51+08:00
[INFO] ------------------------------------------------------------------------

@wing328 wing328 merged commit 6ac8d9b into OpenAPITools:master Jan 24, 2022
@wing328 wing328 added this to the 5.4.0 milestone Jan 24, 2022
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.

[REQ] Add support for Helidon MP 2.x
3 participants