Skip to content

Commit e34b93e

Browse files
jonatan-ivanovjonatan-ivanov
committed
Merge branch '1.9.x'
# Conflicts: # samples/micrometer-samples-boot2-reactive/gradle.lockfile # samples/micrometer-samples-boot2/gradle.lockfile # samples/micrometer-samples-spring-integration/gradle.lockfile
2 parents 6eba9e7 + 01c8576 commit e34b93e

File tree

6 files changed

+85
-85
lines changed

6 files changed

+85
-85
lines changed

‎samples/micrometer-samples-boot2-reactive/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'java'
3-
id 'org.springframework.boot' version '2.7.4'
3+
id 'org.springframework.boot' version '2.7.5'
44
}
55

66
apply plugin: 'io.spring.dependency-management'

‎samples/micrometer-samples-boot2-reactive/gradle.lockfile

Lines changed: 31 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎samples/micrometer-samples-boot2/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'java'
3-
id 'org.springframework.boot' version '2.7.4'
3+
id 'org.springframework.boot' version '2.7.5'
44
}
55

66
apply plugin: 'io.spring.dependency-management'

0 commit comments

Comments
 (0)