Skip to content

Commit

Permalink
Ensure jetty 12 has servlet.path starting with / (#8093)
Browse files Browse the repository at this point in the history 
* 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]>
  • Loading branch information
@github-actions @amarziali
github-actions[bot] and amarziali authored Dec 17, 2024
1 parent f8d6ad8 commit 772d178
Show file tree
Hide file tree
Showing 41 changed files with 835 additions and 354 deletions.
155 changes: 155 additions & 0 deletions dd-java-agent/instrumentation/apache-httpcore-5/gradle.lockfile
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions dd-java-agent/instrumentation/armeria-grpc/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,15 @@ com.google.re2j:re2j:1.2=compileClasspath
com.google.re2j:re2j:1.7=compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath
com.linecorp.armeria:armeria-grpc-protocol:0.84.0=compileClasspath,compileProtoPath
com.linecorp.armeria:armeria-grpc-protocol:1.0.0=testCompileProtoPath,testRuntimeClasspath
com.linecorp.armeria:armeria-grpc-protocol:1.31.2=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath
com.linecorp.armeria:armeria-grpc-protocol:1.31.3=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath
com.linecorp.armeria:armeria-grpc:0.84.0=compileClasspath,compileProtoPath
com.linecorp.armeria:armeria-grpc:1.0.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
com.linecorp.armeria:armeria-grpc:1.31.2=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath
com.linecorp.armeria:armeria-grpc:1.31.3=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath
com.linecorp.armeria:armeria-junit4:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
com.linecorp.armeria:armeria-protobuf:1.31.2=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath
com.linecorp.armeria:armeria-protobuf:1.31.3=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath
com.linecorp.armeria:armeria:0.84.0=compileClasspath,compileProtoPath
com.linecorp.armeria:armeria:1.0.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
com.linecorp.armeria:armeria:1.31.2=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath
com.linecorp.armeria:armeria:1.31.3=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath
com.squareup.moshi:moshi:1.11.0=compileClasspath,compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
Expand Down
6 changes: 3 additions & 3 deletions dd-java-agent/instrumentation/armeria-jetty/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=anno
com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,jetty11LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,jetty9LatestDepTestAnnotationProcessor,jetty9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor
com.google.re2j:re2j:1.7=instrumentPluginClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
com.linecorp.armeria:armeria-jetty11:1.24.0=jetty11TestCompileClasspath,jetty11TestRuntimeClasspath
com.linecorp.armeria:armeria-jetty11:1.31.2=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath
com.linecorp.armeria:armeria-jetty11:1.31.3=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath
com.linecorp.armeria:armeria-jetty9:1.24.0=compileClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath
com.linecorp.armeria:armeria-jetty9:1.31.2=jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath
com.linecorp.armeria:armeria-jetty9:1.31.3=jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath
com.linecorp.armeria:armeria:1.24.0=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath
com.linecorp.armeria:armeria:1.31.2=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath
com.linecorp.armeria:armeria:1.31.3=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath
com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.squareup.okhttp3:logging-interceptor:3.12.12=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.squareup.okhttp3:okhttp:3.12.12=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down
Loading

0 comments on commit 772d178

Please sign in to comment.