Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into seth.samuel/DBMON-4…
Browse files Browse the repository at this point in the history
…656-mysql-jdbc
  • Loading branch information
sethsamuel committed Oct 11, 2024
2 parents 188d110 + eadf0cc commit 2f50239
Show file tree
Hide file tree
Showing 67 changed files with 2,114 additions and 469 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath
ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath
com.beust:jcommander:1.78=testRuntimeClasspath
com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.datadoghq:ddprof:1.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.datadoghq:ddprof:1.15.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath
com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs
Expand Down
8 changes: 4 additions & 4 deletions dd-java-agent/instrumentation/aerospike-4/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClas
com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-annotations:2.10.3=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.docker-java:docker-java-api:3.3.4=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.docker-java:docker-java-transport-zerodep:3.3.4=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.docker-java:docker-java-transport:3.3.4=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.docker-java:docker-java-api:3.4.0=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.docker-java:docker-java-transport-zerodep:3.4.0=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.docker-java:docker-java-transport:3.4.0=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.javaparser:javaparser-core:3.25.1=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
Expand Down Expand Up @@ -162,7 +162,7 @@ org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
org.spockframework:spock-core:2.2-groovy-3.0=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.spockframework:spock-junit4:2.2-groovy-3.0=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.testcontainers:testcontainers:1.19.3=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.testcontainers:testcontainers:1.20.1=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.testng:testng:7.5=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
org.webjars:jquery:3.5.1=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
org.xmlresolver:xmlresolver:4.4.3=spotbugs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ com.typesafe.akka:akka-actor_2.12:2.5.32=version101ForkedTestCompileClasspath,ve
com.typesafe.akka:akka-actor_2.12:2.6.21=version102IastTestCompileClasspath,version102IastTestRuntimeClasspath
com.typesafe.akka:akka-actor_2.13:2.6.21=version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath
com.typesafe.akka:akka-actor_2.13:2.7.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
com.typesafe.akka:akka-actor_2.13:2.8.6=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath
com.typesafe.akka:akka-actor_2.13:2.8.7=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath
com.typesafe.akka:akka-cluster-sharding_2.11:2.5.9=lagomTestCompileClasspath,lagomTestRuntimeClasspath
com.typesafe.akka:akka-cluster-tools_2.11:2.5.9=lagomTestCompileClasspath,lagomTestRuntimeClasspath
com.typesafe.akka:akka-cluster_2.11:2.5.9=lagomTestCompileClasspath,lagomTestRuntimeClasspath
Expand Down Expand Up @@ -144,7 +144,7 @@ com.typesafe.akka:akka-persistence_2.11:2.5.9=lagomTestCompileClasspath,lagomTes
com.typesafe.akka:akka-protobuf-v3_2.12:2.6.21=version102IastTestCompileClasspath,version102IastTestRuntimeClasspath
com.typesafe.akka:akka-protobuf-v3_2.13:2.6.21=version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath
com.typesafe.akka:akka-protobuf-v3_2.13:2.7.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
com.typesafe.akka:akka-protobuf-v3_2.13:2.8.6=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath
com.typesafe.akka:akka-protobuf-v3_2.13:2.8.7=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath
com.typesafe.akka:akka-protobuf_2.11:2.5.9=lagomTestCompileClasspath,lagomTestRuntimeClasspath
com.typesafe.akka:akka-protobuf_2.12:2.5.32=version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath
com.typesafe.akka:akka-remote_2.11:2.5.9=lagomTestCompileClasspath,lagomTestRuntimeClasspath
Expand All @@ -157,7 +157,7 @@ com.typesafe.akka:akka-stream_2.12:2.5.32=version101ForkedTestCompileClasspath,v
com.typesafe.akka:akka-stream_2.12:2.6.21=version102IastTestCompileClasspath,version102IastTestRuntimeClasspath
com.typesafe.akka:akka-stream_2.13:2.6.21=version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath
com.typesafe.akka:akka-stream_2.13:2.7.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
com.typesafe.akka:akka-stream_2.13:2.8.6=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath
com.typesafe.akka:akka-stream_2.13:2.8.7=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath
com.typesafe.akka:akka-testkit_2.11:2.5.9=lagomTestCompileClasspath,lagomTestRuntimeClasspath
com.typesafe.netty:netty-reactive-streams:2.0.0=lagomTestCompileClasspath,lagomTestRuntimeClasspath
com.typesafe.play:build-link:2.6.11=lagomTestCompileClasspath,lagomTestRuntimeClasspath
Expand Down
Loading

0 comments on commit 2f50239

Please sign in to comment.