jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From k...@apache.org
Subject svn commit: r1868139 [3/3] - in /jackrabbit/commons/filevault-package-maven-plugin/trunk: ./ src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ src/main/java/org/apache/jackrabbit/filevault/maven/packaging/impl/ src/main/java/org/apache/jac...
Date Tue, 08 Oct 2019 15:22:04 GMT
Added: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/resources/filter.xsd
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/resources/filter.xsd?rev=1868139&view=auto
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/resources/filter.xsd (added)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/resources/filter.xsd Tue Oct  8 15:22:03 2019
@@ -0,0 +1,60 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:complexType name="includeExcludeType">
+    <xs:simpleContent>
+      <xs:extension base="xs:string">
+        <xs:attribute type="xs:string" name="pattern" use="required"/>
+        <xs:attribute type="xs:boolean" name="matchProperties" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  <xs:attribute name="type">
+    <xs:simpleType>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="(|cleanup)"/>
+        </xs:restriction>
+    </xs:simpleType>
+  </xs:attribute>
+  <xs:attribute name="mode">
+    <xs:simpleType>
+        <xs:restriction base="xs:string">
+          <xs:enumeration value="replace"/>
+          <xs:enumeration value="merge"/>
+          <xs:enumeration value="update"/>
+        </xs:restriction>
+    </xs:simpleType>
+  </xs:attribute>
+  <xs:element name="workspaceFilter">
+    <xs:complexType>
+      <xs:sequence minOccurs="0" maxOccurs="unbounded">
+        <xs:element name="filter">
+          <xs:complexType>
+            <xs:choice maxOccurs="unbounded" minOccurs="0">
+              <xs:element type="includeExcludeType" name="exclude"/>
+              <xs:element type="includeExcludeType" name="include"/>
+            </xs:choice>
+            <xs:attribute type="xs:string" name="root" use="required"/>
+            <xs:attribute ref="type"/>
+            <xs:attribute type="xs:string" name="mode"/>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+      <xs:attribute type="xs:float" name="version"/>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/site/markdown/index.md
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/site/markdown/index.md?rev=1868139&r1=1868138&r2=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/site/markdown/index.md (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/site/markdown/index.md Tue Oct  8 15:22:03 2019
@@ -27,9 +27,7 @@ Apache Jackrabbit FileVault is a project
 
 Downloads
 ---------
-The latest filevault package plugin sources are available for checkout from [svn]
-(https://svn.apache.org/repos/asf/jackrabbit/commons/filevault-package-maven-plugin/trunk), or you can [fork them]
-(https://github.com/apache/jackrabbit-filevault-package-maven-plugin) on GitHub.
+The latest filevault package plugin sources are available for checkout from [svn](https://svn.apache.org/repos/asf/jackrabbit/commons/filevault-package-maven-plugin/trunk), or you can [fork them](https://github.com/apache/jackrabbit-filevault-package-maven-plugin) on GitHub.
 
 See also our [releases](http://jackrabbit.apache.org/downloads.html) on the Jackrabbit
 download page for slightly more stable versions of the codebase.

Added: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/site/markdown/validators.md
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/site/markdown/validators.md?rev=1868139&view=auto
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/site/markdown/validators.md (added)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/site/markdown/validators.md Tue Oct  8 15:22:03 2019
@@ -0,0 +1,77 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+Validators
+===================================================
+
+Overview
+--------
+With the goals [`validate-package`](validate-package-mojo.html) and [`validate-files`](validate-files-mojo.html) it is possible to run validation on top of the given package or the package source files.
+Validation itself is implemented with the [Jackrabbit FileVault Validation Framework][vlt.validation] which also contains a lot of standard validators.
+Look there on which validators are contained and what options they provide.
+
+
+Configuration
+--------
+It is possible to adjust every validator registered in the system (both default and external validators) with the parameter `validatorsSettings`. This is a map with the keys being the validator ids and the values being complex objects.
+Here is an example configuration
+
+```
+<configuration>
+  <validatorsSettings>
+    <jackrabbit-filter>
+      <isDisabled>false</isDisabled><!-- false is default, true disables the validator completely, all other setting are not relevant then -->
+      <defaultSeverity>error</defaultSeverity><!-- lower case enum values of .. />
+      <options>
+        <severityForUncoveredAncestorNodes>error</severityForUncoveredAncestorNodes>
+      </options>
+    </jackrabbit-filter>
+  </validatorsSettings>
+</configuration>
+```
+
+The options for the individual validators together with the validator ids are documented at [Jackrabbit FileVault Validation Framework][vlt.validation].
+
+Severities
+------
+The validation message severities have an impact on the build outcome. By default every validation message with severity `error` will fail the build. One can adjust this setting by leveraging the configuration parameter `failOnValidationWarnings`.
+
+Dependencies
+------
+All package dependencies are resolved via the [Maven Artifact Resolver][maven.resolver]. If package dependencies are only given via their package id a best guess resolution is tried by using the `name` as `artifactId` and `group` as `groupId`. You can tweak this fallback behaviour by leveraging the configuration parameter `mapPackageDependencyToMavenGa`.
+
+Reference External Validators
+-------
+To reference an external validator it just needs to be given as [plugin dependency][maven.plugindependencies] to the `filevault-package-maven-plugin`.
+
+```
+<plugin>
+  <groupId>org.apache.jackrabbit</groupId>
+  <artifactId>filevault-package-maven-plugin</artifactId>
+  <dependencies>
+    <!-- some validator extension -->
+    <dependency>
+      <artifactId>myartifact</artifactId>
+      <groupId>mygroup</groupId>
+      <version>1.0.0</version>
+    </dependency>
+  </dependencies>
+</plugin>
+``` 
+
+[vlt.validation]: https://jackrabbit.apache.org/filevault/validation.html
+[maven.plugindependencies]: https://maven.apache.org/guides/mini/guide-configuring-plugins.html#Using_the_dependencies_Tag
+[maven.resolver]: https://maven.apache.org/resolver/index.html
\ No newline at end of file

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/site/site.xml?rev=1868139&r1=1868138&r2=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/site/site.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/site/site.xml Tue Oct  8 15:22:03 2019
@@ -20,7 +20,7 @@
 <project xmlns="http://maven.apache.org/DECORATION/1.3.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd"
-         name="Jackrabbit Filevault Package Maven Plugin">
+         name="Jackrabbit FileVault Package Maven Plugin">
     <body>
         <menu name="Overview">
             <item name="Introduction" href="index.html"/>
@@ -30,6 +30,7 @@
         <menu name="Documentation">
             <item name="Import-package Generation" href="import_package.html"/>
             <item name="Migration from Adobe" href="migrating.html"/>
+            <item name="Validators" href="validators.html"/>
         </menu>
         <menu name="Project Documentation">
             <item href="project-summary.html" name="Project Summary"/>

Added: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/AbstractValidateMojoTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/AbstractValidateMojoTest.java?rev=1868139&view=auto
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/AbstractValidateMojoTest.java (added)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/AbstractValidateMojoTest.java Tue Oct  8 15:22:03 2019
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.filevault.maven.packaging;
+
+import java.util.Arrays;
+
+import org.apache.jackrabbit.vault.packaging.Dependency;
+import org.apache.maven.artifact.DefaultArtifact;
+import org.apache.maven.artifact.InvalidArtifactRTException;
+import org.hamcrest.Matchers;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class AbstractValidateMojoTest {
+
+    @Test
+    public void testValidMap() {
+        Assert.assertThat(AbstractValidateMojo.resolveMap(Arrays.asList("group1:name1=groupId1:artifactId1", "group2:name2=groupId2:artifactId2")), 
+                Matchers.allOf(
+                    Matchers.hasEntry(Dependency.fromString("group1:name1"), new DefaultArtifact("groupId1", "artifactId1", "", "", "", "", null)),
+                    Matchers.hasEntry(Dependency.fromString("group2:name2"), new DefaultArtifact("groupId2", "artifactId2", "", "", "", "", null)),
+                    Matchers.aMapWithSize(2)));
+       
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testInvalidMap1() {
+        AbstractValidateMojo.resolveMap(Arrays.asList("group1:=artifactId1")); 
+       
+    }
+
+    @Test(expected = InvalidArtifactRTException.class)
+    public void testInvalidMap2() {
+        AbstractValidateMojo.resolveMap(Arrays.asList("group1:=:groupId")); 
+       
+    }
+}

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ProjectBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ProjectBuilder.java?rev=1868139&r1=1868138&r2=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ProjectBuilder.java (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ProjectBuilder.java Tue Oct  8 15:22:03 2019
@@ -16,6 +16,14 @@
  */
 package org.apache.jackrabbit.filevault.maven.packaging.it;
 
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
@@ -32,6 +40,8 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
@@ -51,14 +61,6 @@ import org.slf4j.LoggerFactory;
 import aQute.bnd.header.Attrs;
 import aQute.bnd.header.Parameters;
 
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 /**
  * Helper class to build and verify a maven project.
  */
@@ -75,6 +77,8 @@ public class ProjectBuilder {
 
     static final String TEST_PACKAGE_DEFAULT_NAME = "target/package-plugin-test-pkg-1.0.0-SNAPSHOT.zip";
 
+    static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("%(\\d*)%");
+
     private File testProjectsRoot;
 
     private File testProjectDir;
@@ -97,6 +101,8 @@ public class ProjectBuilder {
     
     private File expectedFilesWithChecksumsFile;
 
+    private File expectedLogLinesFile;
+
     private File logTxtFile;
 
     private boolean buildExpectedToFail;
@@ -156,7 +162,9 @@ public class ProjectBuilder {
         this.expectedManifestFile = new File(testProjectDir, "expected-manifest.txt");
         this.expectedFilterFile = new File(testProjectDir, "expected-filter.xml");
         this.expectedFilesWithChecksumsFile = new File(testProjectDir, "expected-files-with-checksums.txt");
+        this.expectedLogLinesFile = new File(testProjectDir, "expected-log-lines.txt");
         this.logTxtFile = new File(testProjectDir, "log.txt");
+        
         return this;
     }
 
@@ -205,10 +213,11 @@ public class ProjectBuilder {
         verifier.setSystemProperties(testProperties);
         verifier.setDebug(true);
         verifier.setAutoclean(false);
+        //verifier.setDebugJvm(true);
 
         try {
             verifier.executeGoals(Arrays.asList(testGoals));
-            assertFalse("Build expected to fail ", buildExpectedToFail);
+            assertFalse("Build expected to fail in project " + testProjectDir.getAbsolutePath(), buildExpectedToFail);
         } catch (VerificationException e) {
             if (buildExpectedToFail) {
                 return this;
@@ -217,6 +226,7 @@ public class ProjectBuilder {
         } finally {
             verifier.resetStreams();
         }
+        verifier.verify(true);
 
         if (!verifyPackageContents) {
             return this;
@@ -353,6 +363,27 @@ public class ProjectBuilder {
         return this;
     }
 
+    public ProjectBuilder verifyExpectedLogLines(String... placeholderValues) throws IOException {
+        List<String> expectedLogLines = Files.readAllLines(expectedLogLinesFile.toPath());
+        List<String> actualLogLines = getBuildOutput();
+        for (String expectedLogLine : expectedLogLines) {
+            // do placeholder replacement
+            
+            Matcher matcher = PLACEHOLDER_PATTERN.matcher(expectedLogLine);
+            while (matcher.find()) {
+                int placeholderIndex = Integer.parseInt(matcher.group(1));
+                if (placeholderIndex >= placeholderValues.length) {
+                    throw new IllegalArgumentException("At least " + placeholderIndex + " placeholder values need to be given, but only "+ placeholderValues.length + " received.");
+                }
+                // replace current item in iterator with the new value
+                expectedLogLine = matcher.replaceAll(placeholderValues[placeholderIndex]);
+            }
+            // update list
+            assertThat("Could not find the expected log line in the output '" + logTxtFile +"'", actualLogLines, Matchers.hasItem(expectedLogLine));
+        }
+        // support not and exists
+        return this;
+    }
     public List<String> getBuildOutput() throws IOException {
         return Files.readAllLines(logTxtFile.toPath(), StandardCharsets.UTF_8);
     }

Added: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ValidateFilesIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ValidateFilesIT.java?rev=1868139&view=auto
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ValidateFilesIT.java (added)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ValidateFilesIT.java Tue Oct  8 15:22:03 2019
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.filevault.maven.packaging.it;
+
+import java.io.IOException;
+
+import org.apache.maven.it.VerificationException;
+import org.junit.Test;
+
+public class ValidateFilesIT {
+
+    private static final String TEST_PROJECT_NAME = "/validator-projects/";
+
+    private ProjectBuilder verify(String projectName) throws VerificationException, IOException {
+        return new ProjectBuilder()
+                .setTestProjectDir(TEST_PROJECT_NAME + projectName)
+                .setTestGoals("clean", "process-classes") // make sure the validate-files mojo is not skipped
+                .setBuildExpectedToFail(true)
+                .build()
+                .verifyExpectedLogLines("target/vault-work/META-INF/vault/filter.xml");
+    }
+
+    @Test
+    public void testInvalidProject() throws Exception {
+        verify("invalid-project");
+    }
+}

Added: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ValidatePackageIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ValidatePackageIT.java?rev=1868139&view=auto
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ValidatePackageIT.java (added)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ValidatePackageIT.java Tue Oct  8 15:22:03 2019
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.filevault.maven.packaging.it;
+
+import java.io.IOException;
+
+import org.apache.maven.it.VerificationException;
+import org.junit.Test;
+
+public class ValidatePackageIT {
+
+    private static final String TEST_PROJECT_NAME = "/validator-projects/";
+
+    private ProjectBuilder verify(String projectName) throws VerificationException, IOException {
+        return new ProjectBuilder()
+                .setTestProjectDir(TEST_PROJECT_NAME + projectName)
+                .setBuildExpectedToFail(true)
+                .build()
+                .verifyExpectedLogLines("META-INF/vault/filter.xml");
+    }
+
+    @Test
+    public void testInvalidProject() throws Exception {
+        verify("invalid-project");
+    }
+}

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/org/apache/jackrabbit/filevault/maven/packaging/validator/impl/filter.xml (from r1863646, jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/org/apache/jackrabbit/filevault/maven/packaging/validator/impl/filter.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/org/apache/jackrabbit/filevault/maven/packaging/validator/impl/filter.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml&r1=1863646&r2=1868139&rev=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/org/apache/jackrabbit/filevault/maven/packaging/validator/impl/filter.xml Tue Oct  8 15:22:03 2019
@@ -15,7 +15,15 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-
 <workspaceFilter version="1.0">
-    <filter root="/libs/granite/replication"/>
+    <filter root="/apps/test"/>
+    <filter root="/apps/test2">
+        <include pattern=".*/valid" />
+    </filter>
+    <filter root="/apps/test3">
+        <exclude pattern=".*/invalid" />
+    </filter>
+    <filter root="/apps/test4/test">
+        <exclude pattern=".*/invalid" />
+    </filter>
 </workspaceFilter>

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/org/apache/jackrabbit/filevault/maven/packaging/validator/mojo-configuration1.xml (from r1863646, jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/org/apache/jackrabbit/filevault/maven/packaging/validator/mojo-configuration1.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/org/apache/jackrabbit/filevault/maven/packaging/validator/mojo-configuration1.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml&r1=1863646&r2=1868139&rev=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/org/apache/jackrabbit/filevault/maven/packaging/validator/mojo-configuration1.xml Tue Oct  8 15:22:03 2019
@@ -15,7 +15,21 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-
-<workspaceFilter version="1.0">
-    <filter root="/libs/granite/replication"/>
-</workspaceFilter>
+<configuration>
+    <property1></property1>
+    <property2a>
+        true
+    </property2a>
+    <property2b>
+        TRUE
+    </property2b>
+    <property2c>
+        TRue
+    </property2c>
+    <property3a>false</property3a>
+    <property3b>FALSE</property3b>
+    <property3c>False</property3c>
+    <property4a>
+        Some string
+    </property4a>
+</configuration>
\ No newline at end of file

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-content/test-package-exclude.zip
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-content/test-package-exclude.zip?rev=1868139&r1=1868138&r2=1868139&view=diff
==============================================================================
Binary files jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-content/test-package-exclude.zip (original) and jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-content/test-package-exclude.zip Tue Oct  8 15:22:03 2019 differ

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/check-signature/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/check-signature/pom.xml?rev=1868139&r1=1868138&r2=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/check-signature/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/check-signature/pom.xml Tue Oct  8 15:22:03 2019
@@ -46,6 +46,7 @@
                             <groupId>javax.jcr</groupId>
                             <artifactId>jcr</artifactId>
                             <target>/libs/install</target>
+                            <filter>true</filter>
                         </embedded>
                     </embeddeds>
                 </configuration>

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic-empty-directories/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic-empty-directories/pom.xml?rev=1868139&r1=1868138&r2=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic-empty-directories/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic-empty-directories/pom.xml Tue Oct  8 15:22:03 2019
@@ -35,6 +35,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <failOnDependencyErrors>false</failOnDependencyErrors>
+                    <packageType>mixed</packageType>
                     <excludes>**/.dummy</excludes>
                     <filters>
                         <filter>

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic-with-metainf/expected-manifest.txt
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic-with-metainf/expected-manifest.txt?rev=1868139&r1=1868138&r2=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic-with-metainf/expected-manifest.txt (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic-with-metainf/expected-manifest.txt Tue Oct  8 15:22:03 2019
@@ -1,6 +1,6 @@
 Content-Package-Description:Packaging test
 Content-Package-Id:org.apache.jackrabbit.filevault:package-plugin-test-pkg:1.0.0-SNAPSHOT
-Content-Package-Roots:/apps/wcm/core/content,/rep:policy
+Content-Package-Roots:/apps/install/org.apache.jackrabbit.vault-3.1.40.jar,/apps/wcm/core/content,/libs/install/jcr-2.0.jar,/rep:policy
 Content-Package-Type:mixed
 Implementation-Title:Packaging test
 Implementation-Version:1.0.0-SNAPSHOT

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic-with-metainf/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic-with-metainf/pom.xml?rev=1868139&r1=1868138&r2=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic-with-metainf/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic-with-metainf/pom.xml Tue Oct  8 15:22:03 2019
@@ -40,10 +40,12 @@
                             <groupId>javax.jcr</groupId>
                             <artifactId>jcr</artifactId>
                             <target>/libs/install</target>
+                            <filter>true</filter>
                         </embedded>
                         <embedded>
                             <groupId>org.apache.jackrabbit.vault</groupId>
                             <artifactId>org.apache.jackrabbit.vault</artifactId>
+                            <filter>true</filter>
                         </embedded>
                     </embeddeds>
                     <embeddedTarget>/apps/install</embeddedTarget>

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic/expected-manifest.txt
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic/expected-manifest.txt?rev=1868139&r1=1868138&r2=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic/expected-manifest.txt (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic/expected-manifest.txt Tue Oct  8 15:22:03 2019
@@ -1,6 +1,6 @@
 Content-Package-Description:Packaging test
 Content-Package-Id:org.apache.jackrabbit.filevault:package-plugin-test-pkg:1.0.0-SNAPSHOT
-Content-Package-Roots:/apps/some-thirdparty-libs,/apps/wcm/core/content,/etc/cloudservices/ooyala,/etc/designs/some-thirdparty-libs,/etc/packages/apache/consulting,/rep:policy
+Content-Package-Roots:/apps/install/org.apache.jackrabbit.vault-3.1.40.jar,/apps/some-thirdparty-libs,/apps/wcm/core/content,/etc/cloudservices/ooyala,/etc/designs/some-thirdparty-libs,/etc/packages/apache/consulting,/libs/install/jcr-2.0.jar,/rep:policy
 Content-Package-Type:mixed
 Implementation-Title:Packaging test
 Implementation-Version:1.0.0-SNAPSHOT

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic/pom.xml?rev=1868139&r1=1868138&r2=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic/pom.xml Tue Oct  8 15:22:03 2019
@@ -56,10 +56,12 @@
                             <groupId>javax.jcr</groupId>
                             <artifactId>jcr</artifactId>
                             <target>/libs/install</target>
+                            <filter>true</filter>
                         </embedded>
                         <embedded>
                             <groupId>org.apache.jackrabbit.vault</groupId>
                             <artifactId>org.apache.jackrabbit.vault</artifactId>
+                            <filter>true</filter>
                         </embedded>
                     </embeddeds>
                     <embeddedTarget>/apps/install</embeddedTarget>

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/htl-validation/expected-manifest.txt
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/htl-validation/expected-manifest.txt?rev=1868139&r1=1868138&r2=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/htl-validation/expected-manifest.txt (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/htl-validation/expected-manifest.txt Tue Oct  8 15:22:03 2019
@@ -1,7 +1,7 @@
 Content-Package-Description:Packaging test
 Content-Package-Id:org.apache.jackrabbit.filevault:package-plugin-test-pkg:1.0.0-SNAPSHOT
 Content-Package-Roots:/apps/htl/test
-Content-Package-Type:application
+Content-Package-Type:mixed
 Implementation-Title:Packaging test
 Implementation-Version:1.0.0-SNAPSHOT
 Import-Package:javax.jcr;version="[2.0.0,3.0.0)"

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/htl-validation/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/htl-validation/pom.xml?rev=1868139&r1=1868138&r2=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/htl-validation/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/htl-validation/pom.xml Tue Oct  8 15:22:03 2019
@@ -35,6 +35,7 @@
                 <version>${plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
+                    <packageType>mixed</packageType>
                     <failOnDependencyErrors>false</failOnDependencyErrors>
                     <filters>
                         <filter>

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/invalid-package/META-INF/vault/filter-non-matching-regex.xml (from r1863646, jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/invalid-package/META-INF/vault/filter-non-matching-regex.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/invalid-package/META-INF/vault/filter-non-matching-regex.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml&r1=1863646&r2=1868139&rev=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/invalid-package/META-INF/vault/filter-non-matching-regex.xml Tue Oct  8 15:22:03 2019
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,7 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-
 <workspaceFilter version="1.0">
-    <filter root="/libs/granite/replication"/>
-</workspaceFilter>
+    <filter root="/etc/project1">
+        <exclude pattern="/some/other" />
+    </filter>
+    <filter root="invalidroot">
+    </filter>
+</workspaceFilter>
\ No newline at end of file

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/invalid-package/META-INF/vault/filter.xml (from r1863646, jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/invalid-package/META-INF/vault/filter.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/invalid-package/META-INF/vault/filter.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml&r1=1863646&r2=1868139&rev=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/invalid-package/META-INF/vault/filter.xml Tue Oct  8 15:22:03 2019
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,7 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-
 <workspaceFilter version="1.0">
-    <filter root="/libs/granite/replication"/>
-</workspaceFilter>
+    <filter root="/etc/project1">
+        <exclude pattern=".*\.gif" mode="merge" />
+        <include pattern="["/> <!-- invalid regex -->
+        <invalidelement />
+    </filter>
+</workspaceFilter>
\ No newline at end of file

Added: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/invalid-package/META-INF/vault/properties.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/invalid-package/META-INF/vault/properties.xml?rev=1868139&view=auto
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/invalid-package/META-INF/vault/properties.xml (added)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/invalid-package/META-INF/vault/properties.xml Tue Oct  8 15:22:03 2019
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>FileVault Package Properties</comment>
+<entry key="createdBy">admin</entry>
+<entry key="name">mode_ac_test_a</entry>
+<entry key="lastModified">2011-11-15T09:43:22.972+01:00</entry>
+<entry key="lastModifiedBy">admin</entry>
+<entry key="created">2011-11-15T09:43:22.993+01:00</entry>
+<entry key="buildCount">1</entry>
+<entry key="version"/>
+<entry key="dependencies"/>
+<entry key="packageFormatVersion">2</entry>
+<entry key="description"/>
+<entry key="lastWrapped">2011-11-15T09:43:22.972+01:00</entry>
+<entry key="group"/>
+<entry key="lastWrappedBy">admin</entry>
+<entry key="acHandling">overwrite</entry>
+<someinvalidentry></someinvalidentry>
+</properties>

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/resource-empty-directories/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/resource-empty-directories/pom.xml?rev=1868139&r1=1868138&r2=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/resource-empty-directories/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/resource-empty-directories/pom.xml Tue Oct  8 15:22:03 2019
@@ -55,6 +55,7 @@
                 <configuration>
                     <jcrRootSourceDirectory>${project.build.outputDirectory}</jcrRootSourceDirectory>
                     <failOnDependencyErrors>false</failOnDependencyErrors>
+                    <packageType>mixed</packageType>
                     <filters>
                         <filter>
                             <root>/apps/wcm/core</root>

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/META-INF/vault/filter.xml (from r1863646, jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/META-INF/vault/filter.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/META-INF/vault/filter.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml&r1=1863646&r2=1868139&rev=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/META-INF/vault/filter.xml Tue Oct  8 15:22:03 2019
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,7 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-
 <workspaceFilter version="1.0">
-    <filter root="/libs/granite/replication"/>
-</workspaceFilter>
+    <filter root="/etc/project1" type="cleanup" mode="merge">
+        <exclude pattern=".*\.gif" />
+        <include pattern=".*/special\.gif" />
+    </filter>
+</workspaceFilter>
\ No newline at end of file

Added: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/META-INF/vault/genericfile.txt
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/META-INF/vault/genericfile.txt?rev=1868139&view=auto
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/META-INF/vault/genericfile.txt (added)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/META-INF/vault/genericfile.txt Tue Oct  8 15:22:03 2019
@@ -0,0 +1 @@
+Test
\ No newline at end of file

Added: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/META-INF/vault/properties.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/META-INF/vault/properties.xml?rev=1868139&view=auto
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/META-INF/vault/properties.xml (added)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/META-INF/vault/properties.xml Tue Oct  8 15:22:03 2019
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>FileVault Package Properties</comment>
+<entry key="createdBy">admin</entry>
+<entry key="name">mode_ac_test_a</entry>
+<entry key="lastModified">2011-11-15T09:43:22.972+01:00</entry>
+<entry key="lastModifiedBy">admin</entry>
+<entry key="created">2011-11-15T09:43:22.993+01:00</entry>
+<entry key="buildCount">1</entry>
+<entry key="version"/>
+<entry key="dependencies"/>
+<entry key="packageFormatVersion">2</entry>
+<entry key="description"/>
+<entry key="lastWrapped">2011-11-15T09:43:22.972+01:00</entry>
+<entry key="group"/>
+<entry key="lastWrappedBy">admin</entry>
+<entry key="acHandling">overwrite</entry>
+</properties>

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/.content.xml (from r1863646, jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml&r1=1863646&r2=1868139&rev=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/.content.xml Tue Oct  8 15:22:03 2019
@@ -15,7 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-
-<workspaceFilter version="1.0">
-    <filter root="/libs/granite/replication"/>
-</workspaceFilter>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="sling:Folder">
+    <somepath jcr:primaryType="nt:unstructured"
+        attribute1="value1"
+    ></somepath>
+</jcr:root>

Propchange: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/.content.xml
------------------------------------------------------------------------------
    svn:executable = *

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/child1.xml (from r1863646, jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/child1.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/child1.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml&r1=1863646&r2=1868139&rev=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/child1.xml Tue Oct  8 15:22:03 2019
@@ -16,6 +16,9 @@
   limitations under the License.
   -->
 
-<workspaceFilter version="1.0">
-    <filter root="/libs/granite/replication"/>
-</workspaceFilter>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="sling:Folder">
+    <somepath jcr:primaryType="nt:unstructured"
+        attribute1="value1"
+    ></somepath>
+</jcr:root>

Propchange: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/child1.xml
------------------------------------------------------------------------------
    svn:executable = *

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/child2/.content.xml (from r1863646, jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/child2/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/child2/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml&r1=1863646&r2=1868139&rev=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/child2/.content.xml Tue Oct  8 15:22:03 2019
@@ -16,6 +16,9 @@
   limitations under the License.
   -->
 
-<workspaceFilter version="1.0">
-    <filter root="/libs/granite/replication"/>
-</workspaceFilter>
+<child3 xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="sling:Folder">
+    <somepath jcr:primaryType="nt:unstructured"
+        attribute1="value1"
+    ></somepath>
+</child3>

Propchange: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/child2/.content.xml
------------------------------------------------------------------------------
    svn:executable = *

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/child2/child1.xml (from r1863646, jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/child2/child1.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/child2/child1.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml&r1=1863646&r2=1868139&rev=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/child2/child1.xml Tue Oct  8 15:22:03 2019
@@ -15,7 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-
-<workspaceFilter version="1.0">
-    <filter root="/libs/granite/replication"/>
-</workspaceFilter>
+<child3 xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr2="http://www.jcp.org/jcr/1.0"
+    jcr2:primaryType="sling:Folder">
+    <somepath jcr2:primaryType="nt:unstructured"
+        attribute1="value1"
+    ></somepath>
+</child3>

Propchange: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/child2/child1.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/genericfile.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/genericfile.xml?rev=1868139&view=auto
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/genericfile.xml (added)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/genericfile.xml Tue Oct  8 15:22:03 2019
@@ -0,0 +1 @@
+Test
\ No newline at end of file

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/invalid/wrongtype.xml (from r1863646, jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/invalid/wrongtype.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/invalid/wrongtype.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml&r1=1863646&r2=1868139&rev=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/simple-package/jcr_root/apps/invalid/wrongtype.xml Tue Oct  8 15:22:03 2019
@@ -16,6 +16,10 @@
   limitations under the License.
   -->
 
-<workspaceFilter version="1.0">
-    <filter root="/libs/granite/replication"/>
-</workspaceFilter>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="sling:Folder">
+    <somepath jcr:primaryType="nt:unstructured"
+        attribute2="{Long}123"
+        attribute1="{Invalid}value1"
+    ></somepath>
+</jcr:root>

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/filter-tests/inline-filter-twice/pom1.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/filter-tests/inline-filter-twice/pom1.xml?rev=1868139&r1=1868138&r2=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/filter-tests/inline-filter-twice/pom1.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/filter-tests/inline-filter-twice/pom1.xml Tue Oct  8 15:22:03 2019
@@ -35,6 +35,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <failOnDependencyErrors>false</failOnDependencyErrors>
+                    <packageType>mixed</packageType>
                     <filters>
                         <filter>
                             <root>/libs/foo</root>

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/filter-tests/inline-filter-twice/pom2.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/filter-tests/inline-filter-twice/pom2.xml?rev=1868139&r1=1868138&r2=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/filter-tests/inline-filter-twice/pom2.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/filter-tests/inline-filter-twice/pom2.xml Tue Oct  8 15:22:03 2019
@@ -35,6 +35,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <failOnDependencyErrors>false</failOnDependencyErrors>
+                    <packageType>mixed</packageType>
                     <filters>
                         <filter>
                             <root>/libs/bar</root>

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/filter-tests/inline-filter/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/filter-tests/inline-filter/pom.xml?rev=1868139&r1=1868138&r2=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/filter-tests/inline-filter/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/filter-tests/inline-filter/pom.xml Tue Oct  8 15:22:03 2019
@@ -35,6 +35,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <failOnDependencyErrors>false</failOnDependencyErrors>
+                    <packageType>mixed</packageType>
                     <filters>
                         <filter>
                             <root>/libs/foo</root>

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/filter-tests/merge-inline-filter-metainf/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/filter-tests/merge-inline-filter-metainf/pom.xml?rev=1868139&r1=1868138&r2=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/filter-tests/merge-inline-filter-metainf/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/filter-tests/merge-inline-filter-metainf/pom.xml Tue Oct  8 15:22:03 2019
@@ -35,6 +35,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <failOnDependencyErrors>false</failOnDependencyErrors>
+                    <packageType>mixed</packageType>
                     <filters>
                         <filter>
                             <root>/libs/foo</root>

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/filter-tests/merge-inline-filter/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/filter-tests/merge-inline-filter/pom.xml?rev=1868139&r1=1868138&r2=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/filter-tests/merge-inline-filter/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/filter-tests/merge-inline-filter/pom.xml Tue Oct  8 15:22:03 2019
@@ -36,6 +36,7 @@
                 <configuration>
                     <failOnDependencyErrors>false</failOnDependencyErrors>
                     <filterSource>filter.xml</filterSource>
+                    <packageType>mixed</packageType>
                     <filters>
                         <filter>
                             <root>/libs/foo</root>

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml?rev=1868139&r1=1868138&r2=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml Tue Oct  8 15:22:03 2019
@@ -17,5 +17,5 @@
   -->
 
 <workspaceFilter version="1.0">
-    <filter root="/libs/granite/replication"/>
+    <filter root="/libs/granite"/>
 </workspaceFilter>

Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/validate-deps-projects/no-errors/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/validate-deps-projects/no-errors/pom.xml?rev=1868139&r1=1868138&r2=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/validate-deps-projects/no-errors/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/validate-deps-projects/no-errors/pom.xml Tue Oct  8 15:22:03 2019
@@ -47,9 +47,6 @@
                         <!-- test internal ancestors that are exclude by dependent package -->
                         <filter>
                             <root>/libs/foo/bar</root>
-                            <includes>
-                                <include>/libs/foo/bar</include>
-                            </includes>
                         </filter>
                         <filter><root>/libs/foo/bar/sub</root></filter>
                     </filters>

Added: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/validator-projects/invalid-project/expected-log-lines.txt
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/validator-projects/invalid-project/expected-log-lines.txt?rev=1868139&view=auto
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/validator-projects/invalid-project/expected-log-lines.txt (added)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/validator-projects/invalid-project/expected-log-lines.txt Tue Oct  8 15:22:03 2019
@@ -0,0 +1 @@
+[ERROR] ValidationViolation: "jackrabbit-filter: Invalid pattern given ('invalidpattern') which will never match for any descendants of the root path '/apps/wcm/core/content'.", filePath=%0%
\ No newline at end of file

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/validator-projects/invalid-project/pom.xml (from r1863646, jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic-empty-directories/pom.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/validator-projects/invalid-project/pom.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/validator-projects/invalid-project/pom.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic-empty-directories/pom.xml&r1=1863646&r2=1868139&rev=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/default-test-projects/generic-empty-directories/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/validator-projects/invalid-project/pom.xml Tue Oct  8 15:22:03 2019
@@ -16,10 +16,6 @@
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
-    <!-- ====================================================================== -->
-    <!-- P R O J E C T  D E S C R I P T I O N                                   -->
-    <!-- ====================================================================== -->
     <groupId>org.apache.jackrabbit.filevault</groupId>
     <artifactId>package-plugin-test-pkg</artifactId>
     <version>1.0.0-SNAPSHOT</version>
@@ -33,15 +29,6 @@
                 <artifactId>filevault-package-maven-plugin</artifactId>
                 <version>${plugin.version}</version>
                 <extensions>true</extensions>
-                <configuration>
-                    <failOnDependencyErrors>false</failOnDependencyErrors>
-                    <excludes>**/.dummy</excludes>
-                    <filters>
-                        <filter>
-                            <root>/apps/wcm/core</root>
-                        </filter>
-                    </filters>
-                </configuration>
             </plugin>
         </plugins>
     </build>

Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/validator-projects/invalid-project/src/main/content/META-INF/vault/filter.xml (from r1863646, jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/validator-projects/invalid-project/src/main/content/META-INF/vault/filter.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/validator-projects/invalid-project/src/main/content/META-INF/vault/filter.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml&r1=1863646&r2=1868139&rev=1868139&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/package-type-auto/application-sourced/filter.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/validator-projects/invalid-project/src/main/content/META-INF/vault/filter.xml Tue Oct  8 15:22:03 2019
@@ -15,7 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-
 <workspaceFilter version="1.0">
-    <filter root="/libs/granite/replication"/>
+    <filter root="/apps/wcm/core/content">
+        <include pattern="invalidpattern"/>
+    </filter>
+    <filter root="/rep:policy" mode="merge"/>
 </workspaceFilter>



Mime
View raw message