Add a new warnCommon mode similar to failCommon

(cherry picked from commit aee4770)
eclipse-tycho · Jan 30, 2024 · 9df04af · 9df04af
1 parent 4359901
commit 9df04af
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/BaselineMode.java b/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/BaselineMode.java
@@ -23,6 +23,12 @@ public enum BaselineMode {
      */
     warn,
 
+    /**
+     * Warn about discrepancies between build and baseline artifacts but do not fail the build.
+     * Attached artifacts only present in the build do not result in a warning.
+     */
+    warnCommon,
+
     /**
      * Fail the build if there are discrepancies between artifacts present both in build and
      * baseline. Attached artifacts only present in the build do not result in build failure.

diff --git a/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/BaselineValidator.java b/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/BaselineValidator.java
@@ -105,9 +105,9 @@ public Map<String, IP2Artifact> validateAndReplace(MavenProject project, Compari
                             classifier.getValue().writeDetails(new File(logdir, classifier.getKey()));
                         }
                     }
-                    if (baselineMode == fail || (baselineMode == failCommon && !isMissingOnlyDelta(delta))) {
+                    if (shouldFail(baselineMode, delta)) {
                         throw new MojoExecutionException(delta.getDetailedMessage());
-                    } else {
+                    } else if (shouldWarn(baselineMode, delta)) {
                         log.warn(project.toString() + ": " + delta.getDetailedMessage());
                     }
                 }
@@ -198,7 +198,18 @@ public Map<String, IP2Artifact> validateAndReplace(MavenProject project, Compari
         return result;
     }
 
-    private boolean isMissingOnlyDelta(ArtifactDelta delta) {
+    private static boolean shouldFail(BaselineMode baselineMode, CompoundArtifactDelta delta) {
+        return baselineMode == fail || (baselineMode == failCommon && !isMissingOnlyDelta(delta));
+    }
+
+    private static boolean shouldWarn(BaselineMode baselineMode, CompoundArtifactDelta delta) {
+        if (baselineMode == BaselineMode.warnCommon) {
+            return !isMissingOnlyDelta(delta);
+        }
+        return true;
+    }
+
+    private static boolean isMissingOnlyDelta(ArtifactDelta delta) {
         if (delta instanceof MissingArtifactDelta) {
             return true;
         }