yogsototh/leiningen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make base profile's deps defer to raw :dependencies in pom.

Browse source 
Fixes #1569.
This commit is contained in:
Phil Hagelberg 2014-08-04 13:36:23 -07:00
parent 0c9be93a3c
commit e95a167c1b
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/leiningen/pom.clj
View file

@ -312,9 +312,8 @@
(list* dep version (apply concat (assoc (apply hash-map opts) :scope scope))))
(defn- dep-key [dep]
(-> (project/dependency-map dep)
(select-keys [:group-id :artifact-id :classifier
:extension :scope :version])))
(select-keys (project/dependency-map dep) [:group-id :artifact-id :classifier
:extension :scope]))
(defmethod xml-tags ::project
([_ project]
@ -322,11 +321,13 @@
test-project (reprofile [:base :provided :dev :test])
profiles (merge @project/default-profiles (:profiles project)
(project/project-profiles project))
raw-deps (set (map dep-key (:dependencies project)))
deps (concat (:dependencies project)
(for [dep (:dependencies (:provided profiles))]
(make-scope "provided" dep))
(for [profile [:dev :test :base]
dep (:dependencies (profile profiles))]
dep (:dependencies (profile profiles))
:when (not (raw-deps (dep-key dep)))]
(make-scope "test" dep)))]
(list
[:project {:xsi:schemaLocation