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

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


The following commit(s) were added to refs/heads/master by this push:
     new 4275d88  [MANTRUN-231] Document limitations of exportAntProperties 
(#108)
4275d88 is described below

commit 4275d884ad6221e31fa243a6bbca07d5cf7ad3e8
Author: Elliotte Rusty Harold <elh...@users.noreply.github.com>
AuthorDate: Thu Nov 28 20:34:07 2024 +0000

    [MANTRUN-231] Document limitations of exportAntProperties (#108)
---
 .../java/org/apache/maven/plugins/antrun/AntRunMojo.java   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

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 508ab1b..25b026c 100644
--- a/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
+++ b/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
@@ -195,7 +195,7 @@ public class AntRunMojo extends AbstractMojo {
      * This folder is added to the list of those folders containing source to 
be compiled. Use this if your Ant script
      * generates source code.
      *
-     * @deprecated Use the <code>build-helper-maven-plugin</code> to bind 
source directories. For version 3.0.0, this
+     * @deprecated Use the <code>build-helper-maven-plugin</code> to bind 
source directories. In version 3.0.0, this
      *             parameter is only defined to break the build if you use it!
      */
     @SuppressWarnings("DeprecatedIsStillUsed")
@@ -224,7 +224,9 @@ public class AntRunMojo extends AbstractMojo {
     private boolean skip;
 
     /**
-     * Specifies whether the Ant properties should be propagated to the Maven 
properties.
+     * Specifies whether the Ant properties should propagate to the Maven 
properties.
+     * This only works when the ant task is inline in pom.xml, not when it's 
loaded from
+     * an external ant build.xml file.
      *
      * @since 1.7
      */
@@ -466,15 +468,15 @@ public class AntRunMojo extends AbstractMojo {
             return;
         }
 
-        getLog().debug("Propagated Ant properties to Maven properties");
+        getLog().debug("Propagating Ant properties to Maven properties");
         Hashtable<String, Object> antProps = antProject.getProperties();
         Properties mavenProperties = mavenProject.getProperties();
 
         for (Map.Entry<String, Object> entry : antProps.entrySet()) {
             String key = entry.getKey();
             if (mavenProperties.getProperty(key) != null) {
-                getLog().debug("Ant property '" + key + "=" + 
mavenProperties.getProperty(key)
-                        + "' clashs with an existing Maven property, SKIPPING 
this Ant property propagation.");
+                getLog().warn("Ant property '" + key + "=" + 
mavenProperties.getProperty(key)
+                        + "' clashes with an existing Maven property, SKIPPING 
this Ant property propagation.");
                 continue;
             }
             // it is safe to call toString directly since the value cannot be 
null in Hashtable
@@ -486,7 +488,7 @@ public class AntRunMojo extends AbstractMojo {
      * @param antProject {@link Project}
      */
     public void initMavenTasks(Project antProject) {
-        getLog().debug("Initialize Maven Ant Tasks");
+        getLog().debug("Initializing Maven Ant Tasks");
         Typedef typedef = new Typedef();
         typedef.setProject(antProject);
         typedef.setResource(ANTLIB);

Reply via email to