Commit 143cfa35 authored by Andreas Tille's avatar Andreas Tille
Browse files

Attempt to replace ch.systemsx.cisd.args4j by org.kohsuke.args4j but failed.

parent 027e5860
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
use_debian_packaged_libs.patch
use_jaxb.patch
use_debian_packaged_args4j.patch
+43 −0
Original line number Diff line number Diff line
Author: Andreas Tille <tille@debian.org>
Last-Update: Thu, 20 Sep 2018 15:11:52 +0200
Description: Try whether we can use the Debian packaged args4j.jar instead
 of the renamed convenience copy
 .
 Unfortunately this does not work:
 .
  invalid Class-Path header in manifest of jar file: /usr/share/maven-repo/org/debian/maven/maven-repo-helper/debian/maven-repo-helper-debian.jar
 ----------
 1. ERROR in /build/libsis-jhdf5-java-18.09.0-pre1+dfsg/source/java/ch/systemsx/cisd/hdf5/h5ar/HDF5ArchiverMain.java (at line 119)
         @Option(name = "i", longName = "include", metaVar = "REGEX", skipForExample = true, usage = "Regex of files to include")
                             ^^^^^^^^
 The attribute longName is undefined for the annotation type Option
 ----------
 2. ERROR in /build/libsis-jhdf5-java-18.09.0-pre1+dfsg/source/java/ch/systemsx/cisd/hdf5/h5ar/HDF5ArchiverMain.java (at line 119)
         @Option(name = "i", longName = "include", metaVar = "REGEX", skipForExample = true, usage = "Regex of files to include")
                                                                      ^^^^^^^^^^^^^^
 The attribute skipForExample is undefined for the annotation type Option
 ----------
 3. ERROR in /build/libsis-jhdf5-java-18.09.0-pre1+dfsg/source/java/ch/systemsx/cisd/hdf5/h5ar/HDF5ArchiverMain.java (at line 122)
         @Option(name = "e", longName = "exclude", metaVar = "REGEX", usage = "Regex of files to exclude")
                             ^^^^^^^^
 ...

--- a/source/java/ch/systemsx/cisd/hdf5/h5ar/HDF5ArchiverMain.java
+++ b/source/java/ch/systemsx/cisd/hdf5/h5ar/HDF5ArchiverMain.java
@@ -28,11 +28,11 @@ import hdf.hdf5lib.exceptions.HDF5Librar
 
 import org.apache.commons.io.FilenameUtils;
 
-import ch.systemsx.cisd.args4j.Argument;
-import ch.systemsx.cisd.args4j.CmdLineException;
-import ch.systemsx.cisd.args4j.CmdLineParser;
-import ch.systemsx.cisd.args4j.ExampleMode;
-import ch.systemsx.cisd.args4j.Option;
+import org.kohsuke.args4j.Argument;
+import org.kohsuke.args4j.CmdLineException;
+import org.kohsuke.args4j.CmdLineParser;
+import org.kohsuke.args4j.ExampleMode;
+import org.kohsuke.args4j.Option;
 import ch.systemsx.cisd.base.exceptions.IErrorStrategy;
 import ch.systemsx.cisd.hdf5.BuildAndEnvironmentInfo;
 import ch.systemsx.cisd.hdf5.IHDF5WriterConfigurator.FileFormatVersionBounds;