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

Support for GlassFish Docker in the archetype #326

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

OndroMih
Copy link
Contributor

@OndroMih OndroMih commented Aug 14, 2024

This adds support for GlassFish Docker into the archetype:

 mvn archetype:generate -DarchetypeGroupId=org.eclipse.starter -DarchetypeArtifactId=jakarta-starter -DarchetypeVersion=2.4.0-SNAPSHOT -Druntime=glassfish -Ddocker=yes -Dprofile=full -DjakartaVersion=10 -DjavaVersion=17

Only for the above parameters (EE10, Java 17, Full profile).

  • first commit adds the functionality
  • second commit adds tests into the Github workflow

If this PR is merged, I plan to add support for GlassFish Docker in the UI and also add tests that cover other runtimes.

@m-reza-rahman
Copy link
Contributor

m-reza-rahman commented Aug 14, 2024

Could you kindly try to minimize the white space only changes? It is really difficult to see what the actual changes are and it also pollutes the change log. If they are really necessary, please create a separate PR for the desired white space changes?

Once that is done, I would also like to understand why so many new files are needed for a seemingly small set of new features.

@OndroMih OndroMih force-pushed the ondromih-glassfish-docker branch 3 times, most recently from e0fa55f to ba0685a Compare August 14, 2024 01:53
@m-reza-rahman m-reza-rahman self-assigned this Aug 14, 2024
@OndroMih
Copy link
Contributor Author

The big amount of files is for the tests. The tests verify that the generated project contains expected files. Maybe the tests are not needed as the Github workflow covers some of the cases and uses the appropriate Java version. I just used them to run tests locally.

@eclipse-starter-bot
Copy link

Can one of the admins verify this patch?

@OndroMih OndroMih force-pushed the ondromih-glassfish-docker branch 4 times, most recently from 016ed52 to 9e57615 Compare August 14, 2024 03:15
@m-reza-rahman
Copy link
Contributor

OK. Can you please enhance the nightly build if required: https://github.com/eclipse-ee4j/starter/blob/master/.github/workflows/nightly.yml? It should provide reasonable test coverage.

@OndroMih
Copy link
Contributor Author

I removed the tests in maven build and added some tests to the main and nightly builds.

Tests for GlassFish with Docker and Jakarta EE 10, and for Jakarta EE 9.1 without Docker.
Tests for GlassFish with Docker for unsupported combinations.
@m-reza-rahman
Copy link
Contributor

OK. Eventually we can look into moving the tests into the Maven build if there is a reasonable way.

Please do address the extraneous white space changes before I can review for a merge. Do note, there is a reason the white space is the way it is. It avoids users encountering strange formatting as Velocity does not ignore white spaces in the output, even when placed in the same line as conditionals.

@OndroMih
Copy link
Contributor Author

I removed all the unnecessary extraneous white space changes.

I kept the extra spaces in velocity templates to indent blocks and added maven antrun plugin that removes them during the build. Without indenting velocity templates, it's hard to understand them. If you want, I can submit this change as a separate PR. Or even before this PR, as it would be easier to review my changes once the velocity templates are indented.

@m-reza-rahman
Copy link
Contributor

m-reza-rahman commented Aug 15, 2024

Yes, please make that a separate PR to keep the change log clean. I’ll also need to ensure there are no unintended side effects. Since that’s not a functional change, it can be done after the functional change.

@OndroMih OndroMih marked this pull request as draft August 15, 2024 23:09
@OndroMih
Copy link
Contributor Author

OndroMih commented Aug 15, 2024

I created a separate PR only with the indentation changes here: #327

Until that one is merged, I changed this PR to draft.

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

Successfully merging this pull request may close these issues.

3 participants