Updated dependencies

Author: blootsvoets

Dockerfile

@@ -10,7 +10,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gradle:6.6.1-jdk11 AS builder
+FROM gradle:6.7.1-jdk11 AS builder
 
 RUN mkdir /code
 WORKDIR /code

build.gradle

@@ -4,7 +4,7 @@ plugins {
     id 'com.jfrog.bintray' version '1.8.5'
     id 'maven-publish'
     id "org.jetbrains.dokka"
-    id 'com.avast.gradle.docker-compose' version "0.13.4"
+    id 'com.avast.gradle.docker-compose' version "0.14.0"
 }
 
 group 'org.radarbase'
@@ -18,16 +18,16 @@ ext {
     githubUrl = "https://github.com/${githubRepoName}"
     issueUrl = "${githubUrl}/issues"
 
-    avroVersion = '1.10.0'
-    jacksonVersion = '2.11.3'
+    avroVersion = '1.10.1'
+    jacksonVersion = '2.12.0'
     hadoopVersion = '3.3.0'
     jCommanderVersion = '1.78'
     almworksVersion = '1.1.2'
-    junitVersion = '5.6.2'
-    minioVersion = '7.1.4'
-    jedisVersion = '3.3.0'
+    junitVersion = '5.7.0'
+    minioVersion = '8.0.3'
+    jedisVersion = '3.4.0'
     slf4jVersion = '1.7.30'
-    azureStorageVersion = '12.8.0'
+    azureStorageVersion = '12.9.0'
 }
 
 repositories {
@@ -142,6 +142,7 @@ task integrationTest(type: Test) {
         showStandardStreams = true
         setExceptionFormat("full")
     }
+    outputs.upToDateWhen { false }
     shouldRunAfter test
 }
 
@@ -250,5 +251,5 @@ bintray {
 }
 
 wrapper {
-    gradleVersion '6.6.1'
+    gradleVersion '6.7.1'
 }

docker-compose.yml

@@ -10,7 +10,7 @@ services:
       - /data
 
   redis:
-    image: bitnami/redis
+    image: bitnami/redis:6.0
     ports:
       - "6379:6379"
     environment:

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/integrationTest/java/org/radarbase/output/RestructureS3IntegrationTest.kt

@@ -1,7 +1,7 @@
 package org.radarbase.output
 
 import io.minio.*
-import io.minio.PutObjectOptions.MAX_PART_SIZE
+import io.minio.ObjectWriteArgs.MAX_PART_SIZE
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.radarbase.output.config.*

src/main/java/org/radarbase/output/cleaner/SourceDataCleaner.kt

@@ -93,7 +93,7 @@ class SourceDataCleaner(
                 .take(maxFilesPerTopic)
                 .takeWhile { !isClosed.get() }
                 .count { file ->
-                    val extractionSuccessful = if (extractionCheck.isExtracted(file)) {
+                    if (extractionCheck.isExtracted(file)) {
                         logger.info("Removing {}", file.path)
                         Timer.time("cleaner.delete") {
                             sourceStorage.delete(file.path)
@@ -105,7 +105,6 @@ class SourceDataCleaner(
                         accountant.remove(file.range.mapRange { it.ensureToOffset() })
                         false
                     }
-                    extractionSuccessful
                 }
     }
 
@@ -122,4 +121,3 @@ class SourceDataCleaner(
         private val logger = LoggerFactory.getLogger(SourceDataCleaner::class.java)
     }
 }
-

src/main/java/org/radarbase/output/target/S3TargetStorage.kt

@@ -55,9 +55,9 @@ class S3TargetStorage(config: S3Config) : TargetStorage {
     override fun status(path: Path): TargetStorage.PathStatus? {
         return try {
             s3Client.statObject(StatObjectArgs.Builder().objectBuild(bucket, path))
-                    .let { TargetStorage.PathStatus(it.length()) }
+                    .let { TargetStorage.PathStatus(it.size()) }
         } catch (ex: ErrorResponseException) {
-            if (ex.errorResponse().errorCode() == ErrorCode.NO_SUCH_KEY || ex.errorResponse().errorCode() == ErrorCode.NO_SUCH_OBJECT) {
+            if (ex.errorResponse().code() == "NoSuchKey" || ex.errorResponse().code() == "ResourceNotFound") {
                 null
             } else {
                 throw ex