Skip to content

Commit 5e86d80

Browse files
committed
update the other package due to merge conflict
1 parent fa1ae74 commit 5e86d80

22 files changed

Lines changed: 22 additions & 22 deletions

File tree

agent/agent-bootstrap/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtim
99
io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath
1111
org.junit:junit-bom:5.14.2=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.2=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1313
empty=

agent/agent-for-testing/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtim
99
io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath
1111
org.junit:junit-bom:5.14.2=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.2=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1313
empty=

agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath
1111
io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath
1212
org.junit:junit-bom:5.14.2=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
14-
org.testcontainers:testcontainers-bom:2.0.2=runtimeClasspath
14+
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1515
empty=

agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath
1111
io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath
1212
org.junit:junit-bom:5.14.2=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
14-
org.testcontainers:testcontainers-bom:2.0.2=runtimeClasspath
14+
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1515
empty=

agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtim
99
io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath
1111
org.junit:junit-bom:5.14.2=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.2=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1313
empty=

agent/agent-profiler/agent-alerting-api/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtim
99
io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath
1111
org.junit:junit-bom:5.14.2=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.2=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1313
empty=

agent/agent-profiler/agent-alerting/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath
1111
io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath
1212
org.junit:junit-bom:5.14.2=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
14-
org.testcontainers:testcontainers-bom:2.0.2=runtimeClasspath
14+
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1515
empty=

agent/agent-profiler/agent-diagnostics-api/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtim
99
io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath
1111
org.junit:junit-bom:5.14.2=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.2=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1313
empty=

agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtim
99
io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath
1111
org.junit:junit-bom:5.14.2=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.2=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1313
empty=

agent/agent-profiler/agent-diagnostics/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtim
99
io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath
1111
org.junit:junit-bom:5.14.2=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.2=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1313
empty=

0 commit comments

Comments
 (0)