From bdb45e4dca8eb3fed9e36411d6ba229ccba3266c Mon Sep 17 00:00:00 2001 From: Alexey Loubyansky Date: Thu, 12 Nov 2020 15:53:51 +0100 Subject: [PATCH 1/3] Made JarResult.originalArtifact point to the actual original jar instead of where it should end up after renaming --- .../quarkus/deployment/pkg/steps/JarResultBuildStep.java | 9 +-------- .../maven/src/main/java/io/quarkus/maven/BuildMojo.java | 8 +++++--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java index 5054f65e1ab3e..f6c1806e77411 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java @@ -140,7 +140,6 @@ public class JarResultBuildStep { 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"; @BuildStep OutputTargetBuildItem outputTarget(BuildSystemTargetBuildItem bst, PackageConfig packageConfig) { @@ -256,13 +255,7 @@ private JarBuildItem buildUberJar(CurateOutcomeBuildItem curateOutcomeBuildItem, final Path standardJar = outputTargetBuildItem.getOutputDirectory() .resolve(outputTargetBuildItem.getBaseName() + ".jar"); - final Path originalJar; - if (Files.exists(standardJar)) { - originalJar = outputTargetBuildItem.getOutputDirectory() - .resolve(outputTargetBuildItem.getBaseName() + RENAMED_JAR_EXTENSION); - } else { - originalJar = null; - } + final Path originalJar = Files.exists(standardJar) ? standardJar : null; return new JarBuildItem(runnerJar, originalJar, null, PackageConfig.UBER_JAR, suffixToClassifier(packageConfig.runnerSuffix)); diff --git a/devtools/maven/src/main/java/io/quarkus/maven/BuildMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/BuildMojo.java index cd1f01190fd22..5eddc1658f184 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/BuildMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/BuildMojo.java @@ -84,11 +84,13 @@ protected void doExecute() throws MojoExecutionException { if (result.getJar() != null) { if (result.getJar().isUberJar() && result.getJar().getOriginalArtifact() != null) { - final Path standardJar = curatedApplication.getAppModel().getAppArtifact().getPaths().getSinglePath(); + final Path standardJar = result.getJar().getOriginalArtifact(); if (Files.exists(standardJar)) { + final Path renamedOriginal = standardJar.getParent().toAbsolutePath() + .resolve(standardJar.getFileName() + ".original"); try { - IoUtils.recursiveDelete(result.getJar().getOriginalArtifact()); - Files.move(standardJar, result.getJar().getOriginalArtifact()); + IoUtils.recursiveDelete(renamedOriginal); + Files.move(standardJar, renamedOriginal); } catch (IOException e) { throw new UncheckedIOException(e); } From 9d0a0185979f7a68fc8b402de1372990dc3ff33e Mon Sep 17 00:00:00 2001 From: Alexey Loubyansky Date: Thu, 12 Nov 2020 16:21:35 +0100 Subject: [PATCH 2/3] Mojo parameter to skip the original jar renaming to xxx.original --- .../maven/src/main/java/io/quarkus/maven/BuildMojo.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/devtools/maven/src/main/java/io/quarkus/maven/BuildMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/BuildMojo.java index 5eddc1658f184..04ff42b5acbf8 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/BuildMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/BuildMojo.java @@ -52,6 +52,10 @@ public class BuildMojo extends QuarkusBootstrapMojo { @Parameter(defaultValue = "false", property = "quarkus.build.skip") private boolean skip = false; + @Deprecated + @Parameter(property = "skipOriginalJarRename") + boolean skipOriginalJarRename; + @Override protected boolean beforeExecute() throws MojoExecutionException { if (skip) { @@ -83,7 +87,8 @@ protected void doExecute() throws MojoExecutionException { Artifact original = mavenProject().getArtifact(); if (result.getJar() != null) { - if (result.getJar().isUberJar() && result.getJar().getOriginalArtifact() != null) { + if (!skipOriginalJarRename && result.getJar().isUberJar() + && result.getJar().getOriginalArtifact() != null) { final Path standardJar = result.getJar().getOriginalArtifact(); if (Files.exists(standardJar)) { final Path renamedOriginal = standardJar.getParent().toAbsolutePath() From b31b1954c401db637d767c62e4b4cce36de39071 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Thu, 12 Nov 2020 17:53:21 +0100 Subject: [PATCH 3/3] Skip original jar renaming for quarkus-cli --- devtools/cli/pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/devtools/cli/pom.xml b/devtools/cli/pom.xml index fbdc2bd80c7d7..127263a50199f 100644 --- a/devtools/cli/pom.xml +++ b/devtools/cli/pom.xml @@ -54,6 +54,9 @@ generate-code generate-code-tests + + true +