From 27422a8a99ff1c6c744a9c7f282c07d7d1304cb2 Mon Sep 17 00:00:00 2001
From: Zac Sweers <pandanomic@gmail.com>
Date: Thu, 2 Nov 2023 15:31:47 -0400
Subject: [PATCH] Prepare for release 2.4.0.

---
 CHANGELOG.md      | 8 ++++++++
 gradle.properties | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a62265..3fd860f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 Changelog
 =========
 
+2.4.0
+-----
+
+_2023-11-02_
+
+- **New**: Upstream `MergeSarifReports`, a CLI for merging (lint and detekt) sarif reports from project build directories. We use this in our CI to merge all the reports from all the modules into one report.
+- **Fix**: Only use relative paths in lint baseline merged sarifs.
+
 2.3.1
 -----
 
diff --git a/gradle.properties b/gradle.properties
index 544235a..67d41d6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ POM_NAME=Kotlin CLI Util
 POM_ARTIFACT_ID=kotlin-cli-util
 POM_PACKAGING=jar
 GROUP=com.slack.cli
-VERSION_NAME=2.4.0-SNAPSHOT
+VERSION_NAME=2.4.0
 POM_DESCRIPTION=Kotlin CLI utilities, mostly intended for use with Clikt.
 POM_URL=https://github.com/slackhq/kotlin-cli-util/
 POM_SCM_URL=https://github.com/slackhq/kotlin-cli-util/