svn commit: r1739183 - in /maven/plugins/trunk/maven-war-plugin: pom.xml src/it/manifest-content/verify.bsh src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java

[kh...@apache.org]

Author: khmarbaise
Date: Thu Apr 14 20:11:46 2016
New Revision: 1739183

URL: http://svn.apache.org/viewvc?rev=1739183&view=rev
Log:
[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

Modified:
    maven/plugins/trunk/maven-war-plugin/pom.xml
    maven/plugins/trunk/maven-war-plugin/src/it/manifest-content/verify.bsh
    maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java

Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1739183&r1=1739182&r2=1739183&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Thu Apr 14 20:11:46 2016
@@ -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>

Modified: maven/plugins/trunk/maven-war-plugin/src/it/manifest-content/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/manifest-content/verify.bsh?rev=1739183&r1=1739182&r2=1739183&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/it/manifest-content/verify.bsh (original)
+++ maven/plugins/trunk/maven-war-plugin/src/it/manifest-content/verify.bsh Thu Apr 14 20:11:46 2016
@@ -58,7 +58,7 @@ try
         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 ) );

Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java?rev=1739183&r1=1739182&r2=1739183&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java Thu Apr 14 20:11:46 2016
@@ -19,13 +19,14 @@ package org.apache.maven.plugins.war;
  * under the License.
  */
 
+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.apache.maven.plugins.war.WarManifestMojo;
 import org.codehaus.plexus.util.FileUtils;
 
-import java.io.File;
-
 /**
  * @author Allan Ramirez
  */
@@ -117,6 +118,9 @@ public class WarManifestMojoTest
 
         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 @@ public class WarManifestMojoTest
     {
         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() );