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-plugin-tools.git

commit 476b1d4ae299ca4bf13de86b0cfd6b27940d797f
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Tue Nov 17 03:50:01 2026 +0000

    Use System.lineSeparator(), @Override and try-with-resources
---
 .../metadata/GroupRepositoryMetadata.java          |  9 ++++++
 .../plugin/plugin/DescriptorGeneratorMojo.java     |  1 +
 .../tools/plugin/DefaultPluginToolsRequest.java    |  1 +
 .../tools/plugin/EnhancedParameterWrapper.java     | 28 ++++++++++++++++++
 .../tools/plugin/ExtendedPluginDescriptor.java     | 34 ++++++++++++++++++++++
 .../tools/plugin/javadoc/JavadocNonLtsSiteIT.java  |  4 +++
 .../tools/plugin/generator/GeneratorUtils.java     |  2 +-
 .../plugin/generator/HtmlToPlainTextConverter.java |  2 ++
 8 files changed, 80 insertions(+), 1 deletion(-)

diff --git 
a/maven-plugin-plugin/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
 
b/maven-plugin-plugin/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
index 1101ae5a..8ef583ec 100644
--- 
a/maven-plugin-plugin/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
+++ 
b/maven-plugin-plugin/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
@@ -38,22 +38,27 @@ public class GroupRepositoryMetadata extends 
AbstractRepositoryMetadata {
         this.groupId = groupId;
     }
 
+    @Override
     public boolean storedInGroupDirectory() {
         return true;
     }
 
+    @Override
     public boolean storedInArtifactVersionDirectory() {
         return false;
     }
 
+    @Override
     public String getGroupId() {
         return groupId;
     }
 
+    @Override
     public String getArtifactId() {
         return null;
     }
 
+    @Override
     public String getBaseVersion() {
         return null;
     }
@@ -81,18 +86,22 @@ public class GroupRepositoryMetadata extends 
AbstractRepositoryMetadata {
         }
     }
 
+    @Override
     public Object getKey() {
         return groupId;
     }
 
+    @Override
     public boolean isSnapshot() {
         return false;
     }
 
+    @Override
     public ArtifactRepository getRepository() {
         return null;
     }
 
+    @Override
     public void setRepository(ArtifactRepository remoteRepository) {
         // intentionally blank
     }
diff --git 
a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
 
b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
index 6fa04abd..50427517 100644
--- 
a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
+++ 
b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
@@ -329,6 +329,7 @@ public class DescriptorGeneratorMojo extends 
AbstractGeneratorMojo {
         this.buildContext = buildContext;
     }
 
