From 461b9e672d8ab0c9fbfab8e968bf5af316b9ee7d Mon Sep 17 00:00:00 2001
From: Martin Raifer <martin.raifer@heigit.org>
Date: Wed, 7 Feb 2024 11:39:53 +0100
Subject: [PATCH 1/2] chore(dependencies): upgrade postgres to v42.6.0

to match ignite (#521)
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e98282136..7d26e26cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
     <jts.version>1.19.0</jts.version>
     <!-- h2.version has to be in sync with ignite.version -->
     <h2.version>1.4.197</h2.version>
-    <postgresql.version>42.5.4</postgresql.version>
+    <postgresql.version>42.6.0</postgresql.version>
     <slf4j.version>1.7.36</slf4j.version>
     <junit.version>5.9.2</junit.version>
     <jetbrainsannotations.version>24.0.1</jetbrainsannotations.version>

From 70057d6f34388eef52a740a055964ac2dfe51fb0 Mon Sep 17 00:00:00 2001
From: Martin Raifer <martin.raifer@heigit.org>
Date: Wed, 7 Feb 2024 13:39:10 +0100
Subject: [PATCH 2/2] add recent changes to changelog

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 404180cf2..ca5b3aeae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ Changelog
 
 ## 1.3.0-SNAPSHOT (current main)
 
+### other changes
+
+* upgrade dependencies: ignite to v2.16, guava to v33, caffeine to v3.1.8 ([#521]), postgresql to v42.6 ([#523])
+* rename development branch to `main` ([#522])
+
+[#521]: https://github.com/GIScience/oshdb/pull/521
+[#522]: https://github.com/GIScience/oshdb/pull/522
+[#523]: https://github.com/GIScience/oshdb/pull/523
+
 
 ## 1.2.1