[174592] Fix EMF prereq and version numbers
diff --git a/plugins/org.eclipse.jem.beaninfo/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.beaninfo/META-INF/MANIFEST.MF
index 3f0019e..11195bc 100644
--- a/plugins/org.eclipse.jem.beaninfo/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jem.beaninfo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jem.beaninfo; singleton:=true
-Bundle-Version: 1.2.2.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -13,18 +13,18 @@
org.eclipse.jem.internal.beaninfo.common,
org.eclipse.jem.internal.beaninfo.core,
org.eclipse.jem.internal.beaninfo.impl
-Require-Bundle: org.eclipse.jem.proxy;bundle-version="[1.2.0,2.0.0)",
+Require-Bundle: org.eclipse.jem.proxy;bundle-version="[2.0.0,3.0.0)",
com.ibm.etools.emf.event;bundle-version="[3.0.0,4.0.0)";resolution:=optional,
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.workbench;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.jem.workbench;bundle-version="[2.0.0,3.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.jem;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
org.eclipse.osgi;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
org.eclipse.emf.ecore.change;bundle-version="[2.2.0,3.0.0)"
Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jem.proxy/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.proxy/META-INF/MANIFEST.MF
index 45872de..0952f56 100644
--- a/plugins/org.eclipse.jem.proxy/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jem.proxy/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jem.proxy; singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.eclipse.jem.internal.proxy.core.ProxyPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -21,7 +21,7 @@
org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
org.eclipse.pde.core;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.2.0,4.0.0)";resolution:=optional
diff --git a/plugins/org.eclipse.jem.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.ui/META-INF/MANIFEST.MF
index 233e439..264be75 100644
--- a/plugins/org.eclipse.jem.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jem.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jem.ui; singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.eclipse.jem.internal.ui.core.JEMUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -14,14 +14,14 @@
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.beaninfo;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.jem.beaninfo;bundle-version="[2.0.0,3.0.0)",
org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.proxy;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.jem.proxy;bundle-version="[2.0.0,3.0.0)",
org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",
org.eclipse.jdt.debug.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)"
Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jem.workbench/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.workbench/META-INF/MANIFEST.MF
index 2165ba3..61f0d03 100644
--- a/plugins/org.eclipse.jem.workbench/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jem.workbench/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jem.workbench; singleton:=true
-Bundle-Version: 1.2.3.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.eclipse.jem.internal.plugin.JavaPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.jem.internal.adapters.jdom;x-friends:="org.eclipse.jem.beaninfo,org.eclipse.jem.tests",
org.eclipse.jem.internal.plugin;x-friends:="org.eclipse.jem.beaninfo",
org.eclipse.jem.workbench.utility
-Require-Bundle: org.eclipse.jem;bundle-version="[1.2.0,2.0.0)",
+Require-Bundle: org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,2.0.0)"
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)"
Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jem/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem/META-INF/MANIFEST.MF
index 0cea575..94a9e23 100644
--- a/plugins/org.eclipse.jem/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jem/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jem; singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.eclipse.jem.internal.core.JEMPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -22,8 +22,8 @@
org.eclipse.jem.java.internal.impl;x-friends:="org.eclipse.jem.beaninfo,org.eclipse.jem.workbench",
org.eclipse.jem.java.util
Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.3.0,2.4.0)",
- org.eclipse.jem.proxy;bundle-version="[1.2.0,2.0.0)";resolution:=optional,
+ org.eclipse.jem.proxy;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,2.0.0)"
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)"
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.annotations.controller/META-INF/MANIFEST.MF
index f61d843..d926849 100644
--- a/plugins/org.eclipse.jst.common.annotations.controller/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.common.annotations.controller/META-INF/MANIFEST.MF
@@ -13,6 +13,6 @@
org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
org.eclipse.jst.common.annotations.core;bundle-version="[1.1.0,1.2.0)"
diff --git a/plugins/org.eclipse.jst.common.annotations.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.annotations.core/META-INF/MANIFEST.MF
index d6d51a2..c21f4b4 100644
--- a/plugins/org.eclipse.jst.common.annotations.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.common.annotations.core/META-INF/MANIFEST.MF
@@ -9,5 +9,5 @@
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.2.0,2.4.0)",
org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)"
diff --git a/plugins/org.eclipse.jst.common.frameworks/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.frameworks/META-INF/MANIFEST.MF
index 4d451bf..d71dc6a 100644
--- a/plugins/org.eclipse.jst.common.frameworks/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.common.frameworks/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@
org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)",
org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
@@ -25,5 +25,5 @@
org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)"
diff --git a/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF
index 9dcd975..41245bb 100644
--- a/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: J2EE Core Component
+Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.jst.j2ee.core; singleton:=true
Bundle-Version: 1.1.102.qualifier
Bundle-Activator: org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
Export-Package: org.eclipse.jst.j2ee.application,
org.eclipse.jst.j2ee.application.internal.impl;x-internal:=true,
@@ -67,14 +67,14 @@
org.eclipse.jst.j2ee.webservice.wsdd,
org.eclipse.jst.j2ee.webservice.wsdd.internal.impl;x-internal:=true,
org.eclipse.jst.j2ee.webservice.wsdd.internal.util;x-internal:=true
-Require-Bundle: org.eclipse.jem;bundle-version="[1.2.0,1.3.0)",
+Require-Bundle: org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
org.eclipse.emf.common;bundle-version="[2.2.0,2.4.0)",
org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)",
org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
com.ibm.icu;bundle-version="[3.4.4,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)"
diff --git a/plugins/org.eclipse.jst.j2ee.core/plugin.properties b/plugins/org.eclipse.jst.j2ee.core/plugin.properties
index 2e764f7..72fb010 100644
--- a/plugins/org.eclipse.jst.j2ee.core/plugin.properties
+++ b/plugins/org.eclipse.jst.j2ee.core/plugin.properties
@@ -11,4 +11,6 @@
pluginName=J2EE Model
providerName=www.example.org
EJB_VALIDATOR=EJB Validator
-J2EEApplicationErrorCustomizer=J2EE Application Error Customizer
\ No newline at end of file
+J2EEApplicationErrorCustomizer=J2EE Application Error Customizer
+Bundle-Name.0 = J2EE Core Component
+Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF
index 37df710..e61d29e 100644
--- a/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@
org.eclipse.jst.j2ee.jca.modulecore.util,
org.eclipse.jst.j2ee.jca.project.facet
Require-Bundle: org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)",
org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)",
@@ -25,14 +25,14 @@
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)",
- org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
org.eclipse.emf.edit;bundle-version="[2.2.0,2.4.0)",
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF
index 6e8cbc4..1476664 100644
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF
@@ -28,7 +28,7 @@
org.eclipse.jst.servlet.ui;bundle-version="[1.1.0,1.2.0)",
org.eclipse.jst.j2ee.jca.ui;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
diff --git a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF
index 8171755..e2092d1 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF
@@ -38,8 +38,8 @@
org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.jem;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
@@ -56,7 +56,7 @@
org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
org.eclipse.jst.common.annotations.controller;bundle-version="[1.1.0,1.2.0)",
org.eclipse.jst.j2ee.ejb.annotation.model;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
diff --git a/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
index 6356c4b..6e5ee4c 100644
--- a/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
@@ -23,14 +23,14 @@
org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)",
org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)",
org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)",
org.eclipse.emf.edit;bundle-version="[2.2.0,2.4.0)",
- org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
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.jdt.core;bundle-version="[3.2.0,4.0.0)",
@@ -40,7 +40,7 @@
org.eclipse.jst.common.annotations.controller;bundle-version="[1.1.0,1.2.0)",
org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
com.ibm.icu;bundle-version="[3.4.4,4.0.0)",
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF
index 5b23d77..30deed0 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF
@@ -24,7 +24,7 @@
org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
org.eclipse.jst.j2ee.webservice;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.wsdl;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
org.wsdl4j;bundle-version="[1.4.0,1.5.0)",
org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF
index 4aff71f..a02902d 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@
org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)",
org.eclipse.emf.edit;bundle-version="[2.2.0,2.4.0)",
- org.eclipse.jem;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
@@ -30,6 +30,6 @@
org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
org.eclipse.wst.wsdl;bundle-version="[1.0.100,1.1.0)",
org.wsdl4j;bundle-version="[1.4.0,1.5.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)"
Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
index 70b20e7..5a21ca7 100644
--- a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: J2EE Component
+Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.jst.j2ee; singleton:=true
Bundle-Version: 1.1.103.qualifier
Bundle-Activator: org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
Export-Package: org.eclipse.jst.j2ee.application.internal.operations;x-internal:=true,
org.eclipse.jst.j2ee.applicationclient.componentcore.util,
@@ -42,7 +42,7 @@
org.eclipse.jst.j2ee.refactor.listeners,
org.eclipse.jst.j2ee.refactor.operations
Require-Bundle: org.eclipse.emf.edit;bundle-version="[2.2.0,2.4.0)",
- org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
@@ -51,9 +51,9 @@
org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)",
org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)",
- org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
@@ -63,7 +63,7 @@
org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.modulecore;visibility:=reexport;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
org.eclipse.jst.common.annotations.controller;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
diff --git a/plugins/org.eclipse.jst.j2ee/plugin.properties b/plugins/org.eclipse.jst.j2ee/plugin.properties
index bf09cd9..b8ead63 100644
--- a/plugins/org.eclipse.jst.j2ee/plugin.properties
+++ b/plugins/org.eclipse.jst.j2ee/plugin.properties
@@ -23,4 +23,6 @@
APPCLIENT_FACET_LABEL=Application Client module
APPCLIENT_FACET_DESCRIPTION=Enables the project to be deployed as a J2EE Application Client module.
APPCLIENT_FACET_TEMPLATE=Application Client Project
-differentRuntimesDetectedMarkerName = Faceted Project Problem (Mismatched Runtimes)
\ No newline at end of file
+differentRuntimesDetectedMarkerName = Faceted Project Problem (Mismatched Runtimes)
+Bundle-Vendor.0 = Eclipse.org
+Bundle-Name.0 = J2EE Component
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF
index 987645f..3fbe9a1 100644
--- a/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF
@@ -26,8 +26,8 @@
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.jem;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.2.0,2.4.0)",
org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
diff --git a/plugins/org.eclipse.wst.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.web/META-INF/MANIFEST.MF
index e75d517..cad05f7 100644
--- a/plugins/org.eclipse.wst.web/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.web/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@
org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)",
- org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
org.eclipse.emf.ecore;bundle-version="[2.2.0,2.4.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
