[armedbear-cvs] r13863 - trunk/abcl/contrib/abcl-asdf

[mevenson at common-lisp.net]

Author: mevenson
Date: Mon Feb  6 10:20:27 2012
New Revision: 13863

Log:
abcl-asdf: always use runtime scope for resolving Maven artifacts.

Modified:
   trunk/abcl/contrib/abcl-asdf/abcl-asdf.lisp
   trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp

Modified: trunk/abcl/contrib/abcl-asdf/abcl-asdf.lisp
==============================================================================
--- trunk/abcl/contrib/abcl-asdf/abcl-asdf.lisp	Mon Feb  6 10:20:25 2012	(r13862)
+++ trunk/abcl/contrib/abcl-asdf/abcl-asdf.lisp	Mon Feb  6 10:20:27 2012	(r13863)
@@ -55,7 +55,7 @@
 (in-package #:abcl-asdf)
 
 (defgeneric satisfy (something)
- :documentation "Returns a string in JVM CLASSPATH format as entries delimited by classpath separator string."
+ (:documentation "Returns a string in JVM CLASSPATH format as entries delimited by classpath separator string."))
 
 (defmethod satisfy ((mvn-component asdf::mvn))
   "Resolve all runtime dependencies of MVN-COMPONENT.

Modified: trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp
==============================================================================
--- trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp	Mon Feb  6 10:20:25 2012	(r13862)
+++ trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp	Mon Feb  6 10:20:27 2012	(r13863)
@@ -308,7 +308,7 @@
                              group-id artifact-id version)))
          (dependency 
           (java:jnew (jss:find-java-class "aether.graph.Dependency")
-                     artifact "compile"))
+                     artifact (java:jfield (jss:find-java-class "JavaScopes") "RUNTIME")))
          (collect-request (java:jnew (jss:find-java-class "CollectRequest"))))
     (#"setRoot" collect-request dependency)
     (#"addRepository" collect-request (ensure-remote-repository))