From 82585f748b496c073d6116e91be9de3ca33fc15f Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Tue, 21 Jun 2022 16:04:54 +0200
Subject: [PATCH 1/2] Fix test-distribution classpath re resolver

As currently it seems mixed versions of resolver artifacts are
present on classpath. Resolver 1.8.0 introduces a binary
breakage.

Anyway, this fixes the thing, as impl was actually coming in
as transitive dep of maven-resolver-provider, that is NOT
the same version as the rest of resolver dependencies.

Relying on transitive while fixing other versions is wrong.
---
 tests/test-distribution/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml
index 5f23b4f7f8e5..8f9edd248d01 100644
--- a/tests/test-distribution/pom.xml
+++ b/tests/test-distribution/pom.xml
@@ -48,6 +48,11 @@
       <artifactId>maven-resolver-spi</artifactId>
       <version>${maven.resolver.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-impl</artifactId>
+      <version>${maven.resolver.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
       <artifactId>maven-resolver-connector-basic</artifactId>

From bb3dee410c993c12d54629b75db3a38b11ad49bd Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Tue, 21 Jun 2022 16:22:00 +0200
Subject: [PATCH 2/2] Update to resolver 1.8.1

And add exclusion to banned dependency, that is used when
running in SISU container.
---
 pom.xml                         | 2 +-
 tests/test-distribution/pom.xml | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e3f7d28b0164..f3c956d7828e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,7 @@
     <mariadb.version>3.0.5</mariadb.version>
     <mariadb.docker.version>10.3.6</mariadb.docker.version>
     <maven-artifact-transfer.version>0.13.1</maven-artifact-transfer.version>
-    <maven.resolver.version>1.8.0</maven.resolver.version>
+    <maven.resolver.version>1.8.1</maven.resolver.version>
     <maven.version>3.8.4</maven.version>
     <mongodb.version>3.12.11</mongodb.version>
     <openpojo.version>0.9.1</openpojo.version>
diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml
index 8f9edd248d01..ca48cc68b7a8 100644
--- a/tests/test-distribution/pom.xml
+++ b/tests/test-distribution/pom.xml
@@ -52,6 +52,13 @@
       <groupId>org.apache.maven.resolver</groupId>
       <artifactId>maven-resolver-impl</artifactId>
       <version>${maven.resolver.version}</version>
+      <exclusions>
+        <!-- Used when running in SISU container to manage beans lifecycle (of locking factories) -->
+        <exclusion>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>