You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2014/08/26 22:36:49 UTC
svn commit: r1620723 - in /maven/plugins/trunk/maven-gpg-plugin: pom.xml
src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java
src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java
Author: khmarbaise
Date: Tue Aug 26 20:36:49 2014
New Revision: 1620723
URL: http://svn.apache.org/r1620723
Log:
[MGPG-51]
- Upgrade to Maven 2.2.1
Modified:
maven/plugins/trunk/maven-gpg-plugin/pom.xml
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.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=1620723&r1=1620722&r2=1620723&view=diff
==============================================================================
--- maven/plugins/trunk/maven-gpg-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-gpg-plugin/pom.xml Tue Aug 26 20:36:49 2014
@@ -57,7 +57,7 @@ under the License.
</distributionManagement>
<properties>
- <mavenVersion>2.0.6</mavenVersion>
+ <mavenVersion>2.2.1</mavenVersion>
<mavenPluginPluginVersion>3.2</mavenPluginPluginVersion>
</properties>
@@ -85,6 +85,11 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-repository-metadata</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${mavenVersion}</version>
</dependency>
Modified: maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java?rev=1620723&r1=1620722&r2=1620723&view=diff
==============================================================================
--- maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java (original)
+++ maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java Tue Aug 26 20:36:49 2014
@@ -19,6 +19,12 @@ package org.apache.maven.plugin.gpg;
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
@@ -28,12 +34,6 @@ import org.apache.maven.artifact.version
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
import org.apache.maven.artifact.versioning.VersionRange;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
/**
* A wrapper class for attached artifacts which have a GPG signature. Needed as attached artifacts in general do not
* have metadata.
@@ -211,11 +211,6 @@ public class AttachedSignedArtifact
return delegate.equals( o );
}
- public int compareTo( Object o )
- {
- return delegate.compareTo( o );
- }
-
public void updateVersion( String version, ArtifactRepository localRepository )
{
delegate.updateVersion( version, localRepository );
@@ -308,4 +303,15 @@ public class AttachedSignedArtifact
}
return result;
}
+
+ public int compareTo( Artifact o )
+ {
+ return delegate.compareTo( o );
+ }
+
+ public ArtifactMetadata getMetadata( Class<?> metadataClass )
+ {
+ // TODO Auto-generated method stub
+ return delegate.getMetadata( metadataClass );
+ }
}
Modified: maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java?rev=1620723&r1=1620722&r2=1620723&view=diff
==============================================================================
--- maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java (original)
+++ maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java Tue Aug 26 20:36:49 2014
@@ -19,6 +19,14 @@ package org.apache.maven.plugin.gpg;
* under the License.
*/
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
+import java.util.List;
+import java.util.Map;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.deployer.ArtifactDeployer;
import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
@@ -48,14 +56,6 @@ import org.codehaus.plexus.util.StringUt
import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-import java.util.List;
-import java.util.Map;
-
/**
* Signs artifacts and installs the artifact in the remote repository.
*