Use group.id/artifact notation in project.clj.

technomancy · Nov 14, 2009 · acb11e3 · acb11e3
1 parent b36f9c1
commit acb11e3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/project.clj b/project.clj
@@ -3,7 +3,7 @@
 ;; loading other task definitions.
 
 (defproject leiningen "0.5.0-SNAPSHOT"
-  :dependencies [["org.clojure" "clojure" "1.1.0-alpha-SNAPSHOT"]
-                 ["org.clojure" "clojure-contrib" "1.0-SNAPSHOT"]
-                 ["ant" "ant-launcher" "1.6.2"]
-                 ["org.apache.maven" "maven-ant-tasks" "2.0.10"]])
+  :dependencies [[org.clojure/clojure "1.1.0-alpha-SNAPSHOT"]
+                 [org.clojure/clojure-contrib "1.0-SNAPSHOT"]
+                 [ant/ant-launcher "1.6.2"]
+                 [org.apache.maven/maven-ant-tasks "2.0.10"]])
diff --git a/src/leiningen/deps.clj b/src/leiningen/deps.clj
@@ -5,10 +5,10 @@
            [org.apache.maven.artifact.ant DependenciesTask]
            [org.apache.tools.ant.util FlatFileNameMapper]))
 
-(defn- make-dependency [[group name version]]
+(defn- make-dependency [[dep version]]
   (doto (Dependency.)
-    (.setGroupId group)
-    (.setArtifactId name)
+    (.setGroupId (or (namespace dep) (name dep)))
+    (.setArtifactId (name dep))
     (.setVersion version)))
 
 ;; TODO: development dependencies

diff --git a/test/project.clj b/test/project.clj
@@ -1,4 +1,4 @@
 (defproject nomnomnom "1.0-SNAPSHOT"
-  :dependencies [["org.clojure" "clojure" "1.0.0"]
-                 ["rome" "rome" "0.9"]
-                 ["org.ccil.cowan.tagsoup" "tagsoup" "1.2"]])
+  :dependencies [[org.clojure/clojure "1.0.0"]
+                 [rome/rome "0.9"]
+                 [org.ccil.cowan.tagsoup/tagsoup "1.2"]])