Unmerge non-leaky profiles for uberjar snapshot deps check

Fixes technomancy#2385.
puchka · Jun 14, 2019 · 0546de0 · 0546de0
1 parent 7fb1d6b
commit 0546de0
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/leiningen/uberjar.clj b/src/leiningen/uberjar.clj
@@ -16,6 +16,11 @@
            (org.apache.commons.io.output CloseShieldOutputStream)
            (org.apache.commons.lang StringEscapeUtils)))
 
+(defn- check-for-snapshot-deps [project]
+  (->> (project/non-leaky-profiles project)
+       (project/unmerge-profiles project)
+       pom/check-for-snapshot-deps))
+
 (defn- tree-edit
   "Walk the componment xml dom looking for description tag"
   [zipper editor]
@@ -160,8 +165,9 @@ be deactivated."
            provided-profiles (remove
                               (set/difference default-profiles scoped-profiles)
                               (-> project meta :included-profiles))
-           project (project/merge-profiles (project/merge-profiles project [:uberjar]) provided-profiles)
-           _ #_ (bail early if snapshot) (pom/check-for-snapshot-deps project)
+           project (->> (into [:uberjar] provided-profiles)
+                        (project/merge-profiles project))
+           _ (check-for-snapshot-deps project)
            project (update-in project [:jar-inclusions]
                               concat (:uberjar-inclusions project))
            [_ jar] (try (first (jar/jar project main))