addRepository call

[Cyrus Harmon]

A recent commit:

62a21ec Fix ABCL-ASDF usage with maven-3.3.x

contained the following change:

-    (when repository
-      (#"addRepository" collect-request 
-                        (if repository-p
-                            (ensure-remote-repository :repository repository)
-                            (ensure-remote-repository))))
+    (#"addRepository" collect-request 
+                      (if repository-p
+                          (ensure-remote-repository :repository repository)
+                          (ensure-remote-repository)))

The upshot of this change is that it broke my code that uses :repository nil. This may be a non-standard thing, but I use it for jars in my local maven library. I propose the following:

--- i/contrib/abcl-asdf/maven-embedder.lisp
+++ w/contrib/abcl-asdf/maven-embedder.lisp
@@ -469,10 +469,13 @@ (defun resolve-dependencies (group-id artifact-id
                      artifact (java:jfield (jss:find-java-class "JavaScopes") "COMPILE")))
          (collect-request (java:jnew (jss:find-java-class "CollectRequest"))))
     (#"setRoot" collect-request dependency)
-    (#"addRepository" collect-request 
-                      (if repository-p
-                          (ensure-remote-repository :repository repository)
-                          (ensure-remote-repository)))
+
+    ;; Don't call addRepository if we explicitly specify a NIL repository
+    (unless (and repository-p (not repository))
+      (#"addRepository" collect-request 
+                        (if repository-p
+                            (ensure-remote-repository :repository repository)
+                            (ensure-remote-repository))))
     (let* ((node 
             (#"getRoot" (#"collectDependencies" (ensure-repository-system) (ensure-session) collect-request)))
            (dependency-request


which will call ensure-remote-repository only if :repository NIL is not explicitly specified. Any objections?

thanks,

Cyrus