Skip to content

Commit 18c38d2

Browse files
AlexeyKuznetsov-DDAlexeyKuznetsov-DD
committed
Rollback some dependencies to fix compilation.
1 parent db14dc0 commit 18c38d2

File tree

3 files changed

+40
-51
lines changed

3 files changed

+40
-51
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,29 +134,29 @@ org.jetbrains:annotations:13.0=latestDepTestCompileClasspath,latestDepTestRuntim
134134
org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath
135135
org.junit.jupiter:junit-jupiter-api:5.12.0=testCompileClasspath,testRuntimeClasspath
136136
org.junit.jupiter:junit-jupiter-api:5.3.0=compileClasspath
137-
org.junit.jupiter:junit-jupiter-api:6.0.0-M2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
137+
org.junit.jupiter:junit-jupiter-api:5.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
138138
org.junit.jupiter:junit-jupiter-engine:5.12.0=testCompileClasspath,testRuntimeClasspath
139-
org.junit.jupiter:junit-jupiter-engine:6.0.0-M2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
139+
org.junit.jupiter:junit-jupiter-engine:5.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
140140
org.junit.jupiter:junit-jupiter-params:5.12.0=testCompileClasspath,testRuntimeClasspath
141-
org.junit.jupiter:junit-jupiter-params:6.0.0-M2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
141+
org.junit.jupiter:junit-jupiter-params:5.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
142142
org.junit.platform:junit-platform-commons:1.12.0=testCompileClasspath,testRuntimeClasspath
143143
org.junit.platform:junit-platform-commons:1.3.0=compileClasspath
144-
org.junit.platform:junit-platform-commons:6.0.0-M2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
144+
org.junit.platform:junit-platform-commons:1.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
145145
org.junit.platform:junit-platform-engine:1.12.0=testCompileClasspath,testRuntimeClasspath
146146
org.junit.platform:junit-platform-engine:1.3.0=compileClasspath
147-
org.junit.platform:junit-platform-engine:6.0.0-M2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
147+
org.junit.platform:junit-platform-engine:1.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
148148
org.junit.platform:junit-platform-launcher:1.12.0=testCompileClasspath,testRuntimeClasspath
149149
org.junit.platform:junit-platform-launcher:1.3.0=compileClasspath
150-
org.junit.platform:junit-platform-launcher:6.0.0-M2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
150+
org.junit.platform:junit-platform-launcher:1.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
151151
org.junit.platform:junit-platform-runner:1.12.0=testRuntimeClasspath
152152
org.junit.platform:junit-platform-runner:1.9.0=latestDepTestRuntimeClasspath
153153
org.junit.platform:junit-platform-suite-api:1.12.0=testRuntimeClasspath
154-
org.junit.platform:junit-platform-suite-api:6.0.0-M2=latestDepTestRuntimeClasspath
154+
org.junit.platform:junit-platform-suite-api:1.13.4=latestDepTestRuntimeClasspath
155155
org.junit.platform:junit-platform-suite-commons:1.12.0=testRuntimeClasspath
156156
org.junit.platform:junit-platform-suite-commons:1.9.0=latestDepTestRuntimeClasspath
157157
org.junit:junit-bom:5.12.0=testCompileClasspath,testRuntimeClasspath
158158
org.junit:junit-bom:5.9.1=spotbugs
159-
org.junit:junit-bom:6.0.0-M2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
159+
org.junit:junit-bom:5.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
160160
org.msgpack:jackson-dataformat-msgpack:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
161161
org.msgpack:msgpack-core:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
162162
org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,31 +133,31 @@ org.jetbrains:annotations:13.0=latestDepTestCompileClasspath,latestDepTestRuntim
133133
org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath
134134
org.junit.jupiter:junit-jupiter-api:5.12.0=testCompileClasspath,testRuntimeClasspath
135135
org.junit.jupiter:junit-jupiter-api:5.8.0=compileClasspath
136-
org.junit.jupiter:junit-jupiter-api:6.0.0-M2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
136+
org.junit.jupiter:junit-jupiter-api:5.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
137137
org.junit.jupiter:junit-jupiter-engine:5.12.0=testCompileClasspath,testRuntimeClasspath
138138
org.junit.jupiter:junit-jupiter-engine:5.8.0=compileClasspath
139-
org.junit.jupiter:junit-jupiter-engine:6.0.0-M2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
139+
org.junit.jupiter:junit-jupiter-engine:5.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
140140
org.junit.jupiter:junit-jupiter-params:5.12.0=testCompileClasspath,testRuntimeClasspath
141-
org.junit.jupiter:junit-jupiter-params:6.0.0-M2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
141+
org.junit.jupiter:junit-jupiter-params:5.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
142142
org.junit.platform:junit-platform-commons:1.12.0=testCompileClasspath,testRuntimeClasspath
143143
org.junit.platform:junit-platform-commons:1.8.0=compileClasspath
144-
org.junit.platform:junit-platform-commons:6.0.0-M2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
144+
org.junit.platform:junit-platform-commons:1.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
145145
org.junit.platform:junit-platform-engine:1.12.0=testCompileClasspath,testRuntimeClasspath
146146
org.junit.platform:junit-platform-engine:1.8.0=compileClasspath
147-
org.junit.platform:junit-platform-engine:6.0.0-M2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
147+
org.junit.platform:junit-platform-engine:1.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
148148
org.junit.platform:junit-platform-launcher:1.12.0=testCompileClasspath,testRuntimeClasspath
149149
org.junit.platform:junit-platform-launcher:1.8.0=compileClasspath
150-
org.junit.platform:junit-platform-launcher:6.0.0-M2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
150+
org.junit.platform:junit-platform-launcher:1.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
151151
org.junit.platform:junit-platform-runner:1.12.0=testRuntimeClasspath
152152
org.junit.platform:junit-platform-runner:1.9.0=latestDepTestRuntimeClasspath
153153
org.junit.platform:junit-platform-suite-api:1.12.0=testRuntimeClasspath
154-
org.junit.platform:junit-platform-suite-api:6.0.0-M2=latestDepTestRuntimeClasspath
154+
org.junit.platform:junit-platform-suite-api:1.13.4=latestDepTestRuntimeClasspath
155155
org.junit.platform:junit-platform-suite-commons:1.12.0=testRuntimeClasspath
156156
org.junit.platform:junit-platform-suite-commons:1.9.0=latestDepTestRuntimeClasspath
157157
org.junit:junit-bom:5.12.0=testCompileClasspath,testRuntimeClasspath
158158
org.junit:junit-bom:5.8.0=compileClasspath
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:1.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/spring-security-6/gradle.lockfile‎

Lines changed: 24 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -221,64 +221,53 @@ org.snakeyaml:snakeyaml-engine:2.9=instrumentPluginClasspath,latestDepTestRuntim
221221
org.spockframework:spock-core:2.3-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
222222
org.spockframework:spock-junit4:2.3-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
223223
org.springframework.boot:spring-boot-autoconfigure:3.0.0=testCompileClasspath,testRuntimeClasspath
224-
org.springframework.boot:spring-boot-autoconfigure:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
225-
org.springframework.boot:spring-boot-http-converter:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
226-
org.springframework.boot:spring-boot-jackson:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
227-
org.springframework.boot:spring-boot-restclient-test:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
228-
org.springframework.boot:spring-boot-security:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
229-
org.springframework.boot:spring-boot-servlet:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
230-
org.springframework.boot:spring-boot-starter-jackson:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
224+
org.springframework.boot:spring-boot-autoconfigure:3.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
231225
org.springframework.boot:spring-boot-starter-json:3.0.0=testCompileClasspath,testRuntimeClasspath
232-
org.springframework.boot:spring-boot-starter-json:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
233-
org.springframework.boot:spring-boot-starter-logback:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
226+
org.springframework.boot:spring-boot-starter-json:3.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
234227
org.springframework.boot:spring-boot-starter-logging:3.0.0=testCompileClasspath,testRuntimeClasspath
235-
org.springframework.boot:spring-boot-starter-logging:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
228+
org.springframework.boot:spring-boot-starter-logging:3.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
236229
org.springframework.boot:spring-boot-starter-security:3.0.0=testCompileClasspath,testRuntimeClasspath
237-
org.springframework.boot:spring-boot-starter-security:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
230+
org.springframework.boot:spring-boot-starter-security:3.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
238231
org.springframework.boot:spring-boot-starter-test:3.0.0=testCompileClasspath,testRuntimeClasspath
239-
org.springframework.boot:spring-boot-starter-test:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
232+
org.springframework.boot:spring-boot-starter-test:3.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
240233
org.springframework.boot:spring-boot-starter-tomcat:3.0.0=testCompileClasspath,testRuntimeClasspath
241-
org.springframework.boot:spring-boot-starter-tomcat:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
234+
org.springframework.boot:spring-boot-starter-tomcat:3.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
242235
org.springframework.boot:spring-boot-starter-web:3.0.0=testCompileClasspath,testRuntimeClasspath
243-
org.springframework.boot:spring-boot-starter-web:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
244-
org.springframework.boot:spring-boot-starter-webmvc:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
236+
org.springframework.boot:spring-boot-starter-web:3.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
245237
org.springframework.boot:spring-boot-starter:3.0.0=testCompileClasspath,testRuntimeClasspath
246-
org.springframework.boot:spring-boot-starter:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
238+
org.springframework.boot:spring-boot-starter:3.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
247239
org.springframework.boot:spring-boot-test-autoconfigure:3.0.0=testCompileClasspath,testRuntimeClasspath
248-
org.springframework.boot:spring-boot-test-autoconfigure:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
240+
org.springframework.boot:spring-boot-test-autoconfigure:3.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
249241
org.springframework.boot:spring-boot-test:3.0.0=testCompileClasspath,testRuntimeClasspath
250-
org.springframework.boot:spring-boot-test:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
251-
org.springframework.boot:spring-boot-tomcat:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
252-
org.springframework.boot:spring-boot-web-server-test:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
253-
org.springframework.boot:spring-boot-web-server:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
254-
org.springframework.boot:spring-boot-webmvc:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
242+
org.springframework.boot:spring-boot-test:3.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
255243
org.springframework.boot:spring-boot:3.0.0=testCompileClasspath,testRuntimeClasspath
256-
org.springframework.boot:spring-boot:4.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
244+
org.springframework.boot:spring-boot:3.5.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
257245
org.springframework.security:spring-security-config:6.0.0=testCompileClasspath,testRuntimeClasspath
258-
org.springframework.security:spring-security-config:7.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
246+
org.springframework.security:spring-security-config:6.5.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
259247
org.springframework.security:spring-security-core:6.0.0=testCompileClasspath,testRuntimeClasspath
260-
org.springframework.security:spring-security-core:7.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
248+
org.springframework.security:spring-security-core:6.5.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
261249
org.springframework.security:spring-security-crypto:6.0.0=testCompileClasspath,testRuntimeClasspath
262-
org.springframework.security:spring-security-crypto:7.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
250+
org.springframework.security:spring-security-crypto:6.5.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
263251
org.springframework.security:spring-security-web:6.0.0=testCompileClasspath,testRuntimeClasspath
264-
org.springframework.security:spring-security-web:7.0.0-M1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
252+
org.springframework.security:spring-security-web:6.5.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
265253
org.springframework:spring-aop:6.0.2=testCompileClasspath,testRuntimeClasspath
266-
org.springframework:spring-aop:7.0.0-M7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
254+
org.springframework:spring-aop:6.2.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
267255
org.springframework:spring-beans:6.0.2=testCompileClasspath,testRuntimeClasspath
268-
org.springframework:spring-beans:7.0.0-M7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
256+
org.springframework:spring-beans:6.2.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
269257
org.springframework:spring-context:6.0.2=testCompileClasspath,testRuntimeClasspath
270-
org.springframework:spring-context:7.0.0-M7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
258+
org.springframework:spring-context:6.2.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
271259
org.springframework:spring-core:6.0.2=testCompileClasspath,testRuntimeClasspath
272-
org.springframework:spring-core:7.0.0-M7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
260+
org.springframework:spring-core:6.2.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
273261
org.springframework:spring-expression:6.0.2=testCompileClasspath,testRuntimeClasspath
274-
org.springframework:spring-expression:7.0.0-M7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
262+
org.springframework:spring-expression:6.2.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
275263
org.springframework:spring-jcl:6.0.2=testCompileClasspath,testRuntimeClasspath
264+
org.springframework:spring-jcl:6.2.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
276265
org.springframework:spring-test:6.0.2=testCompileClasspath,testRuntimeClasspath
277-
org.springframework:spring-test:7.0.0-M7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
266+
org.springframework:spring-test:6.2.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
278267
org.springframework:spring-web:6.0.2=testCompileClasspath,testRuntimeClasspath
279-
org.springframework:spring-web:7.0.0-M7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
268+
org.springframework:spring-web:6.2.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
280269
org.springframework:spring-webmvc:6.0.2=testCompileClasspath,testRuntimeClasspath
281-
org.springframework:spring-webmvc:7.0.0-M7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
270+
org.springframework:spring-webmvc:6.2.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
282271
org.testng:testng:7.5.1=latestDepTestRuntimeClasspath,testRuntimeClasspath
283272
org.webjars:jquery:3.5.1=latestDepTestRuntimeClasspath,testRuntimeClasspath
284273
org.xmlresolver:xmlresolver:4.4.3=spotbugs

0 commit comments

Comments
 (0)