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

Update Kotlin and Scala gradle templates to match Java template #5311

Merged
merged 1 commit into from
Nov 15, 2019

Conversation

aguibert
Copy link
Member

@aguibert aguibert commented Nov 8, 2019

Fixes #5251

The quarkus platform bom has changed a bit from quarkus-bom to quarkus-universe-bom, and additionally the Java templates have been updated to use properties instead of hardcoded values. The code in io.quarkus.cli.commands.file.GradleBuildFile.containsBOM() depends on these properties being used.

This PR does 2 things:

  1. Updates the Kotlin and Scala templates to use the variables for the bom
  2. Adds toleration to the resolved property variables in case we ever decide to not use properties or if this code gets called after the properties have been completed

I couldn't write a good test for this issue in this repo, so I have opened a PR in the code.quarkus repo here:
quarkusio/code.quarkus.io#226

NOTE TO REVIEWER:
Please also view the corresponding code.quarkus PR with this PR

Copy link
Contributor

@gastaldi gastaldi left a comment

Choose a reason for hiding this comment

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

LGTM

@gastaldi gastaldi added this to the 1.1.0 milestone Nov 8, 2019
@geoand
Copy link
Contributor

geoand commented Nov 8, 2019

Would it be possible to add one of the Maven exec style tests we have for other things as well?

@aguibert
Copy link
Member Author

aguibert commented Nov 8, 2019

@geoand, sure I can add some tests in this repo -- @gsmet requested that also. Can you point me to an example of the maven exec tests you had in mind?

@geoand
Copy link
Contributor

geoand commented Nov 8, 2019

Not in front of machine now, but I'll get a link to you within the day

@geoand
Copy link
Contributor

geoand commented Nov 8, 2019

I was able to find some (hopefully good) candidates for inspiration in this PR: #4579

And also in these existing tests: https://github.com/quarkusio/quarkus/tree/master/integration-tests/kubernetes
https://github.com/quarkusio/quarkus/tree/master/integration-tests/maven/src/it

@cescoffier
Copy link
Member

@aguibert let's keep this PR open until we have the tests in.

@aguibert
Copy link
Member Author

Generally I agree that having tests in the same repo as the code is better, but in order to write tests for this PR in this repo, we'll have to create a new IT project that exercises the tools/common module and the templates in the platform-descriptor-json module as well. Note that we already have the ITs in an adjacent code.quarkus.io repo.

While I could create ITs in this repo, it would just be a mock/duplicate of the more realistic ITs we already have in the other repo, and would still risk falling out of date with the "real" code/tests over in the code.quarkus.io repo. Are we sure we want tests in this repo?

@cescoffier
Copy link
Member

Oh didn't follow that you have IT in code.quarkus.io.
If @geoand and @ia3andy are ok with this, then let's go for it.

@geoand
Copy link
Contributor

geoand commented Nov 13, 2019

Now that I think of it, we might need the input of @maxandersen and @aloubyansky here since there are changes going on with the tooling. Can you guys please take a look?

@maxandersen
Copy link
Member

I was sure we fixed this earlier in 1.0 but seems we missed some ;/
@aloubyansky can you check this with your work on cleaning up generated pom.xml for 1.0 ?

Copy link
Member

@aloubyansky aloubyansky left a comment

Choose a reason for hiding this comment

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

Looks good. Thanks!

@aloubyansky aloubyansky merged commit 5f1837b into quarkusio:master Nov 15, 2019
@gsmet gsmet removed the backport? label Nov 15, 2019
@gsmet gsmet modified the milestones: 1.1.0, 1.0.0.Final Nov 15, 2019
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.

Gradle created project duplicates dependencies section when Kotlin is selected
7 participants