maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r951948 - in /maven/plugins/trunk/maven-gpg-plugin: ./ src/it/sign-and-deploy-not-jar-packaging/ src/main/java/org/apache/maven/plugin/gpg/
Date Sun, 06 Jun 2010 20:07:45 GMT
Author: bentmann
Date: Sun Jun  6 20:07:45 2010
New Revision: 951948

URL: http://svn.apache.org/viewvc?rev=951948&view=rev
Log:
[MGPG-26] sign-and-deploy-file does not work with javadoc and sources artifcats

Added:
    maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/
    maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/invoker.properties
  (with props)
    maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/setup.bsh
  (with props)
    maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/test.jar
  (with props)
    maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/test.properties
  (with props)
    maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/verify.bsh
  (with props)
Modified:
    maven/plugins/trunk/maven-gpg-plugin/pom.xml
    maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AscArtifactMetadata.java

Modified: maven/plugins/trunk/maven-gpg-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/pom.xml?rev=951948&r1=951947&r2=951948&view=diff
==============================================================================
--- maven/plugins/trunk/maven-gpg-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-gpg-plugin/pom.xml Sun Jun  6 20:07:45 2010
@@ -29,7 +29,7 @@ under the License.
   </parent>
 
   <artifactId>maven-gpg-plugin</artifactId>
-  <version>1.2-SNAPSHOT</version>
+  <version>1.1.1-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
 
   <name>Maven GPG Plugin</name>

Added: maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/invoker.properties?rev=951948&view=auto
==============================================================================
--- maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/invoker.properties
(added)
+++ maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/invoker.properties
Sun Jun  6 20:07:45 2010
@@ -0,0 +1 @@
+invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:sign-and-deploy-file

Propchange: maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/invoker.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/invoker.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/setup.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/setup.bsh?rev=951948&view=auto
==============================================================================
--- maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/setup.bsh
(added)
+++ maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/setup.bsh
Sun Jun  6 20:07:45 2010
@@ -0,0 +1,4 @@
+import java.io.*;
+import org.codehaus.plexus.util.*;
+
+FileUtils.deleteDirectory( new File( basedir, "target" ) );

Propchange: maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/setup.bsh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/setup.bsh
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/test.jar
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/test.jar?rev=951948&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/test.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/test.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/test.properties?rev=951948&view=auto
==============================================================================
--- maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/test.properties
(added)
+++ maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/test.properties
Sun Jun  6 20:07:45 2010
@@ -0,0 +1,8 @@
+file = test.jar
+groupId = org.apache.maven.its.gpg.sadnjp
+artifactId = test
+version = 1.0
+packaging = javadoc
+url = file:target/repo
+generatePom = false
+gpg.passphrase = TEST

Propchange: maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/test.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/test.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/verify.bsh?rev=951948&view=auto
==============================================================================
--- maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/verify.bsh
(added)
+++ maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/verify.bsh
Sun Jun  6 20:07:45 2010
@@ -0,0 +1,20 @@
+import java.io.*;
+
+File artifactDir = new File( basedir, "target/repo/org/apache/maven/its/gpg/sadnjp/test/1.0"
);
+
+String[] expectedFiles = {
+    "test-1.0-javadoc.jar",
+    "test-1.0-javadoc.jar.asc",
+};
+
+for ( String expectedFile : expectedFiles )
+{
+    File file = new File( artifactDir, expectedFile );
+
+    System.out.println( "Checking for existence of " + file );
+
+    if ( !file.isFile() )
+    {
+        throw new Exception( "Missing file " + file );
+    }
+}

Propchange: maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/verify.bsh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-gpg-plugin/src/it/sign-and-deploy-not-jar-packaging/verify.bsh
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AscArtifactMetadata.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AscArtifactMetadata.java?rev=951948&r1=951947&r2=951948&view=diff
==============================================================================
--- maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AscArtifactMetadata.java
(original)
+++ maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AscArtifactMetadata.java
Sun Jun  6 20:07:45 2010
@@ -57,7 +57,8 @@ public class AscArtifactMetadata
 
     private String getFilename()
     {
-        StringBuffer buf = new StringBuffer( getArtifactId() );
+        StringBuffer buf = new StringBuffer( 128 );
+        buf.append( getArtifactId() );
         buf.append( "-" ).append( artifact.getVersion() );
         if ( isPom )
         {
@@ -69,7 +70,7 @@ public class AscArtifactMetadata
             {
                 buf.append( "-" ).append( artifact.getClassifier() );
             }
-            buf.append( "." ).append( artifact.getType() );
+            buf.append( "." ).append( artifact.getArtifactHandler().getExtension() );
         }
         buf.append( ".asc" );
         return buf.toString();



Mime
View raw message