Skip to content

Fix CLI version option #756

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Mar 16, 2025
Merged

Fix CLI version option #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 6 additions & 0 deletions cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>${mainClass}</mainClass>
<manifestEntries>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
Expand Down Expand Up @@ -89,6 +92,9 @@
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>${mainClass}</mainClass>
<manifestEntries>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
Expand Down
11 changes: 10 additions & 1 deletion cli/src/main/java/org/openapitools/openapidiff/cli/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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";
Expand Down
Loading