Merge branch 'no-redisson-shutdown' into 'master'

Bump versions, remove redisson, graceful shutdown

See merge request videocore/encore!155

Author: fhermansson

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+insert_final_newline = true
+
+[{*.kt,*.kts}]
+ktlint_code_style = intellij_idea
+ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
+
+#  Disable wildcard imports entirely
+ij_kotlin_name_count_to_use_star_import = 2147483647
+ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
+ij_kotlin_packages_to_use_import_on_demand = unset

.github/workflows/publishjar.yml

@@ -18,15 +18,20 @@ jobs:
       - name: Set up GraalVm
         uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'graalvm-community'
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
       - name: Build jars and native images with Gradle
-        run: ./gradlew build nativeCompile -x test
+        run: |
+          export LC_ALL=C.UTF-8
+          export LANG=C.UTF-8
+          export NATIVE_IMAGE_CONFIG_FILE="$(pwd)/native-image.properties"
+          echo 'NativeImageArgs = -J-Xmx14G -H:+AddAllCharsets -J-Dfile.encoding=UTF-8' > $NATIVE_IMAGE_CONFIG_FILE
+          ./gradlew build nativeCompile -x test
       
       - name: Release Jars and native images
         uses: softprops/action-gh-release@v1

.gitlab-ci.yml

@@ -1,3 +1,3 @@
 include:
   - project: 'videocore/gitlab-templates'
-    file: 'encore.yml'
+    file: 'encore.yml'

.idea/compiler.xml

@@ -8,7 +8,7 @@
  
  
 