+    @Override
     public void generate() throws MojoExecutionException {
         if (!"maven-plugin".equalsIgnoreCase(project.getArtifactId())
                 && project.getArtifactId().toLowerCase().startsWith("maven-")
diff --git 
a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/DefaultPluginToolsRequest.java
 
b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/DefaultPluginToolsRequest.java
index 317c354b..ad118502 100644
--- 
a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/DefaultPluginToolsRequest.java
+++ 
b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/DefaultPluginToolsRequest.java
@@ -170,6 +170,7 @@ public class DefaultPluginToolsRequest implements 
PluginToolsRequest {
         return repoSession;
     }
 
+    @Override
     public void setRepoSession(RepositorySystemSession repoSession) {
         this.repoSession = repoSession;
     }
diff --git 
a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/EnhancedParameterWrapper.java
 
b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/EnhancedParameterWrapper.java
index da0540d4..d01669a2 100644
--- 
a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/EnhancedParameterWrapper.java
+++ 
b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/EnhancedParameterWrapper.java
@@ -36,114 +36,142 @@ public class EnhancedParameterWrapper extends Parameter {
         this.delegate = delegate;
     }
 
+    @Override
     public String getName() {
         return delegate.getName();
     }
 
+    @Override
     public void setName(String name) {
         delegate.setName(name);
     }
 
+    @Override
     public String getType() {
         return delegate.getType();
     }
 
+    @Override
     public void setType(String type) {
         delegate.setType(type);
     }
 
+    @Override
     public boolean isRequired() {
         return delegate.isRequired();
     }
 
+    @Override
     public void setRequired(boolean required) {
         delegate.setRequired(required);
     }
 
+    @Override
     public String getDescription() {
         return delegate.getDescription();
     }
 
+    @Override
     public void setDescription(String description) {
         delegate.setDescription(description);
     }
 
+    @Override
     public String getExpression() {
         return delegate.getExpression();
     }
 
+    @Override
     public void setExpression(String expression) {
         delegate.setExpression(expression);
     }
 
+    @Override
     public String getDeprecated() {
         return delegate.getDeprecated();
     }
 
+    @Override
     public void setDeprecated(String deprecated) {
         delegate.setDeprecated(deprecated);
     }
 
+    @Override
     public int hashCode() {
         return delegate.hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         return delegate.equals(other);
     }
 
+    @Override
     public String getAlias() {
         return delegate.getAlias();
     }
 
+    @Override
     public void setAlias(String alias) {
         delegate.setAlias(alias);
     }
 
+    @Override
     public boolean isEditable() {
         return delegate.isEditable();
     }
 
+    @Override
     public void setEditable(boolean editable) {
         delegate.setEditable(editable);
     }
 
+    @Override
     public void setDefaultValue(String defaultValue) {
         delegate.setDefaultValue(defaultValue);
     }
 
+    @Override
     public String getDefaultValue() {
         return delegate.getDefaultValue();
     }
 
+    @Override
     public String toString() {
         return delegate.toString();
     }
 
+    @Override
     public Requirement getRequirement() {
         return delegate.getRequirement();
     }
 
+    @Override
     public void setRequirement(Requirement requirement) {
         delegate.setRequirement(requirement);
     }
 
+    @Override
     public String getImplementation() {
         return delegate.getImplementation();
     }
 
+    @Override
     public void setImplementation(String implementation) {
         delegate.setImplementation(implementation);
     }
 
+    @Override
     public String getSince() {
         return delegate.getSince();
     }
 
+    @Override
     public void setSince(String since) {
         delegate.setSince(since);
     }
 
+    @Override
     public Parameter clone() {
         return delegate.clone();
     }
diff --git 
a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/ExtendedPluginDescriptor.java
 
b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/ExtendedPluginDescriptor.java
index 0ae9e935..bf17d042 100644
--- 
a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/ExtendedPluginDescriptor.java
+++ 
b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/ExtendedPluginDescriptor.java
@@ -47,10 +47,12 @@ public class ExtendedPluginDescriptor extends 
PluginDescriptor {
         this.setComponents(delegate.getComponents());
     }
 
+    @Override
     public void setRequiredJavaVersion(String requiredJavaVersion) {
         this.requiredJavaVersion = requiredJavaVersion;
     }
 
+    @Override
     public String getRequiredJavaVersion() {
         return requiredJavaVersion;
     }
@@ -80,10 +82,12 @@ public class ExtendedPluginDescriptor extends 
PluginDescriptor {
     }
 
     /* -- START delegate methods --*/
+    @Override
     public List<MojoDescriptor> getMojos() {
         return delegate.getMojos();
     }
 
+    @Override
     public void addMojo(MojoDescriptor mojoDescriptor) throws 
DuplicateMojoDescriptorException {
         delegate.addMojo(mojoDescriptor);
     }
@@ -94,118 +98,147 @@ public class ExtendedPluginDescriptor extends 
PluginDescriptor {
         }
     }
 
+    @Override
     public String getGroupId() {
         return delegate.getGroupId();
     }
 
+    @Override
     public void setGroupId(String groupId) {
         delegate.setGroupId(groupId);
     }
 
+    @Override
     public String getArtifactId() {
         return delegate.getArtifactId();
     }
 
+    @Override
     public void setArtifactId(String artifactId) {
         delegate.setArtifactId(artifactId);
     }
 
+    @Override
     public String getPluginLookupKey() {
         return delegate.getPluginLookupKey();
     }
 
+    @Override
     public String getId() {
         return delegate.getId();
     }
 
+    @Override
     public String getGoalPrefix() {
         return delegate.getGoalPrefix();
     }
 
+    @Override
     public void setGoalPrefix(String goalPrefix) {
         delegate.setGoalPrefix(goalPrefix);
     }
 
+    @Override
     public void setVersion(String version) {
         delegate.setVersion(version);
     }
 
+    @Override
     public String getVersion() {
         return delegate.getVersion();
     }
 
+    @Override
     public void setSource(String source) {
         delegate.setSource(source);
     }
 
+    @Override
     public String getSource() {
         return delegate.getSource();
     }
 
+    @Override
     public boolean isInheritedByDefault() {
         return delegate.isInheritedByDefault();
     }
 
+    @Override
     public void setInheritedByDefault(boolean inheritedByDefault) {
         delegate.setInheritedByDefault(inheritedByDefault);
     }
 
+    @Override
     public List<Artifact> getArtifacts() {
         return delegate.getArtifacts();
     }
 
+    @Override
     public void setArtifacts(List<Artifact> artifacts) {
         delegate.setArtifacts(artifacts);
     }
 
+    @Override
     public Map<String, Artifact> getArtifactMap() {
         return delegate.getArtifactMap();
     }
 
+    @Override
     public MojoDescriptor getMojo(String goal) {
         return delegate.getMojo(goal);
     }
 
+    @Override
     public void setClassRealm(ClassRealm classRealm) {
         delegate.setClassRealm(classRealm);
     }
 
+    @Override
     public ClassRealm getClassRealm() {
         return delegate.getClassRealm();
     }
 
+    @Override
     public void setIntroducedDependencyArtifacts(Set<Artifact> 
introducedDependencyArtifacts) {
         
delegate.setIntroducedDependencyArtifacts(introducedDependencyArtifacts);
     }
 
+    @Override
     public Set<Artifact> getIntroducedDependencyArtifacts() {
         return delegate.getIntroducedDependencyArtifacts();
     }
 
+    @Override
     public void setName(String name) {
         delegate.setName(name);
     }
 
+    @Override
     public String getName() {
         return delegate.getName();
     }
 
+    @Override
     public void setDescription(String description) {
         delegate.setDescription(description);
     }
 
+    @Override
     public String getDescription() {
         return delegate.getDescription();
     }
 
+    @Override
     public void setRequiredMavenVersion(String requiredMavenVersion) {
         delegate.setRequiredMavenVersion(requiredMavenVersion);
     }
 
+    @Override
     public String getRequiredMavenVersion() {
         return delegate.getRequiredMavenVersion();
     }
 
+    @Override
     public void setPlugin(Plugin plugin) {
         delegate.setPlugin(plugin);
     }
@@ -225,6 +258,7 @@ public class ExtendedPluginDescriptor extends 
PluginDescriptor {
         delegate.setPluginArtifact(pluginArtifact);
     }
 
+    @Override
     public PluginDescriptor clone() {
         return delegate.clone();
     }
diff --git 
a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocNonLtsSiteIT.java
 
b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocNonLtsSiteIT.java
index e1fc2579..7e531831 100644
--- 
a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocNonLtsSiteIT.java
+++ 
b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocNonLtsSiteIT.java
@@ -51,24 +51,28 @@ class JavadocNonLtsSiteIT extends JavadocSiteIT {
 
     @ParameterizedTest
     @MethodSource("javadocBaseUrls")
+    @Override
     void constructors(URI javadocBaseUrl) throws Exception {
         super.constructors(javadocBaseUrl);
     }
 
     @ParameterizedTest
     @MethodSource("javadocBaseUrls")
+    @Override
     void methods(URI javadocBaseUrl) throws Exception {
         super.methods(javadocBaseUrl);
     }
 
     @ParameterizedTest
     @MethodSource("javadocBaseUrls")
+    @Override
     void fields(URI javadocBaseUrl) throws Exception {
         super.fields(javadocBaseUrl);
     }
 
     @ParameterizedTest
     @MethodSource("javadocBaseUrls")
+    @Override
     void nestedClass(URI javadocBaseUrl) throws Exception {
         super.nestedClass(javadocBaseUrl);
     }
diff --git 
a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java
 
b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java
index e99e1ac0..b3f356e6 100644
--- 
a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java
+++ 
b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java
@@ -255,7 +255,7 @@ public final class GeneratorUtils {
         }
 
         // strip the header/body stuff
-        String ls = System.getProperty("line.separator");
+        String ls = System.lineSeparator();
         int startPos = commentCleaned.indexOf("<body>" + ls) + 6 + ls.length();
         int endPos = commentCleaned.indexOf(ls + "</body>");
         commentCleaned = commentCleaned.substring(startPos, endPos);
diff --git 
a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/HtmlToPlainTextConverter.java
 
b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/HtmlToPlainTextConverter.java
index fd52e024..4907226d 100644
--- 
a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/HtmlToPlainTextConverter.java
+++ 
b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/HtmlToPlainTextConverter.java
@@ -67,6 +67,7 @@ public class HtmlToPlainTextConverter implements Converter {
         private int listDepth = 0; // nesting depth of the current <ul>/<ol>, 
used to indent nested <li> items
 
         // hit when the node is first seen
+        @Override
         public void head(Node node, int depth) {
             String name = node.nodeName();
             if (node instanceof TextNode) {
@@ -87,6 +88,7 @@ public class HtmlToPlainTextConverter implements Converter {
         }
 
         // hit when all of the node's children (if any) have been visited
+        @Override
         public void tail(Node node, int depth) {
             String name = node.nodeName();
             if (name.equals("ul") || name.equals("ol")) {

Reply via email to