From 11c03445ec1eac2cf32ac2336519ed56b523673e Mon Sep 17 00:00:00 2001
From: Ian Joiner <iajoiner809@gmail.com>
Date: Thu, 15 Sep 2022 09:31:07 -0400
Subject: [PATCH 1/8] feature complete

---
 dev/release/update_change_log.sh | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/dev/release/update_change_log.sh b/dev/release/update_change_log.sh
index 252cd285d92..5cfc4b817a2 100755
--- a/dev/release/update_change_log.sh
+++ b/dev/release/update_change_log.sh
@@ -36,9 +36,35 @@ SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 SOURCE_TOP_DIR="$(cd "${SOURCE_DIR}/../../" && pwd)"
 
 OUTPUT_PATH="${SOURCE_TOP_DIR}/CHANGELOG.md"
+OLD_OUTPUT_PATH="${SOURCE_TOP_DIR}/CHANGELOG-old.md"
 
 # remove license header so github-changelog-generator has a clean base to append
-sed -i.bak '1,18d' "${OUTPUT_PATH}"
+sed -i.bak '1,21d' "${OUTPUT_PATH}"
+sed -i.bak '1,21d' "${OLD_OUTPUT_PATH}"
+
+# Copy the previous CHANGELOG.md to CHANGELOG-old.md
+echo '<!---
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+# Historical Changelog
+' | cat - "${OUTPUT_PATH}" "${OLD_OUTPUT_PATH}" > "${OLD_OUTPUT_PATH}".tmp
+mv "${OLD_OUTPUT_PATH}".tmp "${OLD_OUTPUT_PATH}"
 
 # use exclude-tags-regex to filter out tags used for object_store
 # crates and only only look at tags that DO NOT begin with `object_store_`
@@ -75,5 +101,7 @@ echo '<!---
   specific language governing permissions and limitations
   under the License.
 -->
+
+# Changelog
 ' | cat - "${OUTPUT_PATH}" > "${OUTPUT_PATH}".tmp
 mv "${OUTPUT_PATH}".tmp "${OUTPUT_PATH}"

From 391971ef814fb3814a37a7e08f0dd438d007e17c Mon Sep 17 00:00:00 2001
From: Ian Joiner <iajoiner809@gmail.com>
Date: Thu, 15 Sep 2022 10:04:42 -0400
Subject: [PATCH 2/8] fix footer issue

---
 dev/release/update_change_log.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev/release/update_change_log.sh b/dev/release/update_change_log.sh
index 5cfc4b817a2..72e0eb95be7 100755
--- a/dev/release/update_change_log.sh
+++ b/dev/release/update_change_log.sh
@@ -29,8 +29,8 @@
 
 set -e
 
-SINCE_TAG="21.0.0"
-FUTURE_RELEASE="22.0.0"
+SINCE_TAG="22.0.0"
+FUTURE_RELEASE="23.0.0"
 
 SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 SOURCE_TOP_DIR="$(cd "${SOURCE_DIR}/../../" && pwd)"
@@ -39,8 +39,11 @@ OUTPUT_PATH="${SOURCE_TOP_DIR}/CHANGELOG.md"
 OLD_OUTPUT_PATH="${SOURCE_TOP_DIR}/CHANGELOG-old.md"
 
 # remove license header so github-changelog-generator has a clean base to append
-sed -i.bak '1,21d' "${OUTPUT_PATH}"
+sed -i.bak '1,20d' "${OUTPUT_PATH}"
 sed -i.bak '1,21d' "${OLD_OUTPUT_PATH}"
+# remove the github-changelog-generator footer from the old CHANGELOG.md
+head -n -5 "${OUTPUT_PATH}" > "${OUTPUT_PATH}".tmp
+mv "${OUTPUT_PATH}".tmp "${OUTPUT_PATH}"
 
 # Copy the previous CHANGELOG.md to CHANGELOG-old.md
 echo '<!---

From 21525b1f6231ab336e1ca068a38ee3c2c3815c32 Mon Sep 17 00:00:00 2001
From: Ian Joiner <iajoiner809@gmail.com>
Date: Thu, 15 Sep 2022 10:06:01 -0400
Subject: [PATCH 3/8] fix duplicate changelog issue

---
 dev/release/update_change_log.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dev/release/update_change_log.sh b/dev/release/update_change_log.sh
index 72e0eb95be7..6bd809e94a6 100755
--- a/dev/release/update_change_log.sh
+++ b/dev/release/update_change_log.sh
@@ -104,7 +104,5 @@ echo '<!---
   specific language governing permissions and limitations
   under the License.
 -->
-
-# Changelog
 ' | cat - "${OUTPUT_PATH}" > "${OUTPUT_PATH}".tmp
 mv "${OUTPUT_PATH}".tmp "${OUTPUT_PATH}"

From ecc6537bcd471bc9d148e367d8c5d797609426ed Mon Sep 17 00:00:00 2001
From: Ian Joiner <iajoiner809@gmail.com>
Date: Thu, 15 Sep 2022 10:10:26 -0400
Subject: [PATCH 4/8] use tac instead of head for head -n -<num> is not
 universal

---
 dev/release/update_change_log.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev/release/update_change_log.sh b/dev/release/update_change_log.sh
