[maven-doxia-converter] branch DOXIATOOLS-63 updated: [DOXIATOOLS-63] Upgrade maven-assembly-plugin to 3.2.0

[sl...@apache.org]

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

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


The following commit(s) were added to refs/heads/DOXIATOOLS-63 by this push:
     new 632825e  [DOXIATOOLS-63] Upgrade maven-assembly-plugin to 3.2.0
632825e is described below

commit 632825e098dda97f6aa0b6fc65836fd32f1f5251
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 \