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 13:14:06 UTC
svn commit: r1871744 - in
/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test:
java/org/apache/jackrabbit/filevault/maven/packaging/it/
resources/test-projects/generate-metadata-multimodule/container/
resources/test-projects/generate-meta...
Author: kwin
Date: Wed Dec 18 13:14:05 2019
New Revision: 1871744
URL: http://svn.apache.org/viewvc?rev=1871744&view=rev
Log:
fix IT by getting rid of content package type
Added:
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub1/src/main/content/jcr_root/apps/
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub1/src/main/content/jcr_root/apps/sub1/
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub1/src/main/content/jcr_root/apps/sub1/.content.xml
- copied, changed from r1871740, jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub1/src/main/content/jcr_root/sub1/.content.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub2/src/main/content/jcr_root/apps/
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub2/src/main/content/jcr_root/apps/sub2/
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub2/src/main/content/jcr_root/apps/sub2/.content.xml
- copied, changed from r1871740, jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub2/src/main/content/jcr_root/sub2/.content.xml
Removed:
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub1/src/main/content/jcr_root/sub1/.content.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub2/src/main/content/jcr_root/sub2/.content.xml
Modified:
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/GenerateMetadataMultiModuleIT.java
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/container/pom.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub1/src/main/content/META-INF/vault/filter.xml
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub2/src/main/content/META-INF/vault/filter.xml
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/GenerateMetadataMultiModuleIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/GenerateMetadataMultiModuleIT.java?rev=1871744&r1=1871743&r2=1871744&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/GenerateMetadataMultiModuleIT.java (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/GenerateMetadataMultiModuleIT.java Wed Dec 18 13:14:05 2019
@@ -40,7 +40,7 @@ public class GenerateMetadataMultiModule
/**
* Tests that the generate-manifest goal generates the expected filter.xml and
- * runs validation successfully when run on when run on
+ * runs validation successfully when run on
* inter-module dependencies in a multi-module setup for clean + package goals.
*/
@Test
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/container/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/container/pom.xml?rev=1871744&r1=1871743&r2=1871744&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/container/pom.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/container/pom.xml Wed Dec 18 13:14:05 2019
@@ -24,7 +24,7 @@
<artifactId>package-plugin-test-pkg</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>content-package</packaging>
- <name>Packaging test</name>
+ <name>Packaging test container</name>
<build>
<plugins>
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub1/src/main/content/META-INF/vault/filter.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub1/src/main/content/META-INF/vault/filter.xml?rev=1871744&r1=1871743&r2=1871744&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub1/src/main/content/META-INF/vault/filter.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub1/src/main/content/META-INF/vault/filter.xml Wed Dec 18 13:14:05 2019
@@ -16,5 +16,5 @@
limitations under the License.
-->
<workspaceFilter version="1.0">
- <filter root="/sub1"/>
+ <filter root="/apps/sub1"/>
</workspaceFilter>
Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub1/src/main/content/jcr_root/apps/sub1/.content.xml (from r1871740, jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub1/src/main/content/jcr_root/sub1/.content.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub1/src/main/content/jcr_root/apps/sub1/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub1/src/main/content/jcr_root/apps/sub1/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub1/src/main/content/jcr_root/sub1/.content.xml&r1=1871740&r2=1871744&rev=1871744&view=diff
==============================================================================
(empty)
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub2/src/main/content/META-INF/vault/filter.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub2/src/main/content/META-INF/vault/filter.xml?rev=1871744&r1=1871743&r2=1871744&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub2/src/main/content/META-INF/vault/filter.xml (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub2/src/main/content/META-INF/vault/filter.xml Wed Dec 18 13:14:05 2019
@@ -16,5 +16,5 @@
limitations under the License.
-->
<workspaceFilter version="1.0">
- <filter root="/sub2"/>
+ <filter root="/apps/sub2"/>
</workspaceFilter>
Copied: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub2/src/main/content/jcr_root/apps/sub2/.content.xml (from r1871740, jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub2/src/main/content/jcr_root/sub2/.content.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub2/src/main/content/jcr_root/apps/sub2/.content.xml?p2=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub2/src/main/content/jcr_root/apps/sub2/.content.xml&p1=jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/generate-metadata-multimodule/sub2/src/main/content/jcr_root/sub2/.content.xml&r1=1871740&r2=1871744&rev=1871744&view=diff
==============================================================================
(empty)