Make sure our CachingProjectBuilder is used, fixes #218

apache · Nov 16, 2020 · 99b41fc · 99b41fc
1 parent b6cc70e
commit 99b41fc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/daemon/src/main/java/org/apache/maven/project/CachingProjectBuilder.java b/daemon/src/main/java/org/apache/maven/project/CachingProjectBuilder.java
@@ -75,6 +75,7 @@
 import org.eclipse.aether.repository.WorkspaceRepository;
 import org.eclipse.aether.resolution.ArtifactRequest;
 import org.eclipse.aether.resolution.ArtifactResult;
+import org.eclipse.sisu.Priority;
 import org.eclipse.sisu.Typed;
 
 /**
@@ -86,6 +87,7 @@
 @Named
 @Singleton
 @Typed(ProjectBuilder.class)
+@Priority(10)
 public class CachingProjectBuilder
         implements ProjectBuilder {
 

diff --git a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/NewManagedModuleNativeIT.java b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/NewManagedModuleNativeIT.java
@@ -83,7 +83,7 @@ void upgrade() throws IOException, InterruptedException {
         {
             final TestClientOutput output = new TestClientOutput();
             cl.execute(output, "clean", "install", "-e", "-B", "-ntp")
-                    .assertFailure(); // Switch back to assertSuccess() once https://github.com/mvndaemon/mvnd/issues/218 is fixed
+                    .assertSuccess();
         }
         Assertions.assertThat(registry.getAll().size()).isEqualTo(1);
 

diff --git a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/UpgradesInBomNativeIT.java b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/UpgradesInBomNativeIT.java
@@ -77,7 +77,7 @@ void upgrade() throws IOException, InterruptedException {
         {
             final TestClientOutput output = new TestClientOutput();
             cl.execute(output, "clean", "install", "-e")
-                    .assertFailure(); // Switch back to assertSuccess() once https://github.com/mvndaemon/mvnd/issues/218 is fixed
+                    .assertSuccess();
         }
         Assertions.assertThat(registry.getAll().size()).isEqualTo(1);