Merge pull request #9817 from geoand/fast-jar-directory

Make the directory containing the output fast jar a constant
quarkusio · Jun 9, 2020 · 9fb4df8 · 9fb4df8
2 parents feb9e82 + dffe957
commit 9fb4df8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 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
@@ -134,6 +134,7 @@ public class JarResultBuildStep {
     public static final String TRANSFORMED_BYTECODE_JAR = "transformed-bytecode.jar";
     public static final String APP = "app";
     public static final String QUARKUS = "quarkus";
+    public static final String DEFAULT_FAST_JAR_DIRECTORY_NAME = "quarkus-app";
 
     private static final boolean IS_WINDOWS = System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("windows");
 
@@ -397,7 +398,7 @@ private JarBuildItem buildThinJar(CurateOutcomeBuildItem curateOutcomeBuildItem,
         boolean rebuild = outputTargetBuildItem.isRebuild();
 
         Path buildDir = outputTargetBuildItem.getOutputDirectory()
-                .resolve(outputTargetBuildItem.getBaseName());
+                .resolve(packageConfig.outputDirectory.orElse(DEFAULT_FAST_JAR_DIRECTORY_NAME));
         //unmodified 3rd party dependencies
         Path libDir = buildDir.resolve(LIB);
         //parent first entries

diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/JarRunnerIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/JarRunnerIT.java
@@ -88,7 +88,7 @@ public void testThatFastJarFormatWorks() throws MavenInvocationException, IOExce
         Assertions.assertFalse(Files.exists(jar));
 
         jar = testDir.toPath().toAbsolutePath()
-                .resolve(Paths.get("target/acme-1.0-SNAPSHOT/quarkus-run.jar"));
+                .resolve(Paths.get("target/quarkus-app/quarkus-run.jar"));
         Assertions.assertTrue(Files.exists(jar));
         File output = new File(testDir, "target/output.log");
         output.createNewFile();
@@ -131,7 +131,7 @@ public void testThatMutableFastJarWorks() throws MavenInvocationException, IOExc
         Assertions.assertFalse(Files.exists(jar));
 
         jar = testDir.toPath().toAbsolutePath()
-                .resolve(Paths.get("target/acme-1.0-SNAPSHOT/quarkus-run.jar"));
+                .resolve(Paths.get("target/quarkus-app/quarkus-run.jar"));
         Assertions.assertTrue(Files.exists(jar));
         File output = new File(testDir, "target/output.log");
         output.createNewFile();