You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/12/06 00:31:08 UTC

[maven-filtering] branch MRESOURCES-268 created (now 72f70fe)

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

slachiewicz pushed a change to branch MRESOURCES-268
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git.


      at 72f70fe  [MRESOURCES-268] - Report path of offending file on copy/filter error.

This branch includes the following new commits:

     new 37de3c1  (doc) correct link to jira issue
     new 72f70fe  [MRESOURCES-268] - Report path of offending file on copy/filter error.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


[maven-filtering] 01/02: (doc) correct link to jira issue

Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch MRESOURCES-268
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git

commit 37de3c1dba84b372a51f17cd74a9fdc1d846218f
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Jan 24 22:35:02 2021 +0100

    (doc) correct link to jira issue
---
 src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java b/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java
index 4c3e501..ffaf21f 100644
--- a/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java
+++ b/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java
@@ -41,7 +41,7 @@ public final class FilteringUtils
         // nothing just an util class
     }
 
-    // TODO: Correct to handle relative windows paths. (http://jira.codehaus.org/browse/MSHARED-121)
+    // TODO: Correct to handle relative windows paths. (http://jira.apache.org/jira/browse/MSHARED-121)
     // How do we distinguish a relative windows path from some other value that happens to contain backslashes??
     /**
      * @param val The value to be escaped.

[maven-filtering] 02/02: [MRESOURCES-268] - Report path of offending file on copy/filter error.

Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch MRESOURCES-268
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git

commit 72f70fe0771b22fd25b363e6457a5eb04f02a4c0
Author: sebthom <se...@users.noreply.github.com>
AuthorDate: Fri Feb 5 08:23:56 2021 +0100

    [MRESOURCES-268] - Report path of offending file on copy/filter error.
    
    Changes DefaultMavenFileFilter#copyFile to contain the path to the
    offending file as part of the thrown MavenFilteringException.
    Without this change end-users won't see which file caused the error.
---
 .../org/apache/maven/shared/filtering/DefaultMavenFileFilter.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
index beb2049..5f29e9e 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
@@ -20,7 +20,6 @@ package org.apache.maven.shared.filtering;
  */
 
 import java.io.File;
-import java.io.IOException;
 import java.util.List;
 
 import org.apache.maven.execution.MavenSession;
@@ -108,9 +107,10 @@ public class DefaultMavenFileFilter
 
             buildContext.refresh( to );
         }
-        catch ( IOException e )
+        catch ( Exception e )
         {
-            throw new MavenFilteringException( e.getMessage(), e );
+            throw new MavenFilteringException( ( filtering ? "filtering " : "copying " ) + from.getPath() + " to "
+                + to.getPath() + " failed with " + e.getClass().getSimpleName() + ": " + e.getMessage(), e );
         }
     }
 }