diff options
21 files changed, 251 insertions, 59 deletions
diff --git a/org.eclipse.m2e.archetype.common/META-INF/MANIFEST.MF b/org.eclipse.m2e.archetype.common/META-INF/MANIFEST.MF index 57289d99..18d0fa69 100644 --- a/org.eclipse.m2e.archetype.common/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.archetype.common/META-INF/MANIFEST.MF @@ -35,7 +35,7 @@ Bundle-ClassPath: jars/jchardet-1.0.jar, Bundle-Name: %Bundle-Name Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 -Require-Bundle: org.eclipse.m2e.maven.runtime;bundle-version="[0.13.0,0.14.0)" +Require-Bundle: org.eclipse.m2e.maven.runtimefactory;bundle-version="[0.13.0,0.14.0)" Bundle-Vendor: %Bundle-Vendor MavenArtifact-BaseVersion: 2.0.1.20090526-1230 Bundle-Version: 0.13.0.qualifier diff --git a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF index ad5b693b..d9223eaa 100644 --- a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF @@ -30,7 +30,6 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.5.2", org.eclipse.core.resources;bundle-version="3.5.2", org.eclipse.core.runtime;bundle-version="3.5.0", org.eclipse.m2e.model.edit;bundle-version="[0.13.0,0.14.0)", - org.eclipse.m2e.maven.runtime;bundle-version="[0.13.0,0.14.0)", org.eclipse.m2e.archetype.common;bundle-version="[0.13.0,0.14.0)", com.ibm.icu;bundle-version="4.0.1", org.eclipse.m2e.maven.indexer;bundle-version="[0.13.0,0.14.0)", @@ -43,6 +42,22 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.5.2", org.slf4j.api;bundle-version="1.6.1", org.eclipse.jface.text, org.eclipse.ui -Import-Package: org.eclipse.ltk.core.refactoring, +Import-Package: org.apache.maven.artifact;version="3.0.2", + org.apache.maven.artifact.repository;version="3.0.2", + org.apache.maven.artifact.repository.layout;version="3.0.2", + org.apache.maven.artifact.versioning;version="3.0.2", + org.apache.maven.cli;version="3.0.2", + org.apache.maven.execution;version="3.0.2", + org.apache.maven.model;version="3.0.2", + org.apache.maven.plugin;version="3.0.2", + org.apache.maven.project;version="3.0.2", + org.apache.maven.repository;version="3.0.2", + org.apache.maven.settings;version="3.0.2", + org.apache.maven.settings.building;version="3.0.2", + org.apache.maven.wagon.repository;version="1.0.0.beta-7", + org.codehaus.plexus.util;version="2.0.6", + org.eclipse.compare.rangedifferencer, + org.eclipse.ltk.core.refactoring, org.eclipse.ltk.core.refactoring.resource, - org.eclipse.compare.rangedifferencer + org.sonatype.aether.artifact;version="1.11.0", + org.sonatype.aether.graph;version="1.11.0" diff --git a/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs index 0e8ed1ba..c23ee6d7 100644 --- a/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Tue Feb 08 09:45:35 CET 2011 +#Fri May 06 13:14:06 EDT 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning @@ -43,7 +43,7 @@ org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning @@ -79,12 +79,15 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF index 72330a50..aa75cb7e 100644 --- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF @@ -13,13 +13,13 @@ Require-Bundle: org.eclipse.core.expressions, org.eclipse.core.filesystem, org.eclipse.search, - org.eclipse.m2e.maven.runtime;bundle-version="[0.13.0,0.14.0)", + org.eclipse.m2e.maven.runtimefactory;bundle-version="[0.13.0,0.14.0)", org.eclipse.m2e.archetype.common;bundle-version="[0.13.0,0.14.0)", - org.eclipse.m2e.maven.indexer;bundle-version="[0.13.0,0.14.0)", com.ibm.icu;bundle-version="4.0.1", org.slf4j.api;bundle-version="1.6.1", com.ning.async-http-client;bundle-version="[1.6.3,1.6.4)", - org.jboss.netty;bundle-version="3.2.3" + org.jboss.netty;bundle-version="3.2.3", + org.eclipse.m2e.maven.indexer Eclipse-LazyStart: true Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: J2SE-1.5, @@ -50,3 +50,78 @@ Export-Package: org.eclipse.m2e.core, org.eclipse.m2e.core.repository MavenArtifact-GroupId: org.eclipse.m2e MavenArtifact-ArtifactId: org.eclipse.m2e.core +Import-Package: com.google.inject;version="[1.3.0,2.0.0)", + com.google.inject.binder;version="1.3.0", + com.google.inject.name;version="1.3.0", + org.apache.maven;version="3.0.2", + org.apache.maven.artifact;version="3.0.2", + org.apache.maven.artifact.factory;version="3.0.2", + org.apache.maven.artifact.handler;version="3.0.2", + org.apache.maven.artifact.handler.manager;version="3.0.2", + org.apache.maven.artifact.manager;version="3.0.2", + org.apache.maven.artifact.metadata;version="3.0.2", + org.apache.maven.artifact.repository;version="3.0.2", + org.apache.maven.artifact.resolver;version="3.0.2", + org.apache.maven.artifact.versioning;version="3.0.2", + org.apache.maven.classrealm;version="3.0.2", + org.apache.maven.cli;version="3.0.2", + org.apache.maven.execution;version="3.0.2", + org.apache.maven.lifecycle;version="3.0.2", + org.apache.maven.lifecycle.internal;version="3.0.2", + org.apache.maven.model;version="3.0.2", + org.apache.maven.model.building;version="3.0.2", + org.apache.maven.model.interpolation;version="3.0.2", + org.apache.maven.model.io;version="3.0.2", + org.apache.maven.plugin;version="3.0.2", + org.apache.maven.plugin.descriptor;version="3.0.2", + org.apache.maven.plugin.internal;version="3.0.2", + org.apache.maven.plugin.version;version="3.0.2", + org.apache.maven.project;version="3.0.2", + org.apache.maven.project.artifact;version="3.0.2", + org.apache.maven.properties.internal;version="3.0.2", + org.apache.maven.repository;version="3.0.2", + org.apache.maven.repository.internal;version="3.0.2", + org.apache.maven.settings;version="3.0.2", + org.apache.maven.settings.building;version="3.0.2", + org.apache.maven.settings.crypto;version="3.0.2", + org.apache.maven.settings.io;version="3.0.2", + org.apache.maven.wagon;version="1.0.0.beta-7", + org.apache.maven.wagon.authentication;version="1.0.0.beta-7", + org.apache.maven.wagon.events;version="1.0.0.beta-7", + org.apache.maven.wagon.proxy;version="1.0.0.beta-7", + org.apache.maven.wagon.repository;version="1.0.0.beta-7", + org.apache.maven.wagon.resource;version="1.0.0.beta-7", + org.codehaus.plexus;version="2.0.0", + org.codehaus.plexus.classworlds;version="2.4.0", + org.codehaus.plexus.classworlds.launcher;version="2.4.0", + org.codehaus.plexus.classworlds.realm;version="2.4.0", + org.codehaus.plexus.component.annotations;version="1.5.5", + org.codehaus.plexus.component.configurator;version="2.0.0", + org.codehaus.plexus.component.configurator.converters;version="2.0.0", + org.codehaus.plexus.component.configurator.converters.lookup;version="2.0.0", + org.codehaus.plexus.component.configurator.expression;version="2.0.0", + org.codehaus.plexus.component.repository;version="2.0.0", + org.codehaus.plexus.component.repository.exception;version="2.0.0", + org.codehaus.plexus.configuration;version="2.0.0", + org.codehaus.plexus.configuration.xml;version="2.0.0", + org.codehaus.plexus.logging;version="2.0.0", + org.codehaus.plexus.util, + org.codehaus.plexus.util.dag;version="2.0.6", + org.codehaus.plexus.util.io;version="2.0.6", + org.codehaus.plexus.util.xml;version="2.0.6", + org.codehaus.plexus.util.xml.pull;version="2.0.6", + org.sonatype.aether;version="1.11.0", + org.sonatype.aether.artifact;version="1.11.0", + org.sonatype.aether.collection;version="1.11.0", + org.sonatype.aether.graph;version="1.11.0", + org.sonatype.aether.repository;version="1.11.0", + org.sonatype.aether.resolution;version="1.11.0", + org.sonatype.aether.transfer;version="1.11.0", + org.sonatype.aether.util;version="1.11.0", + org.sonatype.aether.util.filter;version="1.11.0", + org.sonatype.aether.util.graph;version="1.11.0", + org.sonatype.aether.util.graph.transformer;version="1.11.0", + org.sonatype.aether.version;version="1.11.0", + org.sonatype.guice.bean.reflect;version="2.0.0", + org.sonatype.guice.plexus.binders;version="2.0.0", + org.sonatype.plexus.build.incremental;version="0.0.7" diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java index 471a8b09..0d356770 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java @@ -31,6 +31,7 @@ import org.codehaus.plexus.DefaultContainerConfiguration; import org.codehaus.plexus.DefaultPlexusContainer; import org.codehaus.plexus.MutablePlexusContainer; import org.codehaus.plexus.PlexusContainer; +import org.codehaus.plexus.PlexusContainerException; import org.codehaus.plexus.classworlds.ClassWorld; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; @@ -409,7 +410,13 @@ public class MavenPluginActivator extends Plugin { } public RepositorySystem getRepositorySystem() { - return lookup(RepositorySystem.class); + try { + return maven.getPlexusContainerImpl().lookup(RepositorySystem.class); + } catch(ComponentLookupException ex) { + throw new NoSuchComponentException(ex); + } catch(PlexusContainerException ex) { + throw new NoSuchComponentException(ex); + } } public MavenSession setSession(MavenSession session) { diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/NoSuchComponentException.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/NoSuchComponentException.java index cc09334b..780c3e36 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/NoSuchComponentException.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/NoSuchComponentException.java @@ -11,7 +11,6 @@ package org.eclipse.m2e.core.internal; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; /** * NoSuchComponentException @@ -22,7 +21,7 @@ public class NoSuchComponentException extends IllegalArgumentException { private static final long serialVersionUID = 9184391358528175461L; - public NoSuchComponentException(ComponentLookupException ex) { + public NoSuchComponentException(Exception ex) { super(ex); } diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java index cf5691c0..32c275a9 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java @@ -31,11 +31,14 @@ import java.util.Properties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.inject.Module; + import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.MultiStatus; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.osgi.util.NLS; @@ -144,6 +147,9 @@ import org.sonatype.aether.resolution.ArtifactResult; import org.sonatype.aether.transfer.ArtifactNotFoundException; import org.sonatype.aether.transfer.TransferListener; import org.sonatype.aether.util.FilterRepositorySystemSession; +import org.sonatype.guice.bean.reflect.BundleClassSpace; +import org.sonatype.guice.bean.reflect.ClassSpace; +import org.sonatype.guice.plexus.binders.PlexusXmlBeanModule; import org.eclipse.m2e.core.embedder.ILocalRepositoryListener; import org.eclipse.m2e.core.embedder.IMaven; @@ -1042,15 +1048,19 @@ public class MavenImpl implements IMaven, IMavenConfigurationChangeListener { return new ArtifactTransferListenerAdapter(this, monitor); } - public synchronized PlexusContainer getPlexusContainer() throws CoreException { + public PlexusContainer getPlexusContainer() throws CoreException { + try { + return getPlexusContainerImpl(); + } catch(PlexusContainerException ex) { + throw new CoreException(new Status(IStatus.ERROR, IMavenConstants.PLUGIN_ID, -1, + Messages.MavenImpl_error_init_maven, ex)); + } + } + + public synchronized PlexusContainer getPlexusContainerImpl() throws PlexusContainerException { if(plexus == null) { - try { - plexus = newPlexusContainer(); - plexus.setLoggerManager(new EclipseLoggerManager(mavenConfiguration)); - } catch(PlexusContainerException ex) { - throw new CoreException(new Status(IStatus.ERROR, IMavenConstants.PLUGIN_ID, -1, - Messages.MavenImpl_error_init_maven, ex)); - } + plexus = newPlexusContainer(); + plexus.setLoggerManager(new EclipseLoggerManager(mavenConfiguration)); } return plexus; } @@ -1107,13 +1117,14 @@ public class MavenImpl implements IMaven, IMavenConfigurationChangeListener { } private static DefaultPlexusContainer newPlexusContainer() throws PlexusContainerException { - ContainerConfiguration mavenCoreCC = new DefaultContainerConfiguration().setClassWorld( - new ClassWorld(MAVEN_CORE_REALM_ID, M2EMavenRuntime.class.getClassLoader())).setName( - "mavenCore"); //$NON-NLS-1$ - - mavenCoreCC.setAutoWiring(true); - - return new DefaultPlexusContainer(mavenCoreCC, new ExtensionModule()); + ArrayList<Module> modules = new ArrayList<Module>(); + + List<ClassSpace> spaces = new ArrayList<ClassSpace>(); + spaces.add(new BundleClassSpace(Platform.getBundle("org.eclipse.m2e.maven.runtime.aether"))); + spaces.add(new BundleClassSpace(Platform.getBundle("org.eclipse.m2e.maven.runtime.maven-core"))); + spaces.add(new BundleClassSpace(Platform.getBundle("org.eclipse.m2e.maven.runtime.sisu"))); + + return M2EMavenRuntime.newPlexusContainer(MAVEN_CORE_REALM_ID, spaces, new ExtensionModule()); } public synchronized void disposeContainer() { diff --git a/org.eclipse.m2e.discovery/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.discovery/.settings/org.eclipse.jdt.core.prefs index f819822b..606c8a7f 100644 --- a/org.eclipse.m2e.discovery/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.discovery/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Tue Feb 15 22:00:23 EST 2011 +#Fri May 06 15:23:33 EDT 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning @@ -43,7 +43,7 @@ org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning @@ -79,12 +79,15 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning diff --git a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF index aaf0e501..5fc63fbf 100644 --- a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF @@ -21,7 +21,6 @@ Require-Bundle: org.eclipse.equinox.p2.ui.discovery, org.eclipse.equinox.p2.metadata, org.eclipse.m2e.core.ui;bundle-version="[0.13.0,0.14.0)", org.slf4j.api;bundle-version="1.6.1", - org.eclipse.m2e.maven.runtime;bundle-version="[0.13.0,0.14.0)", org.eclipse.equinox.p2.repository, org.eclipse.equinox.p2.ui Export-Package: org.eclipse.m2e.internal.discovery;x-internal:=true, @@ -31,8 +30,13 @@ Export-Package: org.eclipse.m2e.internal.discovery;x-internal:=true, org.eclipse.m2e.internal.discovery.startup;x-internal:=true, org.eclipse.m2e.internal.discovery.strategy;x-internal:=true, org.eclipse.m2e.internal.discovery.wizards;x-internal:=true -Import-Package: org.apache.maven.model, +Import-Package: org.apache.maven.execution, + org.apache.maven.model, org.apache.maven.plugin, + org.apache.maven.project;version="3.0.2", + org.codehaus.plexus.util, + org.codehaus.plexus.util.xml;version="2.0.6", + org.codehaus.plexus.util.xml.pull;version="2.0.6", org.eclipse.equinox.internal.p2.discovery.compatibility, org.eclipse.equinox.internal.p2.ui, org.eclipse.equinox.internal.p2.ui.dialogs, diff --git a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF index af366792..a57ffa21 100644 --- a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF @@ -15,7 +15,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.wst.xml.core, org.eclipse.wst.common.uriresolver, org.eclipse.m2e.core;bundle-version="[0.13.0,0.14.0)", - org.eclipse.m2e.maven.runtime;bundle-version="[0.13.0,0.14.0)", org.eclipse.core.resources, org.eclipse.ui.ide, org.eclipse.core.filesystem, @@ -31,3 +30,13 @@ Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 Service-Component: OSGI-INF/component.xml +Import-Package: org.apache.maven.artifact;version="3.0.2", + org.apache.maven.artifact.repository;version="3.0.2", + org.apache.maven.model, + org.apache.maven.plugin.descriptor;version="3.0.2", + org.apache.maven.project;version="3.0.2", + org.codehaus.plexus.component.repository;version="2.0.0", + org.codehaus.plexus.configuration;version="2.0.0", + org.codehaus.plexus.configuration.xml;version="2.0.0", + org.codehaus.plexus.interpolation;version="1.14.0", + org.codehaus.plexus.util;version="2.0.6" diff --git a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF index 2c2095d3..741a41e7 100644 --- a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF @@ -15,7 +15,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.wst.xml.core, org.eclipse.emf.edit.ui;resolution:=optional, org.eclipse.m2e.core;bundle-version="[0.13.0,0.14.0)", - org.eclipse.m2e.maven.runtime;bundle-version="[0.13.0,0.14.0)", org.eclipse.m2e.editor.xml;bundle-version="[0.13.0,0.14.0)", org.eclipse.m2e.core.ui;bundle-version="[0.13.0,0.14.0)", org.slf4j.api;bundle-version="1.6.1", @@ -29,3 +28,11 @@ Export-Package: org.eclipse.m2e.editor, org.eclipse.m2e.editor.composites, org.eclipse.m2e.editor.dialogs, org.eclipse.m2e.editor.pom +Import-Package: org.apache.maven.artifact;version="3.0.2", + org.apache.maven.artifact.resolver.filter;version="3.0.2", + org.apache.maven.model;version="3.0.2", + org.apache.maven.model.io.xpp3, + org.apache.maven.project;version="3.0.2", + org.codehaus.plexus.interpolation;version="1.14.0", + org.sonatype.aether.artifact;version="1.11.0", + org.sonatype.aether.graph;version="1.11.0" diff --git a/org.eclipse.m2e.integration.tests.common/META-INF/MANIFEST.MF b/org.eclipse.m2e.integration.tests.common/META-INF/MANIFEST.MF index 6c92a1a8..bdd55aec 100644 --- a/org.eclipse.m2e.integration.tests.common/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.integration.tests.common/META-INF/MANIFEST.MF @@ -30,7 +30,8 @@ Require-Bundle: org.junit4;bundle-version="4.4.0", org.eclipse.m2e.editor.xml, org.eclipse.m2e.model.edit, org.eclipse.m2e.core, - org.eclipse.m2e.maven.runtime, org.eclipse.m2e.tests.common, org.eclipse.m2e.core.ui;bundle-version="[0.13.0,0.14.0)" +Import-Package: org.apache.maven.model;version="3.0.2", + org.codehaus.plexus.util diff --git a/org.eclipse.m2e.jdt/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.jdt/.settings/org.eclipse.jdt.core.prefs index 9ac7fdc3..18bd0157 100644 --- a/org.eclipse.m2e.jdt/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.jdt/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Wed Dec 15 13:33:53 EST 2010 +#Fri May 06 14:22:55 EDT 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning @@ -41,7 +41,7 @@ org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning @@ -77,12 +77,15 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning diff --git a/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF b/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF index 25e0f345..f5a3941c 100644 --- a/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF @@ -22,7 +22,6 @@ Require-Bundle: org.eclipse.core.resources, org.eclipse.ui.ide, org.eclipse.ltk.core.refactoring, org.eclipse.search, - org.eclipse.m2e.maven.runtime;bundle-version="[0.13.0,0.14.0)", org.eclipse.m2e.model.edit;bundle-version="[0.13.0,0.14.0)", org.eclipse.m2e.core;bundle-version="[0.13.0,0.14.0)", org.eclipse.ui.console, @@ -33,3 +32,11 @@ Bundle-Activator: org.eclipse.m2e.jdt.MavenJdtPlugin Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor +Import-Package: org.apache.maven.artifact;version="3.0.2", + org.apache.maven.artifact.handler;version="3.0.2", + org.apache.maven.artifact.repository;version="3.0.2", + org.apache.maven.artifact.resolver.filter;version="3.0.2", + org.apache.maven.execution;version="3.0.2", + org.apache.maven.model;version="3.0.2", + org.apache.maven.plugin;version="3.0.2", + org.apache.maven.project diff --git a/org.eclipse.m2e.launching/META-INF/MANIFEST.MF b/org.eclipse.m2e.launching/META-INF/MANIFEST.MF index de871e0f..dfc5e589 100644 --- a/org.eclipse.m2e.launching/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.launching/META-INF/MANIFEST.MF @@ -21,7 +21,6 @@ Require-Bundle: org.eclipse.core.resources, org.eclipse.jdt.ui, org.eclipse.jdt.debug.ui, org.eclipse.jdt.junit, - org.eclipse.m2e.maven.runtime;bundle-version="[0.13.0,0.14.0)", org.eclipse.m2e.core;bundle-version="[0.13.0,0.14.0)", com.ibm.icu;bundle-version="4.0.1", org.eclipse.m2e.core.ui;bundle-version="[0.13.0,0.14.0)", @@ -32,4 +31,6 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5, Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.m2e.actions;x-internal:=true Bundle-Activator: org.eclipse.m2e.internal.launch.MavenLaunchPlugin -Import-Package: org.slf4j +Import-Package: org.apache.maven.artifact;version="3.0.2", + org.codehaus.plexus.util;version="2.0.6", + org.slf4j diff --git a/org.eclipse.m2e.maven.indexer/META-INF/MANIFEST.MF b/org.eclipse.m2e.maven.indexer/META-INF/MANIFEST.MF index a56a54db..1fbe417d 100644 --- a/org.eclipse.m2e.maven.indexer/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.maven.indexer/META-INF/MANIFEST.MF @@ -34,8 +34,7 @@ Bundle-ClassPath: local-patches.jar, Bundle-Name: %Bundle-Name Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 -Require-Bundle: org.eclipse.m2e.maven.runtime;bundle-version="[0.13.0,0.14.0)", - org.eclipse.m2e.archetype.common;bundle-version="[0.13.0,0.14.0)" +Require-Bundle: org.eclipse.m2e.archetype.common;bundle-version="[0.13.0,0.14.0)" Bundle-Vendor: %Bundle-Vendor MavenArtifact-BaseVersion: 2.0.4-SNAPSHOT Bundle-Version: 0.13.0.qualifier @@ -43,4 +42,23 @@ MavenArtifact-GroupId: org.eclipse.m2e MavenArtifact-ArtifactId: org.eclipse.m2e.maven.indexer Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.maven.indexer;singleton:=true +Import-Package: org.apache.maven.artifact.versioning, + org.apache.maven.model, + org.apache.maven.wagon, + org.apache.maven.wagon.authentication, + org.apache.maven.wagon.authorization, + org.apache.maven.wagon.events, + org.apache.maven.wagon.proxy, + org.apache.maven.wagon.repository, + org.codehaus.plexus, + org.codehaus.plexus.classworlds, + org.codehaus.plexus.component.annotations, + org.codehaus.plexus.component.repository.exception, + org.codehaus.plexus.configuration, + org.codehaus.plexus.configuration.xml, + org.codehaus.plexus.logging, + org.codehaus.plexus.util, + org.codehaus.plexus.util.io, + org.codehaus.plexus.util.xml, + org.codehaus.plexus.util.xml.pull diff --git a/org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF b/org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF index 29617bb3..a0b83b1e 100644 --- a/org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF @@ -6,15 +6,4 @@ Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.maven.runtime;singleton:=true Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 -Require-Bundle: com.ning.async-http-client;bundle-version="1.6.3", - org.eclipse.m2e.maven.runtime.aether;bundle-version="0.13.0";visibility:=reexport, - org.eclipse.m2e.maven.runtime.atinject;bundle-version="0.13.0";visibility:=reexport, - org.eclipse.m2e.maven.runtime.classworlds;bundle-version="0.13.0";visibility:=reexport, - org.eclipse.m2e.maven.runtime.maven-core;bundle-version="0.13.0";visibility:=reexport, - org.eclipse.m2e.maven.runtime.plexus-annotations;bundle-version="0.13.0";visibility:=reexport, - org.eclipse.m2e.maven.runtime.plexus-utils;bundle-version="0.13.0";visibility:=reexport, - org.eclipse.m2e.maven.runtime.sisu;bundle-version="0.13.0";visibility:=reexport, - org.eclipse.m2e.maven.runtime.sisu-guice;bundle-version="0.13.0";visibility:=reexport, - org.eclipse.m2e.maven.runtime.wagon-provider-api;bundle-version="0.13.0";visibility:=reexport, - org.jboss.netty;bundle-version="3.2.4" Export-Package: org.eclipse.m2e.maven.runtime.internal;x-friends:="org.eclipse.m2e.core" diff --git a/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF b/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF index 18ca4544..d4b27793 100644 --- a/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF @@ -7,7 +7,6 @@ Bundle-Version: 0.13.0.qualifier Bundle-Activator: org.eclipse.m2e.refactoring.internal.Activator Require-Bundle: org.eclipse.m2e.core;bundle-version="[0.13.0,0.14.0)", org.eclipse.m2e.model.edit;bundle-version="[0.13.0,0.14.0)", - org.eclipse.m2e.maven.runtime;bundle-version="[0.13.0,0.14.0)", org.eclipse.core.runtime, org.eclipse.core.resources, org.eclipse.core.filebuffers, @@ -26,7 +25,14 @@ Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 Export-Package: org.eclipse.m2e.refactoring.exclude;x-internal="true" -Import-Package: org.eclipse.m2e.editor.composites, +Import-Package: org.apache.maven.artifact;version="3.0.2", + org.apache.maven.execution;version="3.0.2", + org.apache.maven.model;version="3.0.2", + org.apache.maven.project;version="3.0.2", + org.eclipse.m2e.editor.composites, org.eclipse.m2e.editor.pom, org.eclipse.search.ui.text, - org.eclipse.ui.forms.editor + org.eclipse.ui.forms.editor, + org.sonatype.aether.artifact;version="1.11.0", + org.sonatype.aether.graph;version="1.11.0", + org.sonatype.aether.util.artifact;version="1.11.0" diff --git a/org.eclipse.m2e.scm/META-INF/MANIFEST.MF b/org.eclipse.m2e.scm/META-INF/MANIFEST.MF index 96a8963e..a91c6fc0 100644 --- a/org.eclipse.m2e.scm/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.scm/META-INF/MANIFEST.MF @@ -20,9 +20,14 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.5.2", org.eclipse.core.runtime;bundle-version="3.5.0", org.eclipse.swt;bundle-version="3.5.2", org.eclipse.jface;bundle-version="3.5.2", - org.eclipse.m2e.maven.runtime;bundle-version="[0.13.0,0.14.0)", org.eclipse.m2e.core.ui;bundle-version="[0.13.0,0.14.0)", org.eclipse.ui.workbench;bundle-version="3.5.2", org.eclipse.ui.ide;bundle-version="3.5.1", org.eclipse.jdt.core;bundle-version="3.5.2";resolution:=optional, org.slf4j.api;bundle-version="1.6.1" +Import-Package: org.apache.maven.artifact;version="3.0.2", + org.apache.maven.artifact.repository;version="3.0.2", + org.apache.maven.artifact.resolver;version="3.0.2", + org.apache.maven.model, + org.codehaus.plexus.util;version="2.0.6", + org.codehaus.plexus.util.xml.pull;version="2.0.6" diff --git a/org.eclipse.m2e.tests.common/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.tests.common/.settings/org.eclipse.jdt.core.prefs index a8bb8d79..c01ffe41 100644 --- a/org.eclipse.m2e.tests.common/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.tests.common/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Mon Dec 20 23:28:27 EST 2010 +#Fri May 06 14:21:08 EDT 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning @@ -27,6 +27,9 @@ org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning org.eclipse.jdt.core.compiler.problem.deprecation=warning org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled @@ -38,8 +41,9 @@ org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning @@ -51,6 +55,7 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public @@ -58,7 +63,9 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore @@ -70,11 +77,15 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning @@ -88,6 +99,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverridin org.eclipse.jdt.core.compiler.problem.unusedImport=error org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled diff --git a/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF b/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF index 1f212b99..e4941ec0 100644 --- a/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF @@ -5,7 +5,6 @@ Bundle-SymbolicName: org.eclipse.m2e.tests.common;singleton:=true Bundle-Version: 0.13.0.qualifier Require-Bundle: org.junit, org.eclipse.m2e.core;bundle-version="[0.13.0,0.14.0)", - org.eclipse.m2e.maven.runtime;bundle-version="[0.13.0,0.14.0)", org.eclipse.m2e.jdt;bundle-version="[0.13.0,0.14.0)", org.eclipse.core.runtime, org.eclipse.core.resources, @@ -24,3 +23,21 @@ Bundle-Vendor: %Bundle-Vendor MavenArtifact-GroupId: org.eclipse.m2e MavenArtifact-ArtifactId: org.eclipse.m2e.tests.common Export-Package: org.eclipse.m2e.tests.common +Import-Package: org.apache.maven.artifact.repository;version="3.0.2", + org.apache.maven.execution;version="3.0.2", + org.apache.maven.lifecycle;version="3.0.2", + org.apache.maven.model;version="3.0.2", + org.apache.maven.plugin;version="3.0.2", + org.apache.maven.project;version="3.0.2", + org.apache.maven.wagon;version="1.0.0.beta-7", + org.apache.maven.wagon.authentication;version="1.0.0.beta-7", + org.apache.maven.wagon.providers.file;version="3.0.2", + org.apache.maven.wagon.proxy;version="1.0.0.beta-7", + org.apache.maven.wagon.repository;version="1.0.0.beta-7", + org.apache.maven.wagon.resource;version="1.0.0.beta-7", + org.codehaus.plexus, + org.codehaus.plexus.classworlds.realm;version="2.4.0", + org.codehaus.plexus.component.repository;version="2.0.0", + org.codehaus.plexus.util;version="2.0.6", + org.codehaus.plexus.util.xml;version="2.0.6", + org.codehaus.plexus.util.xml.pull;version="2.0.6" |