apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-11 13:39:32 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Make sure our CachingProjectBuilder is used, fixes #218

Browse Source
This commit is contained in:
Guillaume Nodet
2020-11-16 20:08:52 +01:00
parent ac0e755823
commit e07f378fe1
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/src/main/java/org/apache/maven/project/CachingProjectBuilder.java
View File

@@ -75,6 +75,7 @@ import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.repository.WorkspaceRepository; import org.eclipse.aether.repository.WorkspaceRepository;
import org.eclipse.aether.resolution.ArtifactRequest; import org.eclipse.aether.resolution.ArtifactRequest;
import org.eclipse.aether.resolution.ArtifactResult; import org.eclipse.aether.resolution.ArtifactResult;
import org.eclipse.sisu.Priority;
import org.eclipse.sisu.Typed; import org.eclipse.sisu.Typed;
/** /**
@@ -86,6 +87,7 @@ import org.eclipse.sisu.Typed;
@Named @Named
@Singleton @Singleton
@Typed(ProjectBuilder.class) @Typed(ProjectBuilder.class)
@Priority(10)
public class CachingProjectBuilder public class CachingProjectBuilder
implements ProjectBuilder { implements ProjectBuilder {

2
integration-tests/src/test/java/org/mvndaemon/mvnd/it/NewManagedModuleNativeIT.java
View File

@@ -83,7 +83,7 @@ public class NewManagedModuleNativeIT {
{ {
final TestClientOutput output = new TestClientOutput(); final TestClientOutput output = new TestClientOutput();
cl.execute(output, "clean", "install", "-e", "-B", "-ntp") 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); Assertions.assertThat(registry.getAll().size()).isEqualTo(1);

2
integration-tests/src/test/java/org/mvndaemon/mvnd/it/UpgradesInBomNativeIT.java
View File

@@ -77,7 +77,7 @@ public class UpgradesInBomNativeIT {
{ {
final TestClientOutput output = new TestClientOutput(); final TestClientOutput output = new TestClientOutput();
cl.execute(output, "clean", "install", "-e") 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); Assertions.assertThat(registry.getAll().size()).isEqualTo(1);