Skip to content

Commit 376d514

Browse files
authored
Merge pull request #207 from Karm/issue-203
Fixes issue 203, suffixes for artifactIds
2 parents 597b6af + f4d8955 commit 376d514

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/MicroprofileServersAddon.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@
3535
import javax.annotation.PostConstruct;
3636
import javax.enterprise.context.ApplicationScoped;
3737
import javax.inject.Inject;
38-
import java.util.*;
38+
import java.util.ArrayList;
39+
import java.util.HashSet;
40+
import java.util.List;
41+
import java.util.Map;
42+
import java.util.Set;
3943

4044
import static org.eclipse.microprofile.starter.core.model.JessieModel.Parameter.MICROPROFILESPECS;
4145

@@ -145,6 +149,16 @@ public void adaptMavenModel(Model pomFile, JessieModel model, boolean mainProjec
145149
mavenHelper.addDependency(pomFile, "org.bouncycastle", "bcpkix-jdk15on", "1.53");
146150
}
147151

152+
if (model.hasMainAndSecondaryProject()) {
153+
String artifactID = pomFile.getArtifactId();
154+
if (mainProject) {
155+
pomFile.setArtifactId(artifactID + "-" + JessieModel.MAIN_INDICATOR);
156+
} else {
157+
pomFile.setArtifactId(artifactID + "-" + JessieModel.SECONDARY_INDICATOR);
158+
}
159+
pomFile.getBuild().setFinalName(artifactID);
160+
}
161+
148162
}
149163

150164
private Profile findProfile(String profileName) {

0 commit comments

Comments
 (0)