From d48a71276ab8eb39a4a4cd46454e64414f7e94fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= Date: Tue, 24 Sep 2024 08:42:46 +0200 Subject: [PATCH] Don't use repo system for standalone director --- .../runtime/StandaloneDirectorRuntimeFactory.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/runtime/StandaloneDirectorRuntimeFactory.java b/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/runtime/StandaloneDirectorRuntimeFactory.java index 98f9a7c279..3cfb54dc40 100644 --- a/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/runtime/StandaloneDirectorRuntimeFactory.java +++ b/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/runtime/StandaloneDirectorRuntimeFactory.java @@ -17,9 +17,9 @@ import java.util.Arrays; import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.DefaultArtifact; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.repository.RepositorySystem; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.logging.Logger; @@ -31,9 +31,6 @@ @Component(role = StandaloneDirectorRuntimeFactory.class) public class StandaloneDirectorRuntimeFactory { - @Requirement - private RepositorySystem repositorySystem; - @Requirement DirectorRuntime bootstrapDirector; @@ -80,8 +77,8 @@ private void installStandaloneDirector(File installLocation, ArtifactRepository private File getDirectorRepositoryZip(ArtifactRepository localMavenRepository) { // this artifact is a dependency of the Mojo, so we expect it in the local Maven repo - Artifact artifact = repositorySystem.createArtifact("org.eclipse.tycho", "tycho-bundles-external", "2.7.5", - "eclipse-repository"); + Artifact artifact = new DefaultArtifact("org.eclipse.tycho", "tycho-bundles-external", "2.7.5", null, "zip", + null, null); return new File(localMavenRepository.getBasedir(), localMavenRepository.pathOf(artifact)); } }