Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x

jetty · Oct 28, 2020 · 1ad6eba · 1ad6eba
2 parents d3bdeef + 1c3c3ca
commit 1ad6eba
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -36,7 +36,7 @@
     <tycho-version>2.0.0</tycho-version>
     <junit.version>5.7.0</junit.version>
     <maven.version>3.6.3</maven.version>
-    <maven.resolver.version>1.3.1</maven.resolver.version>
+    <maven.resolver.version>1.6.1</maven.resolver.version>
     <weld.version>3.1.5.Final</weld.version>
     <jboss.logging.version>3.4.1.Final</jboss.logging.version>
     <jetty.perf-helper.version>1.0.6</jetty.perf-helper.version>

diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml
@@ -32,6 +32,21 @@
       <artifactId>maven-resolver-provider</artifactId>
       <version>${maven.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-util</artifactId>
+      <version>${maven.resolver.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-api</artifactId>
+      <version>${maven.resolver.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-spi</artifactId>
+      <version>${maven.resolver.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
       <artifactId>maven-resolver-connector-basic</artifactId>