From c9ea6b1cd805b851119f280149b6765215c0e42b Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Sat, 8 Feb 2025 20:13:33 -0600 Subject: [PATCH] write-pom - add warning if pom-data ignored because src-pom template exists --- CHANGELOG.md | 1 + .../clojure/tools/build/tasks/write_pom.clj | 23 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37a410c..ae234ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ Changelog =========== * next + * write-pom - add warning if pom-data ignored because src-pom template exists * Update deps to latest * v0.10.6 52cf7d6 on Nov 22, 2024 * compile-clj - add stream control args for compilation so out and err can be captured diff --git a/src/main/clojure/clojure/tools/build/tasks/write_pom.clj b/src/main/clojure/clojure/tools/build/tasks/write_pom.clj index 68c8aae..fa9cb5b 100644 --- a/src/main/clojure/clojure/tools/build/tasks/write_pom.clj +++ b/src/main/clojure/clojure/tools/build/tasks/write_pom.clj @@ -238,16 +238,19 @@ src-pom-file (api/resolve-path (or src-pom "pom.xml")) repos (or repos (remove #(= "https://repo1.maven.org/maven2/" (-> % val :url)) (:mvn/repos basis))) pom (if (.exists src-pom-file) - (with-open [rdr (jio/reader src-pom-file)] - (-> rdr - parse-xml - (replace-deps root-deps) - (replace-paths src-dirs) - (replace-resources resource-dirs) - (replace-repos repos) - (replace-lib lib) - (replace-version version) - (replace-scm scm))) + (do + (when pom-data + (println "Warning in write-pom: pom-data supplied but not used because pom template exists at" (or src-pom "pom.xml"))) + (with-open [rdr (jio/reader src-pom-file)] + (-> rdr + parse-xml + (replace-deps root-deps) + (replace-paths src-dirs) + (replace-resources resource-dirs) + (replace-repos repos) + (replace-lib lib) + (replace-version version) + (replace-scm scm)))) (gen-pom (cond-> {:deps root-deps