Merge branch '1.11.x'

jonatan-ivanov · Oct 6, 2023 · 10eb80f · 10eb80f
2 parents 105d6a7 + 0a7d6d5
commit 10eb80f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ awaitility = "4.2.0"
 # legacy SDK
 aws-cloudwatch = "1.12.564"
 caffeine = "2.9.3"
-cloudwatch2 = "2.20.160"
+cloudwatch2 = "2.20.161"
 colt = "1.2.0"
 dagger = "2.48.1"
 dropwizard-metrics = "4.2.20"
@@ -102,7 +102,7 @@ dynatraceUtils = { module = "com.dynatrace.metric.util:dynatrace-metric-utils-ja
 ehcache2 = { module = "net.sf.ehcache:ehcache", version.ref = "ehcache2" }
 ehcache3 = { module = "org.ehcache:ehcache", version.ref = "ehcache3" }
 felixFramework = "org.apache.felix:org.apache.felix.framework:7.0.5"
-felixScr = "org.apache.felix:org.apache.felix.scr:2.2.2"
+felixScr = "org.apache.felix:org.apache.felix.scr:2.2.6"
 gmetric4j = { module = "info.ganglia.gmetric4j:gmetric4j", version.ref = "gmetric4j" }
 googleCloudMonitoring = { module = "com.google.cloud:google-cloud-monitoring", version.ref = "google-cloud-monitoring" }
 googleOauth2Http = { module = "com.google.auth:google-auth-library-oauth2-http", version = "1.16.1"}

diff --git a/micrometer-core/build.gradle b/micrometer-core/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.jetbrains.kotlin.jvm" version "1.7.21"
+    id "org.jetbrains.kotlin.jvm" version "1.7.22"
     id 'me.champeau.mrjar' version "0.1.1"
 }