Skip to content

Commit

Permalink
Merge pull request #5005 from geoand/generated-native-fix
Browse files Browse the repository at this point in the history
Fix broken native build of generated projects
  • Loading branch information
geoand authored Oct 29, 2019
2 parents d763c24 + 265d701 commit cf8ea35
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public class NativeConfig {
/**
* If full stack traces are enabled in the resulting image
*/
@ConfigItem(defaultValue = "false")
@ConfigItem(defaultValue = "true")
public boolean fullStackTraces;

/**
Expand Down
12 changes: 7 additions & 5 deletions devtools/maven/src/main/java/io/quarkus/maven/BuildMojo.java
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,13 @@ public void execute() throws MojoExecutionException {
.setConfigDir(outputDirectory.toPath())
.setBuildSystemProperties(realProperties).build());
Artifact original = project.getArtifact();
if (result.getJar().isUberJar() && result.getJar().getOriginalArtifact() != null) {
original.setFile(result.getJar().getOriginalArtifact().toFile());
}
if (result.getJar().isUberJar()) {
projectHelper.attachArtifact(project, result.getJar().getPath().toFile(), "runner");
if (result.getJar() != null) {
if (result.getJar().isUberJar() && result.getJar().getOriginalArtifact() != null) {
original.setFile(result.getJar().getOriginalArtifact().toFile());
}
if (result.getJar().isUberJar()) {
projectHelper.attachArtifact(project, result.getJar().getPath().toFile(), "runner");
}
}

} catch (AppCreatorException e) {
Expand Down

0 comments on commit cf8ea35

Please sign in to comment.