You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/04/12 17:01:08 UTC

[maven-ejb-plugin] 01/01: remove dependency on internal shaded copy of Guava

This is an automated email from the ASF dual-hosted git repository.

elharo pushed a commit to branch guava
in repository https://gitbox.apache.org/repos/asf/maven-ejb-plugin.git

commit e963f594b03942f1fe612a523d307738d5bbd09a
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Apr 12 12:59:32 2020 -0400

    remove dependency on internal shaded copy of Guava
---
 src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 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 d9c7da8..1f94ede 100644
--- a/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java
+++ b/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java
@@ -21,6 +21,7 @@ package org.apache.maven.plugins.ejb;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -49,8 +50,6 @@ import org.codehaus.plexus.archiver.jar.JarArchiver;
 import org.codehaus.plexus.archiver.jar.ManifestException;
 import org.codehaus.plexus.util.FileUtils;
 
-import com.google.inject.internal.util.Lists;
-
 /**
  * Build an EJB (and optional client) from the current project.
  *
@@ -64,12 +63,12 @@ public class EjbMojo
     extends AbstractMojo
 {
     private static final List<String> DEFAULT_INCLUDES_LIST =
-        Collections.unmodifiableList( Lists.newArrayList( "**/**" ) );
+        Collections.unmodifiableList( Arrays.asList( "**/**" ) );
 
     //@formatter:off
     private static final List<String> DEFAULT_CLIENT_EXCLUDES_LIST =
         Collections.unmodifiableList( 
-            Lists.newArrayList( 
+            Arrays.asList( 
               "**/*Bean.class", 
               "**/*CMP.class", 
               "**/*Session.class",
@@ -373,7 +372,7 @@ public class EjbMojo
 
         try
         {
-            List<String> defaultExcludes = Lists.newArrayList( ejbJar, "**/package.html" );
+            List<String> defaultExcludes = Arrays.asList( ejbJar, "**/package.html" );
             List<String> defaultIncludes = DEFAULT_INCLUDES_LIST;
 
             IncludesExcludes ie =