Merge branch 'master' into release-5.4

Author: Zhihang Yao

impexp-client-gui/build.gradle

@@ -11,11 +11,11 @@ configurations {
 
 dependencies {
     api project(':impexp-client-cli')
-    api 'com.formdev:flatlaf:3.2.1'
-    api 'com.formdev:flatlaf-extras:3.2.1'
-    api 'com.formdev:flatlaf-swingx:3.2.1'
-    api 'com.fifesoft:rsyntaxtextarea:3.3.4'
-    api 'com.github.vertical-blank:sql-formatter:2.0.4'
+    api 'com.formdev:flatlaf:3.4.1'
+    api 'com.formdev:flatlaf-extras:3.4.1'
+    api 'com.formdev:flatlaf-swingx:3.4.1'
+    api 'com.fifesoft:rsyntaxtextarea:3.4.0'
+    api 'com.github.vertical-blank:sql-formatter:2.0.5'
     api ('org.citydb:swingx-ws:1.1.5') {
         transitive = false
     }

impexp-core/build.gradle

@@ -3,21 +3,21 @@ dependencies {
     api 'info.picocli:picocli:4.7.5'
     api 'org.citydb:sqlbuilder:2.2.1'
     api 'org.citydb:3dcitydb-ade-citygml4j:1.1.3'
-    api 'org.geotools:gt-epsg-extension:28.4'
-    api 'org.geotools:gt-epsg-wkt:28.4'
-    api 'org.geotools:gt-referencing:28.4'
+    api 'org.geotools:gt-epsg-extension:31.0'
+    api 'org.geotools:gt-epsg-wkt:31.0'
+    api 'org.geotools:gt-referencing:31.0'
     api 'org.locationtech.jts:jts-core:1.19.0'
-    api 'org.postgresql:postgresql:42.6.0'
-    api 'net.postgis:postgis-jdbc:2021.1.0'
-    api 'com.oracle.database.jdbc:ojdbc8:21.3.0.0'
-    api 'com.oracle.sdoapi:sdoapi:21.3.0.0'
-    api 'org.apache.tika:tika-core:2.8.0'
+    api 'org.postgresql:postgresql:42.7.3'
+    api 'net.postgis:postgis-jdbc:2023.1.0'
+    api 'com.oracle.database.jdbc:ojdbc11:23.3.0.23.09'
+    api 'com.oracle.sdoapi:sdoapi:23.3.0.0'
+    api 'org.apache.tika:tika-core:2.9.2'
     api 'com.univocity:univocity-parsers:2.9.1'
-    api 'org.slf4j:slf4j-nop:2.0.7'
-    implementation 'com.h2database:h2:2.2.220'
-    implementation 'net.sf.saxon:Saxon-HE:12.3'
-    implementation 'org.apache.tomcat:tomcat-jdbc:10.0.27'
-    implementation 'org.apache.commons:commons-compress:1.24.0'
+    api 'org.slf4j:slf4j-nop:2.0.10'
+    implementation 'com.h2database:h2:2.2.224'
+    implementation 'net.sf.saxon:Saxon-HE:12.4'
+    implementation 'org.apache.tomcat:tomcat-jdbc:10.1.20'
+    implementation 'org.apache.commons:commons-compress:1.26.1'
 }
 
 javadoc {

impexp-core/src/main/java/org/citydb/core/database/adapter/AbstractUtilAdapter.java

@@ -46,9 +46,9 @@
 import org.citydb.core.query.builder.sql.SQLQueryBuilder;
 import org.citydb.sqlbuilder.schema.Table;
 import org.citydb.sqlbuilder.select.Select;
+import org.geotools.api.referencing.FactoryException;
+import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.geotools.referencing.CRS;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
 
 import javax.xml.bind.JAXBException;
 import java.sql.*;

impexp-core/src/main/java/org/citydb/core/file/output/ScatterZipOutputStream.java

@@ -34,7 +34,7 @@
 import org.apache.commons.compress.parallel.InputStreamSupplier;
 import org.apache.commons.compress.parallel.ScatterGatherBackingStore;
 import org.apache.commons.compress.parallel.ScatterGatherBackingStoreSupplier;
-import org.apache.commons.compress.utils.BoundedInputStream;
+import org.apache.commons.io.input.BoundedInputStream;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;