Merge pull request #1910 from scireum/feature/ymo/SIRI-920-dependencies

Update some dependencies
scireum · Dec 21, 2023 · 1c0f210 · 1c0f210
2 parents 1ee3c82 + e48d198
commit 1c0f210
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.scireum</groupId>
         <artifactId>sirius-parent</artifactId>
-        <version>11.2.0</version>
+        <version>11.5.0</version>
     </parent>
     <artifactId>sirius-biz</artifactId>
     <version>DEVELOPMENT-SNAPSHOT</version>
@@ -17,9 +17,9 @@
     <url>http://www.sirius-lib.net</url>
 
     <properties>
-        <sirius.kernel>dev-41.0.0</sirius.kernel>
-        <sirius.web>dev-74.8.0</sirius.web>
-        <sirius.db>dev-56.2.0</sirius.db>
+        <sirius.kernel>dev-42.0.0</sirius.kernel>
+        <sirius.web>dev-75.0.0</sirius.web>
+        <sirius.db>dev-57.0.0</sirius.db>
     </properties>
 
     <repositories>
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>3.0.6</version>
+            <version>3.3.1</version>
         </dependency>
         <dependency>
             <groupId>com.clickhouse</groupId>
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.13</version>
+            <version>1.16.0</version>
         </dependency>
 
         <!-- Required as the version brought by clickhouse-jdbc contains security issues -->
@@ -98,13 +98,13 @@
         <dependency>
             <groupId>org.codelibs</groupId>
             <artifactId>jcifs</artifactId>
-            <version>2.1.32</version>
+            <version>2.1.37</version>
         </dependency>
         <!-- Required as the version provided by jcifs has security issues -->
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.70</version>
+            <artifactId>bcprov-jdk18on</artifactId>
+            <version>1.77</version>
         </dependency>
 
         <dependency>
@@ -131,27 +131,27 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-s3</artifactId>
-            <version>1.12.272</version>
+            <version>1.12.610</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
             <version>2.3.1</version>
         </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.11.0</version>
-        </dependency>
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
-            <version>3.9.0</version>
+            <version>3.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.rometools</groupId>
             <artifactId>rome</artifactId>
-            <version>1.18.0</version>
+            <version>2.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>2.0</version>
         </dependency>
 
         <dependency>

diff --git a/src/main/java/sirius/biz/storage/layer3/uplink/util/UplinkConnectorPool.java b/src/main/java/sirius/biz/storage/layer3/uplink/util/UplinkConnectorPool.java
@@ -93,7 +93,7 @@ private GenericObjectPool<UplinkConnector<?>> createPool(UplinkConnectorConfig<?
         uplinkConnectorFactory.linkToPool(pool);
         pool.setMaxIdle(uplinkConnectorConfig.maxIdle);
         pool.setMaxTotal(uplinkConnectorConfig.maxActive);
-        pool.setTimeBetweenEvictionRuns(TIME_BETWEEN_EVICTION_RUNS);
+        pool.setDurationBetweenEvictionRuns(TIME_BETWEEN_EVICTION_RUNS);
         pool.setNumTestsPerEvictionRun(NUM_TESTS_PER_EVICTION_RUN);
         pool.setTestOnBorrow(true);
         pool.setTestWhileIdle(true);

diff --git a/src/main/java/sirius/biz/util/ExtractedFileBuffer.java b/src/main/java/sirius/biz/util/ExtractedFileBuffer.java
@@ -46,7 +46,9 @@ class ExtractedFileBuffer {
      * @param tempFilePrefix    the prefix of the temporary file which will be created if the memory threshold is reached
      */
     ExtractedFileBuffer(int memoryThreshold, int initialBufferSize, String tempFilePrefix) {
-        buffer = new DeferredFileOutputStream(memoryThreshold, initialBufferSize, tempFilePrefix, null, null);
+        DeferredFileOutputStream.Builder builder = new DeferredFileOutputStream.Builder();
+        builder.setThreshold(memoryThreshold).setBufferSize(initialBufferSize).setPrefix(tempFilePrefix);
+        buffer = builder.get();
     }
 
     /**