From f92813740c777b953d11c7492c1c3b5fb0614184 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Wed, 8 Nov 2023 00:13:12 +0100 Subject: [PATCH] Adapt to internal changes in JDT and PDE for Eclipe SimRel 2023-12 JDT moved in https://github.com/eclipse-jdt/eclipse.jdt.ui/pull/810, JDT moved classes from o.e.jdt.ui to o.e.jdt.core.manipulation PDE removed unused attributes of feature.xml in https://github.com/eclipse-pde/eclipse.pde/pull/770 Fixes https://github.com/eclipse-m2e/m2e-core/issues/1591 --- .../src/org/eclipse/m2e/pde/target/MavenFeaturePlugin.java | 2 -- .../org/eclipse/m2e/pde/ui/target/editor/PluginListPage.java | 2 -- org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF | 1 + 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenFeaturePlugin.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenFeaturePlugin.java index 066081fa7d..4ef52bb1e8 100644 --- a/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenFeaturePlugin.java +++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenFeaturePlugin.java @@ -28,8 +28,6 @@ class MavenFeaturePlugin extends FeaturePlugin { BundleInfo bundleInfo = child.getBundleInfo(); setId(bundleInfo.getSymbolicName()); setVersion(bundleInfo.getVersion()); - setFragment(child.isFragment()); - setUnpack(false); } @Override diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/PluginListPage.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/PluginListPage.java index 570095b9dc..71da932995 100644 --- a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/PluginListPage.java +++ b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/PluginListPage.java @@ -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; @@ -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(); diff --git a/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF b/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF index d30795eedf..8a2e1523e4 100644 --- a/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF @@ -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,