JCRVLT-535 no longer adjust configuration for incremental runs as
validators take care of that
fix FilteringIT validation errors
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/AbstractValidateMojo.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/AbstractValidateMojo.java
index 8c6376d..e9b86d2 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/AbstractValidateMojo.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/AbstractValidateMojo.java
@@ -228,6 +228,7 @@
validationHelper.setCsvFile(csvReportFile, StandardCharsets.UTF_8, CSVFormat.EXCEL);
}
if (project != null) {
+ getLog().info("Clear markers in " + project.getBasedir());
validationHelper.clearPreviousValidationMessages(buildContext, project.getBasedir());
}
try {
@@ -312,22 +313,6 @@
}
}
-
- protected void disableChecksOnlyWorkingForPackages() throws MojoExecutionException {
- final ValidatorSettings filterValidatorSettings;
- if (validatorsSettings == null) {
- validatorsSettings = new HashMap<>();
- }
- if (validatorsSettings.containsKey(AdvancedFilterValidatorFactory.ID)) {
- getLog().warn("Overwriting settings for validator " + AdvancedFilterValidatorFactory.ID + " as some checks do not work reliably for this mojo!");
- filterValidatorSettings = validatorsSettings.get(AdvancedFilterValidatorFactory.ID);
- } else {
- filterValidatorSettings = new ValidatorSettings();
- }
- // orphaned filter rules cannot be realiably detected, as the package is not yet build
- filterValidatorSettings.addOption(AdvancedFilterValidatorFactory.OPTION_SEVERITY_FOR_ORPHANED_FILTER_RULES, "debug");
- }
-
public abstract void doExecute(ValidationHelper validationHelper) throws MojoExecutionException, MojoFailureException;
protected Map<String, ValidatorSettings> getValidatorSettingsForPackage(PackageId packageId, boolean isSubPackage) {
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ValidateFilesMojo.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ValidateFilesMojo.java
index 91ccba9..3b7db40 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ValidateFilesMojo.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ValidateFilesMojo.java
@@ -176,7 +176,6 @@
@Override
public void doExecute(ValidationHelper validationHelper) throws MojoExecutionException, MojoFailureException {
- disableChecksOnlyWorkingForPackages();
try {
File metaInfoVaultSourceDirectory = AbstractMetadataPackageMojo.getMetaInfVaultSourceDirectory(metaInfVaultDirectory, getLog());
File metaInfRootDirectory = null;
@@ -216,7 +215,7 @@
SortedSet<Path> sortedFileAndFolderNames = sortAndEnrichFilesAndDirectories(baseDir, scanner.getIncludedFiles(), scanner.getIncludedDirectories());
for (Path fileOrFolder : sortedFileAndFolderNames) {
- getLog().debug("Scanning path " + getProjectRelativeFilePath(baseDir.resolve(fileOrFolder)) + "...");
+ getLog().info("Scanning path " + getProjectRelativeFilePath(baseDir.resolve(fileOrFolder)) + "...");
if (Files.isDirectory(baseDir.resolve(fileOrFolder))) {
validateDirectory(validationHelper, executor, baseDir, isMetaInf, fileOrFolder);
} else {
diff --git a/src/test/resources/test-projects/filtering-tests/simple-filter/expected-files.txt b/src/test/resources/test-projects/filtering-tests/simple-filter/expected-files.txt
index f63b6da..6e43343 100644
--- a/src/test/resources/test-projects/filtering-tests/simple-filter/expected-files.txt
+++ b/src/test/resources/test-projects/filtering-tests/simple-filter/expected-files.txt
@@ -16,6 +16,7 @@
jcr_root/apps/bar/test1.properties
jcr_root/apps/bar/.content.xml
jcr_root/apps/foo/
+jcr_root/apps/foo/.content.xml
jcr_root/apps/foo/test2.properties
jcr_root/apps/foo/child/
jcr_root/apps/foo/child/.content.xml
\ No newline at end of file
diff --git a/src/test/resources/test-projects/filtering-tests/simple-filter/jcr_root/apps/foo/.content.xml b/src/test/resources/test-projects/filtering-tests/simple-filter/jcr_root/apps/foo/.content.xml
new file mode 100644
index 0000000..830aee2
--- /dev/null
+++ b/src/test/resources/test-projects/filtering-tests/simple-filter/jcr_root/apps/foo/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+jcr:primaryType="nt:unstructured" />
\ No newline at end of file
