--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/ContextRepositorySystemSessionImpl.java.orig 2013-08-20 20:53:28.371626142 +0100
+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/ContextRepositorySystemSessionImpl.java 2013-08-20 20:50:23.503158018 +0100
@@ -34,6 +34,9 @@
import org.eclipse.aether.repository.ProxySelector;
import org.eclipse.aether.repository.WorkspaceReader;
import org.eclipse.aether.transfer.TransferListener;
+import org.eclipse.aether.resolution.ResolutionErrorPolicy;
+import org.eclipse.aether.resolution.ArtifactDescriptorPolicy;
+import org.eclipse.aether.collection.VersionFilter;
@Component(role = ContextRepositorySystemSession.class)
@@ -131,15 +134,15 @@
}
public boolean isIgnoreInvalidArtifactDescriptor() {
- return getSession().isIgnoreInvalidArtifactDescriptor();
+ return false;
}
public boolean isIgnoreMissingArtifactDescriptor() {
- return getSession().isIgnoreMissingArtifactDescriptor();
+ return false;
}
public boolean isNotFoundCachingEnabled() {
- return getSession().isNotFoundCachingEnabled();
+ return false;
}
public boolean isOffline() {
@@ -147,7 +150,22 @@
}
public boolean isTransferErrorCachingEnabled() {
- return getSession().isTransferErrorCachingEnabled();
+ return false;
}
+ public ResolutionErrorPolicy getResolutionErrorPolicy() {
+ return getSession().getResolutionErrorPolicy();
+ }
+
+ public ArtifactDescriptorPolicy getArtifactDescriptorPolicy() {
+ return getSession().getArtifactDescriptorPolicy();
+ }
+
+ public VersionFilter getVersionFilter() {
+ return getSession().getVersionFilter();
+ }
+
+ public boolean isIgnoreArtifactDescriptorRepositories() {
+ return getSession().isIgnoreArtifactDescriptorRepositories();
+ }
}
--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java.orig 2013-08-20 22:08:59.598529831 +0100
+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java 2013-08-20 22:07:20.652382818 +0100
@@ -147,7 +147,7 @@
import org.eclipse.aether.resolution.ArtifactResult;
import org.eclipse.aether.transfer.ArtifactNotFoundException;
import org.eclipse.aether.transfer.TransferListener;
-import org.eclipse.aether.util.DefaultRepositorySystemSession;
+import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.m2e.core.embedder.ICallable;
import org.eclipse.m2e.core.embedder.ILocalRepositoryListener;
@@ -292,12 +292,12 @@
return mavenSession;
}
- /*package*/FilterRepositorySystemSession createRepositorySession(MavenExecutionRequest request) {
+ /*package*/RepositorySystemSession createRepositorySession(MavenExecutionRequest request) {
try {
DefaultRepositorySystemSession session = (DefaultRepositorySystemSession) ((DefaultMaven) lookup(Maven.class))
.newRepositorySession(request);
final String updatePolicy = mavenConfiguration.getGlobalUpdatePolicy();
- return new FilterRepositorySystemSession(session, request.isUpdateSnapshots() ? null : updatePolicy);
+ return session;
} catch(CoreException ex) {
log.error(ex.getMessage(), ex);
throw new IllegalStateException("Could not look up Maven embedder", ex);
--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenExecutionContext.java.orig 2013-08-21 18:41:04.625575385 +0100
+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenExecutionContext.java 2013-08-21 18:35:01.006146151 +0100
@@ -51,7 +51,7 @@
private ArtifactRepository localRepository;
- private FilterRepositorySystemSession repositorySession;
+ private RepositorySystemSession repositorySession;
private MavenSession mavenSession;
@@ -104,7 +104,7 @@
// remember original configuration to "pop" the session stack properly
final ArtifactRepository origlocalRepository = localRepository;
- final FilterRepositorySystemSession origRepositorySession = repositorySession;
+ final RepositorySystemSession origRepositorySession = repositorySession;
final MavenSession origMavenSession = mavenSession;
final MavenExecutionRequest origRequest = request;
@@ -121,9 +121,6 @@
populateSystemProperties(request);
this.localRepository = request.getLocalRepository();
this.repositorySession = maven.createRepositorySession(request);
- if(parent != null) {
- this.repositorySession.setData(parent.repositorySession.getData());
- }
final MavenExecutionResult result = new DefaultMavenExecutionResult();
this.mavenSession = new MavenSession(maven.getPlexusContainer(), repositorySession, request, result);
}
@@ -149,8 +146,6 @@
}
private <V> V executeBare(MavenProject project, ICallable<V> callable, IProgressMonitor monitor) throws CoreException {
- final TransferListener origTransferListener = repositorySession.setTransferListener(maven
- .createArtifactTransferListener(monitor));
final MavenProject origProject = mavenSession.getCurrentProject();
final List<MavenProject> origProjects = mavenSession.getProjects();
try {
@@ -160,7 +155,6 @@
}
return callable.call(this, monitor);
} finally {
- repositorySession.setTransferListener(origTransferListener);
if(project != null) {
mavenSession.setCurrentProject(origProject);
mavenSession.setProjects(origProjects != null ? origProjects : Collections.<MavenProject> emptyList());
--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/ReadonlyMavenExecutionRequest.java.orig 2013-08-21 19:59:05.418824293 +0100
+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/ReadonlyMavenExecutionRequest.java 2013-08-21 20:04:52.944433465 +0100
@@ -435,4 +435,11 @@
return request.getProjectBuildingRequest();
}
+ public boolean isUseLegacyLocalRepository() {
+ return request.isUseLegacyLocalRepository();
+ }
+
+ public MavenExecutionRequest setUseLegacyLocalRepository( boolean useLegacyLocalRepository ) {
+ return request.setUseLegacyLocalRepository(useLegacyLocalRepository);
+ }
}
--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java.orig 2013-08-21 20:07:30.330539109 +0100
+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java 2013-08-21 20:10:36.972248347 +0100
@@ -586,12 +586,12 @@
List<PluginExecutionMetadata> result = new ArrayList<PluginExecutionMetadata>();
all_metadatas: for(PluginExecutionMetadata metadata : metadatas) {
@SuppressWarnings("unchecked")
- Map<String, String> parameters = metadata.getFilter().getParameters();
+ Map<Object, String> parameters = metadata.getFilter().getParameters();
if(!parameters.isEmpty()) {
- for(String name : parameters.keySet()) {
- String value = parameters.get(name);
+ for(Object name : parameters.keySet()) {
+ String value = (String)parameters.get(name);
MojoExecution setupExecution = maven.setupMojoExecution(mavenProject, execution, monitor);
- if(!eq(value, maven.getMojoParameterValue(mavenProject, setupExecution, name, String.class, monitor))) {
+ if(!eq(value, maven.getMojoParameterValue(mavenProject, setupExecution, (String)name, String.class, monitor))) {
continue all_metadatas;
}
}
--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/MavenModelManager.java.orig 2013-08-21 20:12:48.057946937 +0100
+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/MavenModelManager.java 2013-08-21 20:21:13.499897600 +0100
@@ -54,12 +54,11 @@
import org.eclipse.aether.collection.DependencyCollectionException;
import org.eclipse.aether.collection.DependencyGraphTransformer;
import org.eclipse.aether.graph.DependencyNode;
-import org.eclipse.aether.util.DefaultRepositorySystemSession;
+import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.util.filter.ScopeDependencyFilter;
-import org.eclipse.aether.util.graph.CloningDependencyVisitor;
-import org.eclipse.aether.util.graph.FilteringDependencyVisitor;
+import org.eclipse.aether.util.graph.visitor.CloningDependencyVisitor;
+import org.eclipse.aether.util.graph.visitor.FilteringDependencyVisitor;
import org.eclipse.aether.util.graph.transformer.ChainedDependencyGraphTransformer;
-import org.eclipse.aether.util.graph.transformer.JavaEffectiveScopeCalculator;
import org.eclipse.m2e.core.internal.IMavenConstants;
import org.eclipse.m2e.core.internal.MavenPluginActivator;
@@ -193,8 +192,7 @@
throws CoreException {
DefaultRepositorySystemSession session = new DefaultRepositorySystemSession(repositorySession);
- DependencyGraphTransformer transformer = new ChainedDependencyGraphTransformer(new JavaEffectiveScopeCalculator(),
- new NearestVersionConflictResolver());
+ DependencyGraphTransformer transformer = new ChainedDependencyGraphTransformer(new NearestVersionConflictResolver());
session.setDependencyGraphTransformer(transformer);
ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java.orig 2013-08-21 20:43:28.526419026 +0100
+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java 2013-08-21 20:46:24.949228762 +0100
@@ -1289,6 +1289,8 @@
ModelProblemCollector problems = new ModelProblemCollector() {
public void add(ModelProblem.Severity severity, String message, InputLocation location, Exception cause) {
}
+ public void add(org.apache.maven.model.building.ModelProblemCollectorRequest modelProblemCollectorRequest) {
+ }
};
lookup(ModelInterpolator.class).interpolateModel(model, project.getBasedir(), request, problems);
}
--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java.orig 2013-08-21 22:40:34.509604755 +0100
+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java 2013-08-21 22:55:01.052976833 +0100
@@ -68,7 +68,6 @@
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.SearchType;
import org.apache.maven.index.artifact.Gav;
-import org.apache.maven.index.artifact.IllegalArtifactCoordinateException;
import org.apache.maven.index.context.IndexCreator;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.creator.JarFileContentsIndexCreator;
@@ -644,13 +643,13 @@
ai.packaging = facade.getPackaging();
File pomFile = facade.getPomFile();
File artifactFile = (pomFile != null) ? pomFile.getParentFile() : null;
- try {
+ //try {
Gav gav = new Gav(key.getGroupId(), key.getArtifactId(), key.getVersion());
return new ArtifactContext(pomFile, artifactFile, null, ai, gav);
- } catch(IllegalArtifactCoordinateException ex) {
- throw new CoreException(new Status(IStatus.ERROR, IMavenConstants.PLUGIN_ID, -1,
- Messages.NexusIndexManager_error_unexpected, ex));
- }
+ //} catch(IllegalArtifactCoordinateException ex) {
+ // throw new CoreException(new Status(IStatus.ERROR, IMavenConstants.PLUGIN_ID, -1,
+ // Messages.NexusIndexManager_error_unexpected, ex));
+ //}
}
protected void scheduleIndexUpdate(final IRepository repository, final boolean force) {
@@ -1299,3 +1298,9 @@
return new String(buff);
}
}
+
+class IllegalArtifactCoordinateException extends Exception {
+ public IllegalArtifactCoordinateException(String message) {
+ super(message);
+ }
+}
--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/NearestVersionConflictResolver.java.orig 2013-08-22 18:31:53.816781922 +0100
+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/NearestVersionConflictResolver.java 2013-08-22 18:32:32.135121372 +0100
@@ -26,7 +26,7 @@
import org.eclipse.aether.collection.DependencyGraphTransformer;
import org.eclipse.aether.collection.UnsolvableVersionConflictException;
import org.eclipse.aether.graph.DependencyNode;
-import org.eclipse.aether.util.graph.DefaultDependencyNode;
+import org.eclipse.aether.graph.DefaultDependencyNode;
import org.eclipse.aether.util.graph.transformer.ConflictIdSorter;
import org.eclipse.aether.util.graph.transformer.TransformationContextKeys;
import org.eclipse.aether.version.Version;
@@ -81,15 +81,15 @@
VersionConstraint constraint = node.getVersionConstraint();
boolean backtrack = false;
- boolean hardConstraint = !constraint.getRanges().isEmpty();
+ //boolean hardConstraint = !constraint.getRange().isEmpty();
- if(hardConstraint) {
+ //if(hardConstraint) {
if(group.constraints.add(constraint)) {
if(group.version != null && !constraint.containsVersion(group.version)) {
backtrack = true;
}
}
- }
+ //}
if(isAcceptable(group, node.getVersion())) {
group.candidates.put(node, pos);
@@ -144,17 +144,17 @@
}
}
- if(group.version == null) {
- throw newFailure(group);
- }
+ //if(group.version == null) {
+ // throw newFailure(group);
+ //}
}
- private UnsolvableVersionConflictException newFailure(ConflictGroup group) {
+ private Exception newFailure(ConflictGroup group) {
Collection<String> versions = new LinkedHashSet<String>();
for(VersionConstraint constraint : group.constraints) {
versions.add(constraint.toString());
}
- return new UnsolvableVersionConflictException(group.key, versions);
+ return new Exception("Something went horribly wrong");
}
private boolean isNearer(Position pos1, Version ver1, Position pos2, Version ver2) {
@@ -168,7 +168,7 @@
private void pruneNonSelectedVersions(ConflictGroup group, Map<?, ?> conflictIds) {
for(Position pos : group.positions) {
- ConflictNode conflictNode = null;
+ DefaultDependencyNode conflictNode = null;
for(ListIterator<DependencyNode> it = pos.parent.getChildren().listIterator(); it.hasNext();) {
DependencyNode child = it.next();
@@ -181,16 +181,15 @@
} else if(pos.equals(group.position)) {
it.remove();
} else if(conflictNode == null) {
- conflictNode = new ConflictNode(child, group.winner);
+ conflictNode = new DefaultDependencyNode(child);
+ conflictNode.setAliases(Collections.singletonList(group.winner.getDependency().getArtifact()));
it.set(conflictNode);
} else {
it.remove();
if(conflictNode.getVersion().compareTo(child.getVersion()) < 0) {
- conflictNode.setDependency(child.getDependency());
conflictNode.setVersion(child.getVersion());
conflictNode.setVersionConstraint(child.getVersionConstraint());
- conflictNode.setPremanagedVersion(child.getPremanagedVersion());
conflictNode.setRelocations(child.getRelocations());
}
}
@@ -266,12 +265,12 @@
}
- static final class ConflictNode extends DefaultDependencyNode {
+ //static final class ConflictNode extends DefaultDependencyNode {
- public ConflictNode(DependencyNode node, DependencyNode related) {
- super(node);
- setAliases(Collections.singletonList(related.getDependency().getArtifact()));
- }
- }
+ //public ConflictNode(DependencyNode node, DependencyNode related) {
+ //super(node);
+ //setAliases(Collections.singletonList(related.getDependency().getArtifact()));
+ //}
+ //}
}
--- org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/DependencyTreePage.java.orig 2013-08-22 18:45:31.019363065 +0100
+++ org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/DependencyTreePage.java 2013-08-22 18:49:46.003743265 +0100
@@ -800,8 +800,8 @@
label.append(a.getBaseVersion());
- if(node.getPremanagedVersion() != null && !node.getPremanagedVersion().equals(a.getBaseVersion())) {
- label.append(" (managed from ").append(node.getPremanagedVersion()).append(")");
+ if(node.getVersion().toString() != null && !node.getVersion().toString().equals(a.getBaseVersion())) {
+ label.append(" (managed from ").append(node.getVersion().toString()).append(")");
}
if(c != null) {
@@ -817,8 +817,8 @@
label.append(" [").append(node.getDependency().getScope()).append("]");
- if(node.getPremanagedScope() != null) {
- label.append(" (from ").append(node.getPremanagedScope()).append(")");
+ if(node.getDependency().getScope() != null) {
+ label.append(" (from ").append(node.getDependency().getScope()).append(")");
}
return label.toString();