Merge branch 'master' into dev

Author: BFergerson

control/build.gradle.kts

@@ -30,8 +30,8 @@ dependencies {
         isTransitive = false
     }
 
-    implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.3.2")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
+    implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.3.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3")
 
     testImplementation("org.junit.jupiter:junit-jupiter-engine:$jupiterVersion")
     testImplementation("io.vertx:vertx-junit5:$vertxVersion")

services/build.gradle.kts

@@ -22,18 +22,18 @@ dependencies {
         isTransitive = false
     }
     compileOnly("org.apache.skywalking:apm-agent-core:$skywalkingAgentVersion")
-    compileOnly("net.bytebuddy:byte-buddy:1.12.9")
+    compileOnly("net.bytebuddy:byte-buddy:1.12.10")
 
     //implementation("com.google.code.gson:gson:$gsonVersion")
     implementation(files("../.ext/gson-2.8.6-SNAPSHOT.jar"))
-    implementation("org.springframework:spring-expression:5.3.19")
+    implementation("org.springframework:spring-expression:5.3.20")
     implementation("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion")
     implementation("org.jetbrains:annotations:23.0.0")
     testImplementation("junit:junit:4.13.2")
     testImplementation("org.mockito:mockito-core:4.+")
 
-    implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.3.2")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
+    implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.3.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3")
 }
 
 tasks {

settings.gradle

@@ -2,10 +2,10 @@ pluginManagement {
     plugins {
         String kotlinVersion = "1.6.10"
         id 'org.jetbrains.kotlin.jvm' version kotlinVersion apply false
-        id 'com.avast.gradle.docker-compose' version "0.15.2" apply false
+        id 'com.avast.gradle.docker-compose' version "0.16.4" apply false
         id 'io.gitlab.arturbosch.detekt' version "1.20.0" apply false
         id 'com.github.johnrengelman.shadow' version "7.1.2" apply false
-        id 'com.diffplug.spotless' version '6.4.2' apply false
+        id 'com.diffplug.spotless' version '6.6.1' apply false
     }
 }