Skip to content

Commit

Permalink
Adapt to internal changes in JDT and PDE for Eclipe SimRel 2023-12
Browse files Browse the repository at this point in the history
JDT moved in eclipse-jdt/eclipse.jdt.ui#810, JDT
moved classes from o.e.jdt.ui to o.e.jdt.core.manipulation

PDE removed unused attributes of feature.xml in
eclipse-pde/eclipse.pde#770

Fixes #1591
  • Loading branch information
HannesWell committed Nov 8, 2023
1 parent 76854ab commit fcf4ebb
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ class MavenFeaturePlugin extends FeaturePlugin {
BundleInfo bundleInfo = child.getBundleInfo();
setId(bundleInfo.getSymbolicName());
setVersion(bundleInfo.getVersion());
setFragment(child.isFragment());
setUnpack(false);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import org.eclipse.pde.internal.core.ifeature.IFeature;
import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
import org.eclipse.pde.internal.core.ifeature.IFeaturePlugin;
import org.eclipse.pde.internal.core.util.CoreUtility;
import org.eclipse.pde.internal.ui.IHelpContextIds;
import org.eclipse.pde.internal.ui.PDEPlugin;
import org.eclipse.pde.internal.ui.shared.CachedCheckboxTreeViewer;
Expand Down Expand Up @@ -174,7 +173,6 @@ public void update(IFeatureModel featureModel) throws CoreException {
FeaturePlugin fplugin = (FeaturePlugin) featureModel.getFactory().createPlugin();
fplugin.loadFrom(plugin);
fplugin.setVersion(id2version.getOrDefault(plugin.getId(), ICoreConstants.DEFAULT_VERSION));
fplugin.setUnpack(CoreUtility.guessUnpack(plugin.getPluginModel().getBundleDescription()));
added[i] = fplugin;
}
IFeature feature = featureModel.getFeature();
Expand Down
1 change: 1 addition & 0 deletions org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)",
org.eclipse.jface,
org.eclipse.jface.text,
org.eclipse.jdt.ui,
org.eclipse.jdt.core.manipulation,
org.eclipse.compare,
org.eclipse.jdt.core,
org.eclipse.ui.ide,
Expand Down

0 comments on commit fcf4ebb

Please sign in to comment.