Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fall back to project when :without-profiles is absent in pom.

We kinda need a circular data structure here where the
:without-profiles map has itself on its own :without-profiles
metadata, but alas.
  • Loading branch information...
commit 3826e789896df497e04e850d90f2bd6bc04de83b 1 parent 5cbe443
@technomancy technomancy authored
Showing with 8 additions and 6 deletions.
  1. +3 −4 src/leiningen/pom.clj
  2. +5 −2 todo.org
View
7 src/leiningen/pom.clj
@@ -254,7 +254,7 @@
(defmethod xml-tags ::project
([_ project]
(let [{:keys [without-profiles included-profiles]} (meta project)
- test-project (-> without-profiles
+ test-project (-> (or without-profiles project)
(project/merge-profiles
(concat [:dev :test :default]
included-profiles))
@@ -295,9 +295,8 @@
"LEIN_SNAPSHOTS_IN_RELEASE environment variable to override.")))
(defn- remove-profiles [project profiles]
- (let [{:keys [included-profiles
- without-profiles]} (meta project)]
- (project/merge-profiles without-profiles
+ (let [{:keys [included-profiles without-profiles]} (meta project)]
+ (project/merge-profiles (or without-profiles project)
(remove #(some #{%} profiles)
included-profiles))))
View
7 todo.org
@@ -3,6 +3,11 @@ Leiningen TODOs
See also https://github.com/technomancy/leiningen/issues
* For 2.0.0
+** preview4
+ - [ ] Don't re-extract native deps (#535)
+ - [ ] Install task outside projects (#546)
+ - [ ] Force checking of snapshots (#518)
+ - [ ] Make offline profile use dev profile (#514)
** Low-hanging fruit (newbies, try one of these!)
- [X] Look for :java-cmd in project map
- [X] Remove task-specific silent flags in favour of global bit (#473)
@@ -10,7 +15,6 @@ See also https://github.com/technomancy/leiningen/issues
- [X] Move newnew template listing into subtasks (newnew #11)
- [X] Collapse all :repl-* settings into :repl-options map (#432)
- [ ] Document creation of new project templates
- - [ ] Install task outside projects
- [ ] Suppress stack trace when getting help on non-existent task (#515)
** Intermediate
- [X] Pretty-print pom
@@ -24,7 +28,6 @@ See also https://github.com/technomancy/leiningen/issues
- [ ] Re-enable transitive cleaning for compile (#516)
** Complex
- [ ] Post-install scripts? (#517)
- - [ ] Force checking of snapshots (#518)
- [ ] Allow jars to be signed. (#519)
- [ ] Calculate web of trust for signed dependencies.
- [ ] Prevent multiple versions of artifacts from getting added (#420)
Please sign in to comment.
Something went wrong with that request. Please try again.