This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-analyser.git
The following commit(s) were added to refs/heads/master by this push:
new af112d8 SLING-13238 – Exposed a getter for conflicts in
ValidationReport (#60)
af112d8 is described below
commit af112d802dd718cccb77f0a8d8654a0c5c66c672
Author: michalwedzik <[email protected]>
AuthorDate: Mon Jul 27 15:07:00 2026 +0200
SLING-13238 – Exposed a getter for conflicts in ValidationReport (#60)
This enables more reliable conflict removal in the aemanalyser-maven-plugin.
Co-authored-by: sii12877 <[email protected]>
---
.../analyser/task/impl/repoinitconflicts/ValidationReport.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git
a/src/main/java/org/apache/sling/feature/analyser/task/impl/repoinitconflicts/ValidationReport.java
b/src/main/java/org/apache/sling/feature/analyser/task/impl/repoinitconflicts/ValidationReport.java
index 34945f6..733905e 100644
---
a/src/main/java/org/apache/sling/feature/analyser/task/impl/repoinitconflicts/ValidationReport.java
+++
b/src/main/java/org/apache/sling/feature/analyser/task/impl/repoinitconflicts/ValidationReport.java
@@ -31,6 +31,10 @@ public class ValidationReport {
private final Map<Feature, List<CreatePath[]>> conflicts = new
LinkedHashMap<>();
+ public Map<Feature, List<CreatePath[]>> getConflicts() {
+ return conflicts;
+ }
+
public void addConflicts(Feature feature, List<CreatePath[]>
featureConflicts) {
if (!featureConflicts.isEmpty()) {
conflicts.put(feature, featureConflicts);