You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2012/05/01 22:55:53 UTC

svn commit: r1332814 - in /maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish: AbstractScmPublishMojo.java ScmPublishPublishScmMojo.java

Author: hboutemy
Date: Tue May  1 20:55:53 2012
New Revision: 1332814

URL: http://svn.apache.org/viewvc?rev=1332814&view=rev
Log:
add support for publish-scm goal without project/pom with "mvn scm-publish:publish-scm -Dscmpublish.pubScmUrl=scm:... -Dscmpublish.content=..."

Modified:
    maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
    maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java

Modified: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java?rev=1332814&r1=1332813&r2=1332814&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java Tue May  1 20:55:53 2012
@@ -291,9 +291,37 @@ public abstract class AbstractScmPublish
             throw new MojoExecutionException( e.getMessage(), e );
         }
 
-        scmPublishExecute();
+        boolean tmpCheckout = false;
+
+        if ( checkoutDirectory.getPath().contains( "${project." ) )
+        {
+            try
+            {
+                tmpCheckout = true;
+                checkoutDirectory = File.createTempFile( "maven-scm-publish", ".checkout" );
+                checkoutDirectory.delete();
+                checkoutDirectory.mkdir();
+            }
+            catch ( IOException ioe )
+            {
+                throw new MojoExecutionException( ioe.getMessage(), ioe );
+            }
+        }
+
+        try
+        {
+            scmPublishExecute();
+        }
+        finally
+        {
+            if ( tmpCheckout )
+            {
+                FileUtils.deleteQuietly( checkoutDirectory );
+            }
+        }
     }
 
+    
     public abstract void scmPublishExecute()
         throws MojoExecutionException, MojoFailureException;
 }
\ No newline at end of file

Modified: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java?rev=1332814&r1=1332813&r2=1332814&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java Tue May  1 20:55:53 2012
@@ -45,6 +45,7 @@ import org.apache.maven.plugin.MojoFailu
  * 
  * @goal publish-scm
  * @aggregate
+ * @requiresProject false
  */
 public class ScmPublishPublishScmMojo
     extends ScmPublishPublishMojo