From 8334978a4309c5a75fc2031d7a4aa5a96359e9f8 Mon Sep 17 00:00:00 2001
From: Sean Corfield <sean@corfield.org>
Date: Fri, 6 Oct 2023 15:11:43 -0700
Subject: [PATCH] update tools.build; drop template pom.xml

---
 CHANGELOG.md     |  2 +-
 build.clj        | 31 ++++++++++++++++++++++++-------
 deps.edn         |  2 +-
 template/pom.xml | 26 --------------------------
 4 files changed, 26 insertions(+), 35 deletions(-)
 delete mode 100644 template/pom.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44b5445..b7fb9a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@
   * Fix [#505](https://github.com/seancorfield/honeysql/issues/505) by rewriting the helper merge function to handle both keywords and symbols properly.
   * Address [#503](https://github.com/seancorfield/honeysql/issues/503) by adding `:at-time-zone` special syntax.
   * Address [#504](https://github.com/seancorfield/honeysql/issues/504) for BigQuery support, by adding special syntax for ignore/respect nulls, as well as new `:distinct` and `:expr` clauses to allow expressions to be qualified with SQL clauses. The latter will probably be useful for other dialects too.
-  * Update CI tooling versions.
+  * Update `tools.build` to 0.9.6 (and get rid of `template/pom.xml` in favor of new `:pom-data` option to `b/write-pom`).
 
 * 2.4.1066 -- 2023-08-27
   * Add `:select` with function call and alias example to README (PR [#502](https://github.com/seancorfield/honeysql/pull/502) [@markbastian](https://github.com/markbastian)).
diff --git a/build.clj b/build.clj
index 2d35569..acfe950 100644
--- a/build.clj
+++ b/build.clj
@@ -65,18 +65,35 @@
   (run-task [:test :runner :1.11])
   opts)
 
+(defn- pom-template [version]
+  [[:description "SQL as Clojure data structures."]
+   [:url "https://github.com/seancorfield/honeysql"]
+   [:licenses
+    [:license
+     [:name "Eclipse Public License"]
+     [:url "http://www.eclipse.org/legal/epl-v10.html"]]]
+   [:developers
+    [:developer
+     [:name "Sean Corfield"]]
+    [:developer
+     [:name "Justin Kramer"]]]
+   [:scm
+    [:url "https://github.com/seancorfield/honeysql"]
+    [:connection "scm:git:git://github.com/seancorfield/honeysql.git"]
+    [:developerConnection "scm:git:ssh://git@github.com/seancorfield/honeysql.git"]
+    [:tag (str "v" version)]]])
+
 (defn- jar-opts [opts]
   (let [version (if (:snapshot opts) snapshot version)]
     (println "\nVersion:" version)
     (assoc opts
-           :lib lib :version version
-           :jar-file (format "target/%s-%s.jar" lib version)
-           :scm {:tag (str "v" version)}
-           :basis (b/create-basis {})
+           :lib lib   :version version
+           :jar-file  (format "target/%s-%s.jar" lib version)
+           :basis     (b/create-basis {})
            :class-dir class-dir
-           :target "target"
-           :src-dirs ["src"]
-           :src-pom "template/pom.xml")))
+           :target    "target"
+           :src-dirs  ["src"]
+           :pom-data  (pom-template version))))
 
 (defn ci
   "Run the CI pipeline of tests (and build the JAR).
diff --git a/deps.edn b/deps.edn
index 7831073..0575971 100644
--- a/deps.edn
+++ b/deps.edn
@@ -3,7 +3,7 @@
  :deps {org.clojure/clojure {:mvn/version "1.9.0"}}
  :aliases
  {;; for help: clojure -A:deps -T:build help/doc
-  :build {:deps {io.github.clojure/tools.build {:mvn/version "0.9.5"}
+  :build {:deps {io.github.clojure/tools.build {:mvn/version "0.9.6"}
                  slipset/deps-deploy {:mvn/version "0.2.1"}}
           :ns-default build}
 
diff --git a/template/pom.xml b/template/pom.xml
deleted file mode 100644
index a220b8c..0000000
--- a/template/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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>
-  <name>honeysql</name>
-  <description>SQL as Clojure data structures.</description>
-  <url>https://github.com/seancorfield/honeysql</url>
-  <licenses>
-    <license>
-      <name>Eclipse Public License</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>Sean Corfield</name>
-    </developer>
-    <developer>
-      <name>Justin Kramer</name>
-    </developer>
-  </developers>
-  <scm>
-    <url>https://github.com/seancorfield/honeysql</url>
-    <connection>scm:git:git://github.com/seancorfield/honeysql.git</connection>
-    <developerConnection>scm:git:ssh://git@github.com/seancorfield/honeysql.git</developerConnection>
-  </scm>
-</project>