| Re: [cbi-dev] M6 removed features |
|
Thanks Paul,
I removed the resolver.test project, however the main project which got pulled in by it org.eclipse.equinox.resolver still required the package so the problem didn't go away.
I found in the MANIFEST file however the definition for the org.osgi.framework.resource and modified to to org.osgi.resource (per the post I found). This allowed the build to continue. I don't think I should be modifying MANIFEST files though I guess this is something upstream should do?
The diff of my changes below:
diff --git a/bundles/org.eclipse.equinox.resolver/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.resolver/META-INF/MANIFEST.MF index ecb6f63..2af49bc 100644 --- a/bundles/org.eclipse.equinox.resolver/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.resolver/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Import-Package: org.eclipse.osgi.service.resolver;version="1.5.0", org.eclipse.osgi.util;version="1.1", org.osgi.framework;version="1.6.0", org.osgi.framework.hooks.resolver;version="1.0.0", - org.osgi.framework.resource;version="1.0.0", + org.osgi.resource;version="1.0.0", org.osgi.framework.wiring;version="1.1.0", org.osgi.util.tracker;version="1.5.0" Bundle-ActivationPolicy: lazy
Thanh On Mon, Mar 19, 2012 at 1:44 PM, Thanh Ha <thanh.ha@xxxxxxxxxxx> wrote: I've actually already upgraded all the submodules to M6 per the map files in the eclipse.platform.releng.maps.git repository. I used the tag I20120314-1800 which I got from http://download.eclipse.org/eclipse/downloads/eclipse3x.php Everything rebased without any conflicts as far as I'm aware.
I used the following tags for the submodules specifically:
|