From e51e61cece46b4d04b386593516942aac8c759ee Mon Sep 17 00:00:00 2001 From: Holger Schill Date: Mon, 9 Jan 2017 16:25:06 +0100 Subject: [PATCH 1/3] [Wizard] General: Gradle Tests dont work #224 Signed-off-by: Holger Schill --- gradle/versions.gradle | 2 +- org.eclipse.xtext/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/versions.gradle b/gradle/versions.gradle index a7c92910d..947e60a9c 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -11,7 +11,7 @@ ext.versions = [ 'xtend_plugin': '1.0.14', 'lsp4j': '0.1.0-SNAPSHOT', 'log4j': '1.2.16', - 'equinoxCommon' : '3.6.0', + 'equinoxCommon' : '3.8.0', 'equinoxRegistry' : '3.5.0.v20100503', 'eclipseCore': '3.6.0.v20100505', 'emfCommon': '[2.10.1,3)', diff --git a/org.eclipse.xtext/build.gradle b/org.eclipse.xtext/build.gradle index 39a4a3858..64e1c3c0d 100644 --- a/org.eclipse.xtext/build.gradle +++ b/org.eclipse.xtext/build.gradle @@ -5,7 +5,7 @@ dependencies { compile project(':org.eclipse.xtext.util') compile "org.eclipse.xtend:org.eclipse.xtend.lib:$versions.xtext" compile "log4j:log4j:$versions.log4j" - compile "org.eclipse.equinox:org.eclipse.equinox.common:$versions.equinoxCommon" + compile "org.eclipse.platform:org.eclipse.equinox.common:$versions.equinoxCommon" compile "org.eclipse.emf:org.eclipse.emf.common:$versions.emfCommon" compile "org.eclipse.emf:org.eclipse.emf.ecore.xmi:$versions.emfEcore" compile "com.google.inject:guice:$versions.guice" From a44c88c4e168f7eb0068f489bd100a844cf1a43c Mon Sep 17 00:00:00 2001 From: Holger Schill Date: Mon, 9 Jan 2017 16:31:19 +0100 Subject: [PATCH 2/3] Change version and group ID for equinox.registry Signed-off-by: Holger Schill --- gradle/versions.gradle | 2 +- org.eclipse.xtext/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 947e60a9c..0ef990df7 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -12,7 +12,7 @@ ext.versions = [ 'lsp4j': '0.1.0-SNAPSHOT', 'log4j': '1.2.16', 'equinoxCommon' : '3.8.0', - 'equinoxRegistry' : '3.5.0.v20100503', + 'equinoxRegistry' : '3.6.100', 'eclipseCore': '3.6.0.v20100505', 'emfCommon': '[2.10.1,3)', 'emfEcore': '[2.10.2,3)', diff --git a/org.eclipse.xtext/build.gradle b/org.eclipse.xtext/build.gradle index 64e1c3c0d..882c5fbb7 100644 --- a/org.eclipse.xtext/build.gradle +++ b/org.eclipse.xtext/build.gradle @@ -11,7 +11,7 @@ dependencies { compile "com.google.inject:guice:$versions.guice" compile "org.antlr:antlr-runtime:$versions.antlr" optional "org.eclipse.core:org.eclipse.core.runtime:$versions.eclipseCore" - optional "org.eclipse.equinox:org.eclipse.equinox.registry:$versions.equinoxRegistry" + optional "org.eclipse.platform:org.eclipse.equinox.registry:$versions.equinoxRegistry" optional "org.eclipse.emf:org.eclipse.emf.mwe.utils:$versions.emfMwe" optional "org.eclipse.xpand:org.eclipse.xtend:$versions.xpand" optional "org.eclipse.xpand:org.eclipse.xtend.typesystem.emf:$versions.xpand" From 7c96131e2a5acf2d3bfac769cb22653c1e835192 Mon Sep 17 00:00:00 2001 From: Holger Schill Date: Mon, 9 Jan 2017 16:45:30 +0100 Subject: [PATCH 3/3] Change Group and version for core.runtime --- gradle/versions.gradle | 2 +- org.eclipse.xtext.testlanguages/build.gradle | 2 +- org.eclipse.xtext/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 0ef990df7..5a8616844 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -13,7 +13,7 @@ ext.versions = [ 'log4j': '1.2.16', 'equinoxCommon' : '3.8.0', 'equinoxRegistry' : '3.6.100', - 'eclipseCore': '3.6.0.v20100505', + 'eclipseCore': '3.12.0', 'emfCommon': '[2.10.1,3)', 'emfEcore': '[2.10.2,3)', 'emfMwe': '1.3.20.201605261059', diff --git a/org.eclipse.xtext.testlanguages/build.gradle b/org.eclipse.xtext.testlanguages/build.gradle index e6a67bcbc..e884692db 100644 --- a/org.eclipse.xtext.testlanguages/build.gradle +++ b/org.eclipse.xtext.testlanguages/build.gradle @@ -1,7 +1,7 @@ dependencies { compile project(':org.eclipse.xtext') compile project(':org.eclipse.xtext.testing') - compile "org.eclipse.core:org.eclipse.core.runtime:$versions.eclipseCore" + compile "org.eclipse.platform:org.eclipse.core.runtime:$versions.eclipseCore" mwe2Compile project(':org.eclipse.xtext.xtext.generator') mwe2Compile "org.eclipse.xtext:org.eclipse.xtext.common.types:$versions.xtext_bootstrap" mwe2Runtime "org.eclipse.emf:org.eclipse.emf.mwe2.launch:$versions.emfMwe2" diff --git a/org.eclipse.xtext/build.gradle b/org.eclipse.xtext/build.gradle index 882c5fbb7..53ce46c00 100644 --- a/org.eclipse.xtext/build.gradle +++ b/org.eclipse.xtext/build.gradle @@ -10,7 +10,7 @@ dependencies { compile "org.eclipse.emf:org.eclipse.emf.ecore.xmi:$versions.emfEcore" compile "com.google.inject:guice:$versions.guice" compile "org.antlr:antlr-runtime:$versions.antlr" - optional "org.eclipse.core:org.eclipse.core.runtime:$versions.eclipseCore" + optional "org.eclipse.platform:org.eclipse.core.runtime:$versions.eclipseCore" optional "org.eclipse.platform:org.eclipse.equinox.registry:$versions.equinoxRegistry" optional "org.eclipse.emf:org.eclipse.emf.mwe.utils:$versions.emfMwe" optional "org.eclipse.xpand:org.eclipse.xtend:$versions.xpand"