Skip to content

Commit f09492a

Browse files
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into jmx-jetty
2 parents fa30d59 + bf76c1f commit f09492a

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ For more information about the maintainer role, see the [community repository](h
141141
- [Gregor Zeitlinger](https://github.com/zeitlinger), Grafana
142142
- [Jack Berg](https://github.com/jack-berg), New Relic
143143
- [Jason Plumb](https://github.com/breedx-splk), Splunk
144-
- [Jay DeLuca](https://github.com/jaydeluca)
144+
- [Jay DeLuca](https://github.com/jaydeluca), Grafana
145145
- [Jean Bisutti](https://github.com/jeanbisutti), Microsoft
146146
- [John Watson](https://github.com/jkwatson), Cloudera
147147
- [Jonas Kunz](https://github.com/JonasKunz), Elastic

conventions/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ dependencies {
5757
implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.4")
5858
implementation("com.google.guava:guava:33.4.8-jre")
5959
implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
60-
implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.7")
60+
implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.8")
6161
implementation("org.apache.httpcomponents:httpclient:4.5.14")
6262
implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.0.2")
6363
implementation("org.owasp:dependency-check-gradle:12.1.3")

examples/distro/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ buildscript {
1313
}
1414
dependencies {
1515
classpath "com.diffplug.spotless:spotless-plugin-gradle:7.0.4"
16-
classpath "com.gradleup.shadow:shadow-gradle-plugin:8.3.7"
16+
classpath "com.gradleup.shadow:shadow-gradle-plugin:8.3.8"
1717
classpath "io.opentelemetry.instrumentation:gradle-plugins:2.18.0-alpha-SNAPSHOT"
1818
}
1919
}

examples/extension/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ plugins {
1010
into a single jar.
1111
See https://imperceptiblethoughts.com/shadow/ for more details about Shadow plugin.
1212
*/
13-
id "com.gradleup.shadow" version "8.3.7"
13+
id "com.gradleup.shadow" version "8.3.8"
1414
id "com.diffplug.spotless" version "7.0.4"
1515

1616
id "io.opentelemetry.instrumentation.muzzle-generation" version "2.18.0-alpha-SNAPSHOT"

gradle-plugins/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies {
4040
implementation("org.eclipse.aether:aether-transport-http:${aetherVersion}")
4141
implementation("org.apache.maven:maven-aether-provider:3.3.9")
4242

43-
implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.7")
43+
implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.8")
4444

4545
testImplementation("org.assertj:assertj-core:3.27.3")
4646

smoke-tests/images/quarkus/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ plugins {
1212
id("otel.java-conventions")
1313

1414
id("com.google.cloud.tools.jib")
15-
id("io.quarkus") version "3.24.1"
15+
id("io.quarkus") version "3.24.2"
1616
}
1717

1818
dependencies {
19-
implementation(enforcedPlatform("io.quarkus:quarkus-bom:3.24.1"))
19+
implementation(enforcedPlatform("io.quarkus:quarkus-bom:3.24.2"))
2020
implementation("io.quarkus:quarkus-rest")
2121
}
2222

0 commit comments

Comments
 (0)