This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-acr-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new c12dae6 Inline deprecated method (#124)
c12dae6 is described below
commit c12dae624ef9ae41384e07fc10a20e3eb8262654
Author: Elliotte Rusty Harold <[email protected]>
AuthorDate: Thu Nov 27 14:15:47 2025 -0600
Inline deprecated method (#124)
* Inline deprecated method
---
src/main/java/org/apache/maven/plugins/acr/AcrMojo.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/acr/AcrMojo.java
b/src/main/java/org/apache/maven/plugins/acr/AcrMojo.java
index e7dede3..8a17037 100644
--- a/src/main/java/org/apache/maven/plugins/acr/AcrMojo.java
+++ b/src/main/java/org/apache/maven/plugins/acr/AcrMojo.java
@@ -45,6 +45,7 @@ import
org.apache.maven.shared.filtering.MavenResourcesExecution;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.archiver.jar.ManifestException;
+import org.codehaus.plexus.archiver.util.DefaultFileSet;
import org.codehaus.plexus.util.FileUtils;
/**
@@ -199,7 +200,11 @@ public class AcrMojo extends AbstractMojo {
}
if (outputDirectory.exists()) {
- archiver.getArchiver().addDirectory(outputDirectory,
DEFAULT_INCLUDES, mainJarExcludes);
+ archiver.getArchiver()
+ .addFileSet(DefaultFileSet.fileSet(outputDirectory)
+ .prefixed("")
+ .includeExclude(DEFAULT_INCLUDES,
mainJarExcludes)
+ .includeEmptyDirs(true));
} else {
// CHECKSTYLE_OFF: LineLength
getLog().info(
@@ -237,10 +242,10 @@ public class AcrMojo extends AbstractMojo {
// CHECKSTYLE_OFF: LineLength
} catch (ArchiverException e) {
throw new MojoExecutionException(
- "There was a problem creating the JavaEE Application
Client archive: " + e.getMessage(), e);
+ "There was a problem creating the JavaEE Application
Client archive: " + e.getMessage(), e);
} catch (ManifestException e) {
throw new MojoExecutionException(
- "There was a problem reading / creating the manifest for
the JavaEE Application Client archive: "
+ "There was a problem reading / creating the manifest for
the JavaEE Application Client archive: "
+ e.getMessage(),
e);
} catch (IOException e) {
