From c6fdf1782e9cba39e840a7e6ad4a65eb268984b9 Mon Sep 17 00:00:00 2001 From: Aliaksandr Pinchuk Date: Sun, 16 Mar 2025 19:28:15 +0100 Subject: [PATCH] Fix CLI version option --- .gitignore | 3 +++ cli/pom.xml | 6 ++++++ .../java/org/openapitools/openapidiff/cli/Main.java | 11 ++++++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7956bcbd3..9190ddebe 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,6 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* target/ + +# IDE files +.vscode/settings.json \ No newline at end of file diff --git a/cli/pom.xml b/cli/pom.xml index 1ffcc3000..f1782dd1a 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -57,6 +57,9 @@ ${mainClass} + + ${project.version} + @@ -89,6 +92,9 @@ ${mainClass} + + ${project.version} + diff --git a/cli/src/main/java/org/openapitools/openapidiff/cli/Main.java b/cli/src/main/java/org/openapitools/openapidiff/cli/Main.java index c80d272b8..a9e223d27 100644 --- a/cli/src/main/java/org/openapitools/openapidiff/cli/Main.java +++ b/cli/src/main/java/org/openapitools/openapidiff/cli/Main.java @@ -35,7 +35,10 @@ public static void main(String... args) { Options options = new Options(); options.addOption(Option.builder("h").longOpt("help").desc("print this message").build()); options.addOption( - Option.builder().longOpt("version").desc("print the version information and exit").build()); + Option.builder("v") + .longOpt("version") + .desc("print the version information and exit") + .build()); options.addOption( Option.builder() .longOpt("state") @@ -72,6 +75,7 @@ public static void main(String... args) { options.addOption(Option.builder().longOpt("warn").desc("Print warning information").build()); options.addOption(Option.builder().longOpt("error").desc("Print error information").build()); options.addOption(Option.builder().longOpt("off").desc("No information printed").build()); + options.addOption(Option.builder().longOpt("off").desc("No information printed").build()); options.addOption( Option.builder("l") .longOpt("log") @@ -149,6 +153,11 @@ public static void main(String... args) { printHelp(options); System.exit(0); } + if (line.hasOption("version") || line.hasOption("v")) { + String version = Main.class.getPackage().getImplementationVersion(); + System.out.println("openapi-diff version: " + (version != null ? version : "DEV")); + System.exit(0); + } String logLevel = "ERROR"; if (line.hasOption("off")) { logLevel = "OFF";