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 2020/07/27 15:27:22 UTC
[jackrabbit-filevault-package-maven-plugin] branch master updated:
releng: fix tests so that they don't emit any validation errors
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault-package-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 0e0910c releng: fix tests so that they don't emit any validation errors
0e0910c is described below
commit 0e0910cdf87504546845f2dd3187a399a2091570
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Mon Jul 27 17:27:10 2020 +0200
releng: fix tests so that they don't emit any validation errors
remove undeclared namespaces
get rid of invalid node nesting due to assumptions about the existing
repo structure
---
.../default-test-projects/generic-unusal-jcrroot/expected-manifest.txt | 2 +-
.../generic-unusal-jcrroot/foo_root/_rep_policy.xml | 2 +-
.../test-projects/default-test-projects/generic-unusal-jcrroot/pom.xml | 2 +-
.../default-test-projects/generic-with-builtcd/expected-manifest.txt | 2 +-
.../default-test-projects/generic-with-builtcd/jcr_root/_rep_policy.xml | 2 +-
.../test-projects/default-test-projects/generic-with-builtcd/pom.xml | 2 +-
.../test-projects/default-test-projects/generic/expected-manifest.txt | 2 +-
.../default-test-projects/generic/jcr_root/_rep_policy.xml | 2 +-
src/test/resources/test-projects/default-test-projects/generic/pom.xml | 2 +-
.../test-projects/default-test-projects/resource/expected-manifest.txt | 2 +-
.../default-test-projects/resource/jcr_root/_rep_policy.xml | 2 +-
src/test/resources/test-projects/default-test-projects/resource/pom.xml | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/expected-manifest.txt b/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/expected-manifest.txt
index 397896e..7feb7d6 100644
--- a/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/expected-manifest.txt
+++ b/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/expected-manifest.txt
@@ -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/some-thirdparty-libs,/apps/wcm/core/content,/etc/cloudservices,/etc/designs/some-thirdparty-libs,/etc/packages/apache/consulting,/rep:policy
Content-Package-Type:mixed
Implementation-Title:Packaging test
Implementation-Version:1.0.0-SNAPSHOT
diff --git a/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/_rep_policy.xml b/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/_rep_policy.xml
index d83757c..49d5c47 100644
--- a/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/_rep_policy.xml
+++ b/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/foo_root/_rep_policy.xml
@@ -25,5 +25,5 @@
<allow0
jcr:primaryType="rep:GrantACE"
rep:principalName="workflow-process-service"
- rep:privileges="{Name}[jcr:read,rep:write,jcr:versionManagement,jcr:lockManagement,crx:replicate]"/>
+ rep:privileges="{Name}[jcr:read,rep:write,jcr:versionManagement,jcr:lockManagement]"/>
</jcr:root>
diff --git a/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/pom.xml b/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/pom.xml
index e5d3499..84e54c0 100755
--- a/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/pom.xml
+++ b/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/pom.xml
@@ -41,7 +41,7 @@
<root>/etc/designs/some-thirdparty-libs</root>
</filter>
<filter>
- <root>/etc/cloudservices/ooyala</root>
+ <root>/etc/cloudservices</root>
</filter>
<filter>
<root>/etc/packages/apache/consulting</root>
diff --git a/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/expected-manifest.txt b/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/expected-manifest.txt
index 397896e..7feb7d6 100644
--- a/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/expected-manifest.txt
+++ b/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/expected-manifest.txt
@@ -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/some-thirdparty-libs,/apps/wcm/core/content,/etc/cloudservices,/etc/designs/some-thirdparty-libs,/etc/packages/apache/consulting,/rep:policy
Content-Package-Type:mixed
Implementation-Title:Packaging test
Implementation-Version:1.0.0-SNAPSHOT
diff --git a/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/_rep_policy.xml b/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/_rep_policy.xml
index d83757c..49d5c47 100644
--- a/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/_rep_policy.xml
+++ b/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/jcr_root/_rep_policy.xml
@@ -25,5 +25,5 @@
<allow0
jcr:primaryType="rep:GrantACE"
rep:principalName="workflow-process-service"
- rep:privileges="{Name}[jcr:read,rep:write,jcr:versionManagement,jcr:lockManagement,crx:replicate]"/>
+ rep:privileges="{Name}[jcr:read,rep:write,jcr:versionManagement,jcr:lockManagement]"/>
</jcr:root>
diff --git a/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/pom.xml b/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/pom.xml
index 81aec54..aafec10 100755
--- a/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/pom.xml
+++ b/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/pom.xml
@@ -41,7 +41,7 @@
<root>/etc/designs/some-thirdparty-libs</root>
</filter>
<filter>
- <root>/etc/cloudservices/ooyala</root>
+ <root>/etc/cloudservices</root>
</filter>
<filter>
<root>/etc/packages/apache/consulting</root>
diff --git a/src/test/resources/test-projects/default-test-projects/generic/expected-manifest.txt b/src/test/resources/test-projects/default-test-projects/generic/expected-manifest.txt
index 6e839be..c681ffb 100644
--- a/src/test/resources/test-projects/default-test-projects/generic/expected-manifest.txt
+++ b/src/test/resources/test-projects/default-test-projects/generic/expected-manifest.txt
@@ -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/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-Roots:/apps/install/org.apache.jackrabbit.vault-3.1.40.jar,/apps/some-thirdparty-libs,/apps/wcm/core/content,/etc/cloudservices,/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
diff --git a/src/test/resources/test-projects/default-test-projects/generic/jcr_root/_rep_policy.xml b/src/test/resources/test-projects/default-test-projects/generic/jcr_root/_rep_policy.xml
index d83757c..49d5c47 100644
--- a/src/test/resources/test-projects/default-test-projects/generic/jcr_root/_rep_policy.xml
+++ b/src/test/resources/test-projects/default-test-projects/generic/jcr_root/_rep_policy.xml
@@ -25,5 +25,5 @@
<allow0
jcr:primaryType="rep:GrantACE"
rep:principalName="workflow-process-service"
- rep:privileges="{Name}[jcr:read,rep:write,jcr:versionManagement,jcr:lockManagement,crx:replicate]"/>
+ rep:privileges="{Name}[jcr:read,rep:write,jcr:versionManagement,jcr:lockManagement]"/>
</jcr:root>
diff --git a/src/test/resources/test-projects/default-test-projects/generic/pom.xml b/src/test/resources/test-projects/default-test-projects/generic/pom.xml
index 68e53a3..997e659 100755
--- a/src/test/resources/test-projects/default-test-projects/generic/pom.xml
+++ b/src/test/resources/test-projects/default-test-projects/generic/pom.xml
@@ -44,7 +44,7 @@
<root>/etc/designs/some-thirdparty-libs</root>
</filter>
<filter>
- <root>/etc/cloudservices/ooyala</root>
+ <root>/etc/cloudservices</root>
</filter>
<filter>
<root>/etc/packages/apache/consulting</root>
diff --git a/src/test/resources/test-projects/default-test-projects/resource/expected-manifest.txt b/src/test/resources/test-projects/default-test-projects/resource/expected-manifest.txt
index 397896e..7feb7d6 100644
--- a/src/test/resources/test-projects/default-test-projects/resource/expected-manifest.txt
+++ b/src/test/resources/test-projects/default-test-projects/resource/expected-manifest.txt
@@ -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/some-thirdparty-libs,/apps/wcm/core/content,/etc/cloudservices,/etc/designs/some-thirdparty-libs,/etc/packages/apache/consulting,/rep:policy
Content-Package-Type:mixed
Implementation-Title:Packaging test
Implementation-Version:1.0.0-SNAPSHOT
diff --git a/src/test/resources/test-projects/default-test-projects/resource/jcr_root/_rep_policy.xml b/src/test/resources/test-projects/default-test-projects/resource/jcr_root/_rep_policy.xml
index d83757c..49d5c47 100644
--- a/src/test/resources/test-projects/default-test-projects/resource/jcr_root/_rep_policy.xml
+++ b/src/test/resources/test-projects/default-test-projects/resource/jcr_root/_rep_policy.xml
@@ -25,5 +25,5 @@
<allow0
jcr:primaryType="rep:GrantACE"
rep:principalName="workflow-process-service"
- rep:privileges="{Name}[jcr:read,rep:write,jcr:versionManagement,jcr:lockManagement,crx:replicate]"/>
+ rep:privileges="{Name}[jcr:read,rep:write,jcr:versionManagement,jcr:lockManagement]"/>
</jcr:root>
diff --git a/src/test/resources/test-projects/default-test-projects/resource/pom.xml b/src/test/resources/test-projects/default-test-projects/resource/pom.xml
index a79e926..f2890c1 100755
--- a/src/test/resources/test-projects/default-test-projects/resource/pom.xml
+++ b/src/test/resources/test-projects/default-test-projects/resource/pom.xml
@@ -51,7 +51,7 @@
<root>/etc/designs/some-thirdparty-libs</root>
</filter>
<filter>
- <root>/etc/cloudservices/ooyala</root>
+ <root>/etc/cloudservices</root>
</filter>
<filter>
<root>/etc/packages/apache/consulting</root>