Skip to content

Commit

Permalink
Merge branch '1.10.x' into 1.11.x
Browse files Browse the repository at this point in the history
  • Loading branch information
jonatan-ivanov committed Jul 10, 2023
2 parents 4c764da + 6f80295 commit e24e408
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def VERSIONS = [
'javax.inject:javax.inject:1',
'javax.servlet:javax.servlet-api:latest.release',
'javax.xml.bind:jaxb-api:2.3.+',
'io.micrometer:context-propagation:1.0.+',
'io.micrometer:context-propagation:1.0.4',
'org.jetbrains.kotlinx:kotlinx-coroutines-core:latest.release',
'net.sf.ehcache:ehcache:latest.release',
'org.apache.felix:org.apache.felix.framework:7.0.5',
Expand Down
2 changes: 1 addition & 1 deletion micrometer-core/gradle.lockfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion micrometer-observation/gradle.lockfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e24e408

Please sign in to comment.