You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2019/12/18 15:26:56 UTC
svn commit: r1871754 - in
/jackrabbit/commons/filevault-package-maven-plugin/trunk/src:
main/java/org/apache/jackrabbit/filevault/maven/packaging/
test/java/org/apache/jackrabbit/filevault/maven/packaging/it/
test/resources/test-projects/analyze-classe...
Author: kwin
Date: Wed Dec 18 15:26:56 2019
New Revision: 1871754
URL: http://svn.apache.org/viewvc?rev=1871754&view=rev
Log:
JCRVLT-351 deprecate "failOnEmptyFilter"
all ITs now have proper filters
Removed:
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/filter-tests/no-filter-with-prop-ok/expected-filter.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/filter-tests/no-filter-with-prop-ok/pom.xml
Modified:
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/AbstractValidateMojo.java
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/GenerateMetadataMojo.java
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/FilterIT.java
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/analyze-classes-multimodule/b/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/override-description/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/container/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-types/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/properties-from-map/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/properties-from-plugin-config-aliased/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/properties-from-plugin-config/pom.xml
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/AbstractValidateMojo.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/AbstractValidateMojo.java?rev=1871754&r1=1871753&r2=1871754&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/AbstractValidateMojo.java (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/AbstractValidateMojo.java Wed Dec 18 15:26:56 2019
@@ -31,7 +31,6 @@ import org.apache.jackrabbit.vault.packa
import org.apache.jackrabbit.vault.packaging.PackageInfo;
import org.apache.jackrabbit.vault.validation.ValidationExecutorFactory;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessageSeverity;
-import org.apache.jackrabbit.vault.validation.spi.impl.AdvancedFilterValidator;
import org.apache.jackrabbit.vault.validation.spi.impl.AdvancedFilterValidatorFactory;
import org.apache.jackrabbit.vault.validation.spi.impl.DependencyValidatorFactory;
import org.apache.maven.artifact.Artifact;
@@ -53,6 +52,8 @@ import org.sonatype.plexus.build.increme
* Common ancestor for all validation related mojos
*/
public abstract class AbstractValidateMojo extends AbstractMojo {
+ @Parameter(property = "vault.skipValidation", defaultValue = "false", required = true)
+ boolean skipValidation;
/** All validator settings in a map. The keys are the validator ids and the values
* are a complex object of type ValdidatorSettings.
@@ -172,6 +173,10 @@ public abstract class AbstractValidateMo
}
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
+ if (skipValidation) {
+ getLog().info("Skipping validation");
+ return;
+ }
translateLegacyParametersToValidatorParameters();
final Collection<PackageInfo> resolvedDependencies = new LinkedList<>();
if (project != null) {
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/GenerateMetadataMojo.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/GenerateMetadataMojo.java?rev=1871754&r1=1871753&r2=1871754&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/GenerateMetadataMojo.java (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/GenerateMetadataMojo.java Wed Dec 18 15:26:56 2019
@@ -153,7 +153,9 @@ public class GenerateMetadataMojo extend
String version;
/**
- * Defines the content of the filter.xml file
+ * Defines the content of the filter.xml file.
+ * Each filter consists of the mandatory element {@code root} and the optional {@code mode} and {@code type} elements. All those elements are simple strings.
+ * In addition optionally a number of {@code include} and {@code exclude} elements are supported below {@code includes}/{@code excludes} respectively.
*/
@Parameter
private final Filters filters = new Filters();
@@ -167,7 +169,9 @@ public class GenerateMetadataMojo extend
/**
* Controls if empty workspace filter fails the build.
+ * @deprecated This is no longer evaluated as every package is supposed to come with a non-empty filter
*/
+ @Deprecated
@Parameter(
property = "vault.failOnEmptyFilter",
defaultValue="true",
@@ -453,6 +457,9 @@ public class GenerateMetadataMojo extend
}
}
+ if (!failOnEmptyFilter) {
+ getLog().warn("The parameter 'failOnEmptyFilter' is no longer supported and ignored. Every package must have a non-empty filter!");
+ }
final File vaultDir = getGeneratedVaultDir();
vaultDir.mkdirs();
@@ -635,13 +642,7 @@ public class GenerateMetadataMojo extend
private void writeFilters(String sourceFilters) throws IOException, MojoExecutionException {
// if no filter is defined at all, fail
if (filters.getFilterSets().isEmpty()) {
- if (failOnEmptyFilter) {
- final String msg = "No workspace filter defined (failOnEmptyFilter=true)";
- getLog().error(msg);
- throw new MojoExecutionException(msg);
- } else {
- getLog().warn("No workspace filter defined. Package import might have unexpected results.");
- }
+ throw new MojoExecutionException("No workspace filter defined!");
}
File filterFile = getGeneratedFilterFile();
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/FilterIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/FilterIT.java?rev=1871754&r1=1871753&r2=1871754&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/FilterIT.java (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/FilterIT.java Wed Dec 18 15:26:56 2019
@@ -48,14 +48,6 @@ public class FilterIT {
}
/**
- * Tests if a pom with no filter definition but with a @{code failOnEmptyFilter} set to {@code false} works.
- */
- @Test
- public void test_no_filter_with_prop_ok() throws Exception {
- verify("no-filter-with-prop-ok", false);
- }
-
- /**
* Tests if a project with an implicit filter defined with a resource based META-INF/vault/filter.xml is correctly built
*/
@Test
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/analyze-classes-multimodule/b/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/analyze-classes-multimodule/b/pom.xml?rev=1871754&r1=1871753&r2=1871754&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/analyze-classes-multimodule/b/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/analyze-classes-multimodule/b/pom.xml Wed Dec 18 15:26:56 2019
@@ -37,12 +37,12 @@
<version>${plugin.version}</version>
<extensions>true</extensions>
<configuration>
- <failOnEmptyFilter>false</failOnEmptyFilter>
<embeddeds>
<embedded>
<groupId>${project.groupId}</groupId>
<artifactId>package-plugin-test-pkg-artifact</artifactId>
<target>/libs/install</target>
+ <addFilter>true</addFilter>
</embedded>
</embeddeds>
</configuration>
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/override-description/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/override-description/pom.xml?rev=1871754&r1=1871753&r2=1871754&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/override-description/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/override-description/pom.xml Wed Dec 18 15:26:56 2019
@@ -35,7 +35,11 @@
<version>${plugin.version}</version>
<extensions>true</extensions>
<configuration>
- <failOnEmptyFilter>false</failOnEmptyFilter>
+ <filters>
+ <filter>
+ <root>/some/path</root>
+ </filter>
+ </filters>
<properties>
<description>Description from plugin</description>
<empty></empty>
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/container/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/container/pom.xml?rev=1871754&r1=1871753&r2=1871754&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/container/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/container/pom.xml Wed Dec 18 15:26:56 2019
@@ -29,8 +29,12 @@
<extensions>true</extensions>
<configuration>
<!-- TODO: implement auto detection -->
- <failOnEmptyFilter>false</failOnEmptyFilter>
<packageType>container</packageType>
+ <filters>
+ <filter>
+ <root>/apps/packages/subpackage</root>
+ </filter>
+ </filters>
</configuration>
</plugin>
</plugins>
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-types/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-types/pom.xml?rev=1871754&r1=1871753&r2=1871754&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-types/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-types/pom.xml Wed Dec 18 15:26:56 2019
@@ -29,7 +29,12 @@
<extensions>true</extensions>
<configuration>
<packageType>${test.packageType}</packageType>
- <failOnEmptyFilter>false</failOnEmptyFilter>
+ <skipValidation>true</skipValidation>
+ <filters>
+ <filter>
+ <root>/some/path</root>
+ </filter>
+ </filters>
</configuration>
</plugin>
</plugins>
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/properties-from-map/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/properties-from-map/pom.xml?rev=1871754&r1=1871753&r2=1871754&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/properties-from-map/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/properties-from-map/pom.xml Wed Dec 18 15:26:56 2019
@@ -34,7 +34,11 @@
<version>${plugin.version}</version>
<extensions>true</extensions>
<configuration>
- <failOnEmptyFilter>false</failOnEmptyFilter>
+ <filters>
+ <filter>
+ <root>/some/path</root>
+ </filter>
+ </filters>
<!-- these property can only bet set via plugin properties -->
<requiresRoot>true</requiresRoot>
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/properties-from-plugin-config-aliased/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/properties-from-plugin-config-aliased/pom.xml?rev=1871754&r1=1871753&r2=1871754&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/properties-from-plugin-config-aliased/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/properties-from-plugin-config-aliased/pom.xml Wed Dec 18 15:26:56 2019
@@ -34,7 +34,11 @@
<version>${plugin.version}</version>
<extensions>true</extensions>
<configuration>
- <failOnEmptyFilter>false</failOnEmptyFilter>
+ <filters>
+ <filter>
+ <root>/some/path</root>
+ </filter>
+ </filters>
<!-- properties set here should have higher precedence than in the properties map -->
<requiresRoot>true</requiresRoot>
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/properties-from-plugin-config/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/properties-from-plugin-config/pom.xml?rev=1871754&r1=1871753&r2=1871754&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/properties-from-plugin-config/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/properties-from-plugin-config/pom.xml Wed Dec 18 15:26:56 2019
@@ -34,7 +34,11 @@
<version>${plugin.version}</version>
<extensions>true</extensions>
<configuration>
- <failOnEmptyFilter>false</failOnEmptyFilter>
+ <filters>
+ <filter>
+ <root>/some/path</root>
+ </filter>
+ </filters>
<!-- properties set here should have higher precedence than in the properties map -->
<requiresRoot>true</requiresRoot>