From cf5560637fcb278acefb71b51dc3c84f503ce3f0 Mon Sep 17 00:00:00 2001 From: Claus Nagel Date: Mon, 15 Jul 2024 13:13:36 +0200 Subject: [PATCH 1/6] updated citygml4j --- citydb-io-citygml/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/citydb-io-citygml/build.gradle b/citydb-io-citygml/build.gradle index 54d72cb3..6cd45179 100644 --- a/citydb-io-citygml/build.gradle +++ b/citydb-io-citygml/build.gradle @@ -1,4 +1,4 @@ -def citygml4j_version = '3.2.1-SNAPSHOT' +def citygml4j_version = '3.2.1' dependencies { api project(':citydb-logging') From 4395f77ba504730fe5a1a9c28ea7d17045d41d24 Mon Sep 17 00:00:00 2001 From: Claus Nagel Date: Mon, 15 Jul 2024 13:28:59 +0200 Subject: [PATCH 2/6] just use citydb-tool as app name --- citydb-cli/build.gradle | 6 +++--- properties.gradle | 3 +-- resources/license/LICENSE.txt | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/citydb-cli/build.gradle b/citydb-cli/build.gradle index 6b07df6d..c0e0fb0a 100644 --- a/citydb-cli/build.gradle +++ b/citydb-cli/build.gradle @@ -50,7 +50,7 @@ application { distributions { main { - distributionBaseName = project.appDistName + distributionBaseName = project.appName contents { into('license') { from "$rootDir/resources/license/APACHE-2.0.txt" @@ -71,7 +71,7 @@ distributions { tasks.register('buildBundle', Zip) { dependsOn installDist - from "$projectDir/build/install/$project.appDistName" + from "$projectDir/build/install/$project.appName" destinationDirectory = distZip.destinationDirectory.get() - archiveFileName = project.appDistName + '-' + project.version + '.zip' + archiveFileName = project.appName + '-' + project.version + '.zip' } \ No newline at end of file diff --git a/properties.gradle b/properties.gradle index 572eb685..35b8cbc7 100644 --- a/properties.gradle +++ b/properties.gradle @@ -1,8 +1,7 @@ ext { date = new Date() - appName = '3D City Database Command-Line Tool' - appDistName = '3DCityDB-Command-Line-Tool' + appName = 'citydb-tool' appCliCommand = 'citydb' appDescription = 'Command-line tool for the 3D City Database' appWebsiteUrl = 'https://github.com/3dcitydb' diff --git a/resources/license/LICENSE.txt b/resources/license/LICENSE.txt index a30fba28..97730636 100644 --- a/resources/license/LICENSE.txt +++ b/resources/license/LICENSE.txt @@ -1,4 +1,4 @@ -The @name@ is free software. +@name@ is free software. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this software except in compliance with the License. From 5a9713cda65eee3106992627ab443d8c1c815504 Mon Sep 17 00:00:00 2001 From: Claus Nagel Date: Mon, 15 Jul 2024 13:29:43 +0200 Subject: [PATCH 3/6] bumping version to 0.8.0-beta --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 83f4b05a..9521213d 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { apply from: 'properties.gradle' -version '0.7.1-beta' +version '0.8.0-beta' allprojects { group 'org.citydb' From d3b5887ed924cf07bbe8b4542023e7369d003946 Mon Sep 17 00:00:00 2001 From: Claus Nagel Date: Mon, 15 Jul 2024 13:36:34 +0200 Subject: [PATCH 4/6] fixed app path in Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7189c520..714da5ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ ARG CITYDB_TOOL_VERSION ENV CITYDB_TOOL_VERSION=${CITYDB_TOOL_VERSION} # Copy from builder -COPY --from=builder /build/citydb-cli/build/install/3DCityDB-Command-Line-Tool /opt/citydb-tool +COPY --from=builder /build/citydb-cli/build/install/citydb-tool /opt/citydb-tool # Run as non-root user, put start script in path and set permissions RUN groupadd --gid 1000 -r citydb-tool && \ From e95c69ec76bda6a7ba54f650aa29424a49d96ac0 Mon Sep 17 00:00:00 2001 From: Claus Nagel Date: Mon, 15 Jul 2024 14:00:08 +0200 Subject: [PATCH 5/6] updated sqlbuilder --- citydb-database/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/citydb-database/build.gradle b/citydb-database/build.gradle index a1d1907c..95f754dc 100644 --- a/citydb-database/build.gradle +++ b/citydb-database/build.gradle @@ -5,7 +5,7 @@ dependencies { api project(':citydb-config') api project(':citydb-logging') api project(':citydb-model') - api 'org.citydb:sqlbuilder:3.0.0-SNAPSHOT' + api 'org.citydb:sqlbuilder:3.0.0' api "org.geotools:gt-referencing:$geotools_version" implementation 'org.apache.tomcat:tomcat-jdbc:10.1.25' implementation "org.geotools:gt-epsg-wkt:$geotools_version" From 42b9ea81187f61c533117f05c5aa65149b6b49aa Mon Sep 17 00:00:00 2001 From: Claus Nagel Date: Fri, 19 Jul 2024 09:31:55 +0200 Subject: [PATCH 6/6] set autoCommit to false by default --- .../src/main/java/org/citydb/database/DatabaseManager.java | 3 ++- citydb-database/src/main/java/org/citydb/database/Pool.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/citydb-database/src/main/java/org/citydb/database/DatabaseManager.java b/citydb-database/src/main/java/org/citydb/database/DatabaseManager.java index 34f7fce7..c1c4f61e 100644 --- a/citydb-database/src/main/java/org/citydb/database/DatabaseManager.java +++ b/citydb-database/src/main/java/org/citydb/database/DatabaseManager.java @@ -83,7 +83,8 @@ public void connect(ConnectionDetails connectionDetails, DatabaseAdapterManager connection.getDatabase())); properties.setInitialSize(0); - properties.setDefaultAutoCommit(true); + properties.setDefaultAutoCommit(false); + properties.setRollbackOnReturn(true); dataSource = new DataSource(properties); dataSource.setLoginTimeout(connection.getPoolOptions() diff --git a/citydb-database/src/main/java/org/citydb/database/Pool.java b/citydb-database/src/main/java/org/citydb/database/Pool.java index 2c841542..1a20676e 100644 --- a/citydb-database/src/main/java/org/citydb/database/Pool.java +++ b/citydb-database/src/main/java/org/citydb/database/Pool.java @@ -46,6 +46,6 @@ public Connection getConnection(boolean autoCommit) throws SQLException { } public Connection getConnection() throws SQLException { - return getConnection(true); + return getConnection(false); } }