From 94f446c8c9f505a8d0b51527925cf1ccc18abf4d Mon Sep 17 00:00:00 2001
From: Stefan Oehme <st.oehme@gmail.com>
Date: Tue, 20 May 2014 14:03:56 +0200
Subject: [PATCH] upgrade to Xtext 2.5.4+

---
 xtext-gradle-lib/build.gradle                         |  4 +++-
 xtext-gradle-plugin/build.gradle                      |  6 ++++++
 .../main/groovy/org/xtext/gradle/XtextPlugin.groovy   | 11 +++++++++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/xtext-gradle-lib/build.gradle b/xtext-gradle-lib/build.gradle
index 57ef0b12..1d7661a6 100644
--- a/xtext-gradle-lib/build.gradle
+++ b/xtext-gradle-lib/build.gradle
@@ -1,6 +1,8 @@
 dependencies {
   compile localGroovy()
-  compile "org.eclipse.xtext:org.eclipse.xtext.builder.standalone:2.5.3"
+  compile ("org.eclipse.xtext:org.eclipse.xtext.builder.standalone:[2.5.4,)") {
+    exclude group:'asm', module:'asm'
+  }
 }
 
 uploadArchives.repositories.mavenDeployer.pom.project {
diff --git a/xtext-gradle-plugin/build.gradle b/xtext-gradle-plugin/build.gradle
index a4413cd8..0515da34 100644
--- a/xtext-gradle-plugin/build.gradle
+++ b/xtext-gradle-plugin/build.gradle
@@ -3,6 +3,12 @@ dependencies {
   compile gradleApi()
 }
 
+jar {
+  manifest {
+    attributes("Implementation-Version": version)
+  }
+}
+
 uploadArchives.repositories.mavenDeployer.pom.project {
   name 'Xtext Gradle Plugin'
   description 'A plugin for invoking Xtext base Code generators'
diff --git a/xtext-gradle-plugin/src/main/groovy/org/xtext/gradle/XtextPlugin.groovy b/xtext-gradle-plugin/src/main/groovy/org/xtext/gradle/XtextPlugin.groovy
index 9cbb9ef5..85306b31 100644
--- a/xtext-gradle-plugin/src/main/groovy/org/xtext/gradle/XtextPlugin.groovy
+++ b/xtext-gradle-plugin/src/main/groovy/org/xtext/gradle/XtextPlugin.groovy
@@ -26,6 +26,10 @@ class XtextPlugin implements Plugin<Project> {
 	XtextPlugin(FileResolver fileResolver) {
 		this.fileResolver = fileResolver
 	}
+  
+  private String getPluginVersion() {
+    this.class.package.implementationVersion
+  }
 
 	def void apply(Project project) {
 		project.plugins.apply(BasePlugin)
@@ -45,8 +49,11 @@ class XtextPlugin implements Plugin<Project> {
 		eclipse.getProject().natures("org.eclipse.xtext.ui.shared.xtextNature")
 		
 		project.afterEvaluate{
-			project.dependencies.add("xtextTooling", "org.eclipse.xtext:org.eclipse.xtext:${xtext.version}")
-			project.dependencies.add("xtextTooling", "org.xtext:xtext-gradle-lib:0.0.3")
+			project.dependencies.add("xtextTooling", "org.eclipse.xtext:org.eclipse.xtext.builder.standalone:${xtext.version}") {
+      	force = true
+        exclude group:'asm'
+      }
+			project.dependencies.add("xtextTooling", "org.xtext:xtext-gradle-lib:${pluginVersion}")
 
 			def XtextGenerate generatorTask = project.tasks.create("xtextGenerate", XtextGenerate)
 			def JavaPluginConvention java = project.convention.findPlugin(JavaPluginConvention)