-SVT *Encore* is a scalable video transcoding tool, built on Open Source giants like [FFmpeg](https://www.ffmpeg.org/) and [Redisson](https://github.com/redisson).
+SVT *Encore* is a scalable video transcoding tool, built on Open Source giants like [FFmpeg](https://www.ffmpeg.org/) and [Spring Boot](https://spring.io/projects/spring-boot).
 
 
 *Encore* was created to scale, and abstract the transcoding _power of FFmpeg_, and to offer a simple solution for Transcoding - Transcoding-as-a-Service.
@@ -34,7 +34,6 @@ _Built with_
 * Gradle
 * Spring Boot
 * FFmpeg
-* Redisson
 * and many other great projects
 
 ## Documentation

.idea/vcs.xml

@@ -7,18 +7,17 @@ repositories {
     gradlePluginPortal()
 }
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
+
 dependencies {
-    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.9.10"))
-    implementation(platform("org.springframework.boot:spring-boot-dependencies:3.1.3"))
-    implementation(platform("org.springframework.cloud:spring-cloud-dependencies:2022.0.4"))
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin")
-    implementation("org.jetbrains.kotlin:kotlin-allopen")
-    implementation("org.springframework.boot:spring-boot-gradle-plugin:3.1.3")
-    implementation("org.jmailen.gradle:kotlinter-gradle:3.13.0")
-    implementation("pl.allegro.tech.build:axion-release-plugin:1.14.3")
-    implementation("org.graalvm.buildtools:native-gradle-plugin:0.9.25")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25")
+    implementation("org.jetbrains.kotlin:kotlin-allopen:1.9.25")
+    implementation("org.springframework.boot:spring-boot-gradle-plugin:3.4.3")
+    implementation("io.spring.gradle:dependency-management-plugin:1.1.5")
+    implementation("org.jmailen.gradle:kotlinter-gradle:4.4.1")
+    implementation("pl.allegro.tech.build:axion-release-plugin:1.18.8")
+    implementation("org.graalvm.buildtools:native-gradle-plugin:0.10.5")
     implementation("com.github.fhermansson:assertj-gradle-plugin:1.1.5")
-    implementation("se.ascp.gradle:gradle-versions-filter:0.1.16")
+    implementation("com.github.ben-manes:gradle-versions-plugin:0.51.0")
 }

README.md

@@ -1,3 +1,6 @@
+import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     idea
     jacoco
@@ -6,7 +9,8 @@ plugins {
     id("pl.allegro.tech.build.axion-release")
     id("com.github.fhermansson.assertj-generator")
     id("org.jmailen.kotlinter")
-    id("se.ascp.gradle.gradle-versions-filter")
+    id("com.github.ben-manes.versions")
+    id("io.spring.dependency-management")
 }
 
 group = "se.svt.oss"
@@ -21,21 +25,32 @@ repositories {
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
+    compilerOptions {
+        freeCompilerArgs.addAll("-Xjsr305=strict")
+    }
+}
+
+fun isNonStable(version: String): Boolean {
+    val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase().contains(it) }
+    val regex = "^[0-9,.v-]+(-r)?$".toRegex()
+    val isStable = stableKeyword || regex.matches(version)
+    return isStable.not()
 }
+
+tasks.withType<DependencyUpdatesTask> {
+    rejectVersionIf {
+        isNonStable(candidate.version)
+    }
+}
+
 tasks.lintKotlinTest {
     source = (source - fileTree("src/test/generated-java")).asFileTree
 }
 tasks.formatKotlinTest {
     source = (source - fileTree("src/test/generated-java")).asFileTree
 }
-kotlinter {
-    disabledRules = arrayOf(
-        "import-ordering",
-        "trailing-comma-on-declaration-site",
-        "trailing-comma-on-call-site"
-    )
-}
+
 assertjGenerator {
     classOrPackageNames = arrayOf(
         "se.svt.oss.encore.model",
@@ -44,20 +59,24 @@ assertjGenerator {
     entryPointPackage = "se.svt.oss.encore"
     useJakartaAnnotations = true
 }
-
-val redissonVersion = "3.23.2"
-
+tasks.test {
+    jvmArgs("-XX:+EnableDynamicAgentLoading")
+}
+dependencyManagement {
+    imports {
+        mavenBom("org.springframework.boot:spring-boot-dependencies:3.4.3")
+        mavenBom("org.springframework.cloud:spring-cloud-dependencies:2024.0.0")
+    }
+}
 dependencies {
-    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.9.10"))
-    implementation(platform("org.springframework.boot:spring-boot-dependencies:3.1.3"))
-    implementation(platform("org.springframework.cloud:spring-cloud-dependencies:2022.0.4"))
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
-    implementation("io.github.microutils:kotlin-logging:3.0.5")
-    implementation("org.redisson:redisson-spring-boot-starter:$redissonVersion")
-    implementation("org.redisson:redisson-spring-data-31:$redissonVersion") // match boot version
-    testImplementation("org.springframework.boot:spring-boot-starter-test")
+    implementation("io.github.oshai:kotlin-logging-jvm:7.0.5")
+    implementation("org.springframework.boot:spring-boot-starter-data-redis")
+    testImplementation("org.springframework.boot:spring-boot-starter-test") {
+        exclude(group = "org.mockito")
+    }
     testImplementation("org.assertj:assertj-core")
-    testImplementation("io.mockk:mockk:1.13.7")
+    testImplementation("io.mockk:mockk:1.13.17")
 }
 
 

buildSrc/build.gradle.kts

@@ -4,17 +4,28 @@ plugins {
     kotlin("plugin.spring")
     id("org.springframework.boot")
     id("org.graalvm.buildtools.native")
+    id("io.spring.dependency-management")
 }
 
+graalvmNative {
+    binaries.all {
+        buildArgs.add("--strict-image-heap")
+    }
+}
 tasks.named<BootJar>("bootJar") {
     archiveClassifier.set("boot")
 }
-
+dependencyManagement {
+    imports {
+        mavenBom("org.springframework.boot:spring-boot-dependencies:3.4.3")
+        mavenBom("org.springframework.cloud:spring-cloud-dependencies:2024.0.0")
+    }
+}
 dependencies {
     implementation("org.springframework.boot:spring-boot-starter")
     implementation("org.springframework.cloud:spring-cloud-starter-config")
     implementation("org.springframework.boot:spring-boot-starter-logging")
-    implementation("net.logstash.logback:logstash-logback-encoder:7.4")
+    implementation("net.logstash.logback:logstash-logback-encoder:8.0")
 }
 
 

buildSrc/src/main/kotlin/encore.kotlin-conventions.gradle.kts

@@ -11,6 +11,10 @@ jacocoTestCoverageVerification {
                     '*.static {...}',
                     '*.model.*.get*',
                     '*.service.localencode.LocalEncodeService.moveFile*',
+                    '*QueueService.getQueue*',
+                    '*QueueService.migrateQueues()',
+                    '*.ShutdownHandler.*',
+                    '*FfmpegExecutor.runFfmpeg$lambda$7(java.lang.Process)',
             ]
             limit {
                 counter = 'LINE'

buildSrc/src/main/kotlin/encore.spring-boot-app-conventions.gradle.kts

@@ -5,26 +5,27 @@ plugins {
 
 dependencies {
 
-    api("se.svt.oss:media-analyzer:2.0.4")
+    api("se.svt.oss:media-analyzer:2.0.7")
     implementation(kotlin("reflect"))
 
-    compileOnly("org.springdoc:springdoc-openapi-starter-webmvc-api:2.2.0")
+    compileOnly("org.springdoc:springdoc-openapi-starter-webmvc-api:2.6.0")
     compileOnly("org.springframework.data:spring-data-rest-core")
+    compileOnly("org.springframework.boot:spring-boot-starter-validation")
     implementation("org.springframework.boot:spring-boot-starter-webflux")
-    implementation("org.springframework.boot:spring-boot-starter-validation")
+    implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
 
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.7.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-slf4j")
 
     testImplementation(project(":encore-web"))
     testImplementation("org.springframework.security:spring-security-test")
     testImplementation("org.awaitility:awaitility")
-    testImplementation("com.github.tomakehurst:wiremock-jre8-standalone:2.35.0")
-    testImplementation("org.springframework.boot:spring-boot-starter-webflux")
+    testImplementation("org.wiremock:wiremock-standalone:3.12.1")
     testImplementation("org.springframework.boot:spring-boot-starter-data-rest")
-    testFixturesImplementation(platform("org.springframework.boot:spring-boot-dependencies:3.1.3"))
-    testFixturesImplementation("com.redis:testcontainers-redis:2.2.0")
+    testFixturesImplementation(platform("org.springframework.boot:spring-boot-dependencies:3.4.3"))
+    testFixturesImplementation("com.redis:testcontainers-redis:2.2.4")
     testFixturesImplementation("io.github.microutils:kotlin-logging:3.0.5")
     testFixturesImplementation("org.junit.jupiter:junit-jupiter-api")
+    testFixturesRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 

checks.gradle

@@ -21,7 +21,7 @@ class ClientConfiguration {
         val webClient = WebClient.builder()
             .defaultHeader(HttpHeaders.USER_AGENT, userAgent)
             .build()
-        return HttpServiceProxyFactory.builder(WebClientAdapter.forClient(webClient))
+        return HttpServiceProxyFactory.builderFor(WebClientAdapter.create(webClient))
             .build()
             .createClient(CallbackClient::class.java)
     }

encore-common/build.gradle.kts

@@ -13,18 +13,19 @@ import se.svt.oss.encore.config.EncoreProperties
 
 class EncoreRuntimeHints : RuntimeHintsRegistrar {
     override fun registerHints(hints: RuntimeHints, classLoader: ClassLoader?) {
+        hints.resources().registerPattern("migrate_queue_script.lua")
         hints.reflection()
             .registerType(
                 EncoreProperties::class.java,
                 MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
             )
             .registerType(
                 EncodingProperties::class.java,
-                MemberCategory.INVOKE_DECLARED_CONSTRUCTORS
+                MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
             )
             .registerType(
                 AudioMixPreset::class.java,
-                MemberCategory.INVOKE_DECLARED_CONSTRUCTORS
+                MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
             )
     }
 }