Skip to content

Commit

Permalink
Merge pull request #23 from jGauravGupta/FISH-8444
Browse files Browse the repository at this point in the history
FISH-8444 DevMode support in IntelliJ IDEA
  • Loading branch information
jGauravGupta authored Apr 8, 2024
2 parents 133dff1 + 0a33d67 commit 2cc5a8d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
11 changes: 6 additions & 5 deletions src/main/java/fish/payara/micro/maven/MavenProject.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,10 @@ public class MavenProject extends PayaraMicroProject {
private static final String NAME = "name";
public static final String MICRO_GROUP_ID = "fish.payara.maven.plugins";
public static final String MICRO_ARTIFACT_ID = "payara-micro-maven-plugin";
public static final String MICRO_VERSION = "1.1.0";
public static final String MICRO_VERSION = "2.3";
public static final String MICRO_PLUGIN = "payara-micro";
public static final String START_GOAL = "start";
public static final String DEV_GOAL = "dev";
private static final String RELOAD_GOAL = "reload";
private static final String STOP_GOAL = "stop";
private static final String BUNDLE_GOAL = "bundle";
Expand All @@ -81,7 +82,7 @@ public class MavenProject extends PayaraMicroProject {
public static final String DEPLOY_WAR_PROPERTY = "-DdeployWar=true";
public static final String PAYARA_TRANSFORMER = "fish.payara.transformer";
public static final String PAYARA_TRANSFORMER_MAVEN = "fish.payara.transformer.maven";
public static final String PAYARA_TRANSFORMER_VERSION = "0.2.11";
public static final String PAYARA_TRANSFORMER_VERSION = "0.2.14";
private boolean useUberJar, exploded;

@Override
Expand All @@ -94,7 +95,7 @@ public String getStartCommand(boolean debug) {
} else {
cmd = String.format("mvn %s %s:%s:%s",
PACKAGE_GOAL,
MICRO_GROUP_ID, MICRO_ARTIFACT_ID, START_GOAL
MICRO_GROUP_ID, MICRO_ARTIFACT_ID, DEV_GOAL
);
}
return debug ? cmd + ' ' + String.format(DEBUG_PROPERTY, DEFAULT_DEBUG_PORT) : cmd;
Expand All @@ -103,7 +104,7 @@ public String getStartCommand(boolean debug) {
private String getStartUberJarCommand() {
return String.format("mvn %s:%s:%s %s:%s:%s",
MICRO_GROUP_ID, MICRO_ARTIFACT_ID, BUNDLE_GOAL,
MICRO_GROUP_ID, MICRO_ARTIFACT_ID, START_GOAL
MICRO_GROUP_ID, MICRO_ARTIFACT_ID, DEV_GOAL
);
}

Expand All @@ -112,7 +113,7 @@ private String getStartExplodedWarCommand() {
RESOURCES_GOAL,
COMPILE_GOAL,
WAR_EXPLODE_GOAL,
MICRO_GROUP_ID, MICRO_ARTIFACT_ID, START_GOAL,
MICRO_GROUP_ID, MICRO_ARTIFACT_ID, DEV_GOAL,
EXPLODED_PROPERTY,
DEPLOY_WAR_PROPERTY
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ public SettingsEditor<? extends RunConfiguration> getConfigurationEditor() {
MavenProject.MICRO_GROUP_ID,
MavenProject.MICRO_ARTIFACT_ID,
MavenProject.MICRO_VERSION,
MavenProject.START_GOAL,
MavenProject.DEV_GOAL,
MavenProject.DEPLOY_WAR_PROPERTY
));
} else {
parameters.getGoals().add(MavenProject.PACKAGE_GOAL);
parameters.getGoals().add(String.format(
"%s:%s",
MavenProject.MICRO_PLUGIN,
MavenProject.START_GOAL
MavenProject.DEV_GOAL
));
}
}
Expand Down

0 comments on commit 2cc5a8d

Please sign in to comment.