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

Made JarResult.originalArtifact point to the actual original jar instead of where it should end up after renaming #13259

Merged
merged 3 commits into from
Nov 12, 2020

Conversation

aloubyansky
Copy link
Member

This fixes an issue when building the uber-jar runner the target dir ends up containing the uber runner jar, the original jar and the "xxx.jar.original" directory which is a copy of the classes dir.

…ead of where it should end up after renaming
@ghost ghost added area/core area/devtools Issues/PR related to maven, gradle, platform and cli tooling/plugins area/maven labels Nov 12, 2020
@@ -140,7 +140,6 @@
public static final String APP = "app";
public static final String QUARKUS = "quarkus";
public static final String DEFAULT_FAST_JAR_DIRECTORY_NAME = "quarkus-app";
public static final String RENAMED_JAR_EXTENSION = ".jar.original";
Copy link
Member Author

Choose a reason for hiding this comment

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

@mariofusco @evacchi i am not sure it is relevant for you but given that @mariofusco introduced this constant i wanted to check whether removing it is ok.

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

So it looks like it's even better. With this change it will always be jar.

@maxandersen maxandersen self-requested a review November 12, 2020 15:41
Copy link
Member

@maxandersen maxandersen left a comment

Choose a reason for hiding this comment

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

+1 for the change, but afaics I just see in my test that I have -runner.jar and .jar.original.

the .jar is missing.

@aloubyansky
Copy link
Member Author

aloubyansky commented Nov 12, 2020

+1 for the change, but afaics I just see in my test that I have -runner.jar and .jar.original.

the .jar is missing.

That's the intended outcome for now. If you build with -DskipOriginalJarRename you won't see the the .original anymore but have the original jar.

@ghost ghost added the area/cli Related to quarkus cli (not maven/gradle/etc.) label Nov 12, 2020
@aloubyansky
Copy link
Member Author

@gsmet do you want me to squash it all?

Copy link
Member

@gsmet gsmet left a comment

Choose a reason for hiding this comment

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

No, they are all semantic commits, I think that's ok.

@gsmet gsmet merged commit e88b2f9 into quarkusio:master Nov 12, 2020
@ghost ghost added this to the 1.11 - master milestone Nov 12, 2020
@gsmet gsmet modified the milestones: 1.11 - master, 1.10.0.Final Nov 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/cli Related to quarkus cli (not maven/gradle/etc.) area/core area/devtools Issues/PR related to maven, gradle, platform and cli tooling/plugins area/maven
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants