Skip to content

Commit ffc2be9

Browse files
amarzialimcculls
andauthored
downgrade akka http 2.6 dependencies for compile (#9631)
* downgrade akka http 2.6 dependencies for compile * regenerate lockfile * Remove CSI from akka * Update dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle Co-authored-by: Stuart McCulloch <[email protected]> --------- Co-authored-by: Stuart McCulloch <[email protected]>
1 parent a081948 commit ffc2be9

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ ext {
55

66
apply from: "$rootDir/gradle/java.gradle"
77
apply plugin: 'scala'
8-
apply plugin: 'call-site-instrumentation'
8+
// temporary workaround to avoid early resolution of test classpath
9+
// ( Akka instrumentation doesn't require call-site instrumentation )
10+
// apply plugin: 'call-site-instrumentation'
911

1012

1113
muzzle {
@@ -63,8 +65,10 @@ compileLatestDepTestGroovy {
6365

6466
dependencies {
6567
main_java11CompileOnly libs.scala213
66-
main_java11CompileOnly group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '10.6.0'
67-
main_java11CompileOnly group: 'com.typesafe.akka', name: 'akka-actor_2.13', version: '2.9.0'
68+
main_java11CompileOnly group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '10.6.0-M1'
69+
// should be 2.9.0 on compileOnly but this has been temporary downgraded for the CI
70+
// for the advice compilation it should not change.
71+
main_java11CompileOnly group: 'com.typesafe.akka', name: 'akka-actor_2.13', version: '2.8.8'
6872

6973
//testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
7074
testImplementation group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '10.6.0'

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,24 +57,29 @@ 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=codenarc,latestDepTestRuntimeClasspath,testRuntimeClasspath
60+
com.typesafe.akka:akka-actor_2.13:2.8.8=main_java11CompileClasspath
6061
com.typesafe.akka:akka-actor_2.13:2.10.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
61-
com.typesafe.akka:akka-actor_2.13:2.9.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
62-
com.typesafe.akka:akka-http-core_2.13:10.6.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
62+
com.typesafe.akka:akka-actor_2.13:2.9.0=testCompileClasspath,testRuntimeClasspath
63+
com.typesafe.akka:akka-http-core_2.13:10.6.0-M1=main_java11CompileClasspath
64+
com.typesafe.akka:akka-http-core_2.13:10.6.0=testCompileClasspath,testRuntimeClasspath
6365
com.typesafe.akka:akka-http-core_2.13:10.7.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6466
com.typesafe.akka:akka-http-jackson_2.13:10.6.0=testCompileClasspath,testRuntimeClasspath
6567
com.typesafe.akka:akka-http-jackson_2.13:10.7.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6668
com.typesafe.akka:akka-http-spray-json_2.13:10.6.0=testCompileClasspath,testRuntimeClasspath
6769
com.typesafe.akka:akka-http-spray-json_2.13:10.7.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
68-
com.typesafe.akka:akka-http_2.13:10.6.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
70+
com.typesafe.akka:akka-http_2.13:10.6.0-M1=main_java11CompileClasspath
71+
com.typesafe.akka:akka-http_2.13:10.6.0=testCompileClasspath,testRuntimeClasspath
6972
com.typesafe.akka:akka-http_2.13:10.7.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
70-
com.typesafe.akka:akka-parsing_2.13:10.6.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
73+
com.typesafe.akka:akka-parsing_2.13:10.6.0-M1=main_java11CompileClasspath
74+
com.typesafe.akka:akka-parsing_2.13:10.6.0=testCompileClasspath,testRuntimeClasspath
7175
com.typesafe.akka:akka-parsing_2.13:10.7.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
7276
com.typesafe.akka:akka-pki_2.13:2.10.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
7377
com.typesafe.akka:akka-protobuf-v3_2.13:2.10.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
7478
com.typesafe.akka:akka-protobuf-v3_2.13:2.9.0=testCompileClasspath,testRuntimeClasspath
7579
com.typesafe.akka:akka-stream_2.13:2.10.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
7680
com.typesafe.akka:akka-stream_2.13:2.9.0=testCompileClasspath,testRuntimeClasspath
77-
com.typesafe:config:1.4.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
81+
com.typesafe:config:1.4.2=main_java11CompileClasspath
82+
com.typesafe:config:1.4.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
7883
commons-codec:commons-codec:1.15=spotbugs
7984
commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
8085
commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath

0 commit comments

Comments
 (0)