Merge branch 'main' into feature-lod-query-filter

3dcitydb · Jul 19, 2024 · 879317f · 879317f
2 parents 897097a + 42b9ea8
commit 879317f
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git 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 && \

diff --git 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'

diff --git 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'
 }
diff --git 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"

diff --git 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
@@ -46,6 +46,6 @@ public Connection getConnection(boolean autoCommit) throws SQLException {
     }
 
     public Connection getConnection() throws SQLException {
-        return getConnection(true);
+        return getConnection(false);
     }
 }
diff --git 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')

diff --git 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
@@ -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.