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

Make kotlin not load parent first, and stop handling pact parent-first configuration in core quarkus #30230

Merged
merged 2 commits into from
Jan 10, 2023

Conversation

holly-cummins
Copy link
Contributor

These changes reinstate @stuartwdouglas's changes from #29697. They’re breaking changes, so they were reverted, but it’s appropriate to apply them in a 3.0 branch.

This PR also has some changes of mine. We always felt a bit uncomfortable having lots of pact configuration in quarkus core, and now that we have a pact extension we can move that config to a more targeted place.

Note that the changes in #29697 break the pact extension. The second set changes in this PR are mine. They half-fix the pact support, but they also need https://github.com/holly-cummins/quarkus-pact/tree/pact-for-quarkus-3 to be applied to the pact extension for things to work fully properly.

When @gsmet is doing the patch-y sync-y magic, could we please

Why so convoluted? The extensions/kotlin/runtime/pom.xml had some changes made, and then reverted, and this changeset reinstates them. But the original change is in the branch I’m basing this change against, and the reversion isn’t. I’ve cherry-picked the reversion in to this branch, and then reverted the reversion … confused yet? My assumption is that git could also get confused by all this, so we should check the output by eye.

At the end, the maven plugin config in the kotlin pom.xml should be something like this (no parent-first artefacts):

<artifactId>quarkus-extension-maven-plugin</artifactId>
                <configuration>
                    <lesserPriorityArtifacts>
                        <!--
                        see https://github.com/quarkusio/quarkus/issues/8405
                        -->
                        <lesserPriorityArtifact>org.jetbrains.kotlin:kotlin-compiler</lesserPriorityArtifact>
                    </lesserPriorityArtifacts>
                    <capabilities>
                        <provides>io.quarkus.kotlin</provides>
                    </capabilities>
                </configuration>

For background, these are the relevant changes in the history.

https://github.com/quarkusio/quarkus/pull/29697/commits (in the branch)
https://github.com/quarkusio/quarkus/pull/29869/commits (not in the branch)

@quarkus-bot quarkus-bot bot added the area/core label Jan 6, 2023
@quarkus-bot

This comment has been minimized.

@holly-cummins
Copy link
Contributor Author

holly-cummins commented Jan 9, 2023

The mac failures are the same we see in #30229.
The windows failure is a bit more troubling, since #29869 (comment) also had a windows-only failure, but I've checked and it's a different failure. I don't think the kotlin changes can have affected smallrye.

@gsmet
Copy link
Member

gsmet commented Jan 10, 2023

@holly-cummins I reapplied your commits on top of an update of jakarta-10-misc. Things look in line with what you described so I will merge this to include it in the transformation and see how it goes.

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