Skip to content

Commit 6ec3446

Browse files
amarzialiamarziali
authored
Bump jetty for testing to 9.4 (#7776)
* Bump jetty for testing to 9.4 * Update lockfiles * use right http2 version for dsm test * Deal with different error handler * Fix method handling to be case insensitive * Add all transitive deps lockfiles
1 parent b53b6dc commit 6ec3446

File tree

454 files changed

+2148
-2185
lines changed

Some content is hidden

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

454 files changed

+2148
-2185
lines changed

‎communication/gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
7373
org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
7474
org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
7575
org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
76-
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
76+
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testRuntimeClasspath
7777
org.checkerframework:checker-compat-qual:2.5.5=testCompileClasspath,testRuntimeClasspath
7878
org.checkerframework:checker-qual:3.13.0=testCompileClasspath,testRuntimeClasspath
7979
org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath

‎dd-java-agent/agent-bootstrap/gradle.lockfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
6767
org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
6868
org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
6969
org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
70-
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
70+
org.apiguardian:apiguardian-api:1.1.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
7171
org.codehaus.groovy:groovy-all:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
7272
org.codehaus.groovy:groovy-ant:2.5.14=codenarc
7373
org.codehaus.groovy:groovy-ant:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -99,10 +99,10 @@ org.codehaus.groovy:groovy:2.5.14=codenarc
9999
org.codehaus.groovy:groovy:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
100100
org.codenarc:CodeNarc:2.2.0=codenarc
101101
org.dom4j:dom4j:2.1.3=spotbugs
102-
org.eclipse.jetty:jetty-http:9.2.30.v20200428=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
103-
org.eclipse.jetty:jetty-io:9.2.30.v20200428=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
104-
org.eclipse.jetty:jetty-server:9.2.30.v20200428=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
105-
org.eclipse.jetty:jetty-util:9.2.30.v20200428=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
102+
org.eclipse.jetty:jetty-http:9.4.56.v20240826=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
103+
org.eclipse.jetty:jetty-io:9.4.56.v20240826=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
104+
org.eclipse.jetty:jetty-server:9.4.56.v20240826=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
105+
org.eclipse.jetty:jetty-util:9.4.56.v20240826=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
106106
org.gmetrics:GMetrics:1.1=codenarc
107107
org.hamcrest:hamcrest-core:1.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
108108
org.hamcrest:hamcrest:2.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath

‎dd-java-agent/agent-builder/gradle.lockfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
6565
org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
6666
org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
6767
org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
68-
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
68+
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testRuntimeClasspath
6969
org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath
7070
org.codehaus.groovy:groovy-ant:2.5.14=codenarc
7171
org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath
@@ -97,10 +97,10 @@ org.codehaus.groovy:groovy:2.5.14=codenarc
9797
org.codehaus.groovy:groovy:3.0.17=testCompileClasspath,testRuntimeClasspath
9898
org.codenarc:CodeNarc:2.2.0=codenarc
9999
org.dom4j:dom4j:2.1.3=spotbugs
100-
org.eclipse.jetty:jetty-http:9.2.30.v20200428=testCompileClasspath,testRuntimeClasspath
101-
org.eclipse.jetty:jetty-io:9.2.30.v20200428=testCompileClasspath,testRuntimeClasspath
102-
org.eclipse.jetty:jetty-server:9.2.30.v20200428=testCompileClasspath,testRuntimeClasspath
103-
org.eclipse.jetty:jetty-util:9.2.30.v20200428=testCompileClasspath,testRuntimeClasspath
100+
org.eclipse.jetty:jetty-http:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
101+
org.eclipse.jetty:jetty-io:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
102+
org.eclipse.jetty:jetty-server:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
103+
org.eclipse.jetty:jetty-util:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
104104
org.gmetrics:GMetrics:1.1=codenarc
105105
org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath
106106
org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath

‎dd-java-agent/agent-ci-visibility/gradle.lockfile‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ com.eed3si9n:sjson-new-scalajson_2.13:0.9.1=zinc
1919
com.fasterxml.jackson.core:jackson-annotations:2.16.0=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
2020
com.fasterxml.jackson.core:jackson-core:2.16.0=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
2121
com.fasterxml.jackson.core:jackson-databind:2.16.0=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
22-
com.fasterxml.jackson:jackson-bom:2.16.0=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
2322
com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
2423
com.github.jnr:jffi:1.3.13=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
2524
com.github.jnr:jnr-a64asm:1.0.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
@@ -88,7 +87,7 @@ org.apache.logging.log4j:log4j-api:2.17.1=zinc
8887
org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
8988
org.apache.logging.log4j:log4j-core:2.17.1=zinc
9089
org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
91-
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
90+
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
9291
org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
9392
org.codehaus.groovy:groovy-ant:2.5.14=codenarc
9493
org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
@@ -120,10 +119,10 @@ org.codehaus.groovy:groovy:2.5.14=codenarc
120119
org.codehaus.groovy:groovy:3.0.17=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
121120
org.codenarc:CodeNarc:2.2.0=codenarc
122121
org.dom4j:dom4j:2.1.3=spotbugs
123-
org.eclipse.jetty:jetty-http:9.2.30.v20200428=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
124-
org.eclipse.jetty:jetty-io:9.2.30.v20200428=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
125-
org.eclipse.jetty:jetty-server:9.2.30.v20200428=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
126-
org.eclipse.jetty:jetty-util:9.2.30.v20200428=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
122+
org.eclipse.jetty:jetty-http:9.4.56.v20240826=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
123+
org.eclipse.jetty:jetty-io:9.4.56.v20240826=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
124+
org.eclipse.jetty:jetty-server:9.4.56.v20240826=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
125+
org.eclipse.jetty:jetty-util:9.4.56.v20240826=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
127126
org.freemarker:freemarker:2.3.30=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
128127
org.fusesource.jansi:jansi:2.1.0=zinc
129128
org.gmetrics:GMetrics:1.1=codenarc
@@ -166,7 +165,7 @@ org.junit.platform:junit-platform-runner:1.9.2=testFixturesRuntimeClasspath,test
166165
org.junit.platform:junit-platform-suite-api:1.9.2=testFixturesRuntimeClasspath,testRuntimeClasspath
167166
org.junit.platform:junit-platform-suite-commons:1.9.2=testFixturesRuntimeClasspath,testRuntimeClasspath
168167
org.junit:junit-bom:5.9.1=spotbugs
169-
org.junit:junit-bom:5.9.2=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
168+
org.junit:junit-bom:5.9.2=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
170169
org.msgpack:jackson-dataformat-msgpack:0.9.6=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
171170
org.msgpack:msgpack-core:0.9.6=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
172171
org.objenesis:objenesis:3.3=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath

‎dd-java-agent/agent-crashtracking/gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
5656
org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
5757
org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
5858
org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
59-
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
59+
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testRuntimeClasspath
6060
org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath
6161
org.codehaus.groovy:groovy-ant:2.5.14=codenarc
6262
org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath

‎dd-java-agent/agent-debugger/debugger-bootstrap/gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
3434
org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
3535
org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
3636
org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
37-
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
37+
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testRuntimeClasspath
3838
org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath
3939
org.codehaus.groovy:groovy-ant:2.5.14=codenarc
4040
org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath

‎dd-java-agent/agent-debugger/debugger-el/gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
3838
org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
3939
org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
4040
org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
41-
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
41+
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testRuntimeClasspath
4242
org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath
4343
org.codehaus.groovy:groovy-ant:2.5.14=codenarc
4444
org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath

‎dd-java-agent/agent-debugger/debugger-test-scala/gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ org.apache.logging.log4j:log4j-api:2.17.1=zinc
4646
org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
4747
org.apache.logging.log4j:log4j-core:2.17.1=zinc
4848
org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
49-
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
49+
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testRuntimeClasspath
5050
org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath
5151
org.codehaus.groovy:groovy-ant:2.5.14=codenarc
5252
org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath

‎dd-java-agent/agent-debugger/gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
8181
org.apache.logging.log4j:log4j-to-slf4j:2.13.3=testCompileClasspath,testRuntimeClasspath
8282
org.apache.tomcat.embed:tomcat-embed-core:9.0.39=testCompileClasspath,testRuntimeClasspath
8383
org.apache.tomcat.embed:tomcat-embed-websocket:9.0.39=testCompileClasspath,testRuntimeClasspath
84-
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
84+
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testRuntimeClasspath
8585
org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath
8686
org.codehaus.groovy:groovy-ant:2.5.14=codenarc
8787
org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath

0 commit comments

Comments
 (0)