index 6bd809e94a6..3a84efffd5a 100755
--- a/dev/release/update_change_log.sh
+++ b/dev/release/update_change_log.sh
@@ -42,8 +42,7 @@ OLD_OUTPUT_PATH="${SOURCE_TOP_DIR}/CHANGELOG-old.md"
 sed -i.bak '1,20d' "${OUTPUT_PATH}"
 sed -i.bak '1,21d' "${OLD_OUTPUT_PATH}"
 # remove the github-changelog-generator footer from the old CHANGELOG.md
-head -n -5 "${OUTPUT_PATH}" > "${OUTPUT_PATH}".tmp
-mv "${OUTPUT_PATH}".tmp "${OUTPUT_PATH}"
+tac "${OUTPUT_PATH}" | sed '1,5 d' | tac > "${OUTPUT_PATH}"
 
 # Copy the previous CHANGELOG.md to CHANGELOG-old.md
 echo '<!---

From 4de86a3627ba5b989a98180ba0c65696b3b2dc2d Mon Sep 17 00:00:00 2001
From: Ian Joiner <iajoiner809@gmail.com>
Date: Thu, 15 Sep 2022 10:20:59 -0400
Subject: [PATCH 5/8] adjust blank lines

---
 dev/release/update_change_log.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/release/update_change_log.sh b/dev/release/update_change_log.sh
index 3a84efffd5a..18be3cce939 100755
--- a/dev/release/update_change_log.sh
+++ b/dev/release/update_change_log.sh
@@ -39,10 +39,10 @@ OUTPUT_PATH="${SOURCE_TOP_DIR}/CHANGELOG.md"
 OLD_OUTPUT_PATH="${SOURCE_TOP_DIR}/CHANGELOG-old.md"
 
 # remove license header so github-changelog-generator has a clean base to append
-sed -i.bak '1,20d' "${OUTPUT_PATH}"
+sed -i.bak '1,21d' "${OUTPUT_PATH}"
 sed -i.bak '1,21d' "${OLD_OUTPUT_PATH}"
 # remove the github-changelog-generator footer from the old CHANGELOG.md
-tac "${OUTPUT_PATH}" | sed '1,5 d' | tac > "${OUTPUT_PATH}"
+tac "${OUTPUT_PATH}" | sed '1,3 d' | tac > "${OUTPUT_PATH}"
 
 # Copy the previous CHANGELOG.md to CHANGELOG-old.md
 echo '<!---

From bbb5ab2103fef47ae4a7a0ef7b1c666614bb41c9 Mon Sep 17 00:00:00 2001
From: Ian Joiner <iajoiner809@gmail.com>
Date: Thu, 15 Sep 2022 10:44:34 -0400
Subject: [PATCH 6/8] fix footer dropping

---
 dev/release/update_change_log.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/release/update_change_log.sh b/dev/release/update_change_log.sh
index 18be3cce939..ef2480a36ed 100755
--- a/dev/release/update_change_log.sh
+++ b/dev/release/update_change_log.sh
@@ -42,7 +42,8 @@ OLD_OUTPUT_PATH="${SOURCE_TOP_DIR}/CHANGELOG-old.md"
 sed -i.bak '1,21d' "${OUTPUT_PATH}"
 sed -i.bak '1,21d' "${OLD_OUTPUT_PATH}"
 # remove the github-changelog-generator footer from the old CHANGELOG.md
-tac "${OUTPUT_PATH}" | sed '1,3 d' | tac > "${OUTPUT_PATH}"
+LINE_COUNT=$(wc -l <"${OUTPUT_PATH}")
+sed -i.bak2 "$(( $LINE_COUNT-3+1 )),$ d" "${OUTPUT_PATH}"
 
 # Copy the previous CHANGELOG.md to CHANGELOG-old.md
 echo '<!---

From 754eec2f3411564cad45b8984a73f514c11afb78 Mon Sep 17 00:00:00 2001
From: Ian Joiner <iajoiner809@gmail.com>
Date: Thu, 15 Sep 2022 10:49:12 -0400
Subject: [PATCH 7/8] line adj

---
 dev/release/update_change_log.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/release/update_change_log.sh b/dev/release/update_change_log.sh
index ef2480a36ed..a3af50a8a6e 100755
--- a/dev/release/update_change_log.sh
+++ b/dev/release/update_change_log.sh
@@ -43,7 +43,7 @@ sed -i.bak '1,21d' "${OUTPUT_PATH}"
 sed -i.bak '1,21d' "${OLD_OUTPUT_PATH}"
 # remove the github-changelog-generator footer from the old CHANGELOG.md
 LINE_COUNT=$(wc -l <"${OUTPUT_PATH}")
-sed -i.bak2 "$(( $LINE_COUNT-3+1 )),$ d" "${OUTPUT_PATH}"
+sed -i.bak2 "$(( $LINE_COUNT-4+1 )),$ d" "${OUTPUT_PATH}"
 
 # Copy the previous CHANGELOG.md to CHANGELOG-old.md
 echo '<!---

From cd4b0d3a233439a23c121807bc38a25ab150c2b6 Mon Sep 17 00:00:00 2001
From: Ian Joiner <iajoiner809@gmail.com>
Date: Thu, 15 Sep 2022 11:16:01 -0400
Subject: [PATCH 8/8] add .bak2 to gitignore

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 2a21776aa54..b8506ea06cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,7 @@ __blobstorage__
 
 # .bak files
 *.bak
-
+*.bak2
 # OS-specific .gitignores
 
 # Mac .gitignore