From cb80b812586e81d0307b191be226df28f4c7baa9 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Wed, 6 Mar 2024 08:47:57 -0800
Subject: [PATCH] Replaced with maven assembly plugin

---
 args4j-maven-plugin/pom.xml                   |  1 +
 .../kohsuke/args4j/maven/Args4jUsageMojo.java | 17 +++----------
 args4j-tools/pom.xml                          | 24 +++++++++++++++++++
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/args4j-maven-plugin/pom.xml b/args4j-maven-plugin/pom.xml
index e06df8a1..fc13bcb9 100644
--- a/args4j-maven-plugin/pom.xml
+++ b/args4j-maven-plugin/pom.xml
@@ -22,6 +22,7 @@
       <groupId>args4j</groupId>
       <artifactId>args4j-tools</artifactId>
       <version>${project.version}</version>
+      <classifier>jar-with-dependencies</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
diff --git a/args4j-maven-plugin/src/main/java/org/kohsuke/args4j/maven/Args4jUsageMojo.java b/args4j-maven-plugin/src/main/java/org/kohsuke/args4j/maven/Args4jUsageMojo.java
index 35a7d711..f7c98223 100644
--- a/args4j-maven-plugin/src/main/java/org/kohsuke/args4j/maven/Args4jUsageMojo.java
+++ b/args4j-maven-plugin/src/main/java/org/kohsuke/args4j/maven/Args4jUsageMojo.java
@@ -8,6 +8,7 @@
 import org.kohsuke.args4j.apt.Main;
 
 import java.io.*;
+import java.lang.ProcessBuilder.Redirect;
 import java.net.URLDecoder;
 import java.util.List;
 
@@ -85,14 +86,13 @@ private void generateUsage(String sourceFile, File args4jBuildDir) throws Interr
         String outputDir = args4jBuildDir.getAbsolutePath();
         ProcessBuilder pb = new ProcessBuilder();
         pb.command("java","-jar", jar.getAbsolutePath(), "-o", outputDir, "-mode", mode, sourceFile);
+        pb.redirectError(Redirect.INHERIT);
+        pb.redirectOutput(Redirect.INHERIT);
 
         printCommand(pb);
         Process process = pb.start();
 
-        InputStreamReader isr = dumpOutput(process);
         int r = process.waitFor();
-
-        isr.close();
         if (r !=0)
             throw new IOException("args4j generation failed: "+r);
     }
@@ -114,15 +114,4 @@ private File dir(ProcessBuilder pb) {
         }
         return directory;
     }
-
-    private InputStreamReader dumpOutput(Process process) throws IOException {
-        InputStream is = process.getInputStream();
-        InputStreamReader isr = new InputStreamReader(is);
-        BufferedReader br = new BufferedReader(isr);
-        String line;
-        while ((line = br.readLine()) != null) {
-          System.out.println(line);
-        }
-        return isr;
-    }
 }
diff --git a/args4j-tools/pom.xml b/args4j-tools/pom.xml
index a5779304..71679590 100644
--- a/args4j-tools/pom.xml
+++ b/args4j-tools/pom.xml
@@ -44,6 +44,30 @@
           </archive>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>3.3.0</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <mainClass>${mainClass}</mainClass>
+            </manifest>
+          </archive>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <dependencies>