(maven-ejb-plugin) branch master updated: Inline deprecated methods (#197)

[elharo]

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-ejb-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 2a19bfa  Inline deprecated methods (#197)
2a19bfa is described below

commit 2a19bfaaa4879cf9c2e58c80333ccb2f27c3bf5b
Author: Elliotte Rusty Harold <elh...@users.noreply.github.com>
AuthorDate: Mon Dec 8 13:08:30 2025 +0000

    Inline deprecated methods (#197)
    
    * Inline deprecated methods
    
    * Inline deprecated methods
    
    * format
    
    * format
---
 src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java 
b/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java
index 38bf0a9..c677395 100644
--- a/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java
+++ b/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java
@@ -46,6 +46,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;
 
 /**
@@ -363,7 +364,10 @@ public class EjbMojo extends AbstractMojo {
             IncludesExcludes ie =
                     new IncludesExcludes(Collections.emptyList(), excludes, 
DEFAULT_INCLUDES_LIST, defaultExcludes);
 
-            archiver.getArchiver().addDirectory(sourceDirectory, 
ie.resultingIncludes(), ie.resultingExcludes());
+            archiver.getArchiver()
+                    .addFileSet(DefaultFileSet.fileSet(sourceDirectory)
+                            .prefixed("")
+                            .includeExclude(ie.resultingIncludes(), 
ie.resultingExcludes()));
 
             // FIXME: We should be able to filter more than just the 
deployment descriptor?
             if (deploymentDescriptor.exists()) {
@@ -403,11 +407,14 @@ public class EjbMojo extends AbstractMojo {
         clientArchiver.configureReproducibleBuild(outputTimestamp);
 
         try {
-
             IncludesExcludes ie = new IncludesExcludes(
                     clientIncludes, clientExcludes, DEFAULT_INCLUDES_LIST, 
DEFAULT_CLIENT_EXCLUDES_LIST);
 
-            clientArchiver.getArchiver().addDirectory(sourceDirectory, 
ie.resultingIncludes(), ie.resultingExcludes());
+            clientArchiver
+                    .getArchiver()
+                    .addFileSet(DefaultFileSet.fileSet(sourceDirectory)
+                            .prefixed("")
+                            .includeExclude(ie.resultingIncludes(), 
ie.resultingExcludes()));
 
             clientArchiver.createArchive(session, project, archive);