Author: ogusakov
Date: Fri Aug 15 09:48:28 2008
New Revision: 686276
URL: http://svn.apache.org/viewvc?rev=686276&view=rev
Log:
chasing runaway windows test failures
Modified:
maven/sandbox/trunk/mercury/mercury-it/pom.xml
maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/pom.xml
maven/sandbox/trunk/mercury/mercury-pom/pom.xml
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java
maven/sandbox/trunk/mercury/pom.xml
Modified: maven/sandbox/trunk/mercury/mercury-it/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-it/pom.xml?rev=686276&r1=686275&r2=686276&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-it/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-it/pom.xml Fri Aug 15 09:48:28 2008
@@ -7,7 +7,7 @@
</parent>
<artifactId>mercury-it</artifactId>
<version>1.0.0-alpha-1-SNAPSHOT</version>
- <name>Mercury Integration Tests: ${project.version}</name>
+ <name>Mercury Integration Tests: ${project.version}</name>
<description>Mercury Integration Tests</description>
</project>
\ No newline at end of file
Modified: maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/pom.xml?rev=686276&r1=686275&r2=686276&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/pom.xml Fri Aug 15
09:48:28 2008
@@ -2,8 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md-sat</artifactId>
- <name>Mercury Dependency Builder: ${project.version}</name>
- <version>1.0.0-SNAPSHOT</version>
+ <name>Mercury Dependency Builder: ${project.version}</name>
<description/>
<parent>
<groupId>org.apache.maven.mercury</groupId>
Modified: maven/sandbox/trunk/mercury/mercury-pom/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-pom/pom.xml?rev=686276&r1=686275&r2=686276&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-pom/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-pom/pom.xml Fri Aug 15 09:48:28 2008
@@ -187,8 +187,22 @@
</profiles>
<build>
-
<plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>package-tests</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Modified:
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java?rev=686276&r1=686275&r2=686276&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java
(original)
+++
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java
Fri Aug 15 09:48:28 2008
@@ -3,7 +3,9 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.Set;
+import org.apache.maven.mercury.artifact.QualityEnum;
import org.apache.maven.mercury.builder.api.MetadataProcessor;
import org.codehaus.plexus.i18n.DefaultLanguage;
import org.codehaus.plexus.i18n.Language;
@@ -53,6 +55,11 @@
//---------------------------------------------------------------------------
protected String type = DEFAULT_REPOSITORY_TYPE;
+ protected boolean snapshots;
+ protected Set<Integer> alpha;
+ protected Set<Integer> beta;
+ protected boolean releases;
+
protected RepositoryReader reader;
protected RepositoryWriter writer;
//---------------------------------------------------------------------------
@@ -164,5 +171,20 @@
return wf.getWriter( repo, mdProcessor );
}
//---------------------------------------------------------------------------
+ public boolean isSnapshots()
+ {
+ return snapshots;
+ }
+ //---------------------------------------------------------------------------
+ public boolean isReleases()
+ {
+ return releases;
+ }
+ //---------------------------------------------------------------------------
+ public boolean isAccepted(QualityEnum quality, int quantity )
+ {
+ return releases;
+ }
+ //---------------------------------------------------------------------------
//---------------------------------------------------------------------------
}
Modified:
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java?rev=686276&r1=686275&r2=686276&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java
(original)
+++
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java
Fri Aug 15 09:48:28 2008
@@ -1,5 +1,6 @@
package org.apache.maven.mercury.repository.api;
+import org.apache.maven.mercury.artifact.QualityEnum;
import org.apache.maven.mercury.builder.api.MetadataProcessor;
@@ -40,13 +41,27 @@
* the artifact, if it was cleared by the conflict resolver but not read
from a localRepo.
*/
public boolean isLocal();
-
/**
* Indicates whether it's even possible to write to this Repository. If
there are multiple localRepo's and Artifact
* needs to be downloaded - it will be "written" to all "local" repositories
that are not "readOnly".
*/
public boolean isReadOnly();
+
+ /**
+ * Indicates whether this repository contains releases
+ */
+ public boolean isReleases();
+
+ /**
+ * Indicates whether this repository contains snapshots
+ */
+ public boolean isSnapshots();
+
+ /**
+ * reserved
+ */
+ public boolean isAccepted( QualityEnum quality, int quantity );
/**
* get default reader, if any
Modified: maven/sandbox/trunk/mercury/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/pom.xml?rev=686276&r1=686275&r2=686276&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/pom.xml (original)
+++ maven/sandbox/trunk/mercury/pom.xml Fri Aug 15 09:48:28 2008
@@ -4,7 +4,7 @@
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
<packaging>pom</packaging>
- <name>Mercury Reactor: ${project.version}</name>
+ <name>Mercury Reactor: ${project.version}</name>
<version>1.0.0-alpha-1-SNAPSHOT</version>
<modules>
