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-antrun-plugin.git
commit 6424b7be7ef5d0ede81763c1d3a0475da38a901b Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 03:55:53 2026 +0000 Simplify redundant code --- .../maven/ant/tasks/DependencyFilesetsTask.java | 2 +- .../maven/ant/tasks/support/VersionMapper.java | 2 +- .../apache/maven/plugins/antrun/AntRunMojo.java | 26 +++++++++++----------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java b/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java index b3eeae1..950ff34 100644 --- a/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java +++ b/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java @@ -87,7 +87,7 @@ public class DependencyFilesetsTask extends Task { getProject().addReference(fileSetName, singleArtifactFileSet); } - getProject().addReference((getPrefix() + getProjectDependenciesId()), dependenciesFileSet); + getProject().addReference(getPrefix() + getProjectDependenciesId(), dependenciesFileSet); } /** diff --git a/src/main/java/org/apache/maven/ant/tasks/support/VersionMapper.java b/src/main/java/org/apache/maven/ant/tasks/support/VersionMapper.java index 77f0f2b..49aa54c 100644 --- a/src/main/java/org/apache/maven/ant/tasks/support/VersionMapper.java +++ b/src/main/java/org/apache/maven/ant/tasks/support/VersionMapper.java @@ -82,6 +82,6 @@ public class VersionMapper implements FileNameMapper, Comparator<String> { @Override public int compare(String s1, String s2) { int lengthDiff = s2.length() - s1.length(); - return (lengthDiff != 0) ? lengthDiff : s1.compareTo(s2); + return lengthDiff != 0 ? lengthDiff : s1.compareTo(s2); } } diff --git a/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java b/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java index 4f7ef41..67b4db0 100644 --- a/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java +++ b/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java @@ -413,34 +413,34 @@ public class AntRunMojo extends AbstractMojo { // Add some of the common Maven properties getLog().debug("Setting properties with prefix: " + propertyPrefix); - antProject.setProperty((propertyPrefix + "project.groupId"), mavenProject.getGroupId()); - antProject.setProperty((propertyPrefix + "project.artifactId"), mavenProject.getArtifactId()); - antProject.setProperty((propertyPrefix + "project.name"), mavenProject.getName()); + antProject.setProperty(propertyPrefix + "project.groupId", mavenProject.getGroupId()); + antProject.setProperty(propertyPrefix + "project.artifactId", mavenProject.getArtifactId()); + antProject.setProperty(propertyPrefix + "project.name", mavenProject.getName()); if (mavenProject.getDescription() != null) { - antProject.setProperty((propertyPrefix + "project.description"), mavenProject.getDescription()); + antProject.setProperty(propertyPrefix + "project.description", mavenProject.getDescription()); } - antProject.setProperty((propertyPrefix + "project.version"), mavenProject.getVersion()); - antProject.setProperty((propertyPrefix + "project.packaging"), mavenProject.getPackaging()); + antProject.setProperty(propertyPrefix + "project.version", mavenProject.getVersion()); + antProject.setProperty(propertyPrefix + "project.packaging", mavenProject.getPackaging()); antProject.setProperty( - (propertyPrefix + "project.build.directory"), + propertyPrefix + "project.build.directory", mavenProject.getBuild().getDirectory()); antProject.setProperty( - (propertyPrefix + "project.build.outputDirectory"), + propertyPrefix + "project.build.outputDirectory", mavenProject.getBuild().getOutputDirectory()); antProject.setProperty( - (propertyPrefix + "project.build.testOutputDirectory"), + propertyPrefix + "project.build.testOutputDirectory", mavenProject.getBuild().getTestOutputDirectory()); antProject.setProperty( - (propertyPrefix + "project.build.sourceDirectory"), + propertyPrefix + "project.build.sourceDirectory", mavenProject.getBuild().getSourceDirectory()); antProject.setProperty( - (propertyPrefix + "project.build.testSourceDirectory"), + propertyPrefix + "project.build.testSourceDirectory", mavenProject.getBuild().getTestSourceDirectory()); antProject.setProperty( - (propertyPrefix + "localRepository"), + propertyPrefix + "localRepository", getLocalRepository().getBasedir().getAbsolutePath()); antProject.setProperty( - (propertyPrefix + "settings.localRepository"), + propertyPrefix + "settings.localRepository", getLocalRepository().getBasedir().getAbsolutePath()); // Add properties for dependency artifacts
