diff --git a/daemon/src/main/java/org/apache/maven/project/CachingProjectBuilder.java b/daemon/src/main/java/org/apache/maven/project/CachingProjectBuilder.java index b025b9cfd..2fc5d6276 100644 --- 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 index d736f19df..45f4d3569 100644 --- 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 index bc32a89ed..7a05359f6 100644 --- 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);