[felix-dev] branch master updated: FELIX-6526|FELIX-6527 Handle absent incremental manifest data file

[jbonofre]

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

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/master by this push:
     new 9a55668fb2 FELIX-6526|FELIX-6527 Handle absent incremental manifest 
data file
     new 28206dac82 Merge pull request #146 from HannesWell/fix6526
9a55668fb2 is described below

commit 9a55668fb238f368fe8302fa06cd8ef165fe878e
Author: Hannes Wellmann <wellmann.hann...@gmx.net>
AuthorDate: Mon May 2 11:52:30 2022 +0200

    FELIX-6526|FELIX-6527 Handle absent incremental manifest data file
---
 .../src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
 
b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
index 412acc8ce1..a5a30faefd 100644
--- 
a/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
+++ 
b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
@@ -424,8 +424,12 @@ public class ManifestPlugin extends BundlePlugin
             return false;
         }
         try
-        { // is pom.xml up-to-date?
+        { // has this project's or a parent's pom.xml been modified after the 
manifest was
+            // generated last?
             Path cacheData = getIncrementalDataPath(project);
+            if(!Files.isRegularFile(cacheData)) {
+                return false;
+            }
             long manifestLastModified = lastModified(cacheData);
             while (project != null)
             {