Skip to content

Commit

Permalink
Merge branch '1.12.x' into 1.13.x
Browse files Browse the repository at this point in the history
  • Loading branch information
jonatan-ivanov committed Jun 10, 2024
2 parents 82232f2 + 9f13912 commit 3ee9e7d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ caffeine = "2.9.3"
cloudwatch2 = "2.25.64"
colt = "1.2.0"
dagger = "2.51.1"
dropwizard-metrics = "4.2.25"
dropwizard-metrics = "4.2.26"
dropwizard-metrics5 = "5.0.0"
dynatrace-utils = "2.2.1"
ehcache2 = "2.10.9.2"
Expand Down Expand Up @@ -76,7 +76,7 @@ signalfx = "1.0.42"
slf4j = "1.7.36"
spectator-atlas = "1.7.13"
spring = "5.3.36"
spring-javaformat = "0.0.41"
spring-javaformat = "0.0.42"
testcontainers = "1.19.8"
tomcat = "8.5.100"
wavefront = "3.4.3"
Expand Down Expand Up @@ -107,7 +107,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.10"
felixScr = "org.apache.felix:org.apache.felix.scr:2.2.12"
gmetric4j = { module = "info.ganglia.gmetric4j:gmetric4j", version.ref = "gmetric4j" }
googleCloudLibrariesBom = { module = "com.google.cloud:libraries-bom", version = "26.38.0" }
googleCloudMonitoring = { module = "com.google.cloud:google-cloud-monitoring", version.ref = "google-cloud-monitoring" }
Expand Down Expand Up @@ -223,7 +223,7 @@ plugin-nebulaInfo = { module = "com.netflix.nebula:gradle-info-plugin", version
plugin-noHttp = { module = "io.spring.nohttp:nohttp-gradle", version = "0.0.11" }
plugin-nexusPublish = { module = "io.github.gradle-nexus:publish-plugin", version = "1.3.0" }
plugin-javaformat = { module = "io.spring.javaformat:spring-javaformat-gradle-plugin", version.ref = "spring-javaformat" }
plugin-japicmp = { module = "me.champeau.gradle:japicmp-gradle-plugin", version = "0.4.2" }
plugin-japicmp = { module = "me.champeau.gradle:japicmp-gradle-plugin", version = "0.4.3" }
plugin-downloadTask = { module = "de.undercouch:gradle-download-task", version = "5.6.0" }
plugin-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.25.0" }
plugin-bnd = "biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0"
Expand Down

0 comments on commit 3ee9e7d

Please sign in to comment.