Skip to content

Commit 772d178

Browse files
github-actions[bot]amarziali
github-actions[bot]
and
amarziali
authored
Ensure jetty 12 has servlet.path starting with / (#8093)
* chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * baseline latest cxf to java 17 * Ensure servlet.path starts with / * fix min java version property * reformat --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Andrea Marziali <[email protected]>
1 parent f8d6ad8 commit 772d178

File tree

41 files changed

+835
-354
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+835
-354
lines changed

‎dd-java-agent/instrumentation/apache-httpcore-5/gradle.lockfile‎

Lines changed: 155 additions & 0 deletions
Large diffs are not rendered by default.

‎dd-java-agent/instrumentation/armeria-grpc/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ com.google.re2j:re2j:1.2=compileClasspath
7979
com.google.re2j:re2j:1.7=compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath
8080
com.linecorp.armeria:armeria-grpc-protocol:0.84.0=compileClasspath,compileProtoPath
8181
com.linecorp.armeria:armeria-grpc-protocol:1.0.0=testCompileProtoPath,testRuntimeClasspath
82-
com.linecorp.armeria:armeria-grpc-protocol:1.31.2=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath
82+
com.linecorp.armeria:armeria-grpc-protocol:1.31.3=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath
8383
com.linecorp.armeria:armeria-grpc:0.84.0=compileClasspath,compileProtoPath
8484
com.linecorp.armeria:armeria-grpc:1.0.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
85-
com.linecorp.armeria:armeria-grpc:1.31.2=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath
85+
com.linecorp.armeria:armeria-grpc:1.31.3=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath
8686
com.linecorp.armeria:armeria-junit4:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
87-
com.linecorp.armeria:armeria-protobuf:1.31.2=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath
87+
com.linecorp.armeria:armeria-protobuf:1.31.3=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath
8888
com.linecorp.armeria:armeria:0.84.0=compileClasspath,compileProtoPath
8989
com.linecorp.armeria:armeria:1.0.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
90-
com.linecorp.armeria:armeria:1.31.2=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath
90+
com.linecorp.armeria:armeria:1.31.3=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath
9191
com.squareup.moshi:moshi:1.11.0=compileClasspath,compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
9292
com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
9393
com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath

‎dd-java-agent/instrumentation/armeria-jetty/gradle.lockfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=anno
5454
com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,jetty11LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,jetty9LatestDepTestAnnotationProcessor,jetty9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor
5555
com.google.re2j:re2j:1.7=instrumentPluginClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
5656
com.linecorp.armeria:armeria-jetty11:1.24.0=jetty11TestCompileClasspath,jetty11TestRuntimeClasspath
57-
com.linecorp.armeria:armeria-jetty11:1.31.2=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath
57+
com.linecorp.armeria:armeria-jetty11:1.31.3=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath
5858
com.linecorp.armeria:armeria-jetty9:1.24.0=compileClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath
59-
com.linecorp.armeria:armeria-jetty9:1.31.2=jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath
59+
com.linecorp.armeria:armeria-jetty9:1.31.3=jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath
6060
com.linecorp.armeria:armeria:1.24.0=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath
61-
com.linecorp.armeria:armeria:1.31.2=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath
61+
com.linecorp.armeria:armeria:1.31.3=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath
6262
com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
6363
com.squareup.okhttp3:logging-interceptor:3.12.12=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
6464
com.squareup.okhttp3:okhttp:3.12.12=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath

0 commit comments

Comments
 (0)