Skip to content

Commit 7ef7b82

Browse files
authored
Fix CLI version option (#756)
1 parent 30a6d78 commit 7ef7b82

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,6 @@
1717
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
1818
hs_err_pid*
1919
target/
20+
21+
# IDE files
22+
.vscode/settings.json

cli/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@
5757
<transformers>
5858
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
5959
<mainClass>${mainClass}</mainClass>
60+
<manifestEntries>
61+
<Implementation-Version>${project.version}</Implementation-Version>
62+
</manifestEntries>
6063
</transformer>
6164
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
6265
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
@@ -89,6 +92,9 @@
8992
<transformers>
9093
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
9194
<mainClass>${mainClass}</mainClass>
95+
<manifestEntries>
96+
<Implementation-Version>${project.version}</Implementation-Version>
97+
</manifestEntries>
9298
</transformer>
9399
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
94100
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />

cli/src/main/java/org/openapitools/openapidiff/cli/Main.java

+10-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ public static void main(String... args) {
3535
Options options = new Options();
3636
options.addOption(Option.builder("h").longOpt("help").desc("print this message").build());
3737
options.addOption(
38-
Option.builder().longOpt("version").desc("print the version information and exit").build());
38+
Option.builder("v")
39+
.longOpt("version")
40+
.desc("print the version information and exit")
41+
.build());
3942
options.addOption(
4043
Option.builder()
4144
.longOpt("state")
@@ -72,6 +75,7 @@ public static void main(String... args) {
7275
options.addOption(Option.builder().longOpt("warn").desc("Print warning information").build());
7376
options.addOption(Option.builder().longOpt("error").desc("Print error information").build());
7477
options.addOption(Option.builder().longOpt("off").desc("No information printed").build());
78+
options.addOption(Option.builder().longOpt("off").desc("No information printed").build());
7579
options.addOption(
7680
Option.builder("l")
7781
.longOpt("log")
@@ -149,6 +153,11 @@ public static void main(String... args) {
149153
printHelp(options);
150154
System.exit(0);
151155
}
156+
if (line.hasOption("version") || line.hasOption("v")) {
157+
String version = Main.class.getPackage().getImplementationVersion();
158+
System.out.println("openapi-diff version: " + (version != null ? version : "DEV"));
159+
System.exit(0);
160+
}
152161
String logLevel = "ERROR";
153162
if (line.hasOption("off")) {
154163
logLevel = "OFF";

0 commit comments

Comments
 (0)