Merge-ignore release 3.6.10 into 3.7.0-M6

reactor · Sep 10, 2024 · ead8493 · ead8493
2 parents 58741d0 + 9454b36
commit ead8493
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,14 +7,14 @@
 
 [versions]
 # Baselines, should be updated on every release
-baseline-core-api = "3.6.9"
-baselinePerfCore = "3.6.9"
+baseline-core-api = "3.6.10"
+baselinePerfCore = "3.6.10"
 baselinePerfExtra = "3.5.2"
 
 # Other shared versions
 #note that some micrometer artifacts like context-propagation has a different version directly set in libraries below
 micrometer = "1.13.3"
-micrometerDocsGenerator = "1.0.3"
+micrometerDocsGenerator = "1.0.4"
 micrometerTracingTest="1.3.3"
 contextPropagation="1.1.1"
 kotlin = "1.8.22"

diff --git a/settings.gradle b/settings.gradle
@@ -30,7 +30,7 @@ dependencyResolutionManagement {
 	libs {
 	  if (System.getProperty("useSnapshotMicrometerVersion")) {
 		version('micrometer', '1.13.4-SNAPSHOT')
-		version('micrometerDocsGenerator', "1.0.4-SNAPSHOT")
+		version('micrometerDocsGenerator', "1.0.5-SNAPSHOT")
 		version('micrometerTracingTest', "1.3.4-SNAPSHOT")
 		version('contextPropagation', "1.1.2-SNAPSHOT")
 	  }