Skip to content

Commit 7ca901a

Browse files
authored
Update dependencies (#142)
* Update dependencies * Apply spotless
1 parent cd2c935 commit 7ca901a

File tree

5 files changed

+22
-25
lines changed

5 files changed

+22
-25
lines changed

aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/SamplingRuleApplier.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,7 @@ SamplingResult shouldSample(
233233
return result;
234234
}
235235

236-
@Nullable
237-
SamplingStatisticsDocument snapshot(Date now) {
236+
@Nullable SamplingStatisticsDocument snapshot(Date now) {
238237
if (clock.nanoTime() < nextSnapshotTimeNanos) {
239238
return null;
240239
}

buildSrc/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
`kotlin-dsl`
33
// When updating, update below in dependencies too
4-
id("com.diffplug.spotless") version "5.16.0"
4+
id("com.diffplug.spotless") version "6.0.0"
55
}
66

77
repositories {
@@ -12,5 +12,5 @@ repositories {
1212

1313
dependencies {
1414
// When updating, update above in plugins too
15-
implementation("com.diffplug.spotless:spotless-plugin-gradle:5.16.0")
15+
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.0.0")
1616
}

dependencyManagement/build.gradle.kts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,51 +12,51 @@ val dependencyVersions = hashMapOf<String, String>()
1212
rootProject.extra["versions"] = dependencyVersions
1313

1414
val DEPENDENCY_BOMS = listOf(
15-
"com.fasterxml.jackson:jackson-bom:2.12.3",
16-
"com.google.guava:guava-bom:30.1.1-jre",
17-
"com.linecorp.armeria:armeria-bom:1.11.0",
18-
"org.junit:junit-bom:5.7.2",
15+
"com.fasterxml.jackson:jackson-bom:2.13.0",
16+
"com.google.guava:guava-bom:31.0.1-jre",
17+
"com.linecorp.armeria:armeria-bom:1.13.3",
18+
"org.junit:junit-bom:5.8.2",
1919
"com.linecorp.armeria:armeria-bom:1.9.1",
20-
"io.grpc:grpc-bom:1.39.0",
21-
"io.opentelemetry:opentelemetry-bom:1.9.0",
22-
"io.opentelemetry:opentelemetry-bom-alpha:1.9.0-alpha",
23-
"org.testcontainers:testcontainers-bom:1.16.0"
20+
"io.grpc:grpc-bom:1.42.1",
21+
"io.opentelemetry:opentelemetry-bom:1.9.1",
22+
"io.opentelemetry:opentelemetry-bom-alpha:1.9.1-alpha",
23+
"org.testcontainers:testcontainers-bom:1.16.2"
2424
)
2525

2626
val DEPENDENCY_SETS = listOf(
2727
DependencySet(
2828
"com.google.auto.service",
29-
"1.0",
29+
"1.0.1",
3030
listOf("auto-service", "auto-service-annotations")
3131
),
3232
DependencySet(
3333
"com.google.auto.value",
34-
"1.8.1",
34+
"1.8.2",
3535
listOf("auto-value", "auto-value-annotations")
3636
),
3737
DependencySet(
3838
"io.prometheus",
39-
"0.11.0",
39+
"0.12.0",
4040
listOf("simpleclient", "simpleclient_common", "simpleclient_httpserver")
4141
),
4242
DependencySet(
4343
"org.mockito",
44-
"3.11.1",
44+
"4.1.0",
4545
listOf("mockito-core", "mockito-junit-jupiter")
4646
),
4747
DependencySet(
4848
"org.slf4j",
49-
"1.7.30",
49+
"1.7.32",
5050
listOf("slf4j-api", "slf4j-simple", "log4j-over-slf4j", "jcl-over-slf4j", "jul-to-slf4j")
5151
)
5252
)
5353

5454
val DEPENDENCIES = listOf(
5555
"com.squareup.okhttp3:okhttp:3.14.9",
5656
"org.assertj:assertj-core:3.21.0",
57-
"org.awaitility:awaitility:4.1.0",
58-
"org.checkerframework:checker-qual:3.15.0",
59-
"org.junit-pioneer:junit-pioneer:1.4.2",
57+
"org.awaitility:awaitility:4.1.1",
58+
"org.checkerframework:checker-qual:3.19.0",
59+
"org.junit-pioneer:junit-pioneer:1.5.0",
6060
"org.skyscreamer:jsonassert:1.5.0"
6161
)
6262

disruptor-processor/src/main/java/io/opentelemetry/contrib/disruptor/trace/DisruptorEventQueue.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,11 @@ void setEntry(
144144
this.result = result;
145145
}
146146

147-
@Nullable
148-
Object getEventArgs() {
147+
@Nullable Object getEventArgs() {
149148
return eventArgs;
150149
}
151150

152-
@Nullable
153-
EventType getEventType() {
151+
@Nullable EventType getEventType() {
154152
return eventType;
155153
}
156154

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pluginManagement {
22
plugins {
33
id("com.github.ben-manes.versions") version "0.39.0"
4-
id("com.github.johnrengelman.shadow") version "7.0.0"
4+
id("com.github.johnrengelman.shadow") version "7.1.0"
55
id("org.unbroken-dome.test-sets") version "4.0.0"
66
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
77
id("nebula.release") version "16.0.0"

0 commit comments

Comments
 (0)