commit 9123deb4dc8ee63b89bdb750a1d6729b236b94a0
author Karl Heinz Marbaise <khmarbaise@apache.org> Thu Apr 14 20:11:46 2016 +0000
committer Karl Heinz Marbaise <khmarbaise@apache.org> Thu Apr 14 20:11:46 2016 +0000
tree 8df447b3bc7916b7b14f44204fa78d7b81fe9d6e
parent 07b242cd3fa93f174680790b8b70326d859b95fe

[MWAR-372] Upgrade maven-archiver to 3.0.1
 o Based on the new version we needed to change an integration
   test which relies on Specification version which contained
   -SNAPSHOT which is not the case anymore.
 o Fixed two unit tests


git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1739183 13f79535-47bb-0310-9956-ffa450edef68

pom.xml

diff --git a/pom.xml b/pom.xml
index a863e89..c31391d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
   </distributionManagement>
 
   <properties>
-    <mavenArchiverVersion>3.0.0</mavenArchiverVersion>
+    <mavenArchiverVersion>3.0.1</mavenArchiverVersion>
     <mavenFilteringVersion>3.0.0</mavenFilteringVersion>
     <mavenVersion>3.0</mavenVersion>
   </properties>

src/it/manifest-content/verify.bsh

diff --git a/src/it/manifest-content/verify.bsh b/src/it/manifest-content/verify.bsh
index 60689fc..d369f8d 100644
--- a/src/it/manifest-content/verify.bsh
+++ b/src/it/manifest-content/verify.bsh
@@ -58,7 +58,7 @@
         return false;
     }
 
-    if ( !"1.0-SNAPSHOT".equals( manifest.get( Attributes.Name.SPECIFICATION_VERSION ) ) )
+    if ( !"1.0".equals( manifest.get( Attributes.Name.SPECIFICATION_VERSION ) ) )
     {
         System.err.println( "Incorrect '" + Attributes.Name.SPECIFICATION_VERSION.toString() + "' manifest entry: " +
             manifest.get( Attributes.Name.SPECIFICATION_VERSION ) );

src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java

diff --git a/src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java b/src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java
index c7faf7f..7e04c07 100644
--- a/src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java
@@ -19,13 +19,14 @@
  * under the License.
  */
 
-import org.apache.maven.archiver.MavenArchiveConfiguration;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.plugins.war.WarManifestMojo;
-import org.codehaus.plexus.util.FileUtils;
-
 import java.io.File;
 
+import org.apache.maven.archiver.MavenArchiveConfiguration;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.DefaultArtifact;
+import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.codehaus.plexus.util.FileUtils;
+
 /**
  * @author Allan Ramirez
  */
@@ -117,6 +118,9 @@
 
         MavenArchiveConfiguration config = (MavenArchiveConfiguration) getVariableValueFromObject( mojo, "archive" );
 
+        DefaultArtifact da = new DefaultArtifact( "org.apache.test", "xyz", "2.0.0", Artifact.SCOPE_COMPILE, "jar", "", null );
+        mojo.getProject().setArtifact( da );
+
         mojo.execute();
 
         assertTrue( config.getManifest().isAddExtensions() );
@@ -149,8 +153,11 @@
     {
         loadMojo( "target/test-classes/unit/manifest/manifest-with-custom-attrs/plugin-config.xml" );
 
+        DefaultArtifact da = new DefaultArtifact( "org.apache.test", "xyz", "2.0.0", Artifact.SCOPE_COMPILE, "jar", "", null );
+        mojo.getProject().setArtifact( da );
+        
         MavenArchiveConfiguration config = (MavenArchiveConfiguration) getVariableValueFromObject( mojo, "archive" );
-
+        
         mojo.execute();
 
         assertTrue( config.getManifest().isAddExtensions() );