diff --git a/README.md b/README.md index 161d31b..e41be01 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,10 @@ The XmlDiff utility compares two XML files and generates a third file that repre To run the difference utility, run this command line: ``` -java io.fixprotocol.xml.XmlDiff [output-file] +java -jar diff-merge-1.5.1-SNAPSHOT-jar-with-dependencies.jar + +Usage: XmlDiff [diff-file] [-e event-file] [-u|-o] +diff-file defaults to console -u=unordered elements -o=ordered elements ``` If the output file is not provided, then results go to the console. diff --git a/pom.xml b/pom.xml index a59dced..671e476 100644 --- a/pom.xml +++ b/pom.xml @@ -112,45 +112,28 @@ - maven-resources-plugin - 3.1.0 - - - copy-resources - verify - - copy-resources - - - ${project.build.directory}/modules - - - ${project.build.directory} - - *.jar - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.1.1 + maven-assembly-plugin + 3.3.0 + + + jar-with-dependencies + + + + io.fixprotocol.xml.XmlDiff + + + true + + + - copy-dependencies - verify + make-assembly + package - copy-dependencies + single - - ${project.build.directory}/modules - true - org.apache.logging.log4j - @@ -158,81 +141,6 @@ - - image - - - - - - org.moditect - moditect-maven-plugin - 1.0.0-SNAPSHOT - - - add-module-infos - generate-resources - - add-module-info - - - ${project.build.directory}/modules - true - true - - - - net.sf.saxon - Saxon-HE - ${saxon.version} - - - module Saxon.HE { - - } - - - - - - - - - create-runtime-image - install - - create-runtime-image - - - - ${project.build.directory}/modules - - - diff.merge - Saxon.HE - - - ${project.build.directory}/jlink-image - - - - xmldiff - diff.merge - io.fixprotocol.xml.XmlDiff - - - xmlmerge - diff.merge - io.fixprotocol.xml.XmlMerge - - - - - - - - - release diff --git a/src/main/java/io/fixprotocol/xml/XmlMerge.java b/src/main/java/io/fixprotocol/xml/XmlMerge.java index 993a4ee..3e7cefe 100644 --- a/src/main/java/io/fixprotocol/xml/XmlMerge.java +++ b/src/main/java/io/fixprotocol/xml/XmlMerge.java @@ -65,7 +65,7 @@ public class XmlMerge { * Merges a baseline XML file with a differences file to produce a second XML file * * @param args three file names: baseline XML file, diff file, name of second XML to produce - * Optionally, argument '-e ' can direct errors to a JSON file for UI rendering. + * Optionally, argument '-e ' can direct errors to a JSON file suitable for UI rendering. * */ public static void main(String[] args) {