[449520] Use org.eclipse.ocl.jdt.annotation7

56 files changed, 90 insertions, 62 deletions

diff --git a/doc/org.eclipse.qvtd.doc/META-INF/MANIFEST.MF b/doc/org.eclipse.qvtd.doc/META-INF/MANIFEST.MF
index 9ffb25813..56b5196e3 100644
--- a/doc/org.eclipse.qvtd.doc/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.qvtd.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.qvtd.doc;singleton:=true
-Bundle-Version: 0.11.100.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-Vendor: %Provider.name
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help;bundle-version="[3.5.0,4.0.0)"
diff --git a/examples/org.eclipse.qvtd.examples.qvtrelation.modelmorf/META-INF/MANIFEST.MF b/examples/org.eclipse.qvtd.examples.qvtrelation.modelmorf/META-INF/MANIFEST.MF
index 31a654840..328497e21 100644
--- a/examples/org.eclipse.qvtd.examples.qvtrelation.modelmorf/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.qvtd.examples.qvtrelation.modelmorf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: QVTrelation ModelMorf Examples (Incubation)
 Bundle-SymbolicName: org.eclipse.qvtd.examples.qvtrelation.modelmorf
-Bundle-Version: 0.11.100.qualifier
+Bundle-Version: 0.12.0.qualifier
 Export-Package: org.eclipse.qvtd.examples.qvtrelation.modelmorf
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/examples/org.eclipse.qvtd.examples.qvtrelation.reltocore/META-INF/MANIFEST.MF b/examples/org.eclipse.qvtd.examples.qvtrelation.reltocore/META-INF/MANIFEST.MF
index b33f2efd2..01c4c1c34 100644
--- a/examples/org.eclipse.qvtd.examples.qvtrelation.reltocore/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.qvtd.examples.qvtrelation.reltocore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: QVTrelation RelToCore Example (Incubation)
 Bundle-SymbolicName: org.eclipse.qvtd.examples.qvtrelation.reltocore
-Bundle-Version: 0.11.100.qualifier
+Bundle-Version: 0.12.0.qualifier
 Export-Package: org.eclipse.qvtd.examples.qvtrelation.reltocore
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/examples/org.eclipse.qvtd.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.qvtd.examples/META-INF/MANIFEST.MF
index ebaf8e411..081345939 100644
--- a/examples/org.eclipse.qvtd.examples/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.qvtd.examples/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.examples;singleton:=true
-Bundle-Version: 0.11.100.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.qvtd.examples.QVTDeclarativeExamplesPlugin
 Require-Bundle: org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
diff --git a/examples/org.eclipse.qvtd.examples/build.properties b/examples/org.eclipse.qvtd.examples/build.properties
index d1e7a27e4..32ac27080 100644
--- a/examples/org.eclipse.qvtd.examples/build.properties
+++ b/examples/org.eclipse.qvtd.examples/build.properties
@@ -19,5 +19,6 @@ bin.includes = META-INF/,\
                icons/,\
                about.html,\
                about.properties,\
-               about.ini
+               about.ini,\
+               build.properties
 src.includes = about.html
diff --git a/features/org.eclipse.qvtd.doc-feature/feature.xml b/features/org.eclipse.qvtd.doc-feature/feature.xml
index b12046a87..c8111a74f 100644
--- a/features/org.eclipse.qvtd.doc-feature/feature.xml
+++ b/features/org.eclipse.qvtd.doc-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.qvtd.doc"
       label="%featureName"
-      version="0.11.100.qualifier"
+      version="0.12.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.qvtd.examples-feature/feature.xml b/features/org.eclipse.qvtd.examples-feature/feature.xml
index 01cb29057..d28bc0432 100644
--- a/features/org.eclipse.qvtd.examples-feature/feature.xml
+++ b/features/org.eclipse.qvtd.examples-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.qvtd.examples"
       label="%featureName"
