JCRVLT-320 filevault-package-maven-plugin:package does not work with Java >= 9 (closes #18)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/commons/filevault-package-maven-plugin/trunk@1846089 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index ccf5bd6..bb3b3b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -322,7 +322,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>3.0.0</version>
+ <version>3.2.0</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
diff --git a/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ProjectBuilder.java b/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ProjectBuilder.java
index 58eb78d..fce03f4 100644
--- a/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ProjectBuilder.java
+++ b/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/ProjectBuilder.java
@@ -68,7 +68,7 @@
*/
private static final Logger log = LoggerFactory.getLogger(ProjectBuilder.class);
- private static final Set<String> IGNORED_MANIFEST_ENTRIES = new HashSet<>(Arrays.asList("Build-Jdk", "Built-By"));
+ private static final Set<String> IGNORED_MANIFEST_ENTRIES = new HashSet<>(Arrays.asList("Build-Jdk", "Built-By", "Created-By"));
static final String TEST_PROJECTS_ROOT = "target/test-classes/test-projects";
diff --git a/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/expected-file-order.txt b/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/expected-file-order.txt
index 9628762..16b8673 100644
--- a/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/expected-file-order.txt
+++ b/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/expected-file-order.txt
@@ -1,6 +1,6 @@
META-INF/MANIFEST.MF
META-INF/vault/
jcr_root/apps/wcm/core/content/
-jcr_root/_rep_policy.xml
jcr_root/etc/designs/some-thirdparty-libs/
-jcr_root/etc/cloudservices/ooyala/
\ No newline at end of file
+jcr_root/etc/cloudservices/ooyala/
+jcr_root/_rep_policy.xml
\ No newline at end of file
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 566ba64..a572c3b 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,9 +1,7 @@
-Archiver-Version:Plexus Archiver
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-Type:mixed
-Created-By:Apache Maven
Implementation-Title:Packaging test
Implementation-Vendor-Id:org.apache.jackrabbit.filevault
Implementation-Version:1.0.0-SNAPSHOT
diff --git a/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/expected-file-order.txt b/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/expected-file-order.txt
index 9628762..16b8673 100644
--- a/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/expected-file-order.txt
+++ b/src/test/resources/test-projects/default-test-projects/generic-with-builtcd/expected-file-order.txt
@@ -1,6 +1,6 @@
META-INF/MANIFEST.MF
META-INF/vault/
jcr_root/apps/wcm/core/content/
-jcr_root/_rep_policy.xml
jcr_root/etc/designs/some-thirdparty-libs/
-jcr_root/etc/cloudservices/ooyala/
\ No newline at end of file
+jcr_root/etc/cloudservices/ooyala/
+jcr_root/_rep_policy.xml
\ No newline at end of file
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 566ba64..a572c3b 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,9 +1,7 @@
-Archiver-Version:Plexus Archiver
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-Type:mixed
-Created-By:Apache Maven
Implementation-Title:Packaging test
Implementation-Vendor-Id:org.apache.jackrabbit.filevault
Implementation-Version:1.0.0-SNAPSHOT
diff --git a/src/test/resources/test-projects/default-test-projects/generic-with-metainf/expected-manifest.txt b/src/test/resources/test-projects/default-test-projects/generic-with-metainf/expected-manifest.txt
index 30325b6..f109fe6 100644
--- a/src/test/resources/test-projects/default-test-projects/generic-with-metainf/expected-manifest.txt
+++ b/src/test/resources/test-projects/default-test-projects/generic-with-metainf/expected-manifest.txt
@@ -1,9 +1,7 @@
-Archiver-Version:Plexus Archiver
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-Type:mixed
-Created-By:Apache Maven
Implementation-Title:Packaging test
Implementation-Vendor-Id:org.apache.jackrabbit.filevault
Implementation-Version:1.0.0-SNAPSHOT
diff --git a/src/test/resources/test-projects/default-test-projects/generic/expected-file-order.txt b/src/test/resources/test-projects/default-test-projects/generic/expected-file-order.txt
index 9628762..16b8673 100644
--- a/src/test/resources/test-projects/default-test-projects/generic/expected-file-order.txt
+++ b/src/test/resources/test-projects/default-test-projects/generic/expected-file-order.txt
@@ -1,6 +1,6 @@
META-INF/MANIFEST.MF
META-INF/vault/
jcr_root/apps/wcm/core/content/
-jcr_root/_rep_policy.xml
jcr_root/etc/designs/some-thirdparty-libs/
-jcr_root/etc/cloudservices/ooyala/
\ No newline at end of file
+jcr_root/etc/cloudservices/ooyala/
+jcr_root/_rep_policy.xml
\ No newline at end of file
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 566ba64..a572c3b 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,9 +1,7 @@
-Archiver-Version:Plexus Archiver
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-Type:mixed
-Created-By:Apache Maven
Implementation-Title:Packaging test
Implementation-Vendor-Id:org.apache.jackrabbit.filevault
Implementation-Version:1.0.0-SNAPSHOT
diff --git a/src/test/resources/test-projects/default-test-projects/htl-validation/expected-manifest.txt b/src/test/resources/test-projects/default-test-projects/htl-validation/expected-manifest.txt
index b150946..61ad9ca 100644
--- a/src/test/resources/test-projects/default-test-projects/htl-validation/expected-manifest.txt
+++ b/src/test/resources/test-projects/default-test-projects/htl-validation/expected-manifest.txt
@@ -1,9 +1,7 @@
-Archiver-Version:Plexus Archiver
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
-Created-By:Apache Maven
Implementation-Title:Packaging test
Implementation-Vendor-Id:org.apache.jackrabbit.filevault
Implementation-Version:1.0.0-SNAPSHOT
diff --git a/src/test/resources/test-projects/default-test-projects/resource/expected-file-order.txt b/src/test/resources/test-projects/default-test-projects/resource/expected-file-order.txt
index 9628762..16b8673 100644
--- a/src/test/resources/test-projects/default-test-projects/resource/expected-file-order.txt
+++ b/src/test/resources/test-projects/default-test-projects/resource/expected-file-order.txt
@@ -1,6 +1,6 @@
META-INF/MANIFEST.MF
META-INF/vault/
jcr_root/apps/wcm/core/content/
-jcr_root/_rep_policy.xml
jcr_root/etc/designs/some-thirdparty-libs/
-jcr_root/etc/cloudservices/ooyala/
\ No newline at end of file
+jcr_root/etc/cloudservices/ooyala/
+jcr_root/_rep_policy.xml
\ No newline at end of file
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 566ba64..a572c3b 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,9 +1,7 @@
-Archiver-Version:Plexus Archiver
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-Type:mixed
-Created-By:Apache Maven
Implementation-Title:Packaging test
Implementation-Vendor-Id:org.apache.jackrabbit.filevault
Implementation-Version:1.0.0-SNAPSHOT
diff --git a/src/test/resources/test-projects/manifest-generation/simple/expected-manifest.txt b/src/test/resources/test-projects/manifest-generation/simple/expected-manifest.txt
index 552fbab..92a2423 100644
--- a/src/test/resources/test-projects/manifest-generation/simple/expected-manifest.txt
+++ b/src/test/resources/test-projects/manifest-generation/simple/expected-manifest.txt
@@ -1,10 +1,8 @@
-Archiver-Version:Plexus Archiver
Content-Package-Dependencies:apache/jackrabbit:test.content.package:0.1,apache/jackrabbit:test.content.package:1.0.4
Content-Package-Description:This is an Example Project to verify that manifest generation is correct.
Content-Package-Id:my/test/group:package-plugin-test-pkg:1.0.0-SNAPSHOT
Content-Package-Roots:/apps/test,/apps/test2
Content-Package-Type:application
-Created-By:Apache Maven
Implementation-Title:Example Default Project
Implementation-Vendor-Id:org.apache.jackrabbit.filevault
Implementation-Version:1.0.0-SNAPSHOT
diff --git a/src/test/resources/test-projects/manifest-generation/with-bundles/expected-manifest.txt b/src/test/resources/test-projects/manifest-generation/with-bundles/expected-manifest.txt
index 5739ae3..8d7a615 100644
--- a/src/test/resources/test-projects/manifest-generation/with-bundles/expected-manifest.txt
+++ b/src/test/resources/test-projects/manifest-generation/with-bundles/expected-manifest.txt
@@ -1,9 +1,7 @@
-Archiver-Version:Plexus Archiver
Content-Package-Description:This is an Example Project to verify that manifest generation is correct.
Content-Package-Id:my/test/group:package-plugin-test-pkg:1.0.0-SNAPSHOT
Content-Package-Roots:/apps/test
Content-Package-Type:application
-Created-By:Apache Maven
Implementation-Title:Example Default Project
Implementation-Vendor-Id:org.apache.jackrabbit.filevault
Implementation-Version:1.0.0-SNAPSHOT
diff --git a/src/test/resources/test-projects/manifest-generation/with-code/expected-manifest.txt b/src/test/resources/test-projects/manifest-generation/with-code/expected-manifest.txt
index eb92a9a..7a0e377 100644
--- a/src/test/resources/test-projects/manifest-generation/with-code/expected-manifest.txt
+++ b/src/test/resources/test-projects/manifest-generation/with-code/expected-manifest.txt
@@ -1,9 +1,7 @@
-Archiver-Version:Plexus Archiver
Content-Package-Description:This is an Example Project to verify that manifest generation is correct.
Content-Package-Id:my/test/group:package-plugin-test-pkg:1.0.0-SNAPSHOT
Content-Package-Roots:/libs/apache
Content-Package-Type:application
-Created-By:Apache Maven
Implementation-Title:Example Default Project
Implementation-Vendor-Id:org.apache.jackrabbit.filevault
Implementation-Version:1.0.0-SNAPSHOT
diff --git a/src/test/resources/test-projects/manifest-generation/with-unused-dependencies/expected-manifest.txt b/src/test/resources/test-projects/manifest-generation/with-unused-dependencies/expected-manifest.txt
index d7527d7..629a5bf 100644
--- a/src/test/resources/test-projects/manifest-generation/with-unused-dependencies/expected-manifest.txt
+++ b/src/test/resources/test-projects/manifest-generation/with-unused-dependencies/expected-manifest.txt
@@ -1,9 +1,7 @@
-Archiver-Version:Plexus Archiver
Content-Package-Description:This is an Example Project to verify that manifest generation is correct.
Content-Package-Id:my/test/group:package-plugin-test-pkg:1.0.0-SNAPSHOT
Content-Package-Roots:/apps/test
Content-Package-Type:application
-Created-By:Apache Maven
Implementation-Title:Example Default Project
Implementation-Vendor-Id:org.apache.jackrabbit.filevault
Implementation-Version:1.0.0-SNAPSHOT
diff --git a/src/test/resources/test-projects/manifest-generation/with-unused-parent-dependencies/expected-manifest.txt b/src/test/resources/test-projects/manifest-generation/with-unused-parent-dependencies/expected-manifest.txt
index eb92a9a..7a0e377 100644
--- a/src/test/resources/test-projects/manifest-generation/with-unused-parent-dependencies/expected-manifest.txt
+++ b/src/test/resources/test-projects/manifest-generation/with-unused-parent-dependencies/expected-manifest.txt
@@ -1,9 +1,7 @@
-Archiver-Version:Plexus Archiver
Content-Package-Description:This is an Example Project to verify that manifest generation is correct.
Content-Package-Id:my/test/group:package-plugin-test-pkg:1.0.0-SNAPSHOT
Content-Package-Roots:/libs/apache
Content-Package-Type:application
-Created-By:Apache Maven
Implementation-Title:Example Default Project
Implementation-Vendor-Id:org.apache.jackrabbit.filevault
Implementation-Version:1.0.0-SNAPSHOT
