From a102f1fd26350455ab820be6774c33effa2c16c6 Mon Sep 17 00:00:00 2001 From: Nelson Morris Date: Wed, 22 Feb 2012 22:55:57 -0600 Subject: [PATCH] Set classifier in pom. Fixes #349 --- src/leiningen/pom.clj | 1 + test/leiningen/test/pom.clj | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/leiningen/pom.clj b/src/leiningen/pom.clj index 13cc389d..e6963b4a 100644 --- a/src/leiningen/pom.clj +++ b/src/leiningen/pom.clj @@ -217,6 +217,7 @@ [:groupId (:group project)] [:artifactId (:name project)] [:version (:version project)] + (when (:classifier project) [:classifier (:classifier project)]) [:name (:name project)] [:description (:description project)] [:url (:url project)] diff --git a/test/leiningen/test/pom.clj b/test/leiningen/test/pom.clj index 2574c2b2..1078d96f 100644 --- a/test/leiningen/test/pom.clj +++ b/test/leiningen/test/pom.clj @@ -1,15 +1,25 @@ (ns leiningen.test.pom (:use [clojure.test] [clojure.java.io :only [file delete-file]] - [leiningen.pom :only [pom]] + [leiningen.pom :only [make-pom pom]] [leiningen.test.helper :only [sample-project]])) -(deftest test-pom +(deftest test-pom-file-is-created (let [pom-file (file (:target-path sample-project) "pom.xml")] (delete-file pom-file true) (pom sample-project) (is (.exists pom-file)))) +(deftest test-pom-has-classifier-when-defined + (let [pom (make-pom sample-project)] + (is (not (re-find #"classifier" pom)))) + (let [altered-meta (assoc-in (meta sample-project) + [:without-profiles :classifier] + "stuff") + pom (make-pom (with-meta sample-project altered-meta))] + (is (re-find #"stuff" pom)))) + + (deftest test-snapshot-checking (let [aborted? (atom false)] (binding [leiningen.pom/abort #(reset! aborted? %&)]