Skip to content

Commit 76c790a

Browse files
heyamsheyams
authored
Resolve component compliance (#2035)
* Use java.specification.version * Update logback * Update azure-blob-storage * Update lockfiles * Revert * Fix submodule
1 parent 93ecd44 commit 76c790a

File tree

8 files changed

+79
-94
lines changed

8 files changed

+79
-94
lines changed

‎agent/agent-bootstrap/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# This file is expected to be part of source control.
44
ch.qos.logback.contrib:logback-json-classic:0.1.5=runtimeClasspath
55
ch.qos.logback.contrib:logback-json-core:0.1.5=runtimeClasspath
6-
ch.qos.logback:logback-classic:1.2.6=runtimeClasspath
7-
ch.qos.logback:logback-core:1.2.6=runtimeClasspath
6+
ch.qos.logback:logback-classic:1.2.8=runtimeClasspath
7+
ch.qos.logback:logback-core:1.2.8=runtimeClasspath
88
com.google.guava:guava-bom:31.0.1-jre=runtimeClasspath
99
com.squareup.moshi:moshi:1.11.0=runtimeClasspath
1010
com.squareup.okio:okio:1.17.5=runtimeClasspath

‎agent/agent-profiler/agent-service-profiler/gradle.lockfile‎

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.azure:azure-core-http-netty:1.11.0=runtimeClasspath
5-
com.azure:azure-core:1.21.0=runtimeClasspath
6-
com.azure:azure-storage-blob:12.14.0=runtimeClasspath
7-
com.azure:azure-storage-common:12.13.0=runtimeClasspath
8-
com.azure:azure-storage-internal-avro:12.1.0=runtimeClasspath
4+
com.azure:azure-core-http-netty:1.11.2=runtimeClasspath
5+
com.azure:azure-core:1.22.0=runtimeClasspath
6+
com.azure:azure-storage-blob:12.14.2=runtimeClasspath
7+
com.azure:azure-storage-common:12.14.1=runtimeClasspath
8+
com.azure:azure-storage-internal-avro:12.1.2=runtimeClasspath
99
com.fasterxml.jackson.core:jackson-annotations:2.12.5=runtimeClasspath
1010
com.fasterxml.jackson.core:jackson-core:2.12.5=runtimeClasspath
1111
com.fasterxml.jackson.core:jackson-databind:2.12.5=runtimeClasspath
@@ -19,36 +19,29 @@ com.microsoft.jfr:jfr-streaming:1.2.0=runtimeClasspath
1919
com.squareup.moshi:moshi-adapters:1.11.0=runtimeClasspath
2020
com.squareup.moshi:moshi:1.11.0=runtimeClasspath
2121
com.squareup.okio:okio:1.17.5=runtimeClasspath
22-
io.netty:netty-buffer:4.1.67.Final=runtimeClasspath
23-
io.netty:netty-codec-dns:4.1.66.Final=runtimeClasspath
24-
io.netty:netty-codec-http2:4.1.67.Final=runtimeClasspath
25-
io.netty:netty-codec-http:4.1.67.Final=runtimeClasspath
26-
io.netty:netty-codec-socks:4.1.67.Final=runtimeClasspath
27-
io.netty:netty-codec:4.1.67.Final=runtimeClasspath
28-
io.netty:netty-common:4.1.67.Final=runtimeClasspath
29-
io.netty:netty-handler-proxy:4.1.67.Final=runtimeClasspath
30-
io.netty:netty-handler:4.1.67.Final=runtimeClasspath
31-
io.netty:netty-resolver-dns-native-macos:4.1.66.Final=runtimeClasspath
32-
io.netty:netty-resolver-dns:4.1.66.Final=runtimeClasspath
33-
io.netty:netty-resolver:4.1.67.Final=runtimeClasspath
22+
io.netty:netty-buffer:4.1.68.Final=runtimeClasspath
23+
io.netty:netty-codec-dns:4.1.68.Final=runtimeClasspath
24+
io.netty:netty-codec-http2:4.1.68.Final=runtimeClasspath
25+
io.netty:netty-codec-http:4.1.68.Final=runtimeClasspath
26+
io.netty:netty-codec-socks:4.1.68.Final=runtimeClasspath
27+
io.netty:netty-codec:4.1.68.Final=runtimeClasspath
28+
io.netty:netty-common:4.1.68.Final=runtimeClasspath
29+
io.netty:netty-handler-proxy:4.1.68.Final=runtimeClasspath
30+
io.netty:netty-handler:4.1.68.Final=runtimeClasspath
31+
io.netty:netty-resolver-dns-native-macos:4.1.68.Final=runtimeClasspath
32+
io.netty:netty-resolver-dns:4.1.68.Final=runtimeClasspath
33+
io.netty:netty-resolver:4.1.68.Final=runtimeClasspath
3434
io.netty:netty-tcnative-boringssl-static:2.0.43.Final=runtimeClasspath
35-
io.netty:netty-transport-native-epoll:4.1.67.Final=runtimeClasspath
36-
io.netty:netty-transport-native-kqueue:4.1.67.Final=runtimeClasspath
37-
io.netty:netty-transport-native-unix-common:4.1.67.Final=runtimeClasspath
38-
io.netty:netty-transport:4.1.67.Final=runtimeClasspath
35+
io.netty:netty-transport-native-epoll:4.1.68.Final=runtimeClasspath
36+
io.netty:netty-transport-native-kqueue:4.1.68.Final=runtimeClasspath
37+
io.netty:netty-transport-native-unix-common:4.1.68.Final=runtimeClasspath
38+
io.netty:netty-transport:4.1.68.Final=runtimeClasspath
3939
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.10.0+ai.patches-alpha=runtimeClasspath
4040
io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha=runtimeClasspath
4141
io.opentelemetry:opentelemetry-bom:1.10.0=runtimeClasspath
42-
io.projectreactor.netty:reactor-netty-core:1.0.10=runtimeClasspath
43-
io.projectreactor.netty:reactor-netty-http-brave:1.0.10=runtimeClasspath
44-
io.projectreactor.netty:reactor-netty-http:1.0.10=runtimeClasspath
45-
io.projectreactor.netty:reactor-netty:1.0.10=runtimeClasspath
42+
io.projectreactor.netty:reactor-netty-core:1.0.11=runtimeClasspath
43+
io.projectreactor.netty:reactor-netty-http:1.0.11=runtimeClasspath
4644
io.projectreactor:reactor-core:3.4.10=runtimeClasspath
47-
io.zipkin.brave:brave-instrumentation-http:5.13.3=runtimeClasspath
48-
io.zipkin.brave:brave:5.13.3=runtimeClasspath
49-
io.zipkin.reporter2:zipkin-reporter-brave:2.16.3=runtimeClasspath
50-
io.zipkin.reporter2:zipkin-reporter:2.16.3=runtimeClasspath
51-
io.zipkin.zipkin2:zipkin:2.23.2=runtimeClasspath
5245
jakarta.activation:jakarta.activation-api:1.2.1=runtimeClasspath
5346
jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=runtimeClasspath
5447
org.codehaus.woodstox:stax2-api:4.2.1=runtimeClasspath

‎agent/agent-tooling/gradle.lockfile‎

Lines changed: 25 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
# This file is expected to be part of source control.
44
ch.qos.logback.contrib:logback-json-classic:0.1.5=runtimeClasspath
55
ch.qos.logback.contrib:logback-json-core:0.1.5=runtimeClasspath
6-
ch.qos.logback:logback-classic:1.2.6=runtimeClasspath
7-
ch.qos.logback:logback-core:1.2.6=runtimeClasspath
8-
com.azure:azure-core-http-netty:1.11.0=runtimeClasspath
9-
com.azure:azure-core:1.21.0=runtimeClasspath
6+
ch.qos.logback:logback-classic:1.2.8=runtimeClasspath
7+
ch.qos.logback:logback-core:1.2.8=runtimeClasspath
8+
com.azure:azure-core-http-netty:1.11.2=runtimeClasspath
9+
com.azure:azure-core:1.22.0=runtimeClasspath
1010
com.azure:azure-identity:1.3.6=runtimeClasspath
1111
com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.4=runtimeClasspath
12-
com.azure:azure-storage-blob:12.14.0=runtimeClasspath
13-
com.azure:azure-storage-common:12.13.0=runtimeClasspath
14-
com.azure:azure-storage-internal-avro:12.1.0=runtimeClasspath
12+
com.azure:azure-storage-blob:12.14.2=runtimeClasspath
13+
com.azure:azure-storage-common:12.14.1=runtimeClasspath
14+
com.azure:azure-storage-internal-avro:12.1.2=runtimeClasspath
1515
com.fasterxml.jackson.core:jackson-annotations:2.12.5=runtimeClasspath
1616
com.fasterxml.jackson.core:jackson-core:2.12.5=runtimeClasspath
1717
com.fasterxml.jackson.core:jackson-databind:2.12.5=runtimeClasspath
@@ -39,23 +39,23 @@ com.squareup.okhttp3:okhttp:4.9.3=runtimeClasspath
3939
com.squareup.okio:okio:2.8.0=runtimeClasspath
4040
commons-codec:commons-codec:1.15=runtimeClasspath
4141
commons-io:commons-io:2.7=runtimeClasspath
42-
io.netty:netty-buffer:4.1.67.Final=runtimeClasspath
43-
io.netty:netty-codec-dns:4.1.66.Final=runtimeClasspath
44-
io.netty:netty-codec-http2:4.1.67.Final=runtimeClasspath
45-
io.netty:netty-codec-http:4.1.67.Final=runtimeClasspath
46-
io.netty:netty-codec-socks:4.1.67.Final=runtimeClasspath
47-
io.netty:netty-codec:4.1.67.Final=runtimeClasspath
48-
io.netty:netty-common:4.1.67.Final=runtimeClasspath
49-
io.netty:netty-handler-proxy:4.1.67.Final=runtimeClasspath
50-
io.netty:netty-handler:4.1.67.Final=runtimeClasspath
51-
io.netty:netty-resolver-dns-native-macos:4.1.66.Final=runtimeClasspath
52-
io.netty:netty-resolver-dns:4.1.66.Final=runtimeClasspath
53-
io.netty:netty-resolver:4.1.67.Final=runtimeClasspath
42+
io.netty:netty-buffer:4.1.68.Final=runtimeClasspath
43+
io.netty:netty-codec-dns:4.1.68.Final=runtimeClasspath
44+
io.netty:netty-codec-http2:4.1.68.Final=runtimeClasspath
45+
io.netty:netty-codec-http:4.1.68.Final=runtimeClasspath
46+
io.netty:netty-codec-socks:4.1.68.Final=runtimeClasspath
47+
io.netty:netty-codec:4.1.68.Final=runtimeClasspath
48+
io.netty:netty-common:4.1.68.Final=runtimeClasspath
49+
io.netty:netty-handler-proxy:4.1.68.Final=runtimeClasspath
50+
io.netty:netty-handler:4.1.68.Final=runtimeClasspath
51+
io.netty:netty-resolver-dns-native-macos:4.1.68.Final=runtimeClasspath
52+
io.netty:netty-resolver-dns:4.1.68.Final=runtimeClasspath
53+
io.netty:netty-resolver:4.1.68.Final=runtimeClasspath
5454
io.netty:netty-tcnative-boringssl-static:2.0.43.Final=runtimeClasspath
55-
io.netty:netty-transport-native-epoll:4.1.67.Final=runtimeClasspath
56-
io.netty:netty-transport-native-kqueue:4.1.67.Final=runtimeClasspath
57-
io.netty:netty-transport-native-unix-common:4.1.67.Final=runtimeClasspath
58-
io.netty:netty-transport:4.1.67.Final=runtimeClasspath
55+
io.netty:netty-transport-native-epoll:4.1.68.Final=runtimeClasspath
56+
io.netty:netty-transport-native-kqueue:4.1.68.Final=runtimeClasspath
57+
io.netty:netty-transport-native-unix-common:4.1.68.Final=runtimeClasspath
58+
io.netty:netty-transport:4.1.68.Final=runtimeClasspath
5959
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:1.10.0+ai.patches-alpha=runtimeClasspath
6060
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-appender:1.10.0+ai.patches-alpha=runtimeClasspath
6161
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.10.0+ai.patches-alpha=runtimeClasspath
@@ -94,16 +94,9 @@ io.opentelemetry:opentelemetry-sdk-metrics:1.10.0-alpha=runtimeClasspath
9494
io.opentelemetry:opentelemetry-sdk-trace:1.10.0=runtimeClasspath
9595
io.opentelemetry:opentelemetry-sdk:1.10.0=runtimeClasspath
9696
io.opentelemetry:opentelemetry-semconv:1.10.0-alpha=runtimeClasspath
97-
io.projectreactor.netty:reactor-netty-core:1.0.10=runtimeClasspath
98-
io.projectreactor.netty:reactor-netty-http-brave:1.0.10=runtimeClasspath
99-
io.projectreactor.netty:reactor-netty-http:1.0.10=runtimeClasspath
100-
io.projectreactor.netty:reactor-netty:1.0.10=runtimeClasspath
97+
io.projectreactor.netty:reactor-netty-core:1.0.11=runtimeClasspath
98+
io.projectreactor.netty:reactor-netty-http:1.0.11=runtimeClasspath
10199
io.projectreactor:reactor-core:3.4.10=runtimeClasspath
102-
io.zipkin.brave:brave-instrumentation-http:5.13.3=runtimeClasspath
103-
io.zipkin.brave:brave:5.13.3=runtimeClasspath
104-
io.zipkin.reporter2:zipkin-reporter-brave:2.16.3=runtimeClasspath
105-
io.zipkin.reporter2:zipkin-reporter:2.16.3=runtimeClasspath
106-
io.zipkin.zipkin2:zipkin:2.23.2=runtimeClasspath
107100
jakarta.activation:jakarta.activation-api:1.2.1=runtimeClasspath
108101
jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=runtimeClasspath
109102
net.bytebuddy:byte-buddy-dep:1.12.6=runtimeClasspath

‎agent/agent/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# This file is expected to be part of source control.
44
ch.qos.logback.contrib:logback-json-classic:0.1.5=runtimeClasspath
55
ch.qos.logback.contrib:logback-json-core:0.1.5=runtimeClasspath
6-
ch.qos.logback:logback-classic:1.2.6=runtimeClasspath
7-
ch.qos.logback:logback-core:1.2.6=runtimeClasspath
6+
ch.qos.logback:logback-classic:1.2.8=runtimeClasspath
7+
ch.qos.logback:logback-core:1.2.8=runtimeClasspath
88
com.google.guava:guava-bom:31.0.1-jre=runtimeClasspath
99
com.squareup.moshi:moshi:1.11.0=runtimeClasspath
1010
com.squareup.okio:okio:1.17.5=runtimeClasspath

‎agent/instrumentation/gradle.lockfile‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
# This file is expected to be part of source control.
44
ch.qos.logback.contrib:logback-json-classic:0.1.5=runtimeClasspath
55
ch.qos.logback.contrib:logback-json-core:0.1.5=runtimeClasspath
6-
com.azure:azure-core-http-netty:1.11.0=runtimeClasspath
7-
com.azure:azure-core:1.21.0=runtimeClasspath
6+
com.azure:azure-core-http-netty:1.11.2=runtimeClasspath
7+
com.azure:azure-core:1.22.0=runtimeClasspath
88
com.azure:azure-identity:1.3.6=runtimeClasspath
99
com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.4=runtimeClasspath
10-
com.azure:azure-storage-blob:12.14.0=runtimeClasspath
11-
com.azure:azure-storage-common:12.13.0=runtimeClasspath
12-
com.azure:azure-storage-internal-avro:12.1.0=runtimeClasspath
10+
com.azure:azure-storage-blob:12.14.2=runtimeClasspath
11+
com.azure:azure-storage-common:12.14.1=runtimeClasspath
12+
com.azure:azure-storage-internal-avro:12.1.2=runtimeClasspath
1313
com.fasterxml.jackson.core:jackson-annotations:2.12.5=runtimeClasspath
1414
com.fasterxml.jackson.core:jackson-core:2.12.5=runtimeClasspath
1515
com.fasterxml.jackson.core:jackson-databind:2.12.5=runtimeClasspath
@@ -37,22 +37,22 @@ com.squareup.okhttp3:okhttp:4.9.3=runtimeClasspath
3737
com.squareup.okio:okio:2.8.0=runtimeClasspath
3838
commons-codec:commons-codec:1.15=runtimeClasspath
3939
commons-io:commons-io:2.7=runtimeClasspath
40-
io.netty:netty-buffer:4.1.67.Final=runtimeClasspath
41-
io.netty:netty-codec-dns:4.1.66.Final=runtimeClasspath
42-
io.netty:netty-codec-http2:4.1.67.Final=runtimeClasspath
43-
io.netty:netty-codec-http:4.1.67.Final=runtimeClasspath
44-
io.netty:netty-codec-socks:4.1.67.Final=runtimeClasspath
45-
io.netty:netty-codec:4.1.67.Final=runtimeClasspath
46-
io.netty:netty-common:4.1.67.Final=runtimeClasspath
47-
io.netty:netty-handler-proxy:4.1.67.Final=runtimeClasspath
48-
io.netty:netty-handler:4.1.67.Final=runtimeClasspath
49-
io.netty:netty-resolver-dns-native-macos:4.1.66.Final=runtimeClasspath
50-
io.netty:netty-resolver-dns:4.1.66.Final=runtimeClasspath
51-
io.netty:netty-resolver:4.1.67.Final=runtimeClasspath
52-
io.netty:netty-transport-native-epoll:4.1.67.Final=runtimeClasspath
53-
io.netty:netty-transport-native-kqueue:4.1.67.Final=runtimeClasspath
54-
io.netty:netty-transport-native-unix-common:4.1.67.Final=runtimeClasspath
55-
io.netty:netty-transport:4.1.67.Final=runtimeClasspath
40+
io.netty:netty-buffer:4.1.68.Final=runtimeClasspath
41+
io.netty:netty-codec-dns:4.1.68.Final=runtimeClasspath
42+
io.netty:netty-codec-http2:4.1.68.Final=runtimeClasspath
43+
io.netty:netty-codec-http:4.1.68.Final=runtimeClasspath
44+
io.netty:netty-codec-socks:4.1.68.Final=runtimeClasspath
45+
io.netty:netty-codec:4.1.68.Final=runtimeClasspath
46+
io.netty:netty-common:4.1.68.Final=runtimeClasspath
47+
io.netty:netty-handler-proxy:4.1.68.Final=runtimeClasspath
48+
io.netty:netty-handler:4.1.68.Final=runtimeClasspath
49+
io.netty:netty-resolver-dns-native-macos:4.1.68.Final=runtimeClasspath
50+
io.netty:netty-resolver-dns:4.1.68.Final=runtimeClasspath
51+
io.netty:netty-resolver:4.1.68.Final=runtimeClasspath
52+
io.netty:netty-transport-native-epoll:4.1.68.Final=runtimeClasspath
53+
io.netty:netty-transport-native-kqueue:4.1.68.Final=runtimeClasspath
54+
io.netty:netty-transport-native-unix-common:4.1.68.Final=runtimeClasspath
55+
io.netty:netty-transport:4.1.68.Final=runtimeClasspath
5656
io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:1.10.0+ai.patches-alpha=runtimeClasspath
5757
io.opentelemetry.instrumentation:opentelemetry-guava-10.0:1.10.0+ai.patches-alpha=runtimeClasspath
5858
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:1.10.0+ai.patches-alpha=runtimeClasspath
@@ -208,9 +208,8 @@ io.opentelemetry:opentelemetry-sdk-logs:1.10.0-alpha=runtimeClasspath
208208
io.opentelemetry:opentelemetry-sdk-metrics:1.10.0-alpha=runtimeClasspath
209209
io.opentelemetry:opentelemetry-sdk-trace:1.10.0=runtimeClasspath
210210
io.opentelemetry:opentelemetry-sdk:1.10.0=runtimeClasspath
211-
io.projectreactor.netty:reactor-netty-core:1.0.10=runtimeClasspath
212-
io.projectreactor.netty:reactor-netty-http:1.0.10=runtimeClasspath
213-
io.projectreactor.netty:reactor-netty:1.0.10=runtimeClasspath
211+
io.projectreactor.netty:reactor-netty-core:1.0.11=runtimeClasspath
212+
io.projectreactor.netty:reactor-netty-http:1.0.11=runtimeClasspath
214213
io.projectreactor:reactor-core:3.4.10=runtimeClasspath
215214
jakarta.activation:jakarta.activation-api:1.2.1=runtimeClasspath
216215
jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=runtimeClasspath

‎dependencyManagement/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ val DEPENDENCY_SETS = listOf(
8989
)
9090

9191
val DEPENDENCIES = listOf(
92-
"ch.qos.logback:logback-classic:1.2.6",
92+
"ch.qos.logback:logback-classic:1.2.8",
9393
"ch.qos.logback.contrib:logback-json-classic:0.1.5",
9494
"com.google.auto.service:auto-service:1.0",
9595
"com.uber.nullaway:nullaway:0.9.1",
@@ -99,7 +99,7 @@ val DEPENDENCIES = listOf(
9999
"org.apache.commons:commons-text:1.9",
100100
"com.google.code.gson:gson:2.8.2",
101101
"com.azure:azure-core:1.21.0",
102-
"com.azure:azure-storage-blob:12.14.0",
102+
"com.azure:azure-storage-blob:12.14.2",
103103
"com.azure:azure-identity:1.3.6",
104104
"com.github.oshi:oshi-core:5.8.0",
105105
"org.assertj:assertj-core:3.22.0",

‎test/smoke/testApps/TraceLogBack/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ dependencies {
1313
// and duplicate class files produces lots of warning messages on jetty
1414
exclude("com.microsoft.azure", "applicationinsights-core")
1515
}
16-
implementation("ch.qos.logback:logback-classic:1.2.3")
16+
implementation("ch.qos.logback:logback-classic:1.2.8")
1717
}

‎test/smoke/testApps/TraceLogBackUsingAgent/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ plugins {
44

55
dependencies {
66
implementation("com.microsoft.azure:applicationinsights-web-auto")
7-
implementation("ch.qos.logback:logback-classic:1.2.3")
7+
implementation("ch.qos.logback:logback-classic:1.2.8")
88
}

0 commit comments

Comments
 (0)