Skip to content

Commit 4cd1085

Browse files
committed
Upgrade some dependencies
* Remove already redundant `parentObservation` population in the `AbstractMessageChannel`: now it is handled properly by the `SimpleObservation` ctor
1 parent e8a9f95 commit 4cd1085

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

build.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,17 @@ ext {
6363
derbyVersion = '10.16.1.1'
6464
findbugsVersion = '3.0.1'
6565
ftpServerVersion = '1.2.0'
66-
graalvmVersion = '22.3.0'
66+
graalvmVersion = '22.3.1'
6767
greenmailVersion = '2.0.0-alpha-3'
68-
groovyVersion = '4.0.7'
68+
groovyVersion = '4.0.9'
6969
hamcrestVersion = '2.2'
7070
hazelcastVersion = '5.2.1'
71-
hibernateVersion = '6.1.6.Final'
71+
hibernateVersion = '6.1.7.Final'
7272
hsqldbVersion = '2.7.1'
7373
h2Version = '2.1.214'
74-
jacksonVersion = '2.14.1'
74+
jacksonVersion = '2.14.2'
7575
jaxbVersion = '4.0.1'
76-
jcifsVersion = '2.1.32'
76+
jcifsVersion = '2.1.33'
7777
jeroMqVersion = '0.5.3'
7878
jmsApiVersion = '3.1.0'
7979
jpaApiVersion = '3.1.0'
@@ -87,16 +87,16 @@ ext {
8787
lettuceVersion = '6.2.2.RELEASE'
8888
log4jVersion = '2.19.0'
8989
mailVersion = '1.0.0'
90-
micrometerPropagationVersion = '1.0.1-SNAPSHOT'
91-
micrometerTracingVersion = '1.0.2-SNAPSHOT'
92-
micrometerVersion = '1.10.4-SNAPSHOT'
90+
micrometerPropagationVersion = '1.0.2'
91+
micrometerTracingVersion = '1.0.2'
92+
micrometerVersion = '1.10.4'
9393
mockitoVersion = '4.10.0'
9494
mongoDriverVersion = '4.8.2'
95-
mysqlVersion = '8.0.31'
95+
mysqlVersion = '8.0.32'
9696
pahoMqttClientVersion = '1.2.5'
9797
postgresVersion = '42.5.1'
9898
r2dbch2Version = '1.0.0.RELEASE'
99-
reactorVersion = '2022.0.2'
99+
reactorVersion = '2022.0.3'
100100
resilience4jVersion = '1.7.1'
101101
romeToolsVersion = '1.18.0'
102102
rsocketVersion = '1.1.3'
@@ -249,7 +249,7 @@ configure(javaProjects) { subproject ->
249249
}
250250

251251
jacoco {
252-
toolVersion = '0.8.7'
252+
toolVersion = '0.8.8'
253253
}
254254

255255
// dependencies that are common across all java projects
@@ -371,7 +371,7 @@ configure(javaProjects) { subproject ->
371371

372372
checkstyle {
373373
configDirectory.set(rootProject.file('src/checkstyle'))
374-
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.5.0'
374+
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.7.0'
375375
}
376376

377377
jar {

spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,6 @@ private boolean sendWithObservation(Message<?> message, long timeout) {
335335
DefaultMessageSenderObservationConvention.INSTANCE,
336336
() -> new MessageSenderContext(messageToSend, getComponentName()),
337337
this.observationRegistry)
338-
.parentObservation(this.observationRegistry.getCurrentObservation()) // TODO until the fix in micrometer-observation
339338
.observe(() -> sendInternal(messageToSend, timeout));
340339
}
341340

0 commit comments

Comments
 (0)