o Removing commons-logging dependency and code.

o Replacing plexus lookup with code.
o Making the Zip packaging format log a warning if <symlink> is used.

Author: trygvis

unix-core/src/main/java/org/codehaus/mojo/unix/core/UnixPlatform.java

@@ -26,8 +26,6 @@
 
 import org.codehaus.mojo.unix.*;
 
-/**
- */
 public interface UnixPlatform
 {
     FileAttributes getDefaultFileAttributes();

unix-maven-plugin/pom.xml

@@ -42,11 +42,6 @@
       <artifactId>commons-lang</artifactId>
       <version>2.1</version>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.0.4</version>
-    </dependency>
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
@@ -56,24 +51,6 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
     </dependency>
-    <!--
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-    </dependency>
-    -->
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
@@ -148,6 +125,28 @@
           </filesets>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <rules>
+            <bannedDependencies>
+              <excludes>
+                <exclude>log4j</exclude>
+                <exclude>commons-logging</exclude>
+              </excludes>
+            </bannedDependencies>
+          </rules>
+          <fail>true</fail>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <profiles>

unix-maven-plugin/src/it/test-zip-1/pom4test.xml

@@ -68,6 +68,10 @@
                 <mode>0666</mode>
               </attributes>
             </copyArtifact>
+            <symlink>
+              <path>/var/log/hudson</path>
+              <value>/var/opt/hudson/log</value>
+            </symlink>
             <filterFiles>
               <includes>
                 <include>/opt/hudson/etc/*</include>

unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/MojoHelper.java

@@ -37,7 +37,6 @@
 import fj.data.Set;
 import static fj.data.Set.*;
 import static java.lang.String.*;
-import org.apache.commons.logging.*;
 import org.apache.maven.artifact.*;
 import org.apache.maven.plugin.*;
 import org.apache.maven.plugin.logging.Log;
@@ -48,7 +47,6 @@
 import org.codehaus.mojo.unix.io.fs.*;
 import org.codehaus.mojo.unix.java.*;
 import static org.codehaus.mojo.unix.java.StringF.*;
-import org.codehaus.mojo.unix.maven.logging.*;
 import org.codehaus.mojo.unix.maven.plugin.*;
 import org.codehaus.mojo.unix.maven.plugin.Package;
 import static org.codehaus.mojo.unix.util.FileModulator.*;
@@ -74,7 +72,6 @@ public abstract class MojoHelper
     public static <UP extends UnixPackage<UP, PP>, PP extends UnixPackage.PreparedPackage> Execution create(
         Map platforms,
         String platformType,
-        Map formats,
         String formatType,
         MavenProjectWrapper project,
         boolean debug,
@@ -84,9 +81,7 @@ public static <UP extends UnixPackage<UP, PP>, PP extends UnixPackage.PreparedPa
         final Log log )
         throws MojoFailureException, MojoExecutionException
     {
-        MavenCommonLoggingLogFactory.setMavenLogger( log );
-
-        @SuppressWarnings( "unchecked" ) PackagingFormat<UP> format = (PackagingFormat<UP>) formats.get( formatType );
+        PackagingFormat<UP> format = PackagingFormat.lookup( formatType );
 
         if ( format == null )
         {
@@ -133,7 +128,7 @@ public static <UP extends UnixPackage<UP, PP>, PP extends UnixPackage.PreparedPa
                                                                            mojoParameters,
                                                                            pakke );
 
-                UP unixPackage = format.start().
+                UP unixPackage = format.start( log ).
                     parameters( parameters ).
                     setVersion( version ).                      // TODO: This should go away
                     workingDirectory( packageRoot ).
@@ -240,29 +235,6 @@ public Execution( List<P3<UP, Package, List<AssemblyOperation>>> packages, Maven
 
         public void execute( String artifactType, MavenProject mavenProject, MavenProjectHelper mavenProjectHelper, ScriptUtil.Strategy strategy )
             throws MojoExecutionException, MojoFailureException
-        {
-            // Save and restore the system property for commons logging.
-            String key = LogFactory.class.getName();
-            String value = System.getProperty( key );
-
-            System.setProperty( key, MavenCommonLoggingLogFactory.class.getName() );
-
-            try
-            {
-                execute_( artifactType, mavenProject, mavenProjectHelper, strategy );
-            }
-            finally {
-                if(value == null) {
-                    System.getProperties().remove( key );
-                }
-                else {
-                    System.setProperty( key, value );
-                }
-            }
-        }
-
-        private void execute_( String artifactType, MavenProject mavenProject, MavenProjectHelper mavenProjectHelper, ScriptUtil.Strategy strategy )
-            throws MojoExecutionException, MojoFailureException
         {
             for ( P3<UP, Package, List<AssemblyOperation>> p : packages )
             {

unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/deb/DebPackagingFormat.java

@@ -24,21 +24,17 @@
  * SOFTWARE.
  */
 
+import org.apache.maven.plugin.logging.*;
 import org.codehaus.mojo.unix.maven.plugin.*;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  */
 public class DebPackagingFormat
-    implements PackagingFormat<DebUnixPackage>
+    extends PackagingFormat<DebUnixPackage>
 {
-    public DebUnixPackage start()
+    public DebUnixPackage start(Log log)
     {
         return new DebUnixPackage();
     }
-
-    public boolean licenseRequired()
-    {
-        return false;
-    }
 }