From 14417de6779f95408b7282f8f269cbc730f293c4 Mon Sep 17 00:00:00 2001
From: Claus Nagel <cnagel@virtualcitysystems.de>
Date: Fri, 5 Jan 2024 08:52:29 +0100
Subject: [PATCH 1/3] fixed exception when dropping empty cache tables

(cherry picked from commit 4484b4f9ec3b48327ca07c480b5917bdcd0b4cea)
---
 .../core/operation/common/cache/CacheTableManager.java       | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/impexp-core/src/main/java/org/citydb/core/operation/common/cache/CacheTableManager.java b/impexp-core/src/main/java/org/citydb/core/operation/common/cache/CacheTableManager.java
index 075b6bea6..c3a45fb0d 100644
--- a/impexp-core/src/main/java/org/citydb/core/operation/common/cache/CacheTableManager.java
+++ b/impexp-core/src/main/java/org/citydb/core/operation/common/cache/CacheTableManager.java
@@ -140,11 +140,6 @@ private void dropIf(Predicate<AbstractCacheTable> filter, Map<CacheTableModel, ?
 	}
 
 	public synchronized void dropAll() throws SQLException {
-		// rollback transactions
-		for (Cache cache : caches.values()) {
-			cache.connection.rollback();
-		}
-
 		// drop cache and branch tables in case they have not
 		// been deleted automatically by the previous rollback
 		for (CacheTable cacheTable : cacheTables.values()) {

From 573d1850cb84e5e91333fcb80ceaa5f03af713d5 Mon Sep 17 00:00:00 2001
From: Zhihang Yao <zyao@virtualcitysystems.de>
Date: Fri, 19 Jan 2024 15:59:03 +0100
Subject: [PATCH 2/3] bumping version to 5.4.1

---
 CHANGES.md   | 5 +++++
 README.md    | 4 ++--
 build.gradle | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index fb8acaf87..5f6c6cc67 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,10 @@
 Change Log
 ==========
+### 5.4.1 - 2024-01-19
+
+#### Fixes
+* Fixed exception when dropping empty cache tables.
+
 ### 5.4.0 - 2023-09-21
 
 #### Additions
diff --git a/README.md b/README.md
index 05ae3446b..9adf1bd41 100644
--- a/README.md
+++ b/README.md
@@ -47,9 +47,9 @@ previous release of the 3D City Database Importer/Exporter under Apache License
 
 Latest release
 --------------
-The latest stable release of the 3D City Database Importer/Exporter is 5.4.0.
+The latest stable release of the 3D City Database Importer/Exporter is 5.4.1.
 
-Download the software [here](https://github.com/3dcitydb/importer-exporter/releases/download/v5.4.0/3DCityDB-Importer-Exporter-5.4.0.zip).
+Download the software [here](https://github.com/3dcitydb/importer-exporter/releases/download/v5.4.1/3DCityDB-Importer-Exporter-5.4.1.zip).
 Previous releases are available from the [releases section](https://github.com/3dcitydb/importer-exporter/releases).
 
 System requirements
diff --git a/build.gradle b/build.gradle
index 02ee4f4d3..b06767f40 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 apply from: 'properties.gradle'
 
-version '5.4.0'
+version '5.4.1'
 
 subprojects {
     apply plugin: 'java-library'

From cfbfbcbff6da308bad1d809dba6355c51de28463 Mon Sep 17 00:00:00 2001
From: Zhihang Yao <zyao@virtualcitysystems.de>
Date: Fri, 19 Jan 2024 16:09:27 +0100
Subject: [PATCH 3/3] fixed build.gradle

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

diff --git a/build.gradle b/build.gradle
index b06767f40..66a55d37b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -104,7 +104,7 @@ subprojects {
         }
         repositories {
             maven {
-                url 'https://3dcitydb.org/maven'
+                url project.hasProperty('gitLab_maven_url') ? project.property('gitLab_maven_url') : System.getenv('GITLAB_MAVEN_URL')
                 name 'gitlab-maven'
                 credentials(HttpHeaderCredentials) {
                     name = 'Private-Token'