diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 522f0669b1..5d7c10a0d9 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -105,6 +105,14 @@ under the License. guice no_aop + + com.google.guava + guava + + + com.google.guava + failureaccess + javax.inject javax.inject diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index a8bcc51372..6792e6219b 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -75,41 +75,29 @@ under the License. maven-shared-utils - com.google.inject - guice - no_aop - - - aopalliance - aopalliance - - - - com.google.code.findbugs - jsr305 - - - org.checkerframework - checker-compat-qual - - - com.google.errorprone - error_prone_annotations - - - com.google.j2objc - j2objc-annotations - - - org.codehaus.mojo - animal-sniffer-annotations - - - org.checkerframework - checker-qual - - - + com.google.inject + guice + no_aop + + + aopalliance + aopalliance + + + + com.google.guava + guava + + + + + com.google.guava + guava + + + com.google.guava + failureaccess + javax.inject javax.inject diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index a2ba1b0061..cd432cb115 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -74,6 +74,16 @@ under the License. no_aop test + + com.google.guava + guava + test + + + com.google.guava + failureaccess + test + org.xmlunit xmlunit-core diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml index 06c83834da..2b9422ca3e 100644 --- a/maven-resolver-provider/pom.xml +++ b/maven-resolver-provider/pom.xml @@ -80,8 +80,22 @@ under the License. aopalliance aopalliance + + com.google.guava + guava + + + com.google.guava + guava + true + + + com.google.guava + failureaccess + true + org.apache.maven.resolver diff --git a/pom.xml b/pom.xml index 9781f29d90..0815f331a4 100644 --- a/pom.xml +++ b/pom.xml @@ -58,6 +58,8 @@ under the License. 1.26 3.3.0 4.2.3 + 30.1-jre + 1.0.1 0.3.5 3.5.1 2.0 @@ -243,6 +245,50 @@ under the License. guice ${guiceVersion} no_aop + + + com.google.guava + guava + + + + + + com.google.guava + guava + ${guavaVersion} + + + com.google.code.findbugs + jsr305 + + + com.google.errorprone + error_prone_annotations + + + com.google.guava + failureaccess + + + com.google.guava + listenablefuture + + + com.google.j2objc + j2objc-annotations + + + org.checkerframework + checker-qual + + + + + + com.google.guava + failureaccess + ${guavafailureaccessVersion} org.eclipse.sisu