File tree Expand file tree Collapse file tree 2 files changed +14
-10
lines changed
src/main/clojure/clojure/tools/build/tasks Expand file tree Collapse file tree 2 files changed +14
-10
lines changed Original file line number Diff line number Diff line change @@ -2,6 +2,7 @@ Changelog
22===========
33
44* next
5+ * write-pom - add warning if pom-data ignored because src-pom template exists
56 * Update deps to latest
67* v0.10.6 52cf7d6 on Nov 22, 2024
78 * compile-clj - add stream control args for compilation so out and err can be captured
Original file line number Diff line number Diff line change 238238 src-pom-file (api/resolve-path (or src-pom " pom.xml" ))
239239 repos (or repos (remove #(= " https://repo1.maven.org/maven2/" (-> % val :url )) (:mvn/repos basis)))
240240 pom (if (.exists src-pom-file)
241- (with-open [rdr (jio/reader src-pom-file)]
242- (-> rdr
243- parse-xml
244- (replace-deps root-deps)
245- (replace-paths src-dirs)
246- (replace-resources resource-dirs)
247- (replace-repos repos)
248- (replace-lib lib)
249- (replace-version version)
250- (replace-scm scm)))
241+ (do
242+ (when pom-data
243+ (println " Warning in write-pom: pom-data supplied but not used because pom template exists at" (or src-pom " pom.xml" )))
244+ (with-open [rdr (jio/reader src-pom-file)]
245+ (-> rdr
246+ parse-xml
247+ (replace-deps root-deps)
248+ (replace-paths src-dirs)
249+ (replace-resources resource-dirs)
250+ (replace-repos repos)
251+ (replace-lib lib)
252+ (replace-version version)
253+ (replace-scm scm))))
251254 (gen-pom
252255 (cond->
253256 {:deps root-deps
You can’t perform that action at this time.
0 commit comments