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

Ensure that duplicates don't end up in dev mode CP in multi-module projects #10421

Merged
merged 1 commit into from
Jul 2, 2020

Conversation

geoand
Copy link
Contributor

@geoand geoand commented Jul 2, 2020

Fixes: #10411

@geoand geoand requested a review from aloubyansky July 2, 2020 07:12
@boring-cyborg boring-cyborg bot added area/devtools Issues/PR related to maven, gradle, platform and cli tooling/plugins area/maven labels Jul 2, 2020
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!

// only add the artifact if it's present in the dev mode context
// we need this to avoid having jars on the classpath multiple times
if (!devModeContext.getLocalArtifacts().contains(new AppArtifactKey(appDep.getGroupId(), appDep.getArtifactId(),
appDep.getClassifier(), appDep.getType()))) {
Copy link
Member

Choose a reason for hiding this comment

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

appDep.getArtifactHandler().getExtension() perhaps would be a more accurate one.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Didn't know that one, thanks!

@geoand
Copy link
Contributor Author

geoand commented Jul 2, 2020

This is a good candidate for 1.6.1, hence the backport label

@geoand geoand marked this pull request as ready for review July 2, 2020 08:37
@famod
Copy link
Member

famod commented Jul 2, 2020

@geoand

This is a good candidate for 1.6.1, hence the backport label

Just asking for sprint planning reasons: 1.6.0 is already "frozen"?

@geoand
Copy link
Contributor Author

geoand commented Jul 2, 2020

@geoand

This is a good candidate for 1.6.1, hence the backport label

Just asking for sprint planning reasons: 1.6.0 is already "frozen"?

Yup. We will only add bug fixes to 1.6.x releases (if needed)

@famod
Copy link
Member

famod commented Jul 2, 2020

Now that's interesting and a bit confusing: In context of my CCE-problem with CXF, I tried out this PR branch and the behaviour changes: I now get a ClassNotFoundException instead of ClassCastException (for the very same class).

Runner-jar is still fine. 😕

I guess it is time to create a separate issue?

@aloubyansky
Copy link
Member

@famod could this be reproduced with the same reproducer referenced from #10411 ?

@geoand
Copy link
Contributor Author

geoand commented Jul 2, 2020

I guess it is time to create a separate issue?

Yup, with a reproducer if possible :)

@famod
Copy link
Member

famod commented Jul 2, 2020

@aloubyansky Unfortunately not. It seems it really requires CXF which makes it harder to reproduce.
I'll try to come up with a reproducer and a new issue then.

Apart from that: This PR does fix #10411 for my internal project! Good work, thanks! Looking forward to 1.6.1.

@geoand
Copy link
Contributor Author

geoand commented Jul 2, 2020

Darn CI failed... It was passing locally... So now I have to figure out what's going on

@aloubyansky
Copy link
Member

Wait for the CI to finish, we'll check the logs.

@geoand
Copy link
Contributor Author

geoand commented Jul 2, 2020

Wait for the CI to finish, we'll check the logs.

I'll take care of it, don't worry :)

@geoand geoand marked this pull request as draft July 2, 2020 10:35
@geoand geoand marked this pull request as ready for review July 2, 2020 12:52
@geoand
Copy link
Contributor Author

geoand commented Jul 2, 2020

CI passed on my fork, so let's see what happens here

@geoand geoand added the triage/waiting-for-ci Ready to merge when CI successfully finishes label Jul 2, 2020
@aloubyansky aloubyansky merged commit d3b3e6d into quarkusio:master Jul 2, 2020
@geoand geoand deleted the #10411 branch July 3, 2020 06:48
geoand added a commit to geoand/quarkus that referenced this pull request Jul 3, 2020
I was able to reproduce the NPE initially
when adding the test for
quarkusio#10421.
The way I got around it in that test was to
make sure the compile phase was invoked
@geoand geoand mentioned this pull request Jul 3, 2020
geoand added a commit to geoand/quarkus that referenced this pull request Jul 3, 2020
I was able to reproduce the NPE initially
when adding the test for
quarkusio#10421.
The way I got around it in that test was to
make sure the compile phase was invoked
@gsmet gsmet modified the milestone: 1.6.1.Final Jul 16, 2020
gsmet pushed a commit to gsmet/quarkus that referenced this pull request Jul 16, 2020
I was able to reproduce the NPE initially
when adding the test for
quarkusio#10421.
The way I got around it in that test was to
make sure the compile phase was invoked
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/devtools Issues/PR related to maven, gradle, platform and cli tooling/plugins area/maven triage/waiting-for-ci Ready to merge when CI successfully finishes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Devmode, Liquibase: Changelog file is found twice if located in another Maven module
4 participants