This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch CLEANUP in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git
commit f0237c3073488d29cae726883a6fbc57da28ea62 Author: Karl Heinz Marbaise <khmarba...@apache.org> AuthorDate: Wed Mar 7 20:14:41 2018 +0100 o Fixed JavaDoc issues o Removed all SVN version entries. o Removed ModuleIdentifierValidator including the test cause it's needed anymore. --- .../maven/plugins/ear/AbstractEarModule.java | 1 - .../apache/maven/plugins/ear/AbstractEarMojo.java | 1 - .../maven/plugins/ear/AbstractXmlWriter.java | 1 - .../org/apache/maven/plugins/ear/AcrModule.java | 3 +- .../maven/plugins/ear/ApplicationXmlWriter.java | 1 - .../plugins/ear/ApplicationXmlWriterContext.java | 1 - .../maven/plugins/ear/EarExecutionContext.java | 3 +- .../org/apache/maven/plugins/ear/EarModule.java | 5 +- .../apache/maven/plugins/ear/EarModuleFactory.java | 1 - .../java/org/apache/maven/plugins/ear/EarMojo.java | 3 +- .../maven/plugins/ear/EarPluginException.java | 1 - .../apache/maven/plugins/ear/EjbClientModule.java | 1 - .../org/apache/maven/plugins/ear/EjbModule.java | 1 - .../org/apache/maven/plugins/ear/EnvEntry.java | 1 - .../plugins/ear/GenerateApplicationXmlMojo.java | 1 - .../org/apache/maven/plugins/ear/HarModule.java | 1 - .../org/apache/maven/plugins/ear/JarModule.java | 8 +- .../maven/plugins/ear/JbossAppXmlWriter.java | 1 - .../maven/plugins/ear/JbossConfiguration.java | 1 - .../apache/maven/plugins/ear/JbossEarModule.java | 1 - .../org/apache/maven/plugins/ear/ParModule.java | 4 +- .../org/apache/maven/plugins/ear/RarModule.java | 1 - .../org/apache/maven/plugins/ear/SecurityRole.java | 1 - .../plugins/ear/UnknownArtifactTypeException.java | 1 - .../org/apache/maven/plugins/ear/WebModule.java | 3 +- .../org/apache/maven/plugins/ear/WsrModule.java | 4 +- .../maven/plugins/ear/util/ArtifactRepository.java | 21 +- .../ear/util/ArtifactTypeMappingService.java | 1 - .../ear/util/ModuleIdentifierValidator.java | 139 -------------- src/site/site.xml | 2 +- .../apache/maven/plugins/ear/EarModuleTest.java | 1 - .../maven/plugins/ear/it/AbstractEarPluginIT.java | 1 - .../org/apache/maven/plugins/ear/it/EarMojoIT.java | 1 - .../maven/plugins/ear/stub/ArtifactTestStub.java | 1 - .../plugins/ear/util/ArtifactRepositoryTest.java | 1 - .../ear/util/ArtifactTypeMappingServiceTest.java | 1 - .../ear/util/ModuleIdentifierValidatorTest.java | 211 --------------------- 37 files changed, 22 insertions(+), 409 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/ear/AbstractEarModule.java b/src/main/java/org/apache/maven/plugins/ear/AbstractEarModule.java index e4743d9..34cda4c 100644 --- a/src/main/java/org/apache/maven/plugins/ear/AbstractEarModule.java +++ b/src/main/java/org/apache/maven/plugins/ear/AbstractEarModule.java @@ -32,7 +32,6 @@ import org.codehaus.plexus.util.xml.XMLWriter; * A base implementation of an {@link EarModule}. * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: AbstractEarModule.java 1645331 2014-12-13 17:31:09Z khmarbaise $ */ public abstract class AbstractEarModule implements EarModule diff --git a/src/main/java/org/apache/maven/plugins/ear/AbstractEarMojo.java b/src/main/java/org/apache/maven/plugins/ear/AbstractEarMojo.java index 2d5d05b..bc258db 100644 --- a/src/main/java/org/apache/maven/plugins/ear/AbstractEarMojo.java +++ b/src/main/java/org/apache/maven/plugins/ear/AbstractEarMojo.java @@ -42,7 +42,6 @@ import org.codehaus.plexus.configuration.PlexusConfigurationException; * A base class for EAR-processing related tasks. * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: AbstractEarMojo.java 1742027 2016-05-02 19:11:21Z khmarbaise $ */ public abstract class AbstractEarMojo extends AbstractMojo diff --git a/src/main/java/org/apache/maven/plugins/ear/AbstractXmlWriter.java b/src/main/java/org/apache/maven/plugins/ear/AbstractXmlWriter.java index f360c6a..fe3603b 100644 --- a/src/main/java/org/apache/maven/plugins/ear/AbstractXmlWriter.java +++ b/src/main/java/org/apache/maven/plugins/ear/AbstractXmlWriter.java @@ -31,7 +31,6 @@ import java.io.Writer; * A base class for deployment descriptor file generators. * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: AbstractXmlWriter.java 1636449 2014-11-03 21:27:36Z khmarbaise $ */ abstract class AbstractXmlWriter { diff --git a/src/main/java/org/apache/maven/plugins/ear/AcrModule.java b/src/main/java/org/apache/maven/plugins/ear/AcrModule.java index 3f4b14f..3342126 100644 --- a/src/main/java/org/apache/maven/plugins/ear/AcrModule.java +++ b/src/main/java/org/apache/maven/plugins/ear/AcrModule.java @@ -27,9 +27,8 @@ import java.util.Set; /** * The {@link EarModule} implementation for an Acr Module. - * <p/> * - * @author <a href="khmarba...@apache.org">Karl Heinz Marbaise</a> + * @author <a href="mailto:khmarba...@apache.org">Karl Heinz Marbaise</a> * @since 3.0.0 */ public class AcrModule diff --git a/src/main/java/org/apache/maven/plugins/ear/ApplicationXmlWriter.java b/src/main/java/org/apache/maven/plugins/ear/ApplicationXmlWriter.java index 65c7701..e5516e5 100644 --- a/src/main/java/org/apache/maven/plugins/ear/ApplicationXmlWriter.java +++ b/src/main/java/org/apache/maven/plugins/ear/ApplicationXmlWriter.java @@ -28,7 +28,6 @@ import org.codehaus.plexus.util.xml.XMLWriter; * An <tt>XmlWriter</tt> based implementation used to generate an <tt>application.xml</tt> file * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: ApplicationXmlWriter.java 1648055 2014-12-27 14:59:45Z khmarbaise $ */ final class ApplicationXmlWriter extends AbstractXmlWriter diff --git a/src/main/java/org/apache/maven/plugins/ear/ApplicationXmlWriterContext.java b/src/main/java/org/apache/maven/plugins/ear/ApplicationXmlWriterContext.java index 8156489..9730acc 100644 --- a/src/main/java/org/apache/maven/plugins/ear/ApplicationXmlWriterContext.java +++ b/src/main/java/org/apache/maven/plugins/ear/ApplicationXmlWriterContext.java @@ -26,7 +26,6 @@ import java.util.List; * A context for the {@link ApplicationXmlWriter}. * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: ApplicationXmlWriter.java 728546 2008-12-21 22:56:51Z bentmann $ */ class ApplicationXmlWriterContext { diff --git a/src/main/java/org/apache/maven/plugins/ear/EarExecutionContext.java b/src/main/java/org/apache/maven/plugins/ear/EarExecutionContext.java index b330f85..fab4838 100644 --- a/src/main/java/org/apache/maven/plugins/ear/EarExecutionContext.java +++ b/src/main/java/org/apache/maven/plugins/ear/EarExecutionContext.java @@ -27,7 +27,6 @@ import org.apache.maven.project.MavenProject; * Contains various runtime parameters used to customize the generated EAR file. * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: EarExecutionContext.java 1755538 2016-08-08 20:32:12Z rfscholte $ */ public class EarExecutionContext { @@ -73,7 +72,7 @@ public class EarExecutionContext } /** - * @return {@link #fileNameMapping} + * @return {@link #outputFileNameMapping} */ public String getOutputFileNameMapping() { diff --git a/src/main/java/org/apache/maven/plugins/ear/EarModule.java b/src/main/java/org/apache/maven/plugins/ear/EarModule.java index 9e38297..5b54a60 100644 --- a/src/main/java/org/apache/maven/plugins/ear/EarModule.java +++ b/src/main/java/org/apache/maven/plugins/ear/EarModule.java @@ -29,14 +29,13 @@ import java.util.Set; * The ear module interface. * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: EarModule.java 1645331 2014-12-13 17:31:09Z khmarbaise $ */ public interface EarModule { /** * Returns the {@link Artifact} representing this module. - * <p/> + * * Note that this might return <tt>null</tt> till the module has been resolved. * * @return the artifact @@ -67,7 +66,7 @@ public interface EarModule /** * Specify whether this module should be unpacked in the EAR archive or not. - * <p/> + * * Returns null if no configuration was specified so that defaulting may apply. * * @return true if this module should be bundled unpacked, false otherwise diff --git a/src/main/java/org/apache/maven/plugins/ear/EarModuleFactory.java b/src/main/java/org/apache/maven/plugins/ear/EarModuleFactory.java index 527a1fb..161e6bc 100644 --- a/src/main/java/org/apache/maven/plugins/ear/EarModuleFactory.java +++ b/src/main/java/org/apache/maven/plugins/ear/EarModuleFactory.java @@ -31,7 +31,6 @@ import org.apache.maven.plugins.ear.util.JavaEEVersion; * Builds an {@link EarModule} based on an <tt>Artifact</tt>. * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: EarModuleFactory.java 1755538 2016-08-08 20:32:12Z rfscholte $ */ public final class EarModuleFactory { 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 1cc7b18..b671adf 100644 --- a/src/main/java/org/apache/maven/plugins/ear/EarMojo.java +++ b/src/main/java/org/apache/maven/plugins/ear/EarMojo.java @@ -64,7 +64,6 @@ import org.codehaus.plexus.util.StringUtils; * Builds J2EE Enterprise Archive (EAR) files. * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: EarMojo.java 1755539 2016-08-08 20:34:46Z rfscholte $ */ // CHECKSTYLE_OFF: LineLength @Mojo( name = "ear", defaultPhase = LifecyclePhase.PACKAGE, threadSafe = true, requiresDependencyResolution = ResolutionScope.TEST ) @@ -616,7 +615,7 @@ public class EarMojo /** * Returns the {@link JarArchiver} implementation used to package the EAR file. - * <p/> + * * By default the archiver is obtained from the Plexus container. * * @return the archiver diff --git a/src/main/java/org/apache/maven/plugins/ear/EarPluginException.java b/src/main/java/org/apache/maven/plugins/ear/EarPluginException.java index 54ba145..9243b9b 100644 --- a/src/main/java/org/apache/maven/plugins/ear/EarPluginException.java +++ b/src/main/java/org/apache/maven/plugins/ear/EarPluginException.java @@ -23,7 +23,6 @@ package org.apache.maven.plugins.ear; * The base exception of the EAR plugin. * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: EarPluginException.java 1645331 2014-12-13 17:31:09Z khmarbaise $ */ public class EarPluginException extends Exception diff --git a/src/main/java/org/apache/maven/plugins/ear/EjbClientModule.java b/src/main/java/org/apache/maven/plugins/ear/EjbClientModule.java index 5ae965d..186f893 100644 --- a/src/main/java/org/apache/maven/plugins/ear/EjbClientModule.java +++ b/src/main/java/org/apache/maven/plugins/ear/EjbClientModule.java @@ -25,7 +25,6 @@ import org.apache.maven.artifact.Artifact; * The {@link EarModule} implementation for an ejb client module. * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: EjbClientModule.java 1645331 2014-12-13 17:31:09Z khmarbaise $ */ public class EjbClientModule extends JarModule diff --git a/src/main/java/org/apache/maven/plugins/ear/EjbModule.java b/src/main/java/org/apache/maven/plugins/ear/EjbModule.java index 1c4ed25..d74b62d 100644 --- a/src/main/java/org/apache/maven/plugins/ear/EjbModule.java +++ b/src/main/java/org/apache/maven/plugins/ear/EjbModule.java @@ -26,7 +26,6 @@ import org.codehaus.plexus.util.xml.XMLWriter; * The {@link EarModule} implementation for an EJB module. * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: EjbModule.java 1645331 2014-12-13 17:31:09Z khmarbaise $ */ public class EjbModule extends AbstractEarModule diff --git a/src/main/java/org/apache/maven/plugins/ear/EnvEntry.java b/src/main/java/org/apache/maven/plugins/ear/EnvEntry.java index ce87323..34046c3 100644 --- a/src/main/java/org/apache/maven/plugins/ear/EnvEntry.java +++ b/src/main/java/org/apache/maven/plugins/ear/EnvEntry.java @@ -26,7 +26,6 @@ import org.codehaus.plexus.util.xml.XMLWriter; * The representation of a env-entry entry within an application.xml file. * * @author Jim Brownfield based on code by <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: EnvEntry.java 1648055 2014-12-27 14:59:45Z khmarbaise $ */ class EnvEntry { diff --git a/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java b/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java index 7a627fd..9d3565e 100644 --- a/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java +++ b/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java @@ -44,7 +44,6 @@ import org.codehaus.plexus.util.FileUtils; * Generates the EAR deployment descriptor file(s). * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: GenerateApplicationXmlMojo.java 1713543 2015-11-09 21:32:15Z khmarbaise $ */ // CHECKSTYLE_OFF: LineLength @Mojo( name = "generate-application-xml", defaultPhase = LifecyclePhase.GENERATE_RESOURCES, threadSafe = true, requiresDependencyResolution = ResolutionScope.TEST ) diff --git a/src/main/java/org/apache/maven/plugins/ear/HarModule.java b/src/main/java/org/apache/maven/plugins/ear/HarModule.java index 0f38df6..335b293 100644 --- a/src/main/java/org/apache/maven/plugins/ear/HarModule.java +++ b/src/main/java/org/apache/maven/plugins/ear/HarModule.java @@ -26,7 +26,6 @@ import org.codehaus.plexus.util.xml.XMLWriter; * The {@link EarModule} implementation for a JBoss Hibernate archive. * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: HarModule.java 1645331 2014-12-13 17:31:09Z khmarbaise $ */ public class HarModule extends AbstractEarModule diff --git a/src/main/java/org/apache/maven/plugins/ear/JarModule.java b/src/main/java/org/apache/maven/plugins/ear/JarModule.java index fd59898..baf30ff 100644 --- a/src/main/java/org/apache/maven/plugins/ear/JarModule.java +++ b/src/main/java/org/apache/maven/plugins/ear/JarModule.java @@ -27,15 +27,13 @@ import java.util.Set; /** * The {@link EarModule} implementation for a non J2EE module such as third party libraries. - * <p/> - * Such module is not incorporated in the generated <tt>application.xml<tt> + * + * <p>Such module is not incorporated in the generated <tt>application.xml</tt> * but some application servers support it. To include it in the generated * deployment descriptor anyway, set the <tt>includeInApplicationXml</tt> boolean flag. - * <p/> - * This class deprecates {@link org.apache.maven.plugins.ear.JavaModule}. + * </p> * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: JarModule.java 1648046 2014-12-27 11:07:02Z khmarbaise $ */ public class JarModule extends AbstractEarModule diff --git a/src/main/java/org/apache/maven/plugins/ear/JbossAppXmlWriter.java b/src/main/java/org/apache/maven/plugins/ear/JbossAppXmlWriter.java index 938231e..9825cf9 100644 --- a/src/main/java/org/apache/maven/plugins/ear/JbossAppXmlWriter.java +++ b/src/main/java/org/apache/maven/plugins/ear/JbossAppXmlWriter.java @@ -29,7 +29,6 @@ import org.codehaus.plexus.util.xml.XMLWriter; * An <tt>XmlWriter</tt> based implementation used to generate a <tt>jboss-app.xml</tt> file * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: JbossAppXmlWriter.java 1636449 2014-11-03 21:27:36Z khmarbaise $ */ final class JbossAppXmlWriter extends AbstractXmlWriter diff --git a/src/main/java/org/apache/maven/plugins/ear/JbossConfiguration.java b/src/main/java/org/apache/maven/plugins/ear/JbossConfiguration.java index 9e15a23..dd5dd11 100644 --- a/src/main/java/org/apache/maven/plugins/ear/JbossConfiguration.java +++ b/src/main/java/org/apache/maven/plugins/ear/JbossConfiguration.java @@ -25,7 +25,6 @@ import java.util.List; * The JBoss specific configuration, used to generate the jboss-app.xml deployment descriptor file * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: JbossConfiguration.java 1636449 2014-11-03 21:27:36Z khmarbaise $ */ class JbossConfiguration { diff --git a/src/main/java/org/apache/maven/plugins/ear/JbossEarModule.java b/src/main/java/org/apache/maven/plugins/ear/JbossEarModule.java index b8ea5b8..f0c4174 100644 --- a/src/main/java/org/apache/maven/plugins/ear/JbossEarModule.java +++ b/src/main/java/org/apache/maven/plugins/ear/JbossEarModule.java @@ -25,7 +25,6 @@ import org.codehaus.plexus.util.xml.XMLWriter; * Represents a JBoss specific ear module. * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: JbossEarModule.java 1542511 2013-11-16 13:33:56Z rfscholte $ */ public interface JbossEarModule { diff --git a/src/main/java/org/apache/maven/plugins/ear/ParModule.java b/src/main/java/org/apache/maven/plugins/ear/ParModule.java index be092a7..f88b479 100644 --- a/src/main/java/org/apache/maven/plugins/ear/ParModule.java +++ b/src/main/java/org/apache/maven/plugins/ear/ParModule.java @@ -24,9 +24,7 @@ import org.apache.maven.artifact.Artifact; /** * The {@link EarModule} implementation for a Par module. * - * @author Stephane Nicoll <snic...@apache.org> - * @author $Author: khmarbaise $ (last edit) - * @version $Revision: 1645331 $ + * @author <a href="snic...@apache.org">Stephane Nicoll</a> */ public class ParModule extends EjbModule diff --git a/src/main/java/org/apache/maven/plugins/ear/RarModule.java b/src/main/java/org/apache/maven/plugins/ear/RarModule.java index 8549cfb..e9af1cb 100644 --- a/src/main/java/org/apache/maven/plugins/ear/RarModule.java +++ b/src/main/java/org/apache/maven/plugins/ear/RarModule.java @@ -26,7 +26,6 @@ import org.codehaus.plexus.util.xml.XMLWriter; * The {@link EarModule} implementation for an J2EE connector module. * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: RarModule.java 1660473 2015-02-17 19:33:00Z khmarbaise $ */ public class RarModule extends AbstractEarModule diff --git a/src/main/java/org/apache/maven/plugins/ear/SecurityRole.java b/src/main/java/org/apache/maven/plugins/ear/SecurityRole.java index 6666a0a..90ee8f9 100644 --- a/src/main/java/org/apache/maven/plugins/ear/SecurityRole.java +++ b/src/main/java/org/apache/maven/plugins/ear/SecurityRole.java @@ -25,7 +25,6 @@ import org.codehaus.plexus.util.xml.XMLWriter; * The representation of a security-role entry within an application.xml file. * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: SecurityRole.java 1542508 2013-11-16 13:21:35Z rfscholte $ */ class SecurityRole { diff --git a/src/main/java/org/apache/maven/plugins/ear/UnknownArtifactTypeException.java b/src/main/java/org/apache/maven/plugins/ear/UnknownArtifactTypeException.java index dc200c0..ae4b507 100644 --- a/src/main/java/org/apache/maven/plugins/ear/UnknownArtifactTypeException.java +++ b/src/main/java/org/apache/maven/plugins/ear/UnknownArtifactTypeException.java @@ -23,7 +23,6 @@ package org.apache.maven.plugins.ear; * Thrown if an unknown artifact type is encountered. * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: UnknownArtifactTypeException.java 1645331 2014-12-13 17:31:09Z khmarbaise $ */ public class UnknownArtifactTypeException extends EarPluginException diff --git a/src/main/java/org/apache/maven/plugins/ear/WebModule.java b/src/main/java/org/apache/maven/plugins/ear/WebModule.java index b1fd84c..a719474 100644 --- a/src/main/java/org/apache/maven/plugins/ear/WebModule.java +++ b/src/main/java/org/apache/maven/plugins/ear/WebModule.java @@ -29,7 +29,6 @@ import java.util.Set; * The {@link EarModule} implementation for a Web application module. * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: WebModule.java 1645331 2014-12-13 17:31:09Z khmarbaise $ */ public class WebModule extends AbstractEarModule @@ -98,7 +97,7 @@ public class WebModule /** * Returns the context root to use for the web module. - * <p/> + * * Note that this might return <tt>null</tt> till the artifact has been resolved. * * @return the context root diff --git a/src/main/java/org/apache/maven/plugins/ear/WsrModule.java b/src/main/java/org/apache/maven/plugins/ear/WsrModule.java index 0c249dd..b1844a1 100644 --- a/src/main/java/org/apache/maven/plugins/ear/WsrModule.java +++ b/src/main/java/org/apache/maven/plugins/ear/WsrModule.java @@ -24,9 +24,7 @@ import org.apache.maven.artifact.Artifact; /** * The {@link EarModule} implementation for a JBoss wsr module. * - * @author Brad O'Hearne <br...@neurofire.com> - * @author $Author: khmarbaise $ (last edit) - * @version $Revision: 1645331 $ + * @author <a href="mailto:br...@neurofire.com">br...@neurofire.com</a> */ public class WsrModule extends RarModule diff --git a/src/main/java/org/apache/maven/plugins/ear/util/ArtifactRepository.java b/src/main/java/org/apache/maven/plugins/ear/util/ArtifactRepository.java index aa8e3aa..81faf7a 100644 --- a/src/main/java/org/apache/maven/plugins/ear/util/ArtifactRepository.java +++ b/src/main/java/org/apache/maven/plugins/ear/util/ArtifactRepository.java @@ -28,7 +28,6 @@ import org.apache.maven.artifact.Artifact; * An artifact repository used to resolve {@link org.apache.maven.plugins.ear.EarModule}. * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: ArtifactRepository.java 1645331 2014-12-13 17:31:09Z khmarbaise $ */ public class ArtifactRepository { @@ -55,13 +54,13 @@ public class ArtifactRepository /** * Returns the artifact with the specified parameters. - * <p/> + * <p> * If the artifact is classified and is the only one with the specified groupI, artifactId and type, it will be - * returned. - * <p/> + * returned.</p> + * <p> * If the artifact is classified and is not the only one with the specified groupI, artifactId and type, it returns - * null. - * <p/> + * null.</p> + * * If the artifact is not found, it returns null. * * @param groupId the group id @@ -101,13 +100,13 @@ public class ArtifactRepository /** * Returns the artifact with the specified parameters. - * <p/> + * <p> * If the artifact is classified and is the only one with the specified groupI, artifactId and type, it will be - * returned. - * <p/> + * returned.</p> + * <p> * If the artifact is classified and is not the only one with the specified groupI, artifactId and type, it returns - * null. - * <p/> + * null.</p> + * * If the artifact is not found, it returns null. * * @param groupId the group id diff --git a/src/main/java/org/apache/maven/plugins/ear/util/ArtifactTypeMappingService.java b/src/main/java/org/apache/maven/plugins/ear/util/ArtifactTypeMappingService.java index 7d3aeb7..e8631ae 100644 --- a/src/main/java/org/apache/maven/plugins/ear/util/ArtifactTypeMappingService.java +++ b/src/main/java/org/apache/maven/plugins/ear/util/ArtifactTypeMappingService.java @@ -34,7 +34,6 @@ import org.codehaus.plexus.configuration.PlexusConfigurationException; * Allows to map custom artifact type to standard type. * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: ArtifactTypeMappingService.java 1645331 2014-12-13 17:31:09Z khmarbaise $ */ public class ArtifactTypeMappingService { diff --git a/src/main/java/org/apache/maven/plugins/ear/util/ModuleIdentifierValidator.java b/src/main/java/org/apache/maven/plugins/ear/util/ModuleIdentifierValidator.java deleted file mode 100644 index b2c7f21..0000000 --- a/src/main/java/org/apache/maven/plugins/ear/util/ModuleIdentifierValidator.java +++ /dev/null @@ -1,139 +0,0 @@ -package org.apache.maven.plugins.ear.util; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.maven.plugins.ear.EarModule; - -/** - * This class will check the list of modules if there exist a duplicate artifactId. If we have such case it's necessary - * to create a warning to the user otherwise it can happen to overwrite existing artifacts during the EAR creation - * process. This is a temporary solution to keep backward compatibility with previous versions. For the next major - * release 3.X the creation of the EAR archive should be done based on unique identifiers like - * {@code groupId:artifactId:version}. - * - * @author Karl Heinz Marbaise <khmarba...@apache.org> - */ -public class ModuleIdentifierValidator -{ - - private List<EarModule> earModules; - - private Map<String, List<EarModule>> result; - - /** - * @param earModules The list of {@link EarModule} which will be checked. - */ - public ModuleIdentifierValidator( List<EarModule> earModules ) - { - if ( earModules == null ) - { - throw new IllegalArgumentException( "Not allowed to give null for earModules." ); - } - this.earModules = earModules; - this.result = new HashMap<String, List<EarModule>>(); - } - - /** - * You have to call {@link #checkForDuplicateArtifacts()} before - * otherwise you will get always {@code false}. - * @return true in case of existing duplicates false otherwise. - */ - public boolean existDuplicateArtifacts() - { - return !result.isEmpty(); - } - - /** - * Trigger the module list check. - * - * @return this for fluent usage. - */ - public ModuleIdentifierValidator checkForDuplicateArtifacts() - { - analyze(); - return this; - } - - private void analyze() - { - final Map<String, List<EarModule>> newList = new HashMap<String, List<EarModule>>(); - - for ( EarModule earModule : earModules ) - { - String earId = earModule.getArtifact().getArtifactId() + ":" + earModule.getArtifact().getVersion(); - - if ( newList.containsKey( earId ) ) - { - newList.get( earId ).add( earModule ); - } - else - { - List<EarModule> list = new ArrayList<EarModule>(); - list.add( earModule ); - newList.put( earId, list ); - } - } - - result.clear(); - for ( Map.Entry<String, List<EarModule>> item : newList.entrySet() ) - { - if ( item.getValue().size() > 1 ) - { - result.put( item.getKey(), item.getValue() ); - } - } - - } - - /** - * @return A map of duplicate artifacts. - */ - public Map<String, List<EarModule>> getDuplicateArtifacts() - { - return result; - } - - /** - * @return The list of {@link EarModule} - */ - public List<EarModule> getEarModules() - { - return earModules; - } - - /** - * @param paramEarModules {@link EarModule} - * @return {@link ModuleIdentifierValidator} - */ - public ModuleIdentifierValidator setEarModules( List<EarModule> paramEarModules ) - { - if ( paramEarModules == null ) - { - throw new IllegalArgumentException( "Not allowed to give null for earModules." ); - } - this.earModules = paramEarModules; - return this; - } -} \ No newline at end of file diff --git a/src/site/site.xml b/src/site/site.xml index 7bb84ad..2151dd9 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -34,7 +34,7 @@ under the License. <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.4</version> + <version>1.7</version> </skin> <custom> 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 7e0582d..d1abcdc 100644 --- a/src/test/java/org/apache/maven/plugins/ear/EarModuleTest.java +++ b/src/test/java/org/apache/maven/plugins/ear/EarModuleTest.java @@ -28,7 +28,6 @@ import org.junit.Test; * Ear module test case. * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: EarModuleTest.java 1648192 2014-12-28 12:39:04Z khmarbaise $ */ public class EarModuleTest { diff --git a/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java b/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java index d733c42..0e6ef79 100644 --- a/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java +++ b/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java @@ -44,7 +44,6 @@ import org.xml.sax.helpers.DefaultHandler; * Base class for ear test cases. * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: AbstractEarPluginIT.java 1630593 2014-10-09 20:40:31Z khmarbaise $ */ public abstract class AbstractEarPluginIT extends TestCase diff --git a/src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java b/src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java index c81d357..8a201de 100644 --- a/src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java +++ b/src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java @@ -31,7 +31,6 @@ import org.codehaus.plexus.util.ReaderFactory; /** * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: EarMojoIT.java 1648055 2014-12-27 14:59:45Z khmarbaise $ * @noinspection JavaDoc */ public class EarMojoIT diff --git a/src/test/java/org/apache/maven/plugins/ear/stub/ArtifactTestStub.java b/src/test/java/org/apache/maven/plugins/ear/stub/ArtifactTestStub.java index 9517b67..c695ac0 100644 --- a/src/test/java/org/apache/maven/plugins/ear/stub/ArtifactTestStub.java +++ b/src/test/java/org/apache/maven/plugins/ear/stub/ArtifactTestStub.java @@ -36,7 +36,6 @@ import java.util.List; * A fake {@link Artifact} test stub. * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: ArtifactTestStub.java 1755538 2016-08-08 20:32:12Z rfscholte $ */ public class ArtifactTestStub implements Artifact 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 ad8f295..9e47c5f 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 @@ -31,7 +31,6 @@ import org.junit.Test; /** * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: ArtifactRepositoryTest.java 1648192 2014-12-28 12:39:04Z khmarbaise $ */ public class ArtifactRepositoryTest extends AbstractEarTestBase 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 ee8a885..bae714c 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 @@ -32,7 +32,6 @@ import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; * Tests for the {@link ArtifactTypeMappingService} * * @author <a href="snic...@apache.org">Stephane Nicoll</a> - * @version $Id: ArtifactTypeMappingServiceTest.java 1542508 2013-11-16 13:21:35Z rfscholte $ */ public class ArtifactTypeMappingServiceTest extends TestCase diff --git a/src/test/java/org/apache/maven/plugins/ear/util/ModuleIdentifierValidatorTest.java b/src/test/java/org/apache/maven/plugins/ear/util/ModuleIdentifierValidatorTest.java deleted file mode 100644 index 62de40c..0000000 --- a/src/test/java/org/apache/maven/plugins/ear/util/ModuleIdentifierValidatorTest.java +++ /dev/null @@ -1,211 +0,0 @@ -package org.apache.maven.plugins.ear.util; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.apache.maven.artifact.Artifact; -import org.apache.maven.plugins.ear.EarModule; -import org.apache.maven.plugins.ear.util.ModuleIdentifierValidator; -import org.junit.Before; -import org.junit.Test; - -public class ModuleIdentifierValidatorTest -{ - private List<EarModule> earModules; - - private ModuleIdentifierValidator miv; - - @Before - public void before() - { - this.earModules = new ArrayList<EarModule>(); - this.miv = new ModuleIdentifierValidator( this.earModules ); - } - - private EarModule createMockEarModule( String groupId, String artifactId, String version ) - { - EarModule earModule = mock( EarModule.class ); - Artifact artifact = mock( Artifact.class ); - when( earModule.getArtifact() ).thenReturn( artifact ); - when( earModule.getArtifact().getGroupId() ).thenReturn( groupId ); - when( earModule.getArtifact().getArtifactId() ).thenReturn( artifactId ); - when( earModule.getArtifact().getVersion() ).thenReturn( version ); - when( earModule.getArtifact().getId() ).thenReturn( groupId + ":" + artifactId + ":" + version ); - return earModule; - } - - private EarModule createMockEarModule( String groupId, String artifactId, String classifier, String version ) - { - EarModule earModule = mock( EarModule.class ); - Artifact artifact = mock( Artifact.class ); - when( earModule.getArtifact() ).thenReturn( artifact ); - when( earModule.getArtifact().getGroupId() ).thenReturn( groupId ); - when( earModule.getArtifact().getArtifactId() ).thenReturn( artifactId ); - when( earModule.getArtifact().getClassifier() ).thenReturn( classifier ); - when( earModule.getArtifact().getVersion() ).thenReturn( version ); - when( earModule.getArtifact().getId() ).thenReturn( groupId + ":" + artifactId + ":" + classifier + ":" + version ); - return earModule; - } - - @Test - public void existDuplicateShouldResultFalseWithEmptyList() - { - miv.checkForDuplicateArtifacts(); - - assertFalse( miv.existDuplicateArtifacts() ); - } - - @Test - public void shouldNotFailCauseTheArtifactIdsAreDifferentWithSameGroupId() - { - earModules.add( createMockEarModule( "org.apache.maven.test", "result-artifact", "1.0.0" ) ); - earModules.add( createMockEarModule( "org.apache.maven.test", "result-artifact-a", "1.0.0" ) ); - earModules.add( createMockEarModule( "org.apache.maven.test", "result-artifact-b", "1.0.0" ) ); - - assertFalse( miv.checkForDuplicateArtifacts().existDuplicateArtifacts() ); - - Map<String, List<EarModule>> result = miv.getDuplicateArtifacts(); - - assertTrue( result.isEmpty() ); - } - - @Test - public void shouldNotFailCauseTheArtifactIdsAreDifferent() - { - earModules.add( createMockEarModule( "org.apache", "artifact-1", "1.0.0" ) ); - earModules.add( createMockEarModule( "org.apache", "artifact-2", "1.0.0" ) ); - earModules.add( createMockEarModule( "org.apache.maven", "aid-1", "1.0.0" ) ); - earModules.add( createMockEarModule( "org.apache.maven", "aid-2", "1.0.0" ) ); - earModules.add( createMockEarModule( "org.apache.maven.test", "result-artifact-a", "1.0.0" ) ); - earModules.add( createMockEarModule( "org.apache.maven.test", "result-artifact-b", "1.0.0" ) ); - - assertFalse( miv.checkForDuplicateArtifacts().existDuplicateArtifacts() ); - - Map<String, List<EarModule>> result = miv.getDuplicateArtifacts(); - - assertTrue( result.isEmpty() ); - } - - @Test - public void shouldNotFailCauseTheClassifiersAreDifferent() - { - earModules.add( createMockEarModule( "org.apache", "artifact-1", "first", "1.0.0" ) ); - earModules.add( createMockEarModule( "org.apache", "artifact-2", "second", "1.0.0" ) ); - earModules.add( createMockEarModule( "org.apache.maven", "aid-1", "first", "1.0.0" ) ); - earModules.add( createMockEarModule( "org.apache.maven", "aid-2", "second", "1.0.0" ) ); - earModules.add( createMockEarModule( "org.apache.maven.test", "result-artifact-a", "first", "1.0.0" ) ); - earModules.add( createMockEarModule( "org.apache.maven.test", "result-artifact-b", "second", "1.0.0" ) ); - - assertFalse( miv.checkForDuplicateArtifacts().existDuplicateArtifacts() ); - - Map<String, List<EarModule>> result = miv.getDuplicateArtifacts(); - - assertTrue( result.isEmpty() ); - } - - @Test - public void shouldFailCauseTheArtifactIdsAreIdenticalWithDifferentGroupIds() - { - EarModule earModule1 = createMockEarModule( "org.apache.maven.test", "result-artifact", "1.0.0" ); - EarModule earModule2 = createMockEarModule( "org.apache.maven", "result-artifact", "1.0.0" ); - earModules.add( earModule1 ); - earModules.add( earModule2 ); - - miv.checkForDuplicateArtifacts(); - Map<String, List<EarModule>> result = miv.getDuplicateArtifacts(); - - assertFalse( result.isEmpty() ); - assertEquals( 1, result.size() ); - assertTrue( result.containsKey( "result-artifact:1.0.0" ) ); - assertEquals( 2, result.get( "result-artifact:1.0.0" ).size() ); - } - - @Test - public void shouldFailCauseTheArtifactIdsAreIdenticalWithClassifiers() - { - EarModule earModule1 = createMockEarModule( "org.apache.maven.test", "result-artifact", "first", "1.0.0" ); - EarModule earModule2 = createMockEarModule( "org.apache.maven", "result-artifact", "second", "1.0.0" ); - earModules.add( earModule1 ); - earModules.add( earModule2 ); - - miv.checkForDuplicateArtifacts(); - Map<String, List<EarModule>> result = miv.getDuplicateArtifacts(); - - assertFalse( result.isEmpty() ); - assertEquals( 1, result.size() ); - assertTrue( result.containsKey( "result-artifact:1.0.0" ) ); - assertEquals( 2, result.get( "result-artifact:1.0.0" ).size() ); - } - - @Test - public void shouldFailCauseTheArtifactIdsAreIdentical() - { - earModules.add( createMockEarModule( "org.apache", "artifact-1", "1.0.0" ) ); - earModules.add( createMockEarModule( "org.apache", "artifact-2", "1.0.0" ) ); - earModules.add( createMockEarModule( "org.apache.maven", "aid-1", "1.0.0" ) ); - earModules.add( createMockEarModule( "org.apache.maven", "artifact-2", "1.0.0" ) ); - earModules.add( createMockEarModule( "org.apache.maven.test", "result-artifact-a", "1.0.0" ) ); - earModules.add( createMockEarModule( "org.apache.maven.test", "result-artifact-b", "1.0.0" ) ); - - miv.checkForDuplicateArtifacts(); - Map<String, List<EarModule>> result = miv.getDuplicateArtifacts(); - - assertFalse( result.isEmpty() ); - } - - @Test - public void shouldFailWithAppropriateInformationAboutTheIdenticalArtifactIds() - { - EarModule earModule_1 = createMockEarModule( "org.apache", "artifact-2", "1.0.0" ); - EarModule earModule_2 = createMockEarModule( "org.apache.maven", "artifact-2", "1.0.0" ); - - earModules.add( createMockEarModule( "org.apache", "artifact-1", "1.0.0" ) ); - earModules.add( earModule_1 ); - earModules.add( createMockEarModule( "org.apache.maven", "aid-1", "1.0.0" ) ); - earModules.add( earModule_2 ); - earModules.add( createMockEarModule( "org.apache.maven.test", "result-artifact-a", "1.0.0" ) ); - earModules.add( createMockEarModule( "org.apache.maven.test", "result-artifact-b", "1.0.0" ) ); - - miv.checkForDuplicateArtifacts(); - Map<String, List<EarModule>> result = miv.getDuplicateArtifacts(); - - assertFalse( result.isEmpty() ); - assertEquals( 1, result.size() ); - - assertTrue( result.containsKey( "artifact-2:1.0.0" ) ); - - List<EarModule> list = result.get( "artifact-2:1.0.0" ); - - assertEquals( 2, list.size() ); - assertTrue( list.contains( earModule_1 ) ); - assertTrue( list.contains( earModule_2 ) ); - - } - -} -- To stop receiving notification emails like this one, please contact khmarba...@apache.org.