[jackrabbit-filevault-package-maven-plugin] branch feature/asf-jenkinsfile updated (54ddd7f -> 7b4bf20)

[kw...@apache.org]

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

kwin pushed a change to branch feature/asf-jenkinsfile
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault-package-maven-plugin.git.


 discard 54ddd7f  fix flaky test on Windows
     new 7b4bf20  fix flaky test on Windows

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (54ddd7f)
            \
             N -- N -- N   refs/heads/feature/asf-jenkinsfile (7b4bf20)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 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.


Summary of changes:
 .../jackrabbit/filevault/maven/packaging/FormatDocviewXmlMojo.java    | 4 ++--
 .../apache/jackrabbit/filevault/maven/packaging/it/FormattingIT.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

[jackrabbit-filevault-package-maven-plugin] 01/01: fix flaky test on Windows

[kw...@apache.org]

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

kwin pushed a commit to branch feature/asf-jenkinsfile
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault-package-maven-plugin.git

commit 7b4bf20458f036863748dde7231a6e4e463a3b0e
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Oct 7 11:58:08 2021 +0200

    fix flaky test on Windows
---
 .../jackrabbit/filevault/maven/packaging/FormatDocviewXmlMojo.java    | 4 ++--
 .../apache/jackrabbit/filevault/maven/packaging/it/FormattingIT.java  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/FormatDocviewXmlMojo.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/FormatDocviewXmlMojo.java
index 692222e..3ce466c 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/FormatDocviewXmlMojo.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/FormatDocviewXmlMojo.java
@@ -147,9 +147,9 @@ public class FormatDocviewXmlMojo extends AbstractMojo {
                         malformedFiles.add(toCheck);
                         // emit violations for m2e (https://www.eclipse.org/m2e/documentation/m2e-making-maven-plugins-compat.html)
                         buildContext.addMessage(toCheck, 0, 0, MSG_MALFORMED_FILE + ". " +  MSG_COUNTERMEASURE, BuildContext.SEVERITY_ERROR, null);
-                        log.error(MSG_MALFORMED_FILE + ":" + toCheck);
+                        log.error(MSG_MALFORMED_FILE + ":" + toCheck.getCanonicalPath());
                     } else {
-                        log.info("Reformatted file '" + toCheck + "'.");
+                        log.info("Reformatted file '" + toCheck.getCanonicalPath() + "'.");
                     }
                 } else {
                     buildContext.removeMessages(toCheck);
diff --git a/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/FormattingIT.java b/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/FormattingIT.java
index 77240a4..e71ed58 100644
--- a/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/FormattingIT.java
+++ b/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/FormattingIT.java
@@ -33,7 +33,8 @@ public class FormattingIT {
                 .build();
 
         for (String formattedFile : formattedFiles) {
-            String path = new File(builder.getTestProjectDir(), formattedFile).getAbsolutePath();
+            // use uppercase drive letter on Windows
+            String path = new File(builder.getTestProjectDir(), formattedFile).getCanonicalPath();
             builder.verifyExpectedLogLines(path);
         }
     }