224290 We should minimize variety in pre-req'd plugins
diff --git a/features/org.eclipse.wst.common_core.feature/feature.xml b/features/org.eclipse.wst.common_core.feature/feature.xml
index 1d1d229..58c09d9 100644
--- a/features/org.eclipse.wst.common_core.feature/feature.xml
+++ b/features/org.eclipse.wst.common_core.feature/feature.xml
@@ -22,16 +22,15 @@
</url>
<requires>
- <import plugin="org.eclipse.emf.ecore.xmi" version="2.4.0" match="compatible"/>
- <import plugin="org.eclipse.wst.validation" version="1.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.project.facet.core" version="1.3.0" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore" version="2.4.0" match="compatible"/>
<import plugin="org.eclipse.wst.common.frameworks" version="1.1.200" match="compatible"/>
<import plugin="org.eclipse.jem.util" version="2.0.100" match="compatible"/>
<import plugin="org.eclipse.emf.edit" version="2.4.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.ecore.xmi" version="2.4.0" match="compatible"/>
<import plugin="org.eclipse.wst.common.emf" version="1.1.200" match="compatible"/>
<import plugin="org.eclipse.core.runtime" version="3.4.0" match="compatible"/>
<import plugin="org.eclipse.core.resources" version="3.4.0" match="compatible"/>
+ <import plugin="org.eclipse.wst.validation" version="1.2.0" match="compatible"/>
+ <import plugin="org.eclipse.wst.common.project.facet.core" version="1.3.0" match="compatible"/>
<import plugin="org.eclipse.core.expressions" version="3.4.0" match="compatible"/>
<import plugin="org.eclipse.wst.command.env.core" version="1.0.203" match="compatible"/>
<import plugin="org.eclipse.core.commands" version="3.4.0" match="compatible"/>
@@ -39,9 +38,10 @@
<import plugin="org.apache.ant" version="1.7.0" match="compatible"/>
<import plugin="org.eclipse.ant.core" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.osgi.util" version="3.1.300" match="compatible"/>
+ <import plugin="org.eclipse.emf.ecore" version="2.4.0" match="compatible"/>
<import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.1.200" match="compatible"/>
<import plugin="org.eclipse.wst.common.uriresolver" version="1.1.301" match="compatible"/>
- <import plugin="com.ibm.icu" version="3.8.1" match="compatible"/>
+ <import plugin="com.ibm.icu" version="3.8.1.1" match="compatible"/>
</requires>
<plugin
diff --git a/plugins/org.eclipse.jem.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.util/META-INF/MANIFEST.MF
index 27b9725..7d851ba 100644
--- a/plugins/org.eclipse.jem.util/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jem.util/META-INF/MANIFEST.MF
@@ -16,11 +16,11 @@
org.eclipse.jem.util.logger.proxy,
org.eclipse.jem.util.logger.proxyrender,
org.eclipse.jem.util.plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)",
org.eclipse.perfmsr.core;bundle-version="1.0.0";resolution:=optional,
- com.ibm.icu;bundle-version="[3.4.4.1,4.0.0)"
+ com.ibm.icu;bundle-version="[3.8.1.1,4.0.0)"
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
