[maven-doxia-converter] branch DOXIATOOLS-62 updated (e27cfc3 -> c531583)

[sl...@apache.org]

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

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


 discard e27cfc3  [DOXIATOOLS-62] Print Doxia version in help command
     new c531583  [DOXIATOOLS-62] Print Doxia version in help command

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (e27cfc3)
            \
             N -- N -- N   refs/heads/DOXIATOOLS-62 (c531583)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/main/java/org/apache/maven/doxia/cli/ConverterCli.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

[sl...@apache.org]

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 c53158393c81a32a42e57cf96d4f2d035288ca93
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..a0d8224 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() );
         }