maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject [maven-assembly-plugin] branch master updated: [MASSEMBLY-885] removed dead code: unused since unpack goal removed
Date Thu, 10 May 2018 20:31:16 GMT
This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new b2e4bc3  [MASSEMBLY-885] removed dead code: unused since unpack goal removed
b2e4bc3 is described below

commit b2e4bc39efb23fbadc4259c6b75f771e52600018
Author: Hervé Boutemy <hboutemy@apache.org>
AuthorDate: Thu May 10 22:31:14 2018 +0200

    [MASSEMBLY-885] removed dead code: unused since unpack goal removed
---
 .../plugins/assembly/utils/AssemblyFileUtils.java  | 30 --------
 .../assembly/utils/AssemblyFileUtilsTest.java      | 88 ----------------------
 2 files changed, 118 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFileUtils.java
b/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFileUtils.java
index c7bc143..7b10446 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFileUtils.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFileUtils.java
@@ -19,11 +19,6 @@ package org.apache.maven.plugins.assembly.utils;
  * under the License.
  */
 
-import org.apache.maven.plugins.assembly.archive.ArchiveExpansionException;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.UnArchiver;
-import org.codehaus.plexus.archiver.manager.ArchiverManager;
-import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
 import org.codehaus.plexus.components.io.fileselectors.FileInfo;
 
 import javax.annotation.Nonnull;
@@ -90,31 +85,6 @@ public final class AssemblyFileUtils
         }
     }
 
-    /**
-     * Unpacks the archive file.
-     *
-     * @param source  File to be unpacked.
-     * @param destDir Location where to put the unpacked files.
-     */
-    public static void unpack( File source, File destDir, ArchiverManager archiverManager
)
-        throws ArchiveExpansionException, NoSuchArchiverException
-    {
-        try
-        {
-            UnArchiver unArchiver = archiverManager.getUnArchiver( source );
-
-            unArchiver.setSourceFile( source );
-
-            unArchiver.setDestDirectory( destDir );
-
-            unArchiver.extract();
-        }
-        catch ( ArchiverException e )
-        {
-            throw new ArchiveExpansionException( "Error unpacking file: " + source + "to:
" + destDir, e );
-        }
-    }
-
     @Nonnull
     private static String normalizePath( @Nonnull String path )
     {
diff --git a/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFileUtilsTest.java
b/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFileUtilsTest.java
deleted file mode 100644
index b5f0f82..0000000
--- a/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFileUtilsTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.apache.maven.plugins.assembly.utils;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.TestCase;
-import org.apache.maven.plugins.assembly.archive.ArchiveExpansionException;
-import org.apache.maven.plugins.assembly.testutils.TestFileManager;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.UnArchiver;
-import org.codehaus.plexus.archiver.manager.ArchiverManager;
-import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
-import org.easymock.classextension.EasyMockSupport;
-
-import java.io.File;
-import java.io.IOException;
-
-import static org.easymock.EasyMock.expect;
-
-public class AssemblyFileUtilsTest
-    extends TestCase
-{
-
-    private final TestFileManager fileManager = new TestFileManager( "file-utils.test.",
"" );
-
-    public void tearDown()
-        throws IOException
-    {
-        fileManager.cleanUp();
-    }
-
-    public void testUnpack_ShouldSetSourceAndDestinationAndCallExtract()
-        throws IOException, ArchiveExpansionException, NoSuchArchiverException
-    {
-        EasyMockSupport mockManager = new EasyMockSupport();
-
-        File source = fileManager.createTempFile();
-        File destDir = fileManager.createTempDir();
-
-        UnArchiver unarchiver = mockManager.createMock( UnArchiver.class );
-
-        ArchiverManager archiverManager = mockManager.createMock( ArchiverManager.class );
-
-        try
-        {
-            expect( archiverManager.getUnArchiver( source ) ).andReturn( unarchiver );
-        }
-        catch ( NoSuchArchiverException e )
-        {
-            fail( "Should never happen." );
-        }
-
-        unarchiver.setSourceFile( source );
-        unarchiver.setDestDirectory( destDir );
-
-        try
-        {
-            unarchiver.extract();
-        }
-        catch ( ArchiverException e )
-        {
-            fail( "Should never happen." );
-        }
-
-        mockManager.replayAll();
-
-        AssemblyFileUtils.unpack( source, destDir, archiverManager );
-
-        mockManager.verifyAll();
-    }
-
-}

-- 
To stop receiving notification emails like this one, please contact
hboutemy@apache.org.

Mime
View raw message