parent 95d9ef14
...@@ -137,6 +137,7 @@ single entry denoting a remote binary artifact." ...@@ -137,6 +137,7 @@ single entry denoting a remote binary artifact."
(if (find-mvn) (if (find-mvn)
(resolve-dependencies group-id artifact-id (resolve-dependencies group-id artifact-id
:version version :version version
:repository NIL
:repositories repositories) :repositories repositories)
(if alternate-uri (if alternate-uri
(values (pathname alternate-uri) alternate-uri) (values (pathname alternate-uri) alternate-uri)
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
(let (aether) (let (aether)
(with-aether (aether) (with-aether (aether)
(let ((collect-request (java:jnew (jss:find-java-class "CollectRequest"))) (let ((collect-request (java:jnew (jss:find-java-class "CollectRequest")))
(exclusions-collection (jss:new 'hashset) ) (exclusions-collection (jss:new 'java.util.HashSet))
(compile-scope (java:jfield (jss:find-java-class "JavaScopes") "COMPILE"))) (compile-scope (java:jfield (jss:find-java-class "JavaScopes") "COMPILE")))
(loop for e in exclusions (loop for e in exclusions
for (groupid artifactid) = (abcl-build:split-string e #\:) for (groupid artifactid) = (abcl-build:split-string e #\:)
......
(defsystem #:soot-mixed-repositories
:defsystem-depends-on (#:jss #:abcl-asdf)
:components ((:mvn "ca.mcgill.sable/soot/3.0.0-20170622.230711-112"
:repository "http://repo1.maven.org/maven2/"
:repositories ("https://soot-build.cs.uni-paderborn.de/nexus/repository/soot-snapshot/")
:classname "soot.SootClass")))
(defsystem #:soot-only-repositories
:defsystem-depends-on (#:jss #:abcl-asdf)
:components ((:mvn "ca.mcgill.sable/soot/3.0.0-20170622.230711-112"
:repositories ("https://soot-build.cs.uni-paderborn.de/nexus/repository/soot-snapshot/"
"http://repo1.maven.org/maven2/")
:classname "soot.SootClass")))
...@@ -13,5 +13,8 @@ ...@@ -13,5 +13,8 @@
(prove:plan 1) (prove:plan 1)
(prove:ok (asdf:load-system :test-mvn-module) (prove:ok (asdf:load-system :test-mvn-module)
"Testing loading of ASDF:MVN-MODULE definition…") "Testing loading of ASDF:MVN-MODULE definition…")
(prove:ok (asdf:load-system :soot-only-repositories)
"Testing loading with only repositories list…")
(prove:ok (asdf:load-system :soot-mixed-repositories)
"Testing loading with both single and list of repositories…")
(prove:finalize) (prove:finalize)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment