Skip to content

Commit 1013e1e

Browse files
authored
Merge branch 'main' into renovate/org.hipparchus-hipparchus-stat-4.x
2 parents 3810174 + 82372b7 commit 1013e1e

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ testing {
137137

138138
implementation(enforcedPlatform("org.junit:junit-bom:5.12.1"))
139139
implementation(enforcedPlatform("org.testcontainers:testcontainers-bom:1.20.6"))
140-
implementation(enforcedPlatform("com.google.guava:guava-bom:33.4.0-jre"))
140+
implementation(enforcedPlatform("com.google.guava:guava-bom:33.4.5-jre"))
141141
implementation(enforcedPlatform("com.linecorp.armeria:armeria-bom:1.32.3"))
142142

143143
compileOnly("com.google.auto.value:auto-value-annotations")

consistent-sampling/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ otelJava.moduleName.set("io.opentelemetry.contrib.sampler")
99
dependencies {
1010
api("io.opentelemetry:opentelemetry-sdk-trace")
1111
api("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
12-
testImplementation("org.hipparchus:hipparchus-core:3.1")
12+
testImplementation("org.hipparchus:hipparchus-core:4.0")
1313
testImplementation("org.hipparchus:hipparchus-stat:4.0")
1414
}

maven-extension/src/test/resources/projects/springboot_1/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>3.4.3</version>
9+
<version>3.4.4</version>
1010
<relativePath/> <!-- lookup parent from repository -->
1111
</parent>
1212
<groupId>io.opentelemetry.contrib.maven.test</groupId>

maven-extension/src/test/resources/projects/springboot_2/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>3.4.3</version>
9+
<version>3.4.4</version>
1010
<relativePath/> <!-- lookup parent from repository -->
1111
</parent>
1212
<groupId>io.opentelemetry.contrib.maven.test</groupId>

0 commit comments

Comments
 (0)