Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2021-06-18 21:07:18 +0000
committerStephan Herrmann2021-06-18 21:07:53 +0000
commit46ad7c68bfcf1dcdd38a3ba4f656e9688300e5ea (patch)
tree7929fb3c0eb124069b66778d223167bf154bc7d7
parent48cd743fa98029a8de5e7583151915d8cd51290a (diff)
downloadorg.eclipse.objectteams-46ad7c68bfcf1dcdd38a3ba4f656e9688300e5ea.tar.gz
org.eclipse.objectteams-46ad7c68bfcf1dcdd38a3ba4f656e9688300e5ea.tar.xz
org.eclipse.objectteams-46ad7c68bfcf1dcdd38a3ba4f656e9688300e5ea.zip
Releng: avoid conflict asm 8.0.1 vs. 9.1.0 by forcing the newer version
-rw-r--r--plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF10
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF
index 0ec5ebd1c..d8ca001a8 100644
--- a/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.objectteams.otredyn;bundle-version="[1.4.0,2.0.0)",
org.eclipse.osgi;bundle-version="[3.10.0,4.0.0)",
org.eclipse.jdt.annotation;bundle-version="[2.2.0,3.0.0)";resolution:=optional,
- org.objectweb.asm;bundle-version="[8.0.1,10.0.0)"
+ org.objectweb.asm;bundle-version="[9.1.0,10.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.objectteams.otequinox
diff --git a/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF
index 90f7b0c68..7b48c693a 100644
--- a/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF
@@ -15,9 +15,9 @@ Export-Package: org.eclipse.objectteams.otredyn.bytecode,
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ClassPath: .
Require-Bundle: org.eclipse.objectteams.runtime;bundle-version="[2.8.0,3.0.0)",
- org.objectweb.asm;bundle-version="[8.0.1,10.0.0)",
- org.objectweb.asm.tree;bundle-version="[8.0.1,10.0.0)",
- org.objectweb.asm.commons;bundle-version="[8.0.1,10.0.0)",
- org.objectweb.asm.util;bundle-version="[8.0.1,10.0.0)",
- org.objectweb.asm.analysis;bundle-version="[8.0.1,10.0.0)",
+ org.objectweb.asm;bundle-version="[9.1.0,10.0.0)",
+ org.objectweb.asm.tree;bundle-version="[9.1.0,10.0.0)",
+ org.objectweb.asm.commons;bundle-version="[9.1.0,10.0.0)",
+ org.objectweb.asm.util;bundle-version="[9.1.0,10.0.0)",
+ org.objectweb.asm.analysis;bundle-version="[9.1.0,10.0.0)",
org.eclipse.jdt.annotation;bundle-version="2.2.400";resolution:=optional

Back to the top