-      version="0.11.100.qualifier"
+      version="0.12.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/plugins/org.eclipse.qvt/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvt/META-INF/MANIFEST.MF
index edf22780c..20fa70ba3 100644
--- a/plugins/org.eclipse.qvt/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvt;singleton:=true
-Bundle-Version: 0.11.100.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.qvtd.codegen/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.codegen/META-INF/MANIFEST.MF
index 2a9bc53a2..5e563ad8a 100644
--- a/plugins/org.eclipse.qvtd.codegen/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.codegen/META-INF/MANIFEST.MF
@@ -2,13 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.codegen;singleton:=true
-Bundle-Version: 0.11.100.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
  org.eclipse.ocl.examples.codegen;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
  org.eclipse.qvtd.pivot.qvtimperative;visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.qvtd.codegen/build.properties b/plugins/org.eclipse.qvtd.codegen/build.properties
index 60e18c5f4..15dea4ba8 100644
--- a/plugins/org.eclipse.qvtd.codegen/build.properties
+++ b/plugins/org.eclipse.qvtd.codegen/build.properties
@@ -24,9 +24,11 @@ bin.includes = .,\
                META-INF/,\
                plugin.xml,\
                plugin.properties,\
-               about.html
+               about.html,\
+               build.properties
 jars.compile.order = .
 source.. = emf-gen/,\
 		   src/
 output.. = bin/
 src.includes = about.html
+additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/plugins/org.eclipse.qvtd.debug.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.debug.ui/META-INF/MANIFEST.MF
index bade1859c..45df5172e 100644
--- a/plugins/org.eclipse.qvtd.debug.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.debug.ui/META-INF/MANIFEST.MF
@@ -2,13 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.debug.ui;singleton:=true
-Bundle-Version: 0.11.100.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.debug.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
  org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.common.ui;bundle-version="[2.7.0,3.0.0)",
diff --git a/plugins/org.eclipse.qvtd.debug.ui/build.properties b/plugins/org.eclipse.qvtd.debug.ui/build.properties
index a64141152..355a300dc 100644
--- a/plugins/org.eclipse.qvtd.debug.ui/build.properties
+++ b/plugins/org.eclipse.qvtd.debug.ui/build.properties
@@ -15,4 +15,7 @@ bin.includes = META-INF/,\
                about.html,\
                plugin.properties,\
                plugin.xml,\
-               icons/
+               icons/,\
+               build.properties
+additional.bundles = org.eclipse.ocl.jdt.annotation7
+src.includes = about.html
diff --git a/plugins/org.eclipse.qvtd.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.debug/META-INF/MANIFEST.MF
index dcc825e2c..b4e35a244 100644
--- a/plugins/org.eclipse.qvtd.debug/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.debug/META-INF/MANIFEST.MF
@@ -2,14 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.debug;singleton:=true
-Bundle-Version: 0.11.100.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
  org.eclipse.ocl.examples.debug;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
  org.eclipse.qvtd.xtext.qvtimperative
 Export-Package: org.eclipse.qvtd.debug,
diff --git a/plugins/org.eclipse.qvtd.debug/build.properties b/plugins/org.eclipse.qvtd.debug/build.properties
index 43c64f202..70a0bdb85 100644
--- a/plugins/org.eclipse.qvtd.debug/build.properties
+++ b/plugins/org.eclipse.qvtd.debug/build.properties
@@ -14,4 +14,7 @@ bin.includes = META-INF/,\
                .,\
                about.html,\
                plugin.properties,\
-               plugin.xml
+               plugin.xml,\
+               build.properties
+additional.bundles = org.eclipse.ocl.jdt.annotation7
+src.includes = about.html
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.pivot.qvtbase/META-INF/MANIFEST.MF
index 86b924548..4fcaca431 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/META-INF/MANIFEST.MF
@@ -14,7 +14,6 @@ Export-Package: org.eclipse.qvtd.pivot.qvtbase,
  org.eclipse.qvtd.pivot.qvtbase.util,
  org.eclipse.qvtd.pivot.qvtbase.utilities
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
  org.eclipse.ocl.examples.pivot;bundle-version="[3.4.0,4.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Import-Package: com.google.inject
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/build.properties b/plugins/org.eclipse.qvtd.pivot.qvtbase/build.properties
index 62bcf61fd..f4432331c 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/build.properties
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/build.properties
@@ -15,9 +15,11 @@ bin.includes = .,\
                plugin.properties,\
                about.html,\
                about.ini,\
-               about.properties
+               about.properties,\
+               build.properties
 jars.compile.order = .
 source.. = emf-gen/,\
 		   src/
 output.. = bin/
 src.includes = about.html
+additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtcore/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.pivot.qvtcore/META-INF/MANIFEST.MF
index 97e32cf7f..1705d2508 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtcore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.pivot.qvtcore/META-INF/MANIFEST.MF
@@ -14,7 +14,6 @@ Export-Package: org.eclipse.qvtd.pivot.qvtcore,
  org.eclipse.qvtd.pivot.qvtcore.util,
  org.eclipse.qvtd.pivot.qvtcore.utilities
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
  org.eclipse.qvtd.pivot.qvtcorebase;visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Import-Package: com.google.inject
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtcore/build.properties b/plugins/org.eclipse.qvtd.pivot.qvtcore/build.properties
index e1fd5b899..cfe000ffc 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtcore/build.properties
+++ b/plugins/org.eclipse.qvtd.pivot.qvtcore/build.properties
@@ -13,9 +13,11 @@ bin.includes = .,\
                META-INF/,\
                plugin.xml,\
                plugin.properties,\
-               about.html
+               about.html,\
+               build.properties
 jars.compile.order = .
 source.. = emf-gen/,\
 		   src/
 output.. = bin/
 src.includes = about.html
+additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtcorebase/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.pivot.qvtcorebase/META-INF/MANIFEST.MF
index c86eca732..3bbf8adfc 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtcorebase/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.pivot.qvtcorebase/META-INF/MANIFEST.MF
@@ -14,7 +14,6 @@ Export-Package: org.eclipse.qvtd.pivot.qvtcorebase,
  org.eclipse.qvtd.pivot.qvtcorebase.util,
  org.eclipse.qvtd.pivot.qvtcorebase.utilities
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
  org.eclipse.qvtd.pivot.qvtbase;visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Import-Package: com.google.inject
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtcorebase/build.properties b/plugins/org.eclipse.qvtd.pivot.qvtcorebase/build.properties
index e1fd5b899..cfe000ffc 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtcorebase/build.properties
+++ b/plugins/org.eclipse.qvtd.pivot.qvtcorebase/build.properties
@@ -13,9 +13,11 @@ bin.includes = .,\
                META-INF/,\
                plugin.xml,\
                plugin.properties,\
-               about.html
+               about.html,\
+               build.properties
 jars.compile.order = .
 source.. = emf-gen/,\
 		   src/
 output.. = bin/
 src.includes = about.html
+additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.pivot.qvtimperative/META-INF/MANIFEST.MF
index b2d76a61c..383605406 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/META-INF/MANIFEST.MF
@@ -15,7 +15,6 @@ Export-Package: org.eclipse.qvtd.pivot.qvtimperative,
  org.eclipse.qvtd.pivot.qvtimperative.util,
  org.eclipse.qvtd.pivot.qvtimperative.utilities
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
  org.eclipse.qvtd.pivot.qvtcorebase;visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Import-Package: com.google.inject,
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/build.properties b/plugins/org.eclipse.qvtd.pivot.qvtimperative/build.properties
index e1fd5b899..cfe000ffc 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/build.properties
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/build.properties
@@ -13,9 +13,11 @@ bin.includes = .,\
                META-INF/,\
                plugin.xml,\
                plugin.properties,\
-               about.html
+               about.html,\
+               build.properties
 jars.compile.order = .
 source.. = emf-gen/,\
 		   src/
 output.. = bin/
 src.includes = about.html
+additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtrelation/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.pivot.qvtrelation/META-INF/MANIFEST.MF
index 972fdc51c..1e1db3ba3 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtrelation/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.pivot.qvtrelation/META-INF/MANIFEST.MF
@@ -14,7 +14,6 @@ Export-Package: org.eclipse.qvtd.pivot.qvtrelation,
  org.eclipse.qvtd.pivot.qvtrelation.util,
  org.eclipse.qvtd.pivot.qvtrelation.utilities
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
  org.eclipse.qvtd.pivot.qvttemplate;visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Import-Package: com.google.inject
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtrelation/build.properties b/plugins/org.eclipse.qvtd.pivot.qvtrelation/build.properties
index e1fd5b899..cfe000ffc 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtrelation/build.properties
+++ b/plugins/org.eclipse.qvtd.pivot.qvtrelation/build.properties
@@ -13,9 +13,11 @@ bin.includes = .,\
                META-INF/,\
                plugin.xml,\
                plugin.properties,\
-               about.html
+               about.html,\
+               build.properties
 jars.compile.order = .
 source.. = emf-gen/,\
 		   src/
 output.. = bin/
 src.includes = about.html
+additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/plugins/org.eclipse.qvtd.pivot.qvttemplate/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.pivot.qvttemplate/META-INF/MANIFEST.MF
index 7f11b95e9..d37f80ec5 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvttemplate/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.pivot.qvttemplate/META-INF/MANIFEST.MF
@@ -14,7 +14,6 @@ Export-Package: org.eclipse.qvtd.pivot.qvttemplate,
  org.eclipse.qvtd.pivot.qvttemplate.util,
  org.eclipse.qvtd.pivot.qvttemplate.utilities
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
  org.eclipse.qvtd.pivot.qvtbase;visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Import-Package: com.google.inject
diff --git a/plugins/org.eclipse.qvtd.pivot.qvttemplate/build.properties b/plugins/org.eclipse.qvtd.pivot.qvttemplate/build.properties
index e1fd5b899..cfe000ffc 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvttemplate/build.properties
+++ b/plugins/org.eclipse.qvtd.pivot.qvttemplate/build.properties
@@ -13,9 +13,11 @@ bin.includes = .,\
                META-INF/,\
                plugin.xml,\
                plugin.properties,\
-               about.html
+               about.html,\
+               build.properties
 jars.compile.order = .
 source.. = emf-gen/,\
 		   src/
 output.. = bin/
 src.includes = about.html
+additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/META-INF/MANIFEST.MF
index d618a64a4..1c928a7fd 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Localization: plugin
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.qvtd.pivot.qvtbase;visibility:=reexport,
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
  org.eclipse.ocl.examples.xtext.essentialocl.ui;bundle-version="[3.4.0,4.0.0)";visibility:=reexport
 Export-Package: org.eclipse.qvtd.xtext.qvtbase.ui.labeling,
  org.eclipse.qvtd.xtext.qvtbase.ui.outline
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/build.properties b/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/build.properties
index 533124a90..3883617dc 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/build.properties
+++ b/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/build.properties
@@ -15,5 +15,7 @@ bin.includes = .,\
                plugin.properties,\
                about.html,\
                icons/,\
-               plugin.xml
+               plugin.xml,\
+               build.properties
 src.includes = about.html
+additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/META-INF/MANIFEST.MF
index d11b8b273..952a4ca8d 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/META-INF/MANIFEST.MF
@@ -16,7 +16,6 @@ Export-Package: org.eclipse.qvtd.xtext.qvtcore.ui,
  org.eclipse.qvtd.xtext.qvtcore.ui.outline,
  org.eclipse.qvtd.xtext.qvtcore.ui.quickfix
 Require-Bundle: org.eclipse.qvtd.xtext.qvtcore;visibility:=reexport,
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
  org.eclipse.qvtd.xtext.qvtcorebase.ui;visibility:=reexport
 Import-Package: org.apache.log4j
 Bundle-Activator: org.eclipse.qvtd.xtext.qvtcore.ui.internal.QVTcoreActivator
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/build.properties b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/build.properties
index 1f4e3504d..7cf0b393b 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/build.properties
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/build.properties
@@ -13,9 +13,11 @@ bin.includes = .,\
                plugin.xml,\
                plugin.properties,\
                about.html,\
-               icons/
+               icons/,\
+               build.properties
 jars.compile.order = .
 source.. = src/,\
            src-gen/
 output.. = bin/
 src.includes = about.html
+additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtcore/META-INF/MANIFEST.MF
index 8d50c904b..075acc947 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/META-INF/MANIFEST.MF
@@ -24,7 +24,6 @@ Export-Package: org.eclipse.qvtd.xtext.qvtcore,
  org.eclipse.qvtd.xtext.qvtcore.utilities,
  org.eclipse.qvtd.xtext.qvtcore.validation
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
  org.eclipse.qvtd.pivot.qvtcore;visibility:=reexport,
  org.eclipse.qvtd.xtext.qvtcorebase;visibility:=reexport
 Bundle-Activator: org.eclipse.qvtd.xtext.qvtcore.utilities.QVTcorePlugin$Implementation
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/build.properties b/plugins/org.eclipse.qvtd.xtext.qvtcore/build.properties
index 31aa80885..bb3714f83 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore/build.properties
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/build.properties
@@ -13,10 +13,12 @@ bin.includes = .,\
                META-INF/,\
                plugin.xml,\
                plugin.properties,\
-               about.html
+               about.html,\
+               build.properties
 jars.compile.order = .
 source.. = src/,\
            src-gen/,\
            emf-gen/
 output.. = bin/
 src.includes = about.html
+additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcorebase.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtcorebase.ui/META-INF/MANIFEST.MF
index 47bbbe838..c49a385a1 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcorebase.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcorebase.ui/META-INF/MANIFEST.MF
@@ -15,7 +15,6 @@ Export-Package: org.eclipse.qvtd.xtext.qvtcorebase.ui,
  org.eclipse.qvtd.xtext.qvtcorebase.ui.outline,
  org.eclipse.qvtd.xtext.qvtcorebase.ui.quickfix
 Require-Bundle: org.eclipse.qvtd.xtext.qvtbase.ui;visibility:=reexport,
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
  org.eclipse.qvtd.xtext.qvtcorebase;visibility:=reexport
 Import-Package: org.apache.log4j
 Bundle-Activator: org.eclipse.qvtd.xtext.qvtcorebase.ui.internal.QVTcoreBaseActivator
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcorebase.ui/build.properties b/plugins/org.eclipse.qvtd.xtext.qvtcorebase.ui/build.properties
index 5dd893953..149ff34db 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcorebase.ui/build.properties
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcorebase.ui/build.properties
@@ -16,5 +16,7 @@ bin.includes = META-INF/,\
                about.html,\
                icons/,\
                plugin.xml,\
-               plugin.properties
+               plugin.properties,\
+               build.properties
 src.includes = about.html
+additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/META-INF/MANIFEST.MF
index 970a90748..c6b03a353 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/META-INF/MANIFEST.MF
@@ -25,7 +25,6 @@ Export-Package: org.eclipse.qvtd.xtext.qvtcorebase,
  org.eclipse.qvtd.xtext.qvtcorebase.utilities,
  org.eclipse.qvtd.xtext.qvtcorebase.validation
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
  org.eclipse.ocl.examples.xtext.essentialocl;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
  org.eclipse.qvtd.pivot.qvtcorebase;visibility:=reexport
 Import-Package: org.apache.log4j
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/build.properties b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/build.properties
index 31aa80885..bb3714f83 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/build.properties
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/build.properties
@@ -13,10 +13,12 @@ bin.includes = .,\
                META-INF/,\
                plugin.xml,\
                plugin.properties,\
-               about.html
+               about.html,\
+               build.properties
 jars.compile.order = .
 source.. = src/,\
            src-gen/,\
            emf-gen/
 output.. = bin/
 src.includes = about.html
+additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/META-INF/MANIFEST.MF
index d68ac24b5..627c42fbb 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/META-INF/MANIFEST.MF
@@ -15,7 +15,6 @@ Export-Package: org.eclipse.qvtd.xtext.qvtimperative.ui,
  org.eclipse.qvtd.xtext.qvtimperative.ui.outline,
  org.eclipse.qvtd.xtext.qvtimperative.ui.quickfix
 Require-Bundle: org.eclipse.qvtd.xtext.qvtimperative;visibility:=reexport,
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
  org.eclipse.qvtd.xtext.qvtcorebase.ui;visibility:=reexport
 Import-Package: org.apache.log4j
 Bundle-Activator: org.eclipse.qvtd.xtext.qvtimperative.ui.internal.QVTimperativeActivator
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/build.properties b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/build.properties
index 1f4e3504d..7cf0b393b 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/build.properties
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/build.properties
@@ -13,9 +13,11 @@ bin.includes = .,\
                plugin.xml,\
                plugin.properties,\
                about.html,\
-               icons/
+               icons/,\
+               build.properties
 jars.compile.order = .
 source.. = src/,\
            src-gen/
 output.. = bin/
 src.includes = about.html
+additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtimperative/META-INF/MANIFEST.MF
index 29bbe3646..b4276f2c4 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative/META-INF/MANIFEST.MF
@@ -25,7 +25,6 @@ Export-Package: org.eclipse.qvtd.xtext.qvtimperative,
  org.eclipse.qvtd.xtext.qvtimperative.utilities,
  org.eclipse.qvtd.xtext.qvtimperative.validation
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
  org.eclipse.ocl.examples.xtext.completeocl,
  org.eclipse.qvtd.pivot.qvtimperative;visibility:=reexport,
  org.eclipse.qvtd.xtext.qvtcorebase;visibility:=reexport
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/build.properties b/plugins/org.eclipse.qvtd.xtext.qvtimperative/build.properties
index 31aa80885..bb3714f83 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/build.properties
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative/build.properties
@@ -13,10 +13,12 @@ bin.includes = .,\
                META-INF/,\
                plugin.xml,\
                plugin.properties,\
-               about.html
+               about.html,\
+               build.properties
 jars.compile.order = .
 source.. = src/,\
            src-gen/,\
            emf-gen/
 output.. = bin/
 src.includes = about.html
+additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/META-INF/MANIFEST.MF
index 60cc203fa..f34e01459 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/META-INF/MANIFEST.MF
@@ -15,7 +15,6 @@ Export-Package: org.eclipse.qvtd.xtext.qvtrelation.ui,
  org.eclipse.qvtd.xtext.qvtrelation.ui.outline,
  org.eclipse.qvtd.xtext.qvtrelation.ui.quickfix
 Require-Bundle: org.eclipse.qvtd.xtext.qvtbase.ui;visibility:=reexport,
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
  org.eclipse.qvtd.xtext.qvtrelation;visibility:=reexport
 Import-Package: org.apache.log4j
 Bundle-Activator: org.eclipse.qvtd.xtext.qvtrelation.ui.internal.QVTrelationActivator
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/build.properties b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/build.properties
index df76c48f8..1ea04bd17 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/build.properties
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/build.properties
@@ -16,5 +16,7 @@ bin.includes = META-INF/,\
                about.html,\
                plugin.xml,\
                plugin.properties,\
-               icons/
+               icons/,\
+               build.properties
 src.includes = about.html
+additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.xtext.qvtrelation/META-INF/MANIFEST.MF
index 9deabde77..49f4308eb 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/META-INF/MANIFEST.MF
@@ -24,7 +24,6 @@ Export-Package: org.eclipse.qvtd.xtext.qvtrelation,
  org.eclipse.qvtd.xtext.qvtrelation.utilities,
  org.eclipse.qvtd.xtext.qvtrelation.validation
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
  org.eclipse.ocl.examples.xtext.essentialocl;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
  org.eclipse.qvtd.pivot.qvtrelation;visibility:=reexport
 Import-Package: org.apache.log4j
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/build.properties b/plugins/org.eclipse.qvtd.xtext.qvtrelation/build.properties
index 6980ede1d..6ea2d43ec 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/build.properties
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/build.properties
@@ -15,10 +15,12 @@ bin.includes = .,\
                META-INF/,\
                plugin.xml,\
                plugin.properties,\
-               about.html
+               about.html,\
+               build.properties
 jars.compile.order = .
 source.. = emf-gen/,\
 		   src/,\
 		   src-gen/
 output.. = bin/
 src.includes = about.html
+additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/releng/org.eclipse.qvtd.build/META-INF/MANIFEST.MF b/releng/org.eclipse.qvtd.build/META-INF/MANIFEST.MF
index 01d1007f7..15b13fc2a 100644
--- a/releng/org.eclipse.qvtd.build/META-INF/MANIFEST.MF
+++ b/releng/org.eclipse.qvtd.build/META-INF/MANIFEST.MF
@@ -2,12 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.build;singleton:=true
-Bundle-Version: 0.11.100.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.resources,
  org.eclipse.core.runtime,
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
  org.eclipse.emf.mwe2.launch,
  org.eclipse.xtext.generator,
  org.eclipse.ocl.examples.build;bundle-version="[3.5.0,3.6.0)",
diff --git a/releng/org.eclipse.qvtd.build/build.properties b/releng/org.eclipse.qvtd.build/build.properties
index d35a71662..52add0be8 100644
--- a/releng/org.eclipse.qvtd.build/build.properties
+++ b/releng/org.eclipse.qvtd.build/build.properties
@@ -19,5 +19,7 @@ bin.includes = META-INF/,\
                topics_Reference.xml,\
                about.html,\
                about.ini,\
-               about.properties
+               about.properties,\
+               build.properties
 src.includes = about.html
+additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/tests/org.eclipse.qvtd.all.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.qvtd.all.tests/META-INF/MANIFEST.MF
index a03c5021f..9e0ea7477 100644
--- a/tests/org.eclipse.qvtd.all.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.qvtd.all.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.qvtd.all.tests
-Bundle-Version: 0.11.100.qualifier
+Bundle-Version: 0.12.0.qualifier
 Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/tests/org.eclipse.qvtd.all.tests/build.properties b/tests/org.eclipse.qvtd.all.tests/build.properties
index a48c40d0a..64b24dc52 100644
--- a/tests/org.eclipse.qvtd.all.tests/build.properties
+++ b/tests/org.eclipse.qvtd.all.tests/build.properties
@@ -14,5 +14,7 @@ bin.includes = META-INF/,\
                .,\
                plugin.properties,\
                about.html,\
-               about.ini
+               about.ini,\
+               build.properties
 src.includes = about.html
+additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/tests/org.eclipse.qvtd.xtext.qvtbase.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.qvtd.xtext.qvtbase.tests/META-INF/MANIFEST.MF
index 97d4101cf..a5e52ad80 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtbase.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.qvtd.xtext.qvtbase.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@ Require-Bundle: org.junit;visibility:=reexport,
  org.apache.log4j;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.uml2.uml.resources;visibility:=reexport,
- org.eclipse.jdt.annotation;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.ocl.examples.xtext.tests
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/tests/org.eclipse.qvtd.xtext.qvtbase.tests/build.properties b/tests/org.eclipse.qvtd.xtext.qvtbase.tests/build.properties
index 4d87a2ed0..3b145275a 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtbase.tests/build.properties
+++ b/tests/org.eclipse.qvtd.xtext.qvtbase.tests/build.properties
@@ -13,5 +13,7 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.properties,\
-               about.html
+               about.html,\
+               build.properties
 src.includes = about.html
+additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/META-INF/MANIFEST.MF
index d120bf217..41f940ee3 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/META-INF/MANIFEST.MF
@@ -7,8 +7,7 @@ Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.qvtd.xtext.qvtbase.tests,
- org.eclipse.qvtd.xtext.qvtcore.ui,
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.qvtd.xtext.qvtcore.ui
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/build.properties b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/build.properties
index d2c55a28d..d4e75c3c3 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/build.properties
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/build.properties
@@ -13,8 +13,10 @@
 bin.includes = .,\
                META-INF/,\
                plugin.properties,\
-               about.html
+               about.html,\
+               build.properties
 jars.compile.order = .
 source.. = src/
 output.. = bin/
 src.includes = about.html
+additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/META-INF/MANIFEST.MF
index 5d15496f4..897409d4f 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.junit,
  org.eclipse.core.runtime,
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,
  org.eclipse.qvtd.codegen,
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/build.properties b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/build.properties
index a6bae1082..2ff096386 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/build.properties
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/build.properties
@@ -14,9 +14,11 @@ bin.includes = .,\
                META-INF/,\
                plugin.xml,\
                plugin.properties,\
-               about.html
+               about.html,\
+               build.properties
 jars.compile.order = .
 source.. = src-gen/,\
 		   src/
 output.. = bin/
 src.includes = about.html
+additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/META-INF/MANIFEST.MF
index d79216229..723b0be59 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/META-INF/MANIFEST.MF
@@ -10,6 +10,5 @@ Require-Bundle: org.eclipse.qvtd.xtext.qvtbase.tests,
  org.eclipse.qvtd.xtext.qvtrelation,
  org.eclipse.qvt,
  org.eclipse.qvtd.examples.qvtrelation.modelmorf,
- org.eclipse.qvtd.examples.qvtrelation.reltocore,
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.qvtd.examples.qvtrelation.reltocore
 Export-Package: org.eclipse.qvtd.xtext.qvtrelation.tests
diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/build.properties b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/build.properties
index 4d87a2ed0..3b145275a 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/build.properties
+++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/build.properties
@@ -13,5 +13,7 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.properties,\
-               about.html
+               about.html,\
+               build.properties
 src.includes = about.html
+additional.bundles = org.eclipse.ocl.jdt.annotation7