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

Browse Source 
Bug fix (avoid NPE)
This commit is contained in:
Sergey Evdokimov
2012-10-25 15:46:07 +04:00
parent 78131bbce4
commit a014f87f01
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/embedder/CustomMaven3Artifact.java
+1
View File
@@ -316,6 +316,7 @@ public class CustomMaven3Artifact implements Artifact {
}
public int compareTo(Artifact o) {
if (o instanceof CustomMaven3Artifact) o = ((CustomMaven3Artifact)o).myWrapee;
return myWrapee.compareTo(o);
}
plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/embedder/CustomMaven3ArtifactResolver.java
+12 -3
View File
@@ -29,9 +29,11 @@ import org.jetbrains.idea.maven.server.MavenModelConverter;
import org.jetbrains.idea.maven.server.UnresolvedArtifactsCollector;
import org.sonatype.aether.RepositorySystem;
import org.sonatype.aether.RepositorySystemSession;
import org.sonatype.aether.repository.LocalRepository;
import org.sonatype.aether.repository.LocalRepositoryManager;
import org.sonatype.aether.resolution.ArtifactRequest;
import org.sonatype.aether.resolution.ArtifactResult;
import org.sonatype.aether.util.FilterRepositorySystemSession;
import java.io.File;
import java.util.*;
@@ -108,9 +110,16 @@ public class CustomMaven3ArtifactResolver
}
}
private RepositorySystemSession getSession( ArtifactRepository localRepository )
{
return LegacyLocalRepositoryManager.overlay( localRepository, legacySupport.getRepositorySession(), repoSystem );
private RepositorySystemSession getSession(ArtifactRepository localRepository) {
RepositorySystemSession session =
LegacyLocalRepositoryManager.overlay(localRepository, legacySupport.getRepositorySession(), repoSystem);
return new FilterRepositorySystemSession(session) {
@Override
public LocalRepository getLocalRepository() {
return getLocalRepositoryManager().getRepository(); // avoid NPE in DefaultMetadataResolver.resolve(RepositorySystemSession,Collection<? extends MetadataRequest>) : 318
}
};
}
private void injectSession1( RepositoryRequest request, MavenSession session )