Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-6642] Revert "[MNG-5995] Remove dependency to maven-compat (#185)" 

This partially reverts commit bb3ec5da71 to restore working with Tycho P2 repository.
This commit is contained in:
Sylwester Lachiewicz 2018-10-13 04:16:44 +02:00
parent 61d888c785
commit 763f76cf83
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,6 @@ import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.bridge.MavenRepositorySystem;
import org.apache.maven.classrealm.ClassRealmManager;
import org.apache.maven.model.Build;
import org.apache.maven.model.Extension;
@ -45,6 +44,7 @@ import org.apache.maven.plugin.MavenPluginManager;
import org.apache.maven.plugin.PluginManagerException;
import org.apache.maven.plugin.PluginResolutionException;
import org.apache.maven.plugin.version.PluginVersionResolutionException;
import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.annotations.Component;
@ -78,7 +78,7 @@ public class DefaultProjectBuildingHelper
private ProjectRealmCache projectRealmCache;
@Requirement
private MavenRepositorySystem repositorySystem;
private RepositorySystem repositorySystem;
@Requirement
private MavenPluginManager pluginManager;
@ -92,7 +92,7 @@ public class DefaultProjectBuildingHelper
for ( Repository repository : pomRepositories )
{
internalRepositories.add( MavenRepositorySystem.buildArtifactRepository( repository ) );
internalRepositories.add( repositorySystem.buildArtifactRepository( repository ) );
}
repositorySystem.injectMirror( request.getRepositorySession(), internalRepositories );