[maven-ear-plugin] branch master updated: cleanup

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[maven-ear-plugin] branch master updated: cleanup

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

hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new c97bf3c  cleanup
c97bf3c is described below

commit c97bf3ce6a072998a2dde17924be6dec0d535d56
Author: Hervé Boutemy <[hidden email]>
AuthorDate: Sat Sep 12 22:17:57 2020 +0200

    cleanup
---
 src/main/java/org/apache/maven/plugins/ear/EarMojo.java                | 3 ++-
 src/test/java/org/apache/maven/plugins/ear/AbstractEarTestBase.java    | 2 --
 src/test/java/org/apache/maven/plugins/ear/EarModuleTest.java          | 1 -
 src/test/java/org/apache/maven/plugins/ear/EnvEntryTest.java           | 2 --
 .../java/org/apache/maven/plugins/ear/util/ArtifactRepositoryTest.java | 2 --
 .../apache/maven/plugins/ear/util/ArtifactTypeMappingServiceTest.java  | 1 -
 .../java/org/apache/maven/plugins/ear/util/EarMavenArchiverTest.java   | 1 -
 src/test/java/org/apache/maven/plugins/ear/util/JavaEEVersionTest.java | 3 ---
 8 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/ear/EarMojo.java b/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
index 6618492..8c4d4ce 100644
--- a/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
@@ -35,6 +35,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.zip.ZipException;
 
 import org.apache.maven.archiver.MavenArchiveConfiguration;
@@ -573,7 +574,7 @@ public class EarMojo
      */
     protected String[] getIncludes()
     {
-        return StringUtils.split( StringUtils.defaultString( earSourceIncludes ), "," );
+        return StringUtils.split( Objects.toString( earSourceIncludes, "" ), "," );
     }
 
     /**
diff --git a/src/test/java/org/apache/maven/plugins/ear/AbstractEarTestBase.java b/src/test/java/org/apache/maven/plugins/ear/AbstractEarTestBase.java
index f230de2..f4f0638 100644
--- a/src/test/java/org/apache/maven/plugins/ear/AbstractEarTestBase.java
+++ b/src/test/java/org/apache/maven/plugins/ear/AbstractEarTestBase.java
@@ -4,8 +4,6 @@ import java.util.Set;
 import java.util.TreeSet;
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugins.ear.AbstractEarModule;
-import org.apache.maven.plugins.ear.EarModule;
 import org.apache.maven.plugins.ear.stub.ArtifactTestStub;
 
 /*
diff --git a/src/test/java/org/apache/maven/plugins/ear/EarModuleTest.java b/src/test/java/org/apache/maven/plugins/ear/EarModuleTest.java
index d1abcdc..785f88b 100644
--- a/src/test/java/org/apache/maven/plugins/ear/EarModuleTest.java
+++ b/src/test/java/org/apache/maven/plugins/ear/EarModuleTest.java
@@ -21,7 +21,6 @@ package org.apache.maven.plugins.ear;
 
 import static org.junit.Assert.assertEquals;
 
-import org.apache.maven.plugins.ear.AbstractEarModule;
 import org.junit.Test;
 
 /**
diff --git a/src/test/java/org/apache/maven/plugins/ear/EnvEntryTest.java b/src/test/java/org/apache/maven/plugins/ear/EnvEntryTest.java
index 20f8d00..f1ba390 100644
--- a/src/test/java/org/apache/maven/plugins/ear/EnvEntryTest.java
+++ b/src/test/java/org/apache/maven/plugins/ear/EnvEntryTest.java
@@ -24,8 +24,6 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import org.apache.maven.plugins.ear.EnvEntry;
-
 /**
  * @author Stephane Nicoll
  */
diff --git a/src/test/java/org/apache/maven/plugins/ear/util/ArtifactRepositoryTest.java b/src/test/java/org/apache/maven/plugins/ear/util/ArtifactRepositoryTest.java
index 9e47c5f..f7739cc 100644
--- a/src/test/java/org/apache/maven/plugins/ear/util/ArtifactRepositoryTest.java
+++ b/src/test/java/org/apache/maven/plugins/ear/util/ArtifactRepositoryTest.java
@@ -24,8 +24,6 @@ import static org.junit.Assert.assertNull;
 
 import org.apache.maven.plugins.ear.AbstractEarTestBase;
 import org.apache.maven.plugins.ear.EarPluginException;
-import org.apache.maven.plugins.ear.util.ArtifactRepository;
-import org.apache.maven.plugins.ear.util.ArtifactTypeMappingService;
 import org.codehaus.plexus.configuration.PlexusConfigurationException;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/maven/plugins/ear/util/ArtifactTypeMappingServiceTest.java b/src/test/java/org/apache/maven/plugins/ear/util/ArtifactTypeMappingServiceTest.java
index bae714c..4805368 100644
--- a/src/test/java/org/apache/maven/plugins/ear/util/ArtifactTypeMappingServiceTest.java
+++ b/src/test/java/org/apache/maven/plugins/ear/util/ArtifactTypeMappingServiceTest.java
@@ -24,7 +24,6 @@ import junit.framework.TestCase;
 import org.apache.maven.plugins.ear.EarModuleFactory;
 import org.apache.maven.plugins.ear.EarPluginException;
 import org.apache.maven.plugins.ear.UnknownArtifactTypeException;
-import org.apache.maven.plugins.ear.util.ArtifactTypeMappingService;
 import org.codehaus.plexus.configuration.PlexusConfigurationException;
 import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
 
diff --git a/src/test/java/org/apache/maven/plugins/ear/util/EarMavenArchiverTest.java b/src/test/java/org/apache/maven/plugins/ear/util/EarMavenArchiverTest.java
index 95793c5..693c84a 100644
--- a/src/test/java/org/apache/maven/plugins/ear/util/EarMavenArchiverTest.java
+++ b/src/test/java/org/apache/maven/plugins/ear/util/EarMavenArchiverTest.java
@@ -8,7 +8,6 @@ import java.util.List;
 import org.apache.maven.plugins.ear.AbstractEarTestBase;
 import org.apache.maven.plugins.ear.EarModule;
 import org.apache.maven.plugins.ear.EjbModule;
-import org.apache.maven.plugins.ear.util.EarMavenArchiver;
 import org.junit.Test;
 
 /*
diff --git a/src/test/java/org/apache/maven/plugins/ear/util/JavaEEVersionTest.java b/src/test/java/org/apache/maven/plugins/ear/util/JavaEEVersionTest.java
index f94bb8b..9933b08 100644
--- a/src/test/java/org/apache/maven/plugins/ear/util/JavaEEVersionTest.java
+++ b/src/test/java/org/apache/maven/plugins/ear/util/JavaEEVersionTest.java
@@ -1,8 +1,5 @@
 package org.apache.maven.plugins.ear.util;
 
-import org.apache.maven.plugins.ear.util.InvalidJavaEEVersion;
-import org.apache.maven.plugins.ear.util.JavaEEVersion;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file