Author: rombert Date: Fri Sep 19 13:43:11 2014 New Revision: 1626215 URL: http://svn.apache.org/r1626215 Log: SLING-3957 - Support m2e 1.6 or newer
Use Require-Bundle instead of Import-Package for stuff provided by m2e . This works around that org.apache.maven, org.codehaus and other packages are exported with mandatory provider=m2e attribute. Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF?rev=1626215&r1=1626214&r2=1626215&view=diff ============================================================================== --- sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF (original) +++ sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF Fri Sep 19 13:43:11 2014 @@ -6,25 +6,15 @@ Bundle-Activator: org.apache.sling.ide.e Bundle-Version: 1.0.3.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: . +Require-Bundle: org.eclipse.m2e.core;bundle-version="1.4.0", + org.eclipse.m2e.archetype.common;bundle-version="1.4.0", + org.eclipse.m2e.maven.runtime;bundle-version="1.4.0" Import-Package: org.apache.commons.httpclient;version="3.1.0", org.apache.commons.httpclient.auth;version="3.1.0", org.apache.commons.httpclient.methods;version="3.1.0", org.apache.commons.httpclient.methods.multipart;version="3.1.0", org.apache.commons.httpclient.params;version="3.1.0", org.apache.commons.io;version="2.0.1", - org.apache.maven, - org.apache.maven.archetype, - org.apache.maven.archetype.catalog, - org.apache.maven.archetype.metadata, - org.apache.maven.artifact, - org.apache.maven.artifact.handler, - org.apache.maven.artifact.installer, - org.apache.maven.artifact.repository, - org.apache.maven.artifact.versioning, - org.apache.maven.execution, - org.apache.maven.model, - org.apache.maven.plugin, - org.apache.maven.project, org.apache.sling.ide.artifacts, org.apache.sling.ide.eclipse.core, org.apache.sling.ide.eclipse.core.debug, @@ -34,7 +24,6 @@ Import-Package: org.apache.commons.httpc org.apache.sling.ide.log, org.apache.sling.ide.osgi, org.apache.sling.ide.transport, - org.codehaus.plexus, org.eclipse.core.resources, org.eclipse.core.runtime;version="3.4.0", org.eclipse.core.runtime.jobs, @@ -47,15 +36,6 @@ Import-Package: org.apache.commons.httpc org.eclipse.jface.resource, org.eclipse.jface.viewers, org.eclipse.jface.wizard, - org.eclipse.m2e.core, - org.eclipse.m2e.core.embedder, - org.eclipse.m2e.core.internal, - org.eclipse.m2e.core.internal.archetype, - org.eclipse.m2e.core.internal.embedder, - org.eclipse.m2e.core.internal.index, - org.eclipse.m2e.core.project, - org.eclipse.m2e.core.project.configurator, - org.eclipse.m2e.core.repository, org.eclipse.swt, org.eclipse.swt.events, org.eclipse.swt.layout,