[maven-ejb-plugin] 02/03: merge master

[elharo]

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

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

commit 523c4aa763f3b8079de243e4a04d86f25ce57ca2
Merge: 7f8b7da 31e122e
Author: Elliotte Rusty Harold <elh...@ibiblio.org>
AuthorDate: Sun Apr 12 19:12:34 2020 -0400

    merge master

 .../java/org/apache/maven/plugins/ejb/EjbMojo.java | 39 ++++------------------
 .../maven/plugins/ejb/IncludesExcludesTest.java    |  7 ++--
 2 files changed, 9 insertions(+), 37 deletions(-)

diff --cc src/test/java/org/apache/maven/plugins/ejb/IncludesExcludesTest.java
index 34adb29,34adb29..430de25
--- a/src/test/java/org/apache/maven/plugins/ejb/IncludesExcludesTest.java
+++ b/src/test/java/org/apache/maven/plugins/ejb/IncludesExcludesTest.java
@@@ -21,12 -21,12 +21,11 @@@ package org.apache.maven.plugins.ejb
  
  import static org.assertj.core.api.Assertions.assertThat;
  
++import java.util.Arrays;
  import java.util.Collections;
  
  import org.junit.Test;
  
--import com.google.inject.internal.util.Lists;
--
  public class IncludesExcludesTest
  {
  
@@@ -64,7 -64,7 +63,7 @@@
      public void 
nonNullForDefaultExcludesShouldResultInExcludesWithDefaultExcludes()
      {
          IncludesExcludes ie = new IncludesExcludes( null, null, 
Collections.<String>emptyList(),
--                                                    Lists.newArrayList( 
"**/package.html" ) );
++                                                    Arrays.asList( 
"**/package.html" ) );
  
          assertThat( ie.resultingIncludes() ).isEqualTo( new String[0] );
          assertThat( ie.resultingExcludes() ).isEqualTo( new String[] { 
"**/package.html" } );
@@@ -73,7 -73,7 +72,7 @@@
      @Test
      public void 
nonNullForDefaultIncludesShouldResultInIncludesWithDefaultIncludes()
      {
--        IncludesExcludes ie = new IncludesExcludes( null, null, 
Lists.newArrayList( "**/package.html" ),
++        IncludesExcludes ie = new IncludesExcludes( null, null, 
Arrays.asList( "**/package.html" ),
                                                      
Collections.<String>emptyList() );
  
          assertThat( ie.resultingIncludes() ).isEqualTo( new String[] { 
"**/package.html" } );