diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index b12ca89b4e9..9bb1d1ba3a4 100644 --- a/jetty-jspc-maven-plugin/pom.xml +++ b/jetty-jspc-maven-plugin/pom.xml @@ -50,31 +50,17 @@ jetty-util ${project.version} - - org.apache.maven - maven-project - 2.0.3 - - - junit - junit - - - org.apache.maven maven-plugin-api - 2.0.3 org.apache.maven maven-artifact - 2.0.3 org.apache.maven.plugin-tools maven-plugin-tools-api - 3.1 junit @@ -103,6 +89,24 @@ ${project.version} test + + org.eclipse.jetty + jetty-client + ${project.version} + test + + + org.eclipse.jetty + jetty-proxy + ${project.version} + test + + + org.eclipse.jetty.http2 + http2-client + ${project.version} + test + @@ -139,6 +143,7 @@ integration-test + install integration-test verify diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index 1acc0c539e9..a650e9841a3 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -10,8 +10,6 @@ Jetty :: Jetty Maven Plugin Jetty maven plugins - 3.5.0 - 3.5 ${project.groupId}.maven.plugin false FREEBEER @@ -51,33 +49,22 @@ org.apache.maven maven-plugin-api - ${mavenVersion} org.apache.maven maven-artifact - ${mavenVersion} org.apache.maven maven-core - ${mavenVersion} org.apache.maven.plugin-tools maven-plugin-tools-api - ${pluginToolsVersion} - - - junit - junit - - org.apache.maven.plugin-tools maven-plugin-annotations - ${pluginToolsVersion} provided diff --git a/pom.xml b/pom.xml index c48de9db7c4..07e6f1f543b 100644 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,9 @@ 1.20 benchmarks 2.21.0 + + 3.5 + 3.5.0 @@ -956,12 +959,34 @@ 1.2 provided - + org.apache.maven - maven-plugin-tools-api - 2.0 + maven-plugin-api + ${mavenVersion} + + org.apache.maven + maven-artifact + ${mavenVersion} + + + org.apache.maven + maven-core + ${mavenVersion} + + + org.apache.maven.plugin-tools + maven-plugin-tools-api + ${mavenPluginToolsVersion} + + + org.apache.maven.plugin-tools + maven-plugin-annotations + ${mavenPluginToolsVersion} + provided + + org.eclipse.jetty.toolchain jetty-test-helper