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

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

commit 7a902649839d5e39a6d22de117d41efe130897e8
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Tue Nov 17 03:15:02 2026 +0000

    Use System.lineSeparator(), @Override and try-with-resources
---
 .../org/apache/maven/plugins/ear/AbstractEarModule.java     | 13 +++++++++++++
 .../java/org/apache/maven/plugins/ear/AppClientModule.java  |  1 +
 src/main/java/org/apache/maven/plugins/ear/EjbModule.java   |  1 +
 src/main/java/org/apache/maven/plugins/ear/EnvEntry.java    |  1 +
 .../maven/plugins/ear/GenerateApplicationXmlMojo.java       |  1 +
 src/main/java/org/apache/maven/plugins/ear/HarModule.java   |  2 ++
 src/main/java/org/apache/maven/plugins/ear/JarModule.java   |  3 +++
 src/main/java/org/apache/maven/plugins/ear/RarModule.java   |  1 +
 src/main/java/org/apache/maven/plugins/ear/SarModule.java   |  2 ++
 .../java/org/apache/maven/plugins/ear/SecurityRole.java     |  1 +
 src/main/java/org/apache/maven/plugins/ear/WebModule.java   |  2 ++
 .../org/apache/maven/plugins/ear/util/EarMavenArchiver.java |  1 +
 .../org/apache/maven/plugins/ear/util/JavaEEVersion.java    |  1 +
 .../apache/maven/plugins/ear/it/AbstractEarPluginIT.java    |  2 ++
 .../maven/plugins/ear/stub/ArtifactHandlerTestStub.java     |  7 +++++++
 .../maven/plugins/ear/util/ResourceEntityResolver.java      |  1 +
 16 files changed, 40 insertions(+)

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 f83da78..6b6a282 100644
--- a/src/main/java/org/apache/maven/plugins/ear/AbstractEarModule.java
+++ b/src/main/java/org/apache/maven/plugins/ear/AbstractEarModule.java
@@ -139,6 +139,7 @@ public abstract class AbstractEarModule implements 
EarModule {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setEarExecutionContext(EarExecutionContext 
earExecutionContext) {
         this.earExecutionContext = earExecutionContext;
     }
@@ -146,6 +147,7 @@ public abstract class AbstractEarModule implements 
EarModule {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void resolveArtifact(Set<Artifact> artifacts) throws 
EarPluginException, MojoFailureException {
         // If the artifact is already set no need to resolve it
         if (artifact == null) {
@@ -172,6 +174,7 @@ public abstract class AbstractEarModule implements 
EarModule {
     /**
      * @return {@link #artifact}
      */
+    @Override
     public Artifact getArtifact() {
         return artifact;
     }
@@ -186,6 +189,7 @@ public abstract class AbstractEarModule implements 
EarModule {
     /**
      * @return return the URI
      */
+    @Override
     public String getUri() {
         if (uri == null) {
             if (getBundleDir() == null) {
@@ -200,6 +204,7 @@ public abstract class AbstractEarModule implements 
EarModule {
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getType() {
         return type;
     }
@@ -244,6 +249,7 @@ public abstract class AbstractEarModule implements 
EarModule {
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getLibDir() {
         libDirectory = cleanArchivePath(libDirectory);
         return libDirectory;
@@ -252,6 +258,7 @@ public abstract class AbstractEarModule implements 
EarModule {
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isClassPathItem() {
         return classPathItem;
     }
@@ -259,6 +266,7 @@ public abstract class AbstractEarModule implements 
EarModule {
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getBundleFileName() {
         if (bundleFileName == null) {
             try {
@@ -282,6 +290,7 @@ public abstract class AbstractEarModule implements 
EarModule {
      *
      * @return the alternative deployment descriptor for this module
      */
+    @Override
     public String getAltDeploymentDescriptor() {
         return altDeploymentDescriptor;
     }
@@ -291,6 +300,7 @@ public abstract class AbstractEarModule implements 
EarModule {
      *
      * @return true if this module should be skipped, false otherwise
      */
+    @Override
     public boolean isExcluded() {
         return excluded;
     }
@@ -298,6 +308,7 @@ public abstract class AbstractEarModule implements 
EarModule {
     /**
      * @return {@link #unpack}
      */
+    @Override
     public Boolean shouldUnpack() {
         return unpack;
     }
@@ -346,6 +357,7 @@ public abstract class AbstractEarModule implements 
EarModule {
     /**
      * {@inheritDoc}
      */
+    @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
         
sb.append(getType()).append(":").append(groupId).append(":").append(artifactId);
@@ -397,6 +409,7 @@ public abstract class AbstractEarModule implements 
EarModule {
     /**
      * @return always {@code true}
      */
+    @Override
     public boolean changeManifestClasspath() {
         return true;
     }
diff --git a/src/main/java/org/apache/maven/plugins/ear/AppClientModule.java 
b/src/main/java/org/apache/maven/plugins/ear/AppClientModule.java
index 71f0256..21b31c8 100644
--- a/src/main/java/org/apache/maven/plugins/ear/AppClientModule.java
+++ b/src/main/java/org/apache/maven/plugins/ear/AppClientModule.java
@@ -49,6 +49,7 @@ public class AppClientModule extends AbstractEarModule {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void appendModule(XMLWriter writer, String version, Boolean 
generateId) {
         startModuleElement(writer, generateId);
         writer.startElement(JAVA_MODULE);
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 15188eb..8578181 100644
--- a/src/main/java/org/apache/maven/plugins/ear/EjbModule.java
+++ b/src/main/java/org/apache/maven/plugins/ear/EjbModule.java
@@ -51,6 +51,7 @@ public class EjbModule extends AbstractEarModule {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void appendModule(XMLWriter writer, String version, Boolean 
generateId) {
         startModuleElement(writer, generateId);
         writer.startElement(EJB_MODULE);
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 8d0d032..d904f0f 100644
--- a/src/main/java/org/apache/maven/plugins/ear/EnvEntry.java
+++ b/src/main/java/org/apache/maven/plugins/ear/EnvEntry.java
@@ -126,6 +126,7 @@ class EnvEntry {
         writer.endElement();
     }
 
+    @Override
     public String toString() {
         return "env-entry [name=" + getName() + ", type=" + getType() + ", 
value=" + getValue() + ", lookup-name="
                 + getLookupName() + "]";
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 7e02c97..9b07bc3 100644
--- a/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java
+++ b/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java
@@ -175,6 +175,7 @@ public class GenerateApplicationXmlMojo extends 
AbstractEarMojo {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
         // Initializes ear modules
         super.execute();
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 d2acb19..4009ec8 100644
--- a/src/main/java/org/apache/maven/plugins/ear/HarModule.java
+++ b/src/main/java/org/apache/maven/plugins/ear/HarModule.java
@@ -53,6 +53,7 @@ public class HarModule extends AbstractEarModule implements 
JbossEarModule {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void appendModule(XMLWriter writer, String version, Boolean 
generateId) {
         // No entry is generated by this artifact ; it should be
         // defined in the jboss-app.xml.
@@ -62,6 +63,7 @@ public class HarModule extends AbstractEarModule implements 
JbossEarModule {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void appendJbossModule(XMLWriter writer, String version) {
         writer.startElement(MODULE_ELEMENT);
         writer.startElement("har");
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 b9c373f..40bc331 100644
--- a/src/main/java/org/apache/maven/plugins/ear/JarModule.java
+++ b/src/main/java/org/apache/maven/plugins/ear/JarModule.java
@@ -65,6 +65,7 @@ public class JarModule extends AbstractEarModule {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void appendModule(XMLWriter writer, String version, Boolean 
generateId) {
         // Generates an entry in the application.xml only if
         // includeInApplicationXml is set
@@ -83,6 +84,7 @@ public class JarModule extends AbstractEarModule {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void resolveArtifact(Set<Artifact> artifacts) throws 
EarPluginException, MojoFailureException {
         // Let's resolve the artifact
         super.resolveArtifact(artifacts);
@@ -101,6 +103,7 @@ public class JarModule extends AbstractEarModule {
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean changeManifestClasspath() {
         return false;
     }
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 cb4ed18..024b41f 100644
--- a/src/main/java/org/apache/maven/plugins/ear/RarModule.java
+++ b/src/main/java/org/apache/maven/plugins/ear/RarModule.java
@@ -55,6 +55,7 @@ public class RarModule extends AbstractEarModule {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void appendModule(XMLWriter writer, String version, Boolean 
generateId) {
         startModuleElement(writer, generateId);
         writer.startElement(RAR_MODULE);
diff --git a/src/main/java/org/apache/maven/plugins/ear/SarModule.java 
b/src/main/java/org/apache/maven/plugins/ear/SarModule.java
index 1edeffa..e8b6384 100644
--- a/src/main/java/org/apache/maven/plugins/ear/SarModule.java
+++ b/src/main/java/org/apache/maven/plugins/ear/SarModule.java
@@ -56,6 +56,7 @@ public class SarModule extends AbstractEarModule implements 
JbossEarModule {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void appendModule(XMLWriter writer, String version, Boolean 
generateId) {
         // If JBoss is not configured, add the module as a connector element
         if (!earExecutionContext.isJbossConfigured()) {
@@ -70,6 +71,7 @@ public class SarModule extends AbstractEarModule implements 
JbossEarModule {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void appendJbossModule(XMLWriter writer, String version) {
         writer.startElement(MODULE_ELEMENT);
         writer.startElement("service");
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 90e9f3f..bb4d403 100644
--- a/src/main/java/org/apache/maven/plugins/ear/SecurityRole.java
+++ b/src/main/java/org/apache/maven/plugins/ear/SecurityRole.java
@@ -111,6 +111,7 @@ class SecurityRole {
         writer.endElement();
     }
 
+    @Override
     public String toString() {
         return "Security role " + getRoleName();
     }
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 7c55d1a..ab57344 100644
--- a/src/main/java/org/apache/maven/plugins/ear/WebModule.java
+++ b/src/main/java/org/apache/maven/plugins/ear/WebModule.java
@@ -65,6 +65,7 @@ public class WebModule extends AbstractEarModule {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void appendModule(XMLWriter writer, String version, Boolean 
generateId) {
         startModuleElement(writer, generateId);
         writer.startElement(WEB_MODULE);
@@ -86,6 +87,7 @@ public class WebModule extends AbstractEarModule {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void resolveArtifact(Set<Artifact> artifacts) throws 
EarPluginException, MojoFailureException {
         // Let's resolve the artifact
         super.resolveArtifact(artifacts);
diff --git 
a/src/main/java/org/apache/maven/plugins/ear/util/EarMavenArchiver.java 
b/src/main/java/org/apache/maven/plugins/ear/util/EarMavenArchiver.java
index 45c8062..a298215 100644
--- a/src/main/java/org/apache/maven/plugins/ear/util/EarMavenArchiver.java
+++ b/src/main/java/org/apache/maven/plugins/ear/util/EarMavenArchiver.java
@@ -69,6 +69,7 @@ public class EarMavenArchiver extends MavenArchiver {
     /**
      * {@inheritDoc}
      */
+    @Override
     public Manifest getManifest(MavenSession session, MavenProject project, 
MavenArchiveConfiguration config)
             throws ManifestException, DependencyResolutionRequiredException {
         final Manifest manifest = super.getManifest(session, project, config);
diff --git a/src/main/java/org/apache/maven/plugins/ear/util/JavaEEVersion.java 
b/src/main/java/org/apache/maven/plugins/ear/util/JavaEEVersion.java
index a46dd93..fb5ea77 100644
--- a/src/main/java/org/apache/maven/plugins/ear/util/JavaEEVersion.java
+++ b/src/main/java/org/apache/maven/plugins/ear/util/JavaEEVersion.java
@@ -203,6 +203,7 @@ public final class JavaEEVersion implements 
Comparable<JavaEEVersion> {
     /**
      * {@inheritDoc}
      */
+    @Override
     public int compareTo(JavaEEVersion otherVersion) {
         if (otherVersion == null) {
             throw new NullPointerException("other object to compare to could 
not be null.");
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 5db0172..f66968e 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
@@ -458,6 +458,7 @@ public abstract class AbstractEarPluginIT {
 
     private static void addFiles(final File directory, final List<File> files, 
final List<File> expectedDirectories) {
         File[] result = directory.listFiles(new FilenameFilter() {
+            @Override
             public boolean accept(File dir, String name) {
                 return !name.equals("META-INF");
             }
@@ -588,6 +589,7 @@ public abstract class AbstractEarPluginIT {
 
     private static File[] getDeploymentDescriptors(final File ddDirectory) {
         return ddDirectory.listFiles(new FilenameFilter() {
+            @Override
             public boolean accept(File dir, String name) {
                 return !name.equalsIgnoreCase("manifest.mf");
             }
diff --git 
a/src/test/java/org/apache/maven/plugins/ear/stub/ArtifactHandlerTestStub.java 
b/src/test/java/org/apache/maven/plugins/ear/stub/ArtifactHandlerTestStub.java
index 87561bc..d1b08ac 100644
--- 
a/src/test/java/org/apache/maven/plugins/ear/stub/ArtifactHandlerTestStub.java
+++ 
b/src/test/java/org/apache/maven/plugins/ear/stub/ArtifactHandlerTestStub.java
@@ -31,30 +31,37 @@ public class ArtifactHandlerTestStub implements 
ArtifactHandler {
         this.extension = extension;
     }
 
+    @Override
     public String getExtension() {
         return extension;
     }
 
+    @Override
     public String getDirectory() {
         throw new UnsupportedOperationException("not implemented ; fake 
artifact stub");
     }
 
+    @Override
     public String getClassifier() {
         return null;
     }
 
+    @Override
     public String getPackaging() {
         throw new UnsupportedOperationException("not implemented ; fake 
artifact stub");
     }
 
+    @Override
     public boolean isIncludesDependencies() {
         throw new UnsupportedOperationException("not implemented ; fake 
artifact stub");
     }
 
+    @Override
     public String getLanguage() {
         throw new UnsupportedOperationException("not implemented ; fake 
artifact stub");
     }
 
+    @Override
     public boolean isAddedToClasspath() {
         throw new UnsupportedOperationException("not implemented ; fake 
artifact stub");
     }
diff --git 
a/src/test/java/org/apache/maven/plugins/ear/util/ResourceEntityResolver.java 
b/src/test/java/org/apache/maven/plugins/ear/util/ResourceEntityResolver.java
index d6a8e21..2743428 100644
--- 
a/src/test/java/org/apache/maven/plugins/ear/util/ResourceEntityResolver.java
+++ 
b/src/test/java/org/apache/maven/plugins/ear/util/ResourceEntityResolver.java
@@ -24,6 +24,7 @@ import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 
 public class ResourceEntityResolver implements EntityResolver {
+    @Override
     public InputSource resolveEntity(String publicId, String systemId) {
         String dtd = "/dtd" + systemId.substring(systemId.lastIndexOf('/'));
         InputStream in = ResourceEntityResolver.class.getResourceAsStream(dtd);

Reply via email to