You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2019/11/03 22:59:58 UTC

[maven-doxia-converter] 01/01: [DOXIATOOLS-62] Print Doxia version in help command

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch DOXIATOOLS-62
in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git

commit e27cfc371e5b7778be0e4bffad5fc62983318cbe
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Nov 3 23:55:49 2019 +0100

    [DOXIATOOLS-62] Print Doxia version in help command
---
 src/main/java/org/apache/maven/doxia/cli/ConverterCli.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/maven/doxia/cli/ConverterCli.java b/src/main/java/org/apache/maven/doxia/cli/ConverterCli.java
index 01e9fed..9f068bf 100644
--- a/src/main/java/org/apache/maven/doxia/cli/ConverterCli.java
+++ b/src/main/java/org/apache/maven/doxia/cli/ConverterCli.java
@@ -27,12 +27,14 @@ import java.util.Properties;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.ParseException;
+import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.maven.doxia.Converter;
 import org.apache.maven.doxia.ConverterException;
 import org.apache.maven.doxia.DefaultConverter;
 import org.apache.maven.doxia.UnsupportedFormatException;
 import org.apache.maven.doxia.logging.Log;
 import org.apache.maven.doxia.logging.SystemStreamLog;
+import org.apache.maven.doxia.parser.AbstractParser;
 import org.apache.maven.doxia.wrapper.InputFileWrapper;
 import org.apache.maven.doxia.wrapper.OutputFileWrapper;
 import org.codehaus.plexus.util.Os;
@@ -207,6 +209,8 @@ public class ConverterCli
             {
                 System.out.println( "Doxia Converter version: " + properties.getProperty( "version", "unknown" ) );
             }
+            System.out.println( "Doxia version: " +
+                    FieldUtils.readStaticField( AbstractParser.class, "DOXIA_VERSION", true ) );
 
             System.out.println( "Java version: " + System.getProperty( "java.version", "<unknown java version>" ) );
 
@@ -214,7 +218,7 @@ public class ConverterCli
                 + Os.OS_ARCH + "\" family: \"" + Os.OS_FAMILY + "\"" );
 
         }
-        catch ( IOException e )
+        catch ( IOException | IllegalAccessException e )
         {
             System.err.println( "Unable to determine version from JAR file: " + e.getMessage() );
         }