Skip to content

Commit aeb9866

Browse files
AlexeyKuznetsov-DDAlexeyKuznetsov-DD
committed
Rollback some dependencies to fix compilation.
1 parent 206b82d commit aeb9866

File tree

4 files changed

+37
-48
lines changed

4 files changed

+37
-48
lines changed

‎dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestR
5757
com.squareup.okio:okio:1.17.5=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5858
com.swoval:file-tree-views:2.1.12=zinc
5959
com.thoughtworks.qdox:qdox:1.12.1=latestDepTestRuntimeClasspath,testRuntimeClasspath
60-
com.typesafe.akka:akka-actor_2.13:2.10.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
60+
com.typesafe.akka:akka-actor_2.13:2.10.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6161
com.typesafe.akka:akka-actor_2.13:2.9.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
6262
com.typesafe.akka:akka-http-core_2.13:10.6.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
6363
com.typesafe.akka:akka-http-core_2.13:10.7.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
@@ -69,10 +69,10 @@ com.typesafe.akka:akka-http_2.13:10.6.0=main_java11CompileClasspath,testCompileC
6969
com.typesafe.akka:akka-http_2.13:10.7.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
7070
com.typesafe.akka:akka-parsing_2.13:10.6.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
7171
com.typesafe.akka:akka-parsing_2.13:10.7.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
72-
com.typesafe.akka:akka-pki_2.13:2.10.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
73-
com.typesafe.akka:akka-protobuf-v3_2.13:2.10.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
72+
com.typesafe.akka:akka-pki_2.13:2.10.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
73+
com.typesafe.akka:akka-protobuf-v3_2.13:2.10.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
7474
com.typesafe.akka:akka-protobuf-v3_2.13:2.9.0=testCompileClasspath,testRuntimeClasspath
75-
com.typesafe.akka:akka-stream_2.13:2.10.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
75+
com.typesafe.akka:akka-stream_2.13:2.10.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
7676
com.typesafe.akka:akka-stream_2.13:2.9.0=testCompileClasspath,testRuntimeClasspath
7777
com.typesafe:config:1.4.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
7878
commons-codec:commons-codec:1.15=spotbugs

‎dd-java-agent/instrumentation/junit-5.3/gradle.lockfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,29 +135,29 @@ org.jetbrains:annotations:13.0=latestDepTestCompileClasspath,latestDepTestRuntim
135135
org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath
136136
org.junit.jupiter:junit-jupiter-api:5.12.0=testCompileClasspath,testRuntimeClasspath
137137
org.junit.jupiter:junit-jupiter-api:5.3.0=compileClasspath
138-
org.junit.jupiter:junit-jupiter-api:6.0.0-M2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
138+
org.junit.jupiter:junit-jupiter-api:5.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
139139
org.junit.jupiter:junit-jupiter-engine:5.12.0=testCompileClasspath,testRuntimeClasspath
140-
org.junit.jupiter:junit-jupiter-engine:6.0.0-M2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
140+
org.junit.jupiter:junit-jupiter-engine:5.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
141141
org.junit.jupiter:junit-jupiter-params:5.12.0=testCompileClasspath,testRuntimeClasspath
142-
org.junit.jupiter:junit-jupiter-params:6.0.0-M2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
142+
org.junit.jupiter:junit-jupiter-params:5.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
143143
org.junit.platform:junit-platform-commons:1.12.0=testCompileClasspath,testRuntimeClasspath
144144
org.junit.platform:junit-platform-commons:1.3.0=compileClasspath
145-
org.junit.platform:junit-platform-commons:6.0.0-M2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
145+
org.junit.platform:junit-platform-commons:1.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
146146
org.junit.platform:junit-platform-engine:1.12.0=testCompileClasspath,testRuntimeClasspath
147147
org.junit.platform:junit-platform-engine:1.3.0=compileClasspath
148-
org.junit.platform:junit-platform-engine:6.0.0-M2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
148+
org.junit.platform:junit-platform-engine:1.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
149149
org.junit.platform:junit-platform-launcher:1.12.0=testCompileClasspath,testRuntimeClasspath
150150
org.junit.platform:junit-platform-launcher:1.3.0=compileClasspath
151-
org.junit.platform:junit-platform-launcher:6.0.0-M2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
151+
org.junit.platform:junit-platform-launcher:1.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
152152
org.junit.platform:junit-platform-runner:1.12.0=testRuntimeClasspath
153153
org.junit.platform:junit-platform-runner:1.9.0=latestDepTestRuntimeClasspath
154154
org.junit.platform:junit-platform-suite-api:1.12.0=testRuntimeClasspath
155-
org.junit.platform:junit-platform-suite-api:6.0.0-M2=latestDepTestRuntimeClasspath
155+
org.junit.platform:junit-platform-suite-api:1.13.4=latestDepTestRuntimeClasspath
156156
org.junit.platform:junit-platform-suite-commons:1.12.0=testRuntimeClasspath
157157
org.junit.platform:junit-platform-suite-commons:1.9.0=latestDepTestRuntimeClasspath
158158
org.junit:junit-bom:5.12.0=testCompileClasspath,testRuntimeClasspath
159159
org.junit:junit-bom:5.9.1=spotbugs
160-
org.junit:junit-bom:6.0.0-M2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
160+
org.junit:junit-bom:5.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
161161
org.msgpack:jackson-dataformat-msgpack:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
162162
org.msgpack:msgpack-core:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
163163
org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath

‎dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public static AgentScope onEnter(
142142
}
143143
DataStreamsTags tags =
144144
DataStreamsTags.createWithClusterId(
145-
"" + "kafka", DataStreamsTags.Direction.Outbound, record.topic(), clusterId);
145+
"kafka", DataStreamsTags.Direction.Outbound, record.topic(), clusterId);
146146
try {
147147
defaultPropagator().inject(span, record.headers(), setter);
148148
if (STREAMING_CONTEXT.isDisabledForTopic(record.topic())

‎dd-java-agent/instrumentation/spring-security-6/gradle.lockfile‎

Lines changed: 24 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -222,64 +222,53 @@ org.snakeyaml:snakeyaml-engine:2.9=instrumentPluginClasspath,latestDepTestRuntim
222222
org.spockframework:spock-core:2.3-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
223223
org.spockframework:spock-junit4:2.3-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
224224
org.springframework.boot:spring-boot-autoconfigure:3.0.0=testCompileClasspath,testRuntimeClasspath
225-
org.springframework.boot:spring-boot-autoconfigure:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
226-
org.springframework.boot:spring-boot-http-converter:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
227-
org.springframework.boot:spring-boot-jackson:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
228-
org.springframework.boot:spring-boot-restclient-test:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
229-
org.springframework.boot:spring-boot-security:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
230-
org.springframework.boot:spring-boot-servlet:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
231-
org.springframework.boot:spring-boot-starter-jackson:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
225+
org.springframework.boot:spring-boot-autoconfigure:3.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
232226
org.springframework.boot:spring-boot-starter-json:3.0.0=testCompileClasspath,testRuntimeClasspath
233-
org.springframework.boot:spring-boot-starter-json:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
234-
org.springframework.boot:spring-boot-starter-logback:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
227+
org.springframework.boot:spring-boot-starter-json:3.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
235228
org.springframework.boot:spring-boot-starter-logging:3.0.0=testCompileClasspath,testRuntimeClasspath
236-
org.springframework.boot:spring-boot-starter-logging:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
229+
org.springframework.boot:spring-boot-starter-logging:3.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
237230
org.springframework.boot:spring-boot-starter-security:3.0.0=testCompileClasspath,testRuntimeClasspath
238-
org.springframework.boot:spring-boot-starter-security:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
231+
org.springframework.boot:spring-boot-starter-security:3.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
239232
org.springframework.boot:spring-boot-starter-test:3.0.0=testCompileClasspath,testRuntimeClasspath
240-
org.springframework.boot:spring-boot-starter-test:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
233+
org.springframework.boot:spring-boot-starter-test:3.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
241234
org.springframework.boot:spring-boot-starter-tomcat:3.0.0=testCompileClasspath,testRuntimeClasspath
242-
org.springframework.boot:spring-boot-starter-tomcat:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
235+
org.springframework.boot:spring-boot-starter-tomcat:3.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
243236
org.springframework.boot:spring-boot-starter-web:3.0.0=testCompileClasspath,testRuntimeClasspath
244-
org.springframework.boot:spring-boot-starter-web:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
245-
org.springframework.boot:spring-boot-starter-webmvc:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
237+
org.springframework.boot:spring-boot-starter-web:3.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
246238
org.springframework.boot:spring-boot-starter:3.0.0=testCompileClasspath,testRuntimeClasspath
247-
org.springframework.boot:spring-boot-starter:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
239+
org.springframework.boot:spring-boot-starter:3.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
248240
org.springframework.boot:spring-boot-test-autoconfigure:3.0.0=testCompileClasspath,testRuntimeClasspath
249-
org.springframework.boot:spring-boot-test-autoconfigure:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
241+
org.springframework.boot:spring-boot-test-autoconfigure:3.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
250242
org.springframework.boot:spring-boot-test:3.0.0=testCompileClasspath,testRuntimeClasspath
251-
org.springframework.boot:spring-boot-test:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
252-
org.springframework.boot:spring-boot-tomcat:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
253-
org.springframework.boot:spring-boot-web-server-test:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
254-
org.springframework.boot:spring-boot-web-server:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
255-
org.springframework.boot:spring-boot-webmvc:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
243+
org.springframework.boot:spring-boot-test:3.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
256244
org.springframework.boot:spring-boot:3.0.0=testCompileClasspath,testRuntimeClasspath
257-
org.springframework.boot:spring-boot:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
245+
org.springframework.boot:spring-boot:3.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
258246
org.springframework.security:spring-security-config:6.0.0=testCompileClasspath,testRuntimeClasspath
259-
org.springframework.security:spring-security-config:7.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
247+
org.springframework.security:spring-security-config:6.5.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
260248
org.springframework.security:spring-security-core:6.0.0=testCompileClasspath,testRuntimeClasspath
261-
org.springframework.security:spring-security-core:7.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
249+
org.springframework.security:spring-security-core:6.5.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
262250
org.springframework.security:spring-security-crypto:6.0.0=testCompileClasspath,testRuntimeClasspath
263-
org.springframework.security:spring-security-crypto:7.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
251+
org.springframework.security:spring-security-crypto:6.5.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
264252
org.springframework.security:spring-security-web:6.0.0=testCompileClasspath,testRuntimeClasspath
265-
org.springframework.security:spring-security-web:7.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
253+
org.springframework.security:spring-security-web:6.5.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
266254
org.springframework:spring-aop:6.0.2=testCompileClasspath,testRuntimeClasspath
267-
org.springframework:spring-aop:7.0.0-M7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
255+
org.springframework:spring-aop:6.2.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
268256
org.springframework:spring-beans:6.0.2=testCompileClasspath,testRuntimeClasspath
269-
org.springframework:spring-beans:7.0.0-M7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
257+
org.springframework:spring-beans:6.2.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
270258
org.springframework:spring-context:6.0.2=testCompileClasspath,testRuntimeClasspath
271-
org.springframework:spring-context:7.0.0-M7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
259+
org.springframework:spring-context:6.2.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
272260
org.springframework:spring-core:6.0.2=testCompileClasspath,testRuntimeClasspath
273-
org.springframework:spring-core:7.0.0-M7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
261+
org.springframework:spring-core:6.2.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
274262
org.springframework:spring-expression:6.0.2=testCompileClasspath,testRuntimeClasspath
275-
org.springframework:spring-expression:7.0.0-M7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
263+
org.springframework:spring-expression:6.2.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
276264
org.springframework:spring-jcl:6.0.2=testCompileClasspath,testRuntimeClasspath
265+
org.springframework:spring-jcl:6.2.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
277266
org.springframework:spring-test:6.0.2=testCompileClasspath,testRuntimeClasspath
278-
org.springframework:spring-test:7.0.0-M7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
267+
org.springframework:spring-test:6.2.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
279268
org.springframework:spring-web:6.0.2=testCompileClasspath,testRuntimeClasspath
280-
org.springframework:spring-web:7.0.0-M7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
269+
org.springframework:spring-web:6.2.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
281270
org.springframework:spring-webmvc:6.0.2=testCompileClasspath,testRuntimeClasspath
282-
org.springframework:spring-webmvc:7.0.0-M7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
271+
org.springframework:spring-webmvc:6.2.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
283272
org.testng:testng:7.5.1=latestDepTestRuntimeClasspath,testRuntimeClasspath
284273
org.webjars:jquery:3.5.1=latestDepTestRuntimeClasspath,testRuntimeClasspath
285274
org.xmlresolver:xmlresolver:4.4.3=spotbugs

0 commit comments

Comments
 (0)