Releng: clean up/update dependencies (mostly OT/Equinox)
diff --git a/plugins/org.eclipse.objectteams.otdt.apt/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.apt/META-INF/MANIFEST.MF
index c5288c5..0ae442f 100644
--- a/plugins/org.eclipse.objectteams.otdt.apt/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.apt/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.eclipse.objectteams.otequinox;bundle-version="[2.2.0,3.0.0)",
+Require-Bundle: org.eclipse.objectteams.otequinox;bundle-version="[2.3.0,3.0.0)",
org.eclipse.osgi;bundle-version="[3.7.0,4.0.0)",
org.eclipse.jdt.core;bundle-version="[3.7.0.v_OTDT_r200,4.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/META-INF/MANIFEST.MF
index cf2bef6..c2cdc2f 100644
--- a/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/META-INF/MANIFEST.MF
@@ -5,12 +5,12 @@
Bundle-Version: 2.3.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.9.0.v_OTDT_r220,4.0.0)",
- org.eclipse.objectteams.otequinox;bundle-version="[2.2.0,3.0.0)",
+Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.10.0.v_OTDT_r230,4.0.0)",
+ org.eclipse.objectteams.otequinox;bundle-version="[2.3.0,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.7.100,4.0.0)",
org.eclipse.pde.core;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.objectteams.otdt;bundle-version="[2.2.0,3.0.0)"
+ org.eclipse.objectteams.otdt;bundle-version="[2.3.0,3.0.0)"
Export-Package: org.eclipse.objectteams.otdt.internal.compiler.adaptor;x-friends:="org.eclipse.objectteams.otdt.test.builder,org.eclipse.core.resources,org.eclipse.jdt.core,org.eclipse.pde.core"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.objectteams.otdt.debug.adaptor/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.debug.adaptor/META-INF/MANIFEST.MF
index e0c1749..961885a 100644
--- a/plugins/org.eclipse.objectteams.otdt.debug.adaptor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.debug.adaptor/META-INF/MANIFEST.MF
@@ -5,15 +5,15 @@
Bundle-Version: 2.3.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.9.0.v_OTDT_r220,4.0.0)",
- org.eclipse.objectteams.otequinox;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.objectteams.otdt;bundle-version="[2.2.0,3.0.0)",
+Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.10.0.v_OTDT_r230,4.0.0)",
+ org.eclipse.objectteams.otequinox;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.objectteams.otdt;bundle-version="[2.3.0,3.0.0)",
org.eclipse.objectteams.otdt.debug;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.objectteams.otdt.debug.ui;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.objectteams.otdt.ui;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.objectteams.otdt.debug.ui;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.objectteams.otdt.ui;bundle-version="[2.3.0,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.8.100,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.10.0,4.0.0)",
org.eclipse.debug.core;bundle-version="[3.8.0,4.0.0)",
org.eclipse.debug.ui;bundle-version="[3.9.0,4.0.0)",
org.eclipse.jdt.debug;bundle-version="[3.8.0,4.0.0)",
@@ -28,6 +28,6 @@
Bundle-Activator: org.eclipse.objectteams.otdt.internal.debug.adaptor.OTDebugAdaptorPlugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.objectteams.otdt.internal.debug.adaptor;x-internal:=true,
- org.eclipse.objectteams.otdt.internal.debug.adaptor.actions;x-internal:=true,
- org.eclipse.objectteams.otdt.internal.debug.adaptor.launching;x-internal:=true
+Export-Package: org.eclipse.objectteams.otdt.internal.debug.adaptor;x-internal:=true;ot-aspect-host="org.eclipse.objectteams.otdt.debug.adaptor",
+ org.eclipse.objectteams.otdt.internal.debug.adaptor.actions;x-internal:=true;ot-aspect-host="org.eclipse.objectteams.otdt.debug.adaptor",
+ org.eclipse.objectteams.otdt.internal.debug.adaptor.launching;x-internal:=true;ot-aspect-host="org.eclipse.objectteams.otdt.debug.adaptor"
diff --git a/plugins/org.eclipse.objectteams.otdt.debug.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.debug.ui/META-INF/MANIFEST.MF
index e350622..e3c0a32 100644
--- a/plugins/org.eclipse.objectteams.otdt.debug.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.debug.ui/META-INF/MANIFEST.MF
@@ -17,13 +17,13 @@
org.eclipse.ui.editors;bundle-version="[3.7.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.7.100,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.10.0,4.0.0)",
org.eclipse.jdt.launching;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.7.0.v_OTDT_r200,4.0.0)",
- org.eclipse.objectteams.otdt;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.objectteams.otdt.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.10.0.v_OTDT_r230,4.0.0)",
+ org.eclipse.objectteams.otdt;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.objectteams.otdt.ui;bundle-version="[2.3.0,3.0.0)",
org.eclipse.objectteams.otdt.debug;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.objectteams.runtime;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.objectteams.runtime;bundle-version="[2.3.0,3.0.0)"
Export-Package: org.eclipse.objectteams.otdt.debug.ui,
org.eclipse.objectteams.otdt.debug.ui.internal;x-internal:=true,
org.eclipse.objectteams.otdt.debug.ui.internal.actions;x-internal:=true,
diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.jdt.ui/META-INF/MANIFEST.MF
index 8ccf42e..b9563e0 100644
--- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.objectteams.otdt.jdt.ui;singleton:=true
Bundle-Version: 2.3.0.qualifier
-Require-Bundle: org.eclipse.jdt.ui;bundle-version="[3.7.0,4.0.0)",
+Require-Bundle: org.eclipse.jdt.ui;bundle-version="[3.10.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
org.eclipse.jface.text;bundle-version="[3.7.0,4.0.0)",
@@ -18,10 +18,10 @@
org.eclipse.compare;bundle-version="[3.5.200,4.0.0)",
org.eclipse.ui.views;bundle-version="[3.6.0,4.0.0)",
org.eclipse.core.filesystem;bundle-version="[1.3.100,2.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.7.0.v_OTDT_r200,4.0.0)",
- org.eclipse.objectteams.otequinox;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.objectteams.otdt.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.objectteams.otdt;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.10.0.v_OTDT_r230,4.0.0)",
+ org.eclipse.objectteams.otequinox;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.objectteams.otdt.ui;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.objectteams.otdt;bundle-version="[2.3.0,3.0.0)",
org.eclipse.jdt.launching;bundle-version="[3.7.100,4.0.0)"
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/org.eclipse.objectteams.otdt.pde.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.pde.ui/META-INF/MANIFEST.MF
index a6d5473..5b638e8 100644
--- a/plugins/org.eclipse.objectteams.otdt.pde.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.pde.ui/META-INF/MANIFEST.MF
@@ -13,14 +13,14 @@
org.eclipse.debug.core;bundle-version="[3.8.0,4.0.0)",
org.eclipse.debug.ui;bundle-version="[3.9.0,4.0.0)",
org.eclipse.ui.forms;bundle-version="[3.5.100,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.10.0,4.0.0)",
org.eclipse.search;bundle-version="[3.9.0,4.0.0)",
org.eclipse.pde.api.tools.ui;bundle-version="[1.0.300,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.9.0.v_OTDT_r220,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.10.0.v_OTDT_r230,4.0.0)",
org.eclipse.objectteams.otdt;bundle-version="[2.3.0,3.0.0)",
org.eclipse.objectteams.otdt.debug;bundle-version="[2.3.0,3.0.0)",
org.eclipse.objectteams.otequinox;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.objectteams.otdt.ui;bundle-version="[2.2.0,3.0.0)"
+ org.eclipse.objectteams.otdt.ui;bundle-version="[2.3.0,3.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.eclipse.objectteams.otdt.internal.migration;x-internal:=true,
diff --git a/plugins/org.eclipse.objectteams.otdt.refactoring/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.refactoring/META-INF/MANIFEST.MF
index 31d2d1f..1472362 100644
--- a/plugins/org.eclipse.objectteams.otdt.refactoring/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.refactoring/META-INF/MANIFEST.MF
@@ -5,19 +5,19 @@
Bundle-Version: 2.3.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jdt.ui;bundle-version="[3.7.0,4.0.0)",
+Require-Bundle: org.eclipse.jdt.ui;bundle-version="[3.10.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
org.eclipse.jface.text;bundle-version="[3.7.0,4.0.0)",
org.eclipse.ltk.core.refactoring;bundle-version="[3.5.200,4.0.0)",
org.eclipse.ui;bundle-version="[3.7.0,4.0.0)",
org.eclipse.ui.editors;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.7.0.v_OTDT_r200,4.0.0)",
- org.eclipse.objectteams.otequinox;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.10.0.v_OTDT_r230,4.0.0)",
+ org.eclipse.objectteams.otequinox;bundle-version="[2.3.0,3.0.0)",
org.eclipse.jdt.core.manipulation;bundle-version="[1.2.0,2.0.0)",
org.eclipse.ltk.ui.refactoring;bundle-version="[3.4.1,4.0.0)",
- org.eclipse.objectteams.otdt;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.objectteams.otdt.jdt.ui;bundle-version="[2.1.0,3.0.0)"
+ org.eclipse.objectteams.otdt;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.objectteams.otdt.jdt.ui;bundle-version="[2.3.0,3.0.0)"
Export-Package: org.eclipse.objectteams.otdt.internal.refactoring.adaptor;x-internal:=true,
org.eclipse.objectteams.otdt.internal.refactoring.adaptor.extractmethod;x-internal:=true,
org.eclipse.objectteams.otdt.internal.refactoring.adaptor.pullup;x-internal:=true,
diff --git a/plugins/org.eclipse.objectteams.otdt.samples/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.samples/META-INF/MANIFEST.MF
index 81a603f..5188e8b 100644
--- a/plugins/org.eclipse.objectteams.otdt.samples/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.samples/META-INF/MANIFEST.MF
@@ -17,11 +17,11 @@
org.eclipse.debug.ui;bundle-version="[3.7.0,4.0.0)",
org.eclipse.debug.core;bundle-version="[3.7.0,4.0.0)",
org.eclipse.jdt.debug.ui;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.7.0.v_OTDT_r200,4.0.0)",
- org.eclipse.objectteams.otdt;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.objectteams.otdt.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.objectteams.otdt.ui.help;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.objectteams.otequinox;bundle-version="[2.2.0,3.0.0)"
+ org.eclipse.jdt.core;bundle-version="[3.10.0.v_OTDT_r230,4.0.0)",
+ org.eclipse.objectteams.otdt;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.objectteams.otdt.ui;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.objectteams.otdt.ui.help;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.objectteams.otequinox;bundle-version="[2.3.0,3.0.0)"
Export-Package: org.eclipse.objectteams.otdt.internal.samples;x-internal:="true"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF
index 82338bd..357c527 100644
--- a/plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF
@@ -12,11 +12,11 @@
org.eclipse.objectteams.otdt.internal.core.ext;x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.8.1.v_OTDT_r210,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.10.0.v_OTDT_r230,4.0.0)",
org.eclipse.jdt.launching;bundle-version="[3.6.100,4.0.0)",
org.eclipse.debug.core;bundle-version="[3.7.100,4.0.0)",
- org.eclipse.osgi;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.objectteams.otequinox;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.osgi;bundle-version="[3.10.0,4.0.0)",
+ org.eclipse.objectteams.otequinox;bundle-version="[2.3.0,3.0.0)",
org.eclipse.ui.ide;bundle-version="3.8.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.objectteams.otequinox.branding/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otequinox.branding/META-INF/MANIFEST.MF
index 29566e4..1715de3 100644
--- a/plugins/org.eclipse.objectteams.otequinox.branding/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otequinox.branding/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.ui.workbench;bundle-version="[3.7.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.objectteams.otequinox;bundle-version="[2.2.0,3.0.0)"
+ org.eclipse.objectteams.otequinox;bundle-version="[2.3.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.objectteams.otequinox.branding.Activator
-Export-Package: org.eclipse.objectteams.otequinox.internal.branding;x-friends:="org.eclipse.ui.workbench"
+Export-Package: org.eclipse.objectteams.otequinox.internal.branding;ot-aspect-host="org.eclipse.objectteams.otequinox.branding";x-friends:="org.eclipse.ui.workbench"
diff --git a/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF
index 8588b50..6056eff 100644
--- a/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF
@@ -7,13 +7,13 @@
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.objectteams.runtime;bundle-version="2.3.0";visibility:=reexport,
- org.eclipse.objectteams.otre;bundle-version="2.3.0",
- org.eclipse.objectteams.otredyn;bundle-version="1.0.0",
- org.eclipse.osgi;bundle-version="3.10.0",
+ org.eclipse.objectteams.runtime;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
+ org.eclipse.objectteams.otre;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.objectteams.otredyn;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.osgi;bundle-version="[3.10.0,4.0.0)",
org.eclipse.equinox.ds;bundle-version="1.4.100",
org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
- org.objectweb.asm;bundle-version="5.0.1"
+ org.objectweb.asm;bundle-version="[5.0.1,6.0.0)"
Import-Package: org.osgi.service.component;version="1.2.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy