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 7f8b7daaf4da408e2d369ef1d2074b900500385f
Author: Elliotte Rusty Harold <elh...@ibiblio.org>
AuthorDate: Sun Apr 12 12:53:53 2020 -0400
wip
---
pom.xml | 16 ++++++++--------
src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java | 9 ++++-----
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6e02c80..3686043 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@ under the License.
<properties>
<mavenArchiverVersion>3.2.0</mavenArchiverVersion>
<mavenFilteringVersion>3.1.1</mavenFilteringVersion>
- <mavenVersion>3.0</mavenVersion>
+ <mavenVersion>3.1.1</mavenVersion>
<javaVersion>7</javaVersion>
<project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>
</properties>
@@ -103,33 +103,33 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.1.0</version>
+ <version>3.3.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>3.6.0</version>
+ <version>4.2.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
- <version>1.25</version>
+ <version>1.26</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>1.7.1</version>
+ <version>2.9.1</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -141,7 +141,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>2.1</version>
+ <version>3.3.0</version>
<scope>test</scope>
</dependency>
</dependencies>
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..a13eba7 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.ArrayList;
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( new ArrayList<String>( "**/**" ) );
//@formatter:off
private static final List<String> DEFAULT_CLIENT_EXCLUDES_LIST =
Collections.unmodifiableList(
- Lists.newArrayList(
+ new ArrayList<String>(
"**/*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 = new ArrayList<>( ejbJar,
"**/package.html" );
List<String> defaultIncludes = DEFAULT_INCLUDES_LIST;
IncludesExcludes ie =
