MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Support Maven 3: use CustomMaven3RepositoryMetadataManager

Browse Source
This commit is contained in:
Sergey Evdokimov
2012-10-10 18:34:52 +04:00
parent c23e81486d
commit 0cbb7017a6
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/maven3-server-impl/lib/maven3/lib/maven-compat-3.0.3.jar
BIN
View File
Binary file not shown.
plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedderImpl.java
+4 -5
View File
@@ -25,6 +25,7 @@ import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
import org.apache.maven.artifact.resolver.*;
import org.apache.maven.cli.MavenCli;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
@@ -70,10 +71,7 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationExce
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.idea.maven.model.*;
import org.jetbrains.idea.maven.server.embedder.CustomMaven3ArtifactResolver;
import org.jetbrains.idea.maven.server.embedder.CustomMaven3ModelInterpolator;
import org.jetbrains.idea.maven.server.embedder.FieldAccessor;
import org.jetbrains.idea.maven.server.embedder.MavenExecutionResult;
import org.jetbrains.idea.maven.server.embedder.*;
import org.sonatype.aether.RepositorySystemSession;
import java.io.File;
@@ -249,7 +247,7 @@ public class Maven3ServerEmbedderImpl extends MavenRemoteObject implements Maven
//((CustomArtifactFactory)getComponent(ArtifactFactory.class)).customize();
//((CustomArtifactFactory)getComponent(ProjectArtifactFactory.class)).customize();
((CustomMaven3ArtifactResolver)getComponent(ArtifactResolver.class)).customize(workspaceMap, failOnUnresolvedDependency);
//((CustomRepositoryMetadataManager)getComponent(RepositoryMetadataManager.class)).customize(workspaceMap);
((CustomMaven3RepositoryMetadataManager)getComponent(RepositoryMetadataManager.class)).customize(workspaceMap);
//((CustomMaven3WagonManager)getComponent(WagonManager.class)).customize(failOnUnresolvedDependency);
setConsoleAndIndicator(console, indicator);
@@ -587,6 +585,7 @@ public class Maven3ServerEmbedderImpl extends MavenRemoteObject implements Maven
//((CustomArtifactFactory)getComponent(ProjectArtifactFactory.class)).reset();
//((CustomArtifactFactory)getComponent(ArtifactFactory.class)).reset();
((CustomMaven3ArtifactResolver)getComponent(ArtifactResolver.class)).reset();
((CustomMaven3RepositoryMetadataManager)getComponent(RepositoryMetadataManager.class)).reset();
//((CustomRepositoryMetadataManager)getComponent(RepositoryMetadataManager.class)).reset();
//((CustomWagonManager)getComponent(WagonManager.class)).reset();
}
plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/embedder/CustomMaven3RepositoryMetadataManager.java
+3 -6
View File
@@ -15,13 +15,11 @@
*/
package org.jetbrains.idea.maven.server.embedder;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.repository.metadata.*;
import org.jetbrains.idea.maven.model.MavenId;
import org.jetbrains.idea.maven.model.MavenWorkspaceMap;
import java.util.List;
public class CustomMaven3RepositoryMetadataManager extends DefaultRepositoryMetadataManager {
private MavenWorkspaceMap myWorkspaceMap;
@@ -34,9 +32,8 @@ public class CustomMaven3RepositoryMetadataManager extends DefaultRepositoryMeta
}
@Override
public void resolve(RepositoryMetadata metadata, List remoteRepositories, ArtifactRepository localRepository)
throws RepositoryMetadataResolutionException {
super.resolve(metadata, remoteRepositories, localRepository);
public void resolve(RepositoryMetadata metadata, RepositoryRequest request) throws RepositoryMetadataResolutionException {
super.resolve(metadata, request);
MavenWorkspaceMap map = myWorkspaceMap;
if (map == null) return;