From 8171d13289d8962310d9433acd8852b268b7c2c2 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 29 Aug 2024 08:49:17 +1000 Subject: [PATCH 1/2] use last h2spec version for quick test Signed-off-by: Olivier Lamy --- jetty-core/jetty-http2/jetty-http2-tests/pom.xml | 2 +- pom.xml | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/jetty-core/jetty-http2/jetty-http2-tests/pom.xml b/jetty-core/jetty-http2/jetty-http2-tests/pom.xml index 3dea9657aadb..e0cfa5d9b70b 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-tests/pom.xml @@ -75,7 +75,7 @@ org.mortbay.jetty h2spec-maven-plugin - 1.0.12 + 1.0.13 org.eclipse.jetty.http2.tests.H2SpecServer ${h2spec.skip} diff --git a/pom.xml b/pom.xml index 3124b3913b90..55dd5730c6e9 100644 --- a/pom.xml +++ b/pom.xml @@ -192,7 +192,6 @@ 2.11.0 33.2.1-jre 7.0.0 - 1.0.13 2.2 5.4.0 7.1.1.Final @@ -1670,11 +1669,6 @@ jacoco-maven-plugin ${jacoco.maven.plugin.version} - - org.mortbay.jetty - h2spec-maven-plugin - ${h2spec.maven.plugin.version} - From 763ba8ce4939b67157b313d9b5209c92ddacf633 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 29 Aug 2024 13:49:25 +1000 Subject: [PATCH 2/2] move h2spec to a profile Signed-off-by: Olivier Lamy --- .../jetty-http2/jetty-http2-tests/pom.xml | 53 +++++++++++-------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/jetty-core/jetty-http2/jetty-http2-tests/pom.xml b/jetty-core/jetty-http2/jetty-http2-tests/pom.xml index e0cfa5d9b70b..82af1f7e8891 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-tests/pom.xml @@ -72,33 +72,40 @@ --add-reads org.eclipse.jetty.http2.server=org.eclipse.jetty.logging - - org.mortbay.jetty - h2spec-maven-plugin - 1.0.13 - - org.eclipse.jetty.http2.tests.H2SpecServer - ${h2spec.skip} - org.eclipse.jetty.h2spec - true - - 3.5 - Sends invalid connection preface - - - - - h2spec - - h2spec - - test - - - + + h2spec + + + + org.mortbay.jetty + h2spec-maven-plugin + 1.0.13 + + org.eclipse.jetty.http2.tests.H2SpecServer + ${h2spec.skip} + org.eclipse.jetty.h2spec + true + + 3.5 - Sends invalid connection preface + + + + + h2spec + + h2spec + + test + + + + + + run-spec-server