Author: dennisl
Date: Thu Oct 25 09:47:28 2012
New Revision: 1402062
URL: http://svn.apache.org/viewvc?rev=1402062&view=rev
Log:
[MASSEMBLY-634] Add Maven version used to Created-By entry in manifest
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java?rev=1402062&r1=1402061&r2=1402062&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
Thu Oct 25 09:47:28 2012
@@ -316,7 +316,8 @@ public class DefaultAssemblyArchiver
{
extraSelectors.add( new JarSecurityFileSelector() );
- extraFinalizers.add( new ManifestCreationFinalizer(
configSource.getProject(),
+ extraFinalizers.add( new ManifestCreationFinalizer(
configSource.getMavenSession(),
+
configSource.getProject(),
configSource.getJarArchiveConfiguration() ) );
}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java?rev=1402062&r1=1402061&r2=1402062&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java
Thu Oct 25 09:47:28 2012
@@ -22,6 +22,7 @@ package org.apache.maven.plugin.assembly
import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.apache.maven.archiver.MavenArchiver;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.AbstractArchiveFinalizer;
import org.codehaus.plexus.archiver.Archiver;
@@ -49,6 +50,8 @@ public class ManifestCreationFinalizer
private final MavenProject project;
+ private final MavenSession session;
+
private final MavenArchiveConfiguration archiveConfiguration;
// TODO: I'd really prefer to rewrite MavenArchiver as either a
@@ -58,8 +61,10 @@ public class ManifestCreationFinalizer
// (the first is preferable).
private final MavenArchiver mavenArchiver = new MavenArchiver();
- public ManifestCreationFinalizer( final MavenProject project, final
MavenArchiveConfiguration archiveConfiguration )
+ public ManifestCreationFinalizer( final MavenSession session, final
MavenProject project,
+ final MavenArchiveConfiguration
archiveConfiguration )
{
+ this.session = session;
this.project = project;
this.archiveConfiguration = archiveConfiguration;
}
@@ -97,7 +102,7 @@ public class ManifestCreationFinalizer
}
else
{
- manifest = mavenArchiver.getManifest( project,
archiveConfiguration );
+ manifest = mavenArchiver.getManifest( session, project,
archiveConfiguration );
}
if ( ( manifest != null ) && ( archiver instanceof JarArchiver
) )
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java?rev=1402062&r1=1402061&r2=1402062&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
Thu Oct 25 09:47:28 2012
@@ -358,6 +358,9 @@ public class DefaultAssemblyArchiverTest
configSource.getArchiverConfig();
configCtl.setReturnValue( null, MockControl.ZERO_OR_MORE );
+ configSource.getMavenSession();
+ configCtl.setReturnValue( null, MockControl.ZERO_OR_MORE );
+
configSource.getProject();
configCtl.setReturnValue( new MavenProject( new Model() ),
MockControl.ZERO_OR_MORE );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java?rev=1402062&r1=1402061&r2=1402062&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java
Thu Oct 25 09:47:28 2012
@@ -56,7 +56,7 @@ public class ManifestCreationFinalizerTe
public void testShouldDoNothingWhenArchiveConfigIsNull()
throws ArchiverException
{
- new ManifestCreationFinalizer( null, null ).finalizeArchiveCreation(
null );
+ new ManifestCreationFinalizer( null, null, null
).finalizeArchiveCreation( null );
}
public void testShouldDoNothingWhenArchiverIsNotJarArchiver()
@@ -71,7 +71,7 @@ public class ManifestCreationFinalizerTe
mm.replayAll();
- new ManifestCreationFinalizer( project, config
).finalizeArchiveCreation( macArchiver.archiver );
+ new ManifestCreationFinalizer( null, project, config
).finalizeArchiveCreation( macArchiver.archiver );
mm.verifyAll();
}
@@ -91,6 +91,7 @@ public class ManifestCreationFinalizerTe
JarArchiver archiver = new JarArchiver();
archiver.setArchiveFinalizers(
Collections.<ArchiveFinalizer>singletonList( new ManifestCreationFinalizer(
+
null,
project,
config ) ) );
@@ -128,6 +129,7 @@ public class ManifestCreationFinalizerTe
JarArchiver archiver = new JarArchiver();
archiver.setArchiveFinalizers(
Collections.<ArchiveFinalizer>singletonList( new ManifestCreationFinalizer(
+
null,
project,
config ) ) );
