Skip to content

Commit 763f76c

Browse files
committed
[MNG-6642] Revert "[MNG-5995] Remove dependency to maven-compat (#185)"
This partially reverts commit bb3ec5d to restore working with Tycho P2 repository.
1 parent 61d888c commit 763f76c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import org.apache.maven.artifact.Artifact;
3434
import org.apache.maven.artifact.InvalidRepositoryException;
3535
import org.apache.maven.artifact.repository.ArtifactRepository;
36-
import org.apache.maven.bridge.MavenRepositorySystem;
3736
import org.apache.maven.classrealm.ClassRealmManager;
3837
import org.apache.maven.model.Build;
3938
import org.apache.maven.model.Extension;
@@ -45,6 +44,7 @@
4544
import org.apache.maven.plugin.PluginManagerException;
4645
import org.apache.maven.plugin.PluginResolutionException;
4746
import org.apache.maven.plugin.version.PluginVersionResolutionException;
47+
import org.apache.maven.repository.RepositorySystem;
4848
import org.codehaus.plexus.PlexusContainer;
4949
import org.codehaus.plexus.classworlds.realm.ClassRealm;
5050
import org.codehaus.plexus.component.annotations.Component;
@@ -78,7 +78,7 @@ public class DefaultProjectBuildingHelper
7878
private ProjectRealmCache projectRealmCache;
7979

8080
@Requirement
81-
private MavenRepositorySystem repositorySystem;
81+
private RepositorySystem repositorySystem;
8282

8383
@Requirement
8484
private MavenPluginManager pluginManager;
@@ -92,7 +92,7 @@ public List<ArtifactRepository> createArtifactRepositories( List<Repository> pom
9292

9393
for ( Repository repository : pomRepositories )
9494
{
95-
internalRepositories.add( MavenRepositorySystem.buildArtifactRepository( repository ) );
95+
internalRepositories.add( repositorySystem.buildArtifactRepository( repository ) );
9696
}
9797

9898
repositorySystem.injectMirror( request.getRepositorySession(), internalRepositories );

0 commit comments

Comments
 (0)