Author: bimargulies
Date: Thu Jul 23 11:39:31 2015
New Revision: 1692379
URL: http://svn.apache.org/r1692379
Log:
MASSEMBLY-780: add .tar.snappy.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/formats/src/assemblies/format-test.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/formats/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/formats/src/assemblies/format-test.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/formats/src/assemblies/format-test.xml?rev=1692379&r1=1692378&r2=1692379&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/formats/src/assemblies/format-test.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/formats/src/assemblies/format-test.xml
Thu Jul 23 11:39:31 2015
@@ -31,6 +31,7 @@ under the License.
<format>tbz2</format>
<format>jar</format>
<format>war</format>
+ <format>tar.snappy</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<files>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/formats/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/formats/verify.bsh?rev=1692379&r1=1692378&r2=1692379&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/formats/verify.bsh
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/formats/verify.bsh
Thu Jul 23 11:39:31 2015
@@ -132,4 +132,16 @@ catch( IOException e )
result = false;
}
+try
+{
+ File assembly = new File( basedir,
"target/assemblies/format-test-1.0.tar.snappy" );
+ result = result && assembly.exists();
+ result = result && assembly.isFile();
+}
+catch( IOException e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
return result;
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java?rev=1692379&r1=1692378&r2=1692379&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java
Thu Jul 23 11:39:31 2015
@@ -496,7 +496,7 @@ public class DefaultAssemblyArchiver
{
TarArchiver.TarCompressionMethod tarCompressionMethod;
// TODO: this should accept gz and bz2 as well so we can skip
- // over the switch
+ // TODO: over the switch
final String compression = format.substring( index + 1 );
if ( "gz".equals( compression ) )
{
@@ -505,6 +505,9 @@ public class DefaultAssemblyArchiver
else if ( "bz2".equals( compression ) )
{
tarCompressionMethod = TarArchiver.TarCompressionMethod.bzip2;
+ } else if ( "snappy".equals( compression ) )
+ {
+ tarCompressionMethod = TarArchiver.TarCompressionMethod.snappy;
}
else
{
