Author: ogusakov
Date: Mon Oct 6 09:26:17 2008
New Revision: 702192
URL: http://svn.apache.org/viewvc?rev=702192&view=rev
Log:
added inclusions/exclusions to basic metadata, finilized alpha-2-SN conversion
Modified:
maven/sandbox/trunk/mercury/ (props changed)
maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java
maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-basic/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpHelper.java
maven/sandbox/trunk/mercury/mercury-pom/pom.xml
Propchange: maven/sandbox/trunk/mercury/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Oct 6 09:26:17 2008
@@ -3,3 +3,4 @@
.classpath
.project
release.properties
+sonatype-work
Modified:
maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java?rev=702192&r1=702191&r2=702192&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java
(original)
+++
maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java
Mon Oct 6 09:26:17 2008
@@ -1,6 +1,7 @@
package org.apache.maven.mercury.artifact;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
@@ -43,6 +44,10 @@
protected String scope;
protected boolean optional;
+
+ protected Collection<ArtifactBasicMetadata> inclusions;
+
+ protected Collection<ArtifactBasicMetadata> exclusions;
/** transient helper objects, used by DependencyBuilder */
transient Object tracker;
@@ -333,7 +338,32 @@
{
return effectiveCoordinates == null ? version:
effectiveCoordinates.getVersion();
}
-
+
+ public boolean hasInclusions()
+ {
+ return inclusions == null ? false : ! inclusions.isEmpty();
+ }
+ public Collection<ArtifactBasicMetadata> getInclusions()
+ {
+ return inclusions;
+ }
+ public void setInclusions( Collection<ArtifactBasicMetadata> inclusions )
+ {
+ this.inclusions = inclusions;
+ }
+
+ public boolean hasExclusions()
+ {
+ return exclusions == null ? false : ! exclusions.isEmpty();
+ }
+ public Collection<ArtifactBasicMetadata> getExclusions()
+ {
+ return exclusions;
+ }
+ public void setExclusions( Collection<ArtifactBasicMetadata> exclusions )
+ {
+ this.exclusions = exclusions;
+ }
@Override
public boolean equals( Object obj )
{
Modified:
maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-basic/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpHelper.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-basic/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpHelper.java?rev=702192&r1=702191&r2=702192&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-basic/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpHelper.java
(original)
+++
maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-basic/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpHelper.java
Mon Oct 6 09:26:17 2008
@@ -4,6 +4,7 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.math.BigInteger;
import java.security.Security;
import java.util.Iterator;
@@ -76,7 +77,8 @@
//---------------------------------------------------------------------------------
public static long hexToId( String hexId )
{
- return Long.parseLong( hexId, 16 );
+ BigInteger bi = new BigInteger( hexId, 16 );
+ return bi.longValue();
}
//---------------------------------------------------------------------------------
public static PGPSignature readSignature( InputStream inS )
Modified: maven/sandbox/trunk/mercury/mercury-pom/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-pom/pom.xml?rev=702192&r1=702191&r2=702192&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-pom/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-pom/pom.xml Mon Oct 6 09:26:17 2008
@@ -18,13 +18,13 @@
<distMgmtSnapshotsName>Apache Development Snapshot
Repository</distMgmtSnapshotsName>
<distMgmtSnapshotsUrl>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</distMgmtSnapshotsUrl>
- <mercury.version>1.0.0-alpha-1-SNAPSHOT</mercury.version>
+ <mercury.version>1.0.0-alpha-2-SNAPSHOT</mercury.version>
- <mercury.version.artifact>1.0.0-alpha-1-SNAPSHOT</mercury.version.artifact>
- <mercury.version.crypto>1.0.0-alpha-1-SNAPSHOT</mercury.version.crypto>
- <mercury.version.md>1.0.0-alpha-1-SNAPSHOT</mercury.version.md>
- <mercury.version.repo>1.0.0-alpha-1-SNAPSHOT</mercury.version.repo>
-
<mercury.version.transport>1.0.0-alpha-1-SNAPSHOT</mercury.version.transport>
+ <mercury.version.artifact>1.0.0-alpha-2-SNAPSHOT</mercury.version.artifact>
+ <mercury.version.crypto>1.0.0-alpha-2-SNAPSHOT</mercury.version.crypto>
+ <mercury.version.md>1.0.0-alpha-2-SNAPSHOT</mercury.version.md>
+ <mercury.version.repo>1.0.0-alpha-2-SNAPSHOT</mercury.version.repo>
+
<mercury.version.transport>1.0.0-alpha-2-SNAPSHOT</mercury.version.transport>
</properties>
