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 Aug 10, 2023
2 parents 30f78c8 + 3c79557 commit 89d9edd
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 75 deletions.
2 changes: 1 addition & 1 deletion samples/micrometer-samples-boot2-reactive/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '2.7.13'
id 'org.springframework.boot' version '2.7.14'
}

apply plugin: 'io.spring.dependency-management'
Expand Down
42 changes: 21 additions & 21 deletions samples/micrometer-samples-boot2-reactive/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 samples/micrometer-samples-boot2/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '2.7.13'
id 'org.springframework.boot' version '2.7.14'
}

apply plugin: 'io.spring.dependency-management'
Expand Down
Loading

0 comments on commit 89d9edd

Please sign in to comment.