JCRVLT-320 upgrade to maven-archiver 3.4.0 (closes #26)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/commons/filevault-package-maven-plugin/trunk@1863108 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 3979741..4758a50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -327,12 +327,12 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>3.2.0</version>
+ <version>3.4.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>3.5</version>
+ <version>4.1.0</version>
</dependency>
<dependency>
<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 dedadce..0b7252b 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
@@ -69,7 +69,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", "Created-By"));
+ private static final Set<String> IGNORED_MANIFEST_ENTRIES = new HashSet<>(Arrays.asList("Build-Jdk-Spec", "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-manifest.txt b/src/test/resources/test-projects/default-test-projects/generic-unusal-jcrroot/expected-manifest.txt
index a572c3b..397896e 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
@@ -3,6 +3,5 @@
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
Implementation-Title:Packaging test
-Implementation-Vendor-Id:org.apache.jackrabbit.filevault
Implementation-Version:1.0.0-SNAPSHOT
Manifest-Version:1.0
\ 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 a572c3b..397896e 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
@@ -3,6 +3,5 @@
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
Implementation-Title:Packaging test
-Implementation-Vendor-Id:org.apache.jackrabbit.filevault
Implementation-Version:1.0.0-SNAPSHOT
Manifest-Version:1.0
\ No newline at end of file
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 f109fe6..b83972a 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
@@ -3,6 +3,5 @@
Content-Package-Roots:/apps/wcm/core/content,/rep:policy
Content-Package-Type:mixed
Implementation-Title:Packaging test
-Implementation-Vendor-Id:org.apache.jackrabbit.filevault
Implementation-Version:1.0.0-SNAPSHOT
Manifest-Version:1.0
\ 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 a572c3b..397896e 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
@@ -3,6 +3,5 @@
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
Implementation-Title:Packaging test
-Implementation-Vendor-Id:org.apache.jackrabbit.filevault
Implementation-Version:1.0.0-SNAPSHOT
Manifest-Version:1.0
\ No newline at end of file
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 61ad9ca..c07222b 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
@@ -3,7 +3,6 @@
Content-Package-Roots:/apps/htl/test
Content-Package-Type:application
Implementation-Title:Packaging test
-Implementation-Vendor-Id:org.apache.jackrabbit.filevault
Implementation-Version:1.0.0-SNAPSHOT
Import-Package:javax.jcr;version="[2.0.0,3.0.0)"
Import-Package:org.apache.sling.scripting.sightly;version="[2.0.0,3.0.0)"
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 a572c3b..397896e 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
@@ -3,6 +3,5 @@
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
Implementation-Title:Packaging test
-Implementation-Vendor-Id:org.apache.jackrabbit.filevault
Implementation-Version:1.0.0-SNAPSHOT
Manifest-Version:1.0
\ No newline at end of file
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 92a2423..0a3911a 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
@@ -4,7 +4,6 @@
Content-Package-Roots:/apps/test,/apps/test2
Content-Package-Type:application
Implementation-Title:Example Default Project
-Implementation-Vendor-Id:org.apache.jackrabbit.filevault
Implementation-Version:1.0.0-SNAPSHOT
Import-Package:com.apache.components;version="[5.5.0,6)"
Import-Package:javax.jcr;version="[2.0.0,3)"
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 8d7a615..f63aefd 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
@@ -3,7 +3,6 @@
Content-Package-Roots:/apps/test
Content-Package-Type:application
Implementation-Title:Example Default Project
-Implementation-Vendor-Id:org.apache.jackrabbit.filevault
Implementation-Version:1.0.0-SNAPSHOT
Import-Package:javax.jcr.lock;version="[1.0.0,3.0.0)"
Import-Package:javax.jcr.nodetype;version="[1.0.0,3.0.0)"
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 7a0e377..c749196 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
@@ -3,7 +3,6 @@
Content-Package-Roots:/libs/apache
Content-Package-Type:application
Implementation-Title:Example Default Project
-Implementation-Vendor-Id:org.apache.jackrabbit.filevault
Implementation-Version:1.0.0-SNAPSHOT
Import-Package:javax.servlet;
Import-Package:org.apache.jackrabbit.api.query;
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 629a5bf..81db0d4 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
@@ -3,6 +3,5 @@
Content-Package-Roots:/apps/test
Content-Package-Type:application
Implementation-Title:Example Default Project
-Implementation-Vendor-Id:org.apache.jackrabbit.filevault
Implementation-Version:1.0.0-SNAPSHOT
Manifest-Version:1.0
\ No newline at end of file
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 7a0e377..c749196 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
@@ -3,7 +3,6 @@
Content-Package-Roots:/libs/apache
Content-Package-Type:application
Implementation-Title:Example Default Project
-Implementation-Vendor-Id:org.apache.jackrabbit.filevault
Implementation-Version:1.0.0-SNAPSHOT
Import-Package:javax.servlet;
Import-Package:org.apache.jackrabbit.api.query;
