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 23:15:28 UTC
[maven-doxia-converter] branch master updated (6ccb11f -> 0b8521d)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git.
from 6ccb11f [DOXIATOOLS-62] Enable xhtml5 parser/sink
new bb144c4 [DOXIATOOLS-62] Print Doxia version
new f18f91a Update link to Jira issues
new 59989f8 [DOXIATOOLS-63] Upgrade JUnit 4.13-rc-1
new 4ad251d [DOXIATOOLS-63] Upgrade icu4j to 65.1
new a729945 [DOXIATOOLS-63] Upgrade commons-io to 2.6
new c3b4ab3 [DOXIATOOLS-63] Upgrade plexus-utils to 3.3.0
new 9c04e81 [DOXIATOOLS-63] Upgrade commons-cli to 1.4
new dc4be7c [DOXIATOOLS-63] Upgrade maven-assembly-plugin to 3.2.0
new 0b8521d [DOXIATOOLS-63] Upgrade plexus-container-default to 2.1.0
The 9 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:
pom.xml | 46 +++--
src/main/assembly/jar.xml | 46 -----
.../org/apache/maven/doxia/DefaultConverter.java | 6 +-
.../org/apache/maven/doxia/cli/CLIManager.java | 217 ++++++---------------
.../org/apache/maven/doxia/cli/ConverterCli.java | 6 +-
src/site/apt/usage.apt.vm | 42 ++--
.../java/org/apache/maven/doxia/ConverterTest.java | 8 +-
7 files changed, 116 insertions(+), 255 deletions(-)
delete mode 100644 src/main/assembly/jar.xml
[maven-doxia-converter] 03/09: [DOXIATOOLS-63] Upgrade JUnit
4.13-rc-1
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git
commit 59989f828553cb7393e8c6f0a936b224a7fc1682
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Nov 3 13:21:44 2019 +0100
[DOXIATOOLS-63] Upgrade JUnit 4.13-rc-1
---
pom.xml | 6 +++---
src/main/assembly/jar.xml | 2 --
src/main/java/org/apache/maven/doxia/DefaultConverter.java | 4 ++--
src/test/java/org/apache/maven/doxia/ConverterTest.java | 8 ++------
4 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2838a23..5c1636c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,9 +170,9 @@ under the License.
<!-- Test -->
<dependency>
- <groupId>junit-addons</groupId>
- <artifactId>junit-addons</artifactId>
- <version>1.4</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13-rc-1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/main/assembly/jar.xml b/src/main/assembly/jar.xml
index 6f2edda..b882505 100644
--- a/src/main/assembly/jar.xml
+++ b/src/main/assembly/jar.xml
@@ -30,8 +30,6 @@ under the License.
<unpack>true</unpack>
<scope>runtime</scope>
<excludes>
- <exclude>junit:junit</exclude>
- <exclude>junit-addons:junit-addons</exclude>
<exclude>javax.servlet:servlet-api</exclude>
<exclude>org.apache.maven.doxia:doxia-converter</exclude>
</excludes>
diff --git a/src/main/java/org/apache/maven/doxia/DefaultConverter.java b/src/main/java/org/apache/maven/doxia/DefaultConverter.java
index 99698cf..d63458b 100644
--- a/src/main/java/org/apache/maven/doxia/DefaultConverter.java
+++ b/src/main/java/org/apache/maven/doxia/DefaultConverter.java
@@ -531,7 +531,7 @@ public class DefaultConverter
* @see {@link XmlStreamReader#getEncoding()} for xml files
* @see {@link CharsetDetector#detect()} for text files
*/
- private static String autoDetectEncoding( File f )
+ static String autoDetectEncoding( File f )
{
if ( !f.isFile() )
{
@@ -578,7 +578,7 @@ public class DefaultConverter
* @throws IllegalArgumentException if f is not a file.
* @throws UnsupportedOperationException if could not detect the Doxia format.
*/
- private static String autoDetectFormat( File f, String encoding )
+ static String autoDetectFormat( File f, String encoding )
{
if ( !f.isFile() )
{
diff --git a/src/test/java/org/apache/maven/doxia/ConverterTest.java b/src/test/java/org/apache/maven/doxia/ConverterTest.java
index 065f30a..f4000e3 100644
--- a/src/test/java/org/apache/maven/doxia/ConverterTest.java
+++ b/src/test/java/org/apache/maven/doxia/ConverterTest.java
@@ -27,8 +27,6 @@ import java.io.FileWriter;
import java.io.OutputStream;
import java.io.StringWriter;
-import junitx.util.PrivateAccessor;
-
import org.apache.maven.doxia.wrapper.InputFileWrapper;
import org.apache.maven.doxia.wrapper.InputReaderWrapper;
import org.apache.maven.doxia.wrapper.OutputFileWrapper;
@@ -652,8 +650,7 @@ public class ConverterTest
private String autoDetectEncoding( File f )
throws Throwable
{
- return (String) PrivateAccessor.invoke( DefaultConverter.class, "autoDetectEncoding",
- new Class[] { File.class }, new Object[] { f } );
+ return DefaultConverter.autoDetectEncoding( f );
}
private String autoDetectEncoding( String filename )
@@ -681,8 +678,7 @@ public class ConverterTest
private String autoDetectFormat( File f, String encoding )
throws Throwable
{
- return (String) PrivateAccessor.invoke( DefaultConverter.class, "autoDetectFormat", new Class[] { File.class,
- String.class }, new Object[] { f, encoding } );
+ return DefaultConverter.autoDetectFormat( f, encoding );
}
private String autoDetectFormat( String filename, String encoding )
[maven-doxia-converter] 07/09: [DOXIATOOLS-63] Upgrade commons-cli
to 1.4
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git
commit 9c04e81879d2062471fca73377a74947e7ec997c
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Nov 3 23:31:48 2019 +0100
[DOXIATOOLS-63] Upgrade commons-cli to 1.4
---
pom.xml | 2 +-
.../org/apache/maven/doxia/cli/CLIManager.java | 217 ++++++---------------
src/site/apt/usage.apt.vm | 33 ++--
3 files changed, 74 insertions(+), 178 deletions(-)
diff --git a/pom.xml b/pom.xml
index ebb4a76..37db990 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,7 +152,7 @@ under the License.
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.1</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/src/main/java/org/apache/maven/doxia/cli/CLIManager.java b/src/main/java/org/apache/maven/doxia/cli/CLIManager.java
index a363003..85756de 100644
--- a/src/main/java/org/apache/maven/doxia/cli/CLIManager.java
+++ b/src/main/java/org/apache/maven/doxia/cli/CLIManager.java
@@ -19,14 +19,10 @@ package org.apache.maven.doxia.cli;
* under the License.
*/
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.GnuParser;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.maven.doxia.DefaultConverter;
@@ -43,10 +39,10 @@ import static org.codehaus.plexus.util.StringUtils.join;
class CLIManager
{
/** h character */
- static final char HELP = 'h';
+ static final String HELP = "h";
/** v character */
- static final char VERSION = 'v';
+ static final String VERSION = "v";
/** in String */
static final String IN = "in";
@@ -64,16 +60,16 @@ class CLIManager
static final String INENCODING = "inEncoding";
/** f character */
- static final char FORMAT = 'f';
+ static final String FORMAT = "f";
/** outEncoding String */
static final String OUTENCODING = "outEncoding";
/** X character */
- static final char DEBUG = 'X';
+ static final String DEBUG = "X";
/** e character */
- static final char ERRORS = 'e';
+ static final String ERRORS = "e";
private static final Options OPTIONS;
@@ -81,47 +77,52 @@ class CLIManager
{
OPTIONS = new Options();
- OptionBuilder.withLongOpt( "help" );
- OptionBuilder.withDescription( "Display help information." );
- OPTIONS.addOption( OptionBuilder.create( HELP ) );
- OptionBuilder.withLongOpt( "version" );
- OptionBuilder.withDescription( "Display version information." );
- OPTIONS.addOption( OptionBuilder.create( VERSION ) );
-
- OptionBuilder.withLongOpt( "input" );
- OptionBuilder.withDescription( "Input file or directory." );
- OptionBuilder.hasArg();
- OPTIONS.addOption( OptionBuilder.create( IN ) );
- OptionBuilder.withLongOpt( "output" );
- OptionBuilder.withDescription( "Output file or directory." );
- OptionBuilder.hasArg();
- OPTIONS.addOption( OptionBuilder.create( OUT ) );
- OptionBuilder.withDescription( "From format. If not specified, try to autodetect it." );
- OptionBuilder.hasArg();
- OPTIONS.addOption( OptionBuilder.create( FROM ) );
- OptionBuilder.withDescription( "To format." );
- OptionBuilder.hasArg();
- OPTIONS.addOption( OptionBuilder.create( TO ) );
- OptionBuilder.withLongOpt( "inputEncoding" );
- OptionBuilder.withDescription( "Input file encoding. If not specified, try to autodetect it." );
- OptionBuilder.hasArg();
- OPTIONS.addOption( OptionBuilder.create( INENCODING ) );
- OptionBuilder.withLongOpt( "format" );
- OptionBuilder.withDescription( "Format the output (actually only xml based outputs) "
- + " to be human readable." );
- OPTIONS.addOption( OptionBuilder.create( FORMAT ) );
- OptionBuilder.withLongOpt( "outputEncoding" );
- OptionBuilder.withDescription( "Output file encoding. If not specified, use the "
- + "input encoding (or autodetected)." );
- OptionBuilder.hasArg();
- OPTIONS.addOption( OptionBuilder.create( OUTENCODING ) );
-
- OptionBuilder.withLongOpt( "debug" );
- OptionBuilder.withDescription( "Produce execution debug output." );
- OPTIONS.addOption( OptionBuilder.create( DEBUG ) );
- OptionBuilder.withLongOpt( "errors" );
- OptionBuilder.withDescription( "Produce execution error messages." );
- OPTIONS.addOption( OptionBuilder.create( ERRORS ) );
+ OPTIONS.addOption( Option.builder( HELP )
+ .longOpt( "help" )
+ .desc( "Display help information." )
+ .build() );
+ OPTIONS.addOption( Option.builder( VERSION )
+ .longOpt( "version" )
+ .desc( "Display version information." )
+ .build() );
+ OPTIONS.addOption( Option.builder( IN )
+ .longOpt( "input" )
+ .desc( "Input file or directory." )
+ .hasArg()
+ .build() );
+ OPTIONS.addOption( Option.builder( OUT )
+ .longOpt( "output" )
+ .desc( "Output file or directory." )
+ .hasArg()
+ .build() );
+ OPTIONS.addOption( Option.builder( FROM )
+ .desc( "From format. If not specified, try to autodetect it." )
+ .hasArg()
+ .build() );
+ OPTIONS.addOption( Option.builder( TO )
+ .desc( "To format." )
+ .hasArg()
+ .build() );
+ OPTIONS.addOption( Option.builder( INENCODING )
+ .desc( "Input file encoding. If not specified, try to autodetect it." )
+ .hasArg()
+ .build() );
+ OPTIONS.addOption( Option.builder( FORMAT )
+ .longOpt( "format" )
+ .desc( "Format the output (actually only xml based outputs) to be human readable." )
+ .build() );
+ OPTIONS.addOption( Option.builder( OUTENCODING )
+ .desc( "Output file encoding. If not specified, use the input encoding (or autodetected)." )
+ .hasArg()
+ .build() );
+ OPTIONS.addOption( Option.builder( DEBUG )
+ .longOpt( "debug" )
+ .desc( "Produce execution debug output." )
+ .build() );
+ OPTIONS.addOption( Option.builder( ERRORS )
+ .longOpt( "errors" )
+ .desc( "Produce execution error messages." )
+ .build() );
}
/**
@@ -138,11 +139,8 @@ class CLIManager
throw new IllegalArgumentException( "args is required." );
}
- // We need to eat any quotes surrounding arguments...
- String[] cleanArgs = cleanArgs( args );
-
- CommandLineParser parser = new GnuParser();
- return parser.parse( OPTIONS, cleanArgs );
+ DefaultParser parser = new DefaultParser();
+ return parser.parse( OPTIONS, args );
}
static void displayHelp()
@@ -150,8 +148,8 @@ class CLIManager
System.out.println();
HelpFormatter formatter = new HelpFormatter();
- formatter.printHelp( "doxia [options] -in <arg> [-from <arg>] [-inEncoding <arg>] -out <arg> "
- + "-to <arg> [-outEncoding <arg>]\n", "\nOptions:", OPTIONS, getSupportedFormatAndEncoding() );
+ formatter.setWidth( 128 );
+ formatter.printHelp( "doxia-converter", "\nOptions:", OPTIONS, getSupportedFormatAndEncoding(), true );
}
private static String getSupportedFormatAndEncoding()
@@ -162,7 +160,7 @@ class CLIManager
private static String getSupportedFormat()
{
return "\nSupported Formats:\n from: " + join( DefaultConverter.SUPPORTED_FROM_FORMAT, ", " )
- + " or autodetect" + "\n out: " + join( DefaultConverter.SUPPORTED_TO_FORMAT, ", " )
+ + " or autodetect" + "\n to: " + join( DefaultConverter.SUPPORTED_TO_FORMAT, ", " )
+ "\n";
}
@@ -170,103 +168,4 @@ class CLIManager
{
return "\nSupported Encoding:\n " + join( CharsetDetector.getAllDetectableCharsets(), ", " );
}
-
- private String[] cleanArgs( String[] args )
- {
- List<String> cleaned = new ArrayList<>();
-
- StringBuilder currentArg = null;
-
- for ( String arg : args )
- {
- boolean addedToBuffer = false;
-
- if ( arg.startsWith( "\"" ) )
- {
- // if we're in the process of building up another arg, push it and start over.
- // this is for the case: "-Dfoo=bar "-Dfoo2=bar two" (note the first unterminated quote)
- if ( currentArg != null )
- {
- cleaned.add( currentArg.toString() );
- }
-
- // start building an argument here.
- currentArg = new StringBuilder( arg.substring( 1 ) );
- addedToBuffer = true;
- }
-
- // this has to be a separate "if" statement, to capture the case of: "-Dfoo=bar"
- if ( arg.endsWith( "\"" ) )
- {
- String cleanArgPart = arg.substring( 0, arg.length() - 1 );
-
- // if we're building an argument, keep doing so.
- if ( currentArg != null )
- {
- // if this is the case of "-Dfoo=bar", then we need to adjust the buffer.
- if ( addedToBuffer )
- {
- currentArg.setLength( currentArg.length() - 1 );
- }
- // otherwise, we trim the trailing " and append to the buffer.
- else
- {
- // TODO: introducing a space here...not sure what else to do but collapse whitespace
- currentArg.append( ' ' ).append( cleanArgPart );
- }
-
- // we're done with this argument, so add it.
- cleaned.add( currentArg.toString() );
- }
- else
- {
- // this is a simple argument...just add it.
- cleaned.add( cleanArgPart );
- }
-
- // the currentArg MUST be finished when this completes.
- currentArg = null;
- continue;
- }
-
- // if we haven't added this arg to the buffer, and we ARE building an argument
- // buffer, then append it with a preceding space...again, not sure what else to
- // do other than collapse whitespace.
- // NOTE: The case of a trailing quote is handled by nullifying the arg buffer.
- if ( !addedToBuffer )
- {
- // append to the argument we're building, collapsing whitespace to a single space.
- if ( currentArg != null )
- {
- currentArg.append( ' ' ).append( arg );
- }
- // this is a loner, just add it directly.
- else
- {
- cleaned.add( arg );
- }
- }
- }
-
- // clean up.
- if ( currentArg != null )
- {
- cleaned.add( currentArg.toString() );
- }
-
- int cleanedSz = cleaned.size();
- String[] cleanArgs;
-
- if ( cleanedSz == 0 )
- {
- // if we didn't have any arguments to clean, simply pass the original array through
- cleanArgs = args;
- }
- else
- {
- cleanArgs = cleaned.toArray( new String[cleanedSz] );
- }
-
- return cleanArgs;
- }
}
diff --git a/src/site/apt/usage.apt.vm b/src/site/apt/usage.apt.vm
index 4dc6d46..87cedad 100644
--- a/src/site/apt/usage.apt.vm
+++ b/src/site/apt/usage.apt.vm
@@ -37,29 +37,26 @@ Usage
+-----+
# java -jar target/apache-doxia-${project.version}-jar-with-dependencies.jar -h
-usage: doxia [options] -in <arg> [-from <arg>] [-inEncoding <arg>] -out
- <arg> -to <arg> [-outEncoding <arg>]
+usage: doxia-converter [-e] [-f] [-from <arg>] [-h] -in <arg> [-inEncoding <arg>] -out <arg> [-outEncoding <arg>] -to
+ <arg> [-v] [-X]
Options:
- -e,--errors Produce execution error messages.
- -f,--format Format the output (actually only xml
- based outputs) to be human readable.
- -from <arg> From format. If not specified, try to
- autodetect it.
- -h,--help Display help information.
- -in,--input <arg> Input file or directory.
- -inEncoding,--inputEncoding <arg> Input file encoding. If not
- specified, try to autodetect it.
- -out,--output <arg> Output file or directory.
- -outEncoding,--outputEncoding <arg> Output file encoding. If not
- specified, use the input encoding (or detected).
- -to <arg> To format.
- -v,--version Display version information.
- -X,--debug Produce execution debug output.
+-e,--errors Produce execution error messages.
+-f,--format Format the output (actually only xml based outputs) to be human readable.
+-from <arg> From format. If not specified, try to autodetect it.
+-h,--help Display help information.
+-in,--input <arg> Input file or directory.
+-inEncoding <arg> Input file encoding. If not specified, try to autodetect it.
+-out,--output <arg> Output file or directory.
+-outEncoding <arg> Output file encoding. If not specified, use the input encoding (or autodetected).
+-to <arg> To format.
+-v,--version Display version information.
+-X,--debug Produce execution debug output.
Supported Formats:
from: apt, confluence, docbook, fml, twiki, xdoc, xhtml, xhtml5 or autodetect
-out: apt, docbook, fo, itext, latex, rtf, xdoc, xhtml, xhtml5
+to: apt, confluence, docbook, fo, itext, latex, rtf, twiki, xdoc, xhtml, xhtml5
+
Supported Encoding:
UTF-8, UTF-16BE, UTF-16LE, UTF-32BE, UTF-32LE, Shift_JIS, ISO-2022-JP, ISO-2022-CN, ISO-2022-KR, GB18030, EUC-JP, EUC-KR, Big5,
ISO-8859-1, ISO-8859-2, ISO-8859-5, ISO-8859-6, ISO-8859-7, ISO-8859-8-I, ISO-8859-8, windows-1251, windows-1256, KOI8-R,
[maven-doxia-converter] 08/09: [DOXIATOOLS-63] Upgrade
maven-assembly-plugin to 3.2.0
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git
commit dc4be7c95af5631d8fc9e490c6d4dd040825a915
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Nov 3 22:23:36 2019 +0100
[DOXIATOOLS-63] Upgrade maven-assembly-plugin to 3.2.0
---
pom.xml | 17 ++++++++---------
src/main/assembly/jar.xml | 44 --------------------------------------------
src/site/apt/usage.apt.vm | 8 ++++----
3 files changed, 12 insertions(+), 57 deletions(-)
diff --git a/pom.xml b/pom.xml
index 37db990..2691ae7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,7 +173,6 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <scope>provided</scope>
</dependency>
<!-- Test -->
@@ -203,20 +202,20 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
+ <version>3.2.0</version>
<configuration>
- <descriptors>
- <descriptor>src/main/assembly/jar.xml</descriptor>
- </descriptors>
- <finalName>apache-doxia-${project.version}</finalName>
<archive>
- <manifestEntries>
- <Main-Class>org.apache.maven.doxia.cli.ConverterCli</Main-Class>
- </manifestEntries>
+ <manifest>
+ <mainClass>org.apache.maven.doxia.cli.ConverterCli</mainClass>
+ </manifest>
</archive>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
</configuration>
<executions>
<execution>
+ <id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
diff --git a/src/main/assembly/jar.xml b/src/main/assembly/jar.xml
deleted file mode 100644
index b882505..0000000
--- a/src/main/assembly/jar.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>jar-with-dependencies</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <unpack>true</unpack>
- <scope>runtime</scope>
- <excludes>
- <exclude>javax.servlet:servlet-api</exclude>
- <exclude>org.apache.maven.doxia:doxia-converter</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
diff --git a/src/site/apt/usage.apt.vm b/src/site/apt/usage.apt.vm
index 87cedad..1153e78 100644
--- a/src/site/apt/usage.apt.vm
+++ b/src/site/apt/usage.apt.vm
@@ -35,10 +35,10 @@ Usage
* Command Line Help
+-----+
-# java -jar target/apache-doxia-${project.version}-jar-with-dependencies.jar -h
+# java -jar target/doxia-converter-${project.version}-jar-with-dependencies.jar -h
-usage: doxia-converter [-e] [-f] [-from <arg>] [-h] -in <arg> [-inEncoding <arg>] -out <arg> [-outEncoding <arg>] -to
- <arg> [-v] [-X]
+usage: doxia-converter [options] -in <arg> [-from <arg>] [-inEncoding <arg>] -out
+ <arg> -to <arg> [-outEncoding <arg>]
Options:
-e,--errors Produce execution error messages.
@@ -68,7 +68,7 @@ ISO-8859-9, IBM424_rtl, IBM424_ltr, IBM420_rtl, IBM420_ltr
* Command Line Execution
+-----+
-# java -jar target/apache-doxia-${project.version}-jar-with-dependencies.jar \
+# java -jar target/doxia-converter-${project.version}-jar-with-dependencies.jar \
-in /path/to/xhtml.file \
-from xhtml \
-out /path/to/outputdir \
[maven-doxia-converter] 02/09: Update link to Jira issues
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git
commit f18f91aa8e82463dd68bf452d330c406fd646683
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Nov 3 13:08:36 2019 +0100
Update link to Jira issues
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 282ca2e..2838a23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@ under the License.
</scm>
<issueManagement>
<system>jira</system>
- <url>https://issues.apache.org/jira/browse/DOXIATOOLS/component/12326004</url>
+ <url>https://issues.apache.org/jira/projects/DOXIATOOLS</url>
</issueManagement>
<ciManagement>
<system>Jenkins</system>
[maven-doxia-converter] 06/09: [DOXIATOOLS-63] Upgrade plexus-utils
to 3.3.0
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git
commit c3b4ab38cb9379ad4ec81a4da29df17d98ae3df1
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Nov 3 13:50:45 2019 +0100
[DOXIATOOLS-63] Upgrade plexus-utils to 3.3.0
---
pom.xml | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 94a9e36..ebb4a76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,15 @@ under the License.
<doxiaVersion>1.9</doxiaVersion>
<javaVersion>7</javaVersion>
</properties>
-
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>3.3.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<!-- doxia -->
<dependency>
[maven-doxia-converter] 01/09: [DOXIATOOLS-62] Print Doxia version
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git
commit bb144c4b48d4f960cf4a5537afb8d14f6767e0b0
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Nov 3 23:55:49 2019 +0100
[DOXIATOOLS-62] Print Doxia version
---
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() );
}
[maven-doxia-converter] 04/09: [DOXIATOOLS-63] Upgrade icu4j to 65.1
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git
commit 4ad251d6871de5aba206ddbdc505423c36cb47b1
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Nov 3 22:29:14 2019 +0100
[DOXIATOOLS-63] Upgrade icu4j to 65.1
---
pom.xml | 2 +-
src/site/apt/usage.apt.vm | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5c1636c..0a0fbcc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,7 +154,7 @@ under the License.
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
- <version>3.8</version>
+ <version>65.1</version>
</dependency>
<!-- Plexus -->
diff --git a/src/site/apt/usage.apt.vm b/src/site/apt/usage.apt.vm
index a3ecaa2..4dc6d46 100644
--- a/src/site/apt/usage.apt.vm
+++ b/src/site/apt/usage.apt.vm
@@ -61,10 +61,9 @@ Supported Formats:
from: apt, confluence, docbook, fml, twiki, xdoc, xhtml, xhtml5 or autodetect
out: apt, docbook, fo, itext, latex, rtf, xdoc, xhtml, xhtml5
Supported Encoding:
-UTF-8, UTF-16BE, UTF-16LE, UTF-32BE, UTF-32LE, Shift_JIS, ISO-2022-JP,
-ISO-2022-CN, ISO-2022-KR, GB18030, EUC-JP, EUC-KR, Big5, ISO-8859-1,
-ISO-8859-2, ISO-8859-5, ISO-8859-6, ISO-8859-7, ISO-8859-8, windows-1251,
-windows-1256, KOI8-R, ISO-8859-9
+UTF-8, UTF-16BE, UTF-16LE, UTF-32BE, UTF-32LE, Shift_JIS, ISO-2022-JP, ISO-2022-CN, ISO-2022-KR, GB18030, EUC-JP, EUC-KR, Big5,
+ISO-8859-1, ISO-8859-2, ISO-8859-5, ISO-8859-6, ISO-8859-7, ISO-8859-8-I, ISO-8859-8, windows-1251, windows-1256, KOI8-R,
+ISO-8859-9, IBM424_rtl, IBM424_ltr, IBM420_rtl, IBM420_ltr
+-----+
<<Note>>: The input parameters (i.e. encoding and format) can be autodetected.
[maven-doxia-converter] 05/09: [DOXIATOOLS-63] Upgrade commons-io
to 2.6
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git
commit a729945877aacd9e34d7caa748d971ed718f1953
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Nov 3 13:23:36 2019 +0100
[DOXIATOOLS-63] Upgrade commons-io to 2.6
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0a0fbcc..94a9e36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,7 +149,7 @@ under the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.2</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
[maven-doxia-converter] 09/09: [DOXIATOOLS-63] Upgrade
plexus-container-default to 2.1.0
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git
commit 0b8521ddec95aaa36aa9635707d4b611742cde2f
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Nov 3 22:38:21 2019 +0100
[DOXIATOOLS-63] Upgrade plexus-container-default to 2.1.0
---
pom.xml | 5 +++++
src/main/java/org/apache/maven/doxia/DefaultConverter.java | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2691ae7..fb1c219 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,11 @@ under the License.
<artifactId>plexus-utils</artifactId>
<version>3.3.0</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>2.1.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
diff --git a/src/main/java/org/apache/maven/doxia/DefaultConverter.java b/src/main/java/org/apache/maven/doxia/DefaultConverter.java
index d63458b..f4b5ef7 100644
--- a/src/main/java/org/apache/maven/doxia/DefaultConverter.java
+++ b/src/main/java/org/apache/maven/doxia/DefaultConverter.java
@@ -499,7 +499,7 @@ public class DefaultConverter
return;
}
- Map<String, String> context = new HashMap<>();
+ Map<Object, Object> context = new HashMap<>();
context.put( "basedir", new File( "" ).getAbsolutePath() );
ContainerConfiguration containerConfiguration = new DefaultContainerConfiguration();