remove wst.common.properties.ui
diff --git a/features/org.eclipse.jst.web_ui.feature/feature.xml b/features/org.eclipse.jst.web_ui.feature/feature.xml index f3571bd..2127641 100644 --- a/features/org.eclipse.jst.web_ui.feature/feature.xml +++ b/features/org.eclipse.jst.web_ui.feature/feature.xml
@@ -31,14 +31,17 @@ <requires> <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/> + <import plugin="org.eclipse.wst.jsdt.web.ui"/> <import plugin="org.eclipse.wst.sse.ui" version="1.0.101"/> <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/> + <import plugin="org.eclipse.jface"/> <import plugin="org.eclipse.wst.html.ui" version="1.0.100"/> <import plugin="org.eclipse.wst.html.core" version="1.1.0"/> <import plugin="org.eclipse.jst.jsp.core" version="1.1.0"/> <import plugin="org.eclipse.wst.css.core" version="1.1.0"/> <import plugin="org.eclipse.wst.xml.core" version="1.1.0"/> <import plugin="org.eclipse.wst.sse.core" version="1.1.0"/> + <import plugin="org.eclipse.wst.jsdt.web.core"/> <import plugin="org.eclipse.jdt.core" version="3.2.0" match="compatible"/> <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/> <import plugin="org.eclipse.jdt.ui" version="3.2.0" match="compatible"/> @@ -59,9 +62,19 @@ <import plugin="org.eclipse.search" version="3.2.0" match="compatible"/> <import plugin="org.eclipse.ltk.core.refactoring" version="3.2.0" match="compatible"/> <import plugin="com.ibm.icu" version="3.4.4" match="compatible"/> - <import plugin="org.eclipse.wst.jsdt.web.ui"/> - <import plugin="org.eclipse.jface"/> - <import plugin="org.eclipse.wst.jsdt.web.core"/> + <import plugin="org.eclipse.ui.cheatsheets" version="3.2.0" match="compatible"/> + <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/> + <import plugin="org.eclipse.ui.forms" version="3.2.0" match="compatible"/> + <import plugin="org.eclipse.draw2d" version="3.2.0" match="compatible"/> + <import plugin="org.eclipse.wst.common.emf" version="1.1.103" match="compatible"/> + <import plugin="org.eclipse.emf" version="2.2.0" match="compatible"/> + <import plugin="org.eclipse.emf.common" version="2.2.0" match="compatible"/> + <import plugin="org.eclipse.gef" version="3.2.0" match="compatible"/> + <import plugin="org.eclipse.emf.ecore.xmi" version="2.2.0" match="compatible"/> + <import plugin="org.eclipse.emf.edit.ui" version="2.2.0" match="compatible"/> + <import plugin="org.eclipse.wst.common.project.facet.ui" version="1.1.0"/> + <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/> + <import plugin="org.eclipse.jst.jsp.ui" version="1.1.0"/> <import plugin="org.eclipse.jst.common.annotations.controller" version="1.1.0" match="compatible"/> <import plugin="org.eclipse.wst.common.emf" version="1.1.0" match="compatible"/> <import plugin="org.eclipse.jst.common.annotations.core" version="1.1.0" match="compatible"/> @@ -75,30 +88,19 @@ <import plugin="org.eclipse.wst.xml.core" version="1.1.0" match="compatible"/> <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="compatible"/> <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" match="compatible"/> - <import plugin="org.eclipse.wst.javascript.ui" version="1.0.0" match="compatible"/> <import plugin="org.eclipse.wst.validation" version="1.1.0" match="compatible"/> - <import plugin="org.eclipse.ui.cheatsheets" version="3.2.0" match="compatible"/> - <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/> - <import plugin="org.eclipse.ui.forms" version="3.2.0" match="compatible"/> - <import plugin="org.eclipse.draw2d" version="3.2.0" match="compatible"/> <import plugin="org.eclipse.jst.j2ee" version="1.1.0" match="compatible"/> - <import plugin="org.eclipse.wst.common.emf" version="1.1.103" match="compatible"/> <import plugin="org.eclipse.wst.common.project.facet.core" version="1.2.0" match="compatible"/> - <import plugin="org.eclipse.emf" version="2.2.0" match="compatible"/> - <import plugin="org.eclipse.emf.common" version="2.2.0" match="compatible"/> - <import plugin="org.eclipse.gef" version="3.2.0" match="compatible"/> - <import plugin="org.eclipse.emf.ecore.xmi" version="2.2.0" match="compatible"/> - <import plugin="org.eclipse.wst.common.ui.properties" version="1.0.101"/> <import plugin="org.eclipse.jst.jsf.facesconfig" version="1.0.0" match="compatible"/> - <import plugin="org.eclipse.emf.edit.ui" version="2.2.0" match="compatible"/> <import plugin="org.eclipse.jst.jsf.common.ui" version="1.0.0" match="compatible"/> <import plugin="org.eclipse.jst.jsf.core" version="1.0.0" match="compatible"/> <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" match="compatible"/> - <import plugin="org.eclipse.wst.common.project.facet.ui" version="1.1.0"/> + <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.2.0" match="compatible"/> <import plugin="org.eclipse.wst.common.frameworks.ui" version="1.1.0" match="compatible"/> <import plugin="org.eclipse.jst.jsf.common" version="1.0.0" match="compatible"/> - <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/> - <import plugin="org.eclipse.jst.jsp.ui" version="1.1.0"/> + <import plugin="org.eclipse.wst.sse.core" version="1.0.101"/> + <import plugin="org.eclipse.jst.jsf.common.runtime" version="1.0.0" match="compatible"/> + <import plugin="org.eclipse.wst.validation" version="1.1.103" match="greaterOrEqual"/> </requires> <plugin