TBUILD-41 :src-pom :none

Author: seancorfield

.gitignore

@@ -11,3 +11,5 @@ test-out
 .clj-kondo/.cache
 .vscode
 .lsp
+.calva/mcp-server/port
+.portal/vs-code.edn

src/main/clojure/clojure/tools/build/api.clj

@@ -385,6 +385,7 @@
   Options:
     :basis - required, used to pull deps, repos
     :src-pom - source pom.xml to synchronize from, default = \"./pom.xml\"
+               may be :none to ignore any existing pom.xml file
     :class-dir - root dir for writing pom files, created if needed
     :target - file path to write pom if no :class-dir specified
     :lib - required, project lib symbol
@@ -396,7 +397,7 @@
     :resource-dirs - coll of resource dirs
     :repos - map of repo name to repo config, replaces repos from deps.edn
     :pom-data - vector of hiccup-style extra pom top elements to include when
-      no :src-pom is provided:
+      :src-pom is :none or the source pom.xml does not exist:
        [[:licenses
          [:license
           [:name \"Eclipse Public License 1.0\"]
@@ -409,7 +410,7 @@
   [params]
   (assert-required "write-pom" params [:basis :lib :version])
   (assert-specs "write-pom" params
-    :src-pom ::specs/path
+    :src-pom (s/or :none #{:none} :path ::specs/path)
     :class-dir ::specs/path
     :target ::specs/path
     :lib ::specs/lib
@@ -556,4 +557,3 @@
     :jar-file ::specs/path
     :class-dir ::specs/path)
   ((requiring-resolve 'clojure.tools.build.tasks.install/install) params))
-

src/main/clojure/clojure/tools/build/tasks/write_pom.clj

@@ -238,9 +238,10 @@
   (let [{:keys [basis class-dir target src-pom lib version scm src-dirs resource-dirs repos pom-data]} params
         {:keys [libs]} basis
         root-deps (libs->deps libs)
-        src-pom-file (api/resolve-path (or src-pom "pom.xml"))
+        src-pom-file (when-not (= :none src-pom)
+                       (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)
+        pom (if (and src-pom-file (.exists src-pom-file))
               (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")))

src/test/clojure/clojure/tools/build/tasks/test_pom.clj

@@ -120,6 +120,74 @@
       (is (.exists prop-out))
       (is (submap? {"groupId" "test", "artifactId" "p2", "version" "1.2.3"} props)))))
 
+(deftest test-ignore-existing-pom
+  ;; verify existing scm info is preserved if src-pom is supplied:
+  (with-test-dir "test-data/p4"
+    (api/set-project-root! (.getAbsolutePath *test-dir*))
+    (api/delete {:path "target"})
+    (api/write-pom {:lib 'test/p4
+                    :version "1.2.3"
+                    :class-dir "target/classes"
+                    :src-dirs ["src"]
+                    :src-pom "pom.xml"
+                    :resource-dirs ["resources"]
+                    :basis (api/create-basis nil)})
+    (let [pom-dir (jio/file (project-path "target/classes/META-INF/maven/test/p4"))
+          pom-out (jio/file pom-dir "pom.xml")
+          pom (read-xml pom-out)
+          prop-out (jio/file pom-dir "pom.properties")
+          props (read-props prop-out)]
+      ;; check xml out
+      (is (.exists pom-out))
+      (are [path val] (= val (xml-path-val pom path))
+        [::pom/packaging] ["jar"]
+        [::pom/groupId] ["test"]
+        [::pom/artifactId] ["p4"]
+        [::pom/version] ["1.2.3"]
+        [::pom/name] ["p4"]
+        [::pom/build ::pom/sourceDirectory] ["src"]
+        [::pom/build ::pom/resources ::pom/resource ::pom/directory] ["resources"]
+        [::pom/scm ::pom/tag] ["HEAD"]
+        [::pom/scm ::pom/url] ["git@github.com:clojure/tools.build.git"])
+      (is (= 2 (count (xml-path-val pom [::pom/dependencies]))))
+      (is (= 1 (count (xml-path-val pom [::pom/repositories]))))
+      ;; check properties out
+      (is (.exists prop-out))
+      (is (submap? {"groupId" "test", "artifactId" "p4", "version" "1.2.3"} props))))
+  ;; verify no scm info is present if src-pom is :none:
+  (with-test-dir "test-data/p4"
+    (api/set-project-root! (.getAbsolutePath *test-dir*))
+    (api/delete {:path "target"})
+    (api/write-pom {:lib 'test/p4
+                    :version "1.2.3"
+                    :class-dir "target/classes"
+                    :src-dirs ["src"]
+                    :src-pom :none
+                    :resource-dirs ["resources"]
+                    :basis (api/create-basis nil)})
+    (let [pom-dir (jio/file (project-path "target/classes/META-INF/maven/test/p4"))
+          pom-out (jio/file pom-dir "pom.xml")
+          pom (read-xml pom-out)
+          prop-out (jio/file pom-dir "pom.properties")
+          props (read-props prop-out)]
+        ;; check xml out
+      (is (.exists pom-out))
+      (are [path val] (= val (xml-path-val pom path))
+        [::pom/packaging] ["jar"]
+        [::pom/groupId] ["test"]
+        [::pom/artifactId] ["p4"]
+        [::pom/version] ["1.2.3"]
+        [::pom/name] ["p4"]
+        [::pom/build ::pom/sourceDirectory] ["src"]
+        [::pom/build ::pom/resources ::pom/resource ::pom/directory] ["resources"]
+        [::pom/scm ::pom/tag] nil
+        [::pom/scm ::pom/url] nil)
+      (is (= 2 (count (xml-path-val pom [::pom/dependencies]))))
+      (is (= 1 (count (xml-path-val pom [::pom/repositories]))))
+        ;; check properties out
+      (is (.exists prop-out))
+      (is (submap? {"groupId" "test", "artifactId" "p4", "version" "1.2.3"} props)))))
+
 ;; check that optional deps are marked optional
 (deftest test-optional
   (with-test-dir "test-data/p3"

test-data/p4/deps.edn

@@ -0,0 +1,9 @@
+{:paths [:clj-paths :resource-paths]
+
+ :deps
+ {org.clojure/clojure {:mvn/version "1.10.1"}
+  org.clojure/core.cache {:mvn/version "1.0.207"}}
+
+ :aliases
+ {:clj-paths ["src"]
+  :resource-paths ["resources"]}}

test-data/p4/pom.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>jar</packaging>
+  <groupId>foo</groupId>
+  <artifactId>bar</artifactId>
+  <version>0.0.1</version>
+  <name>name</name>
+  <dependencies>
+  </dependencies>
+  <repositories>
+  </repositories>
+  <scm>
+    <connection>scm:git:git@github.com:clojure/tools.build.git</connection>
+    <developerConnection>scm:git:git@github.com:clojure/tools.build.git</developerConnection>
+    <url>git@github.com:clojure/tools.build.git</url>
+    <tag>HEAD</tag>
+  </scm>
+</project>

test-data/p4/resources/data.edn

@@ -0,0 +1 @@
+{:version "$version"}

test-data/p4/src/foo/bar.clj

@@ -0,0 +1,3 @@
+(ns foo.bar)
+
+(defn hello [] (println "hello"))