Skip to content

Commit 4f03528

Browse files
authored
Merge pull request wvengen#56 from Syquel/master
Fix wvengen#55 attach ProGuard map and seed files as artifacts if injar and outjar filename are the same.
2 parents c4025ab + 8b03993 commit 4f03528

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

src/main/java/com/github/wvengen/maven/proguard/ProGuardMojo.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -668,14 +668,17 @@ public void execute() throws MojoExecutionException, MojoFailureException {
668668

669669
}
670670

671-
if (attach && !sameArtifact) {
672-
final String classifier;
673-
if (useArtifactClassifier()) {
674-
classifier = attachArtifactClassifier;
675-
} else {
676-
classifier = null;
671+
if (attach) {
672+
if (!sameArtifact) {
673+
final String classifier;
674+
if (useArtifactClassifier()) {
675+
classifier = attachArtifactClassifier;
676+
} else {
677+
classifier = null;
678+
}
679+
680+
projectHelper.attachArtifact(mavenProject, attachArtifactType, classifier, outJarFile);
677681
}
678-
projectHelper.attachArtifact(mavenProject, attachArtifactType, classifier, outJarFile);
679682

680683
final String mainClassifier = useArtifactClassifier() ? attachArtifactClassifier : null;
681684
final File buildOutput = new File(mavenProject.getBuild().getDirectory());

0 commit comments

Comments
 (0)