Merge pull request #711 from eclipse/cd_xtext_issue1190

[eclipse-xtext/xtext#1190] Narrowed the version range for asm to [6.1.1,6.2.0)
eclipse · Apr 23, 2018 · 5e7c2a0 · 5e7c2a0
2 parents 497b704 + de25d13
commit 5e7c2a0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...xtext.generator/src/org/eclipse/xtext/xtext/generator/types/TypesGeneratorFragment2.xtend b/...xtext.generator/src/org/eclipse/xtext/xtext/generator/types/TypesGeneratorFragment2.xtend
@@ -48,13 +48,13 @@ class TypesGeneratorFragment2 extends AbstractXtextGeneratorFragment {
 		if (projectConfig.runtime.manifest !== null) {
 			projectConfig.runtime.manifest.requiredBundles.addAll(
 				'org.eclipse.xtext.common.types',
-				'org.objectweb.asm;bundle-version="[6.1.1,7.0.0)";resolution:=optional'
+				'org.objectweb.asm;bundle-version="[6.1.1,6.2.0)";resolution:=optional'
 			)
 		}
 
 		if (projectConfig.runtimeTest.manifest !== null) {
 			projectConfig.runtimeTest.manifest.requiredBundles.add(
-				'org.objectweb.asm;bundle-version="[6.1.1,7.0.0)";resolution:=optional'
+				'org.objectweb.asm;bundle-version="[6.1.1,6.2.0)";resolution:=optional'
 			)
 		}
 

diff --git a/....generator/xtend-gen/org/eclipse/xtext/xtext/generator/types/TypesGeneratorFragment2.java b/....generator/xtend-gen/org/eclipse/xtext/xtext/generator/types/TypesGeneratorFragment2.java
@@ -50,13 +50,13 @@ public void generate() {
     if (_tripleNotEquals) {
       CollectionExtensions.<String>addAll(this.getProjectConfig().getRuntime().getManifest().getRequiredBundles(), 
         "org.eclipse.xtext.common.types", 
-        "org.objectweb.asm;bundle-version=\"[6.1.1,7.0.0)\";resolution:=optional");
+        "org.objectweb.asm;bundle-version=\"[6.1.1,6.2.0)\";resolution:=optional");
     }
     ManifestAccess _manifest_1 = this.getProjectConfig().getRuntimeTest().getManifest();
     boolean _tripleNotEquals_1 = (_manifest_1 != null);
     if (_tripleNotEquals_1) {
       this.getProjectConfig().getRuntimeTest().getManifest().getRequiredBundles().add(
-        "org.objectweb.asm;bundle-version=\"[6.1.1,7.0.0)\";resolution:=optional");
+        "org.objectweb.asm;bundle-version=\"[6.1.1,6.2.0)\";resolution:=optional");
     }
     ManifestAccess _manifest_2 = this.getProjectConfig().getEclipsePlugin().getManifest();
     boolean _tripleNotEquals_2 = (_manifest_2 != null);

diff --git a/org.eclipse.xtext/META-INF/MANIFEST.MF b/org.eclipse.xtext/META-INF/MANIFEST.MF
@@ -235,7 +235,7 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.10.2";visibility:=re
  org.eclipse.emf.common;bundle-version="2.10.1",
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)";visibility:=reexport,
  com.google.inject;bundle-version="3.0.0";visibility:=reexport,
- org.objectweb.asm;bundle-version="[6.1.1,7.0.0)";resolution:=optional,
+ org.objectweb.asm;bundle-version="[6.1.1,6.2.0)";resolution:=optional,
  org.eclipse.emf.mwe.core;bundle-version="1.2.0";resolution:=optional;visibility:=reexport,
  org.eclipse.emf.mwe.utils;bundle-version="1.2.0";resolution:=optional;visibility:=reexport,
  org.eclipse.xtend;bundle-version="1.1.0";resolution:=optional,