Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LPD-49398 JCommander usage update and LPD-49543 project-templates version update #346

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ dependencies {
api group: "biz.aQute.bnd", name: "biz.aQute.bndlib", version: "5.3.0"
api group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.16.1"
api group: "com.liferay", name: "com.liferay.gogo.shell.client", version: "1.0.0"
api group: "com.liferay", name: "com.liferay.project.templates", version: "5.1.2"
api group: "com.liferay", name: "com.liferay.project.templates", version: "5.1.6"
api group: "com.liferay", name: "com.liferay.release.util", version: "1.0.0"
api group: "commons-io", name: "commons-io", version: "2.7"
api group: "commons-lang", name: "commons-lang", version: "2.6"
Expand Down
15 changes: 12 additions & 3 deletions cli/src/main/java/com/liferay/blade/cli/BladeCLI.java
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,10 @@ public void printUsage() {
jCommander.addCommand(baseArgs);
}

jCommander.usage(sb);
jCommander.getUsageFormatter(
).usage(
sb
);

try (Scanner scanner = new Scanner(sb.toString())) {
StringBuilder simplifiedUsageString = new StringBuilder();
Expand Down Expand Up @@ -396,13 +399,19 @@ public void printUsage() {
}

public void printUsage(String command) {
_jCommander.usage(command);
_jCommander.getUsageFormatter(
).usage(
command
);
}

public void printUsage(String command, String message) {
out(message);

_jCommander.usage(command);
_jCommander.getUsageFormatter(
).usage(
command
);
}

public void run(String[] args) throws Exception {
Expand Down
Loading