Author: jvanzyl
Date: Tue May 27 22:28:47 2008
New Revision: 660813
URL: http://svn.apache.org/viewvc?rev=660813&view=rev
Log:
o adding SAT4J in a lib, need to coorindate with sat4j project to get it into
central.
Added:
maven/sandbox/trunk/mercury/lib/
maven/sandbox/trunk/mercury/lib/install.sh (with props)
maven/sandbox/trunk/mercury/lib/org.sat4j.core.jar (with props)
Modified:
maven/sandbox/trunk/mercury/pom.xml
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/DefaultMetadataResolver.java
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MetadataResolverTest.java
Added: maven/sandbox/trunk/mercury/lib/install.sh
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/lib/install.sh?rev=660813&view=auto
==============================================================================
--- maven/sandbox/trunk/mercury/lib/install.sh (added)
+++ maven/sandbox/trunk/mercury/lib/install.sh Tue May 27 22:28:47 2008
@@ -0,0 +1 @@
+mvn install:install-file -Dfile=org.sat4j.core.jar -DgroupId=org.sat4j
-Dpackaging=jar -DartifactId=org.sat4j.core -Dversion=2.0.0.v20080430
-DgeneratePom=true -DgenerateChecksum=true
Propchange: maven/sandbox/trunk/mercury/lib/install.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/mercury/lib/install.sh
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/sandbox/trunk/mercury/lib/install.sh
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/sandbox/trunk/mercury/lib/org.sat4j.core.jar
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/lib/org.sat4j.core.jar?rev=660813&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/sandbox/trunk/mercury/lib/org.sat4j.core.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: maven/sandbox/trunk/mercury/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/pom.xml?rev=660813&r1=660812&r2=660813&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/pom.xml (original)
+++ maven/sandbox/trunk/mercury/pom.xml Tue May 27 22:28:47 2008
@@ -112,6 +112,12 @@
<artifactId>plexus-utils</artifactId>
<version>1.5.1</version>
</dependency>
+ <!-- SAT solver used to calcuate viable ranges when dependencies are
expressed in conjunctive normal form -->
+ <dependency>
+ <groupId>org.sat4j</groupId>
+ <artifactId>org.sat4j.core</artifactId>
+ <version>2.0.0.v20080430</version>
+ </dependency>
<!-- Test Dependencies -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/DefaultMetadataResolver.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/DefaultMetadataResolver.java?rev=660813&r1=660812&r2=660813&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/DefaultMetadataResolver.java
(original)
+++
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/DefaultMetadataResolver.java
Tue May 27 22:28:47 2008
@@ -17,6 +17,7 @@
* default implementation of the metadata resolver
*
* @author Oleg Gusakov
+ * @author Jason van Zyl
*
* @plexus.component
*/
@@ -43,6 +44,8 @@
{
MetadataResolutionResult result = new MetadataResolutionResult();
+ // We need to make the root and send it into the resolution.
+
MetadataTreeNode tree = resolveMetadataTree( request.getQuery(), null,
request.getLocalRepository(), request.getRemoteRepositories() );
result.setTree( tree );
Modified:
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MetadataResolverTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MetadataResolverTest.java?rev=660813&r1=660812&r2=660813&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MetadataResolverTest.java
(original)
+++
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MetadataResolverTest.java
Tue May 27 22:28:47 2008
@@ -78,6 +78,8 @@
MetadataResolutionResult result = metadataResolver.resolve( request );
assertNotNull( result.getTree() );
+
+ System.out.println(result.getTree());
}
class SimpleSource
