Changeset 13860

Timestamp:

02/06/12 18:20:21 (11 years ago)

Author:

Mark Evenson

Message:

ABCL-ASDF:RESOLVE-ARTIFACT now returns the namestring of the artifact.

This aligns the function to the underlying Maven Aether API. As far
as I can tell, nothing was using RESOLVE-ARTIFACT anyways.

Location:

trunk/abcl/contrib/abcl-asdf

Files:

• abcl-asdf.asd (modified) (1 diff)
• maven-embedder.lisp (modified) (3 diffs)

trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd

@@ -4 +4 @@
 (defsystem :abcl-asdf
   :author "Mark Evenson"
-  :version "0.6.0"
+  :version "0.7.0"
   :depends-on (jss)
   :components 

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

@@ -212 +212 @@
 
 (defun make-proxy ()
-  "Return an org.sonatype.aether.repository.Proxy instance initialized form *MAVEN-HTTP-PROXY*."
+  "Return an org.sonatype.aether.repository.Proxy instance initialized from *MAVEN-HTTP-PROXY*."
   (unless *maven-http-proxy*
     (warn "No proxy specified in *MAVEN-HTTP-PROXY*")
@@ -256 +256 @@
 ;;; TODO change this to work on artifact strings like log4j:log4j:jar:1.2.16
 (defun resolve-artifact (group-id artifact-id &optional (version "LATEST" versionp))
-  "Directly resolve Maven dependencies for item with GROUP-ID and ARTIFACT-ID at VERSION, ignoring dependencies.
+  "Resolve artifact to location on the local filesystem.
 
 Declared dependencies are not attempted to be located.
@@ -273 +273 @@
     (#"setArtifact" artifact-request artifact)
     (#"addRepository" artifact-request (ensure-remote-repository))
-    (#"toString" (#"resolveArtifact" (ensure-repository-system) (ensure-session) artifact-request))))
+    (#"toString" (#"getFile" 
+                  (#"getArtifact" (#"resolveArtifact" (ensure-repository-system) 
+                                                      (ensure-session) artifact-request))))))
 
 (defun make-remote-repository (id type url)