diff --git a/build.gradle b/build.gradle
index eb1a5c507..462813d73 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,6 +10,7 @@ buildscript {
repositories.jcenter()
dependencies {
classpath "org.xtext:xtext-gradle-plugin:$versions.xtext_gradle_plugin"
+ classpath "io.spring.gradle:dependency-management-plugin:$versions.dependency_management_plugin"
}
}
@@ -27,6 +28,12 @@ subprojects {
version = rootProject.version
apply plugin: 'java'
+ apply plugin: 'io.spring.dependency-management'
+ dependencyManagement {
+ imports {
+ mavenBom "org.eclipse.xtext:xtext-dev-bom:$project.version"
+ }
+ }
if (findProperty('compileXtend') == 'true') {
apply plugin: 'org.xtext.xtend'
}
diff --git a/gradle/bootstrap-setup.gradle b/gradle/bootstrap-setup.gradle
index 5dd00cc43..90460a184 100644
--- a/gradle/bootstrap-setup.gradle
+++ b/gradle/bootstrap-setup.gradle
@@ -21,8 +21,6 @@ configurations {
eachDependency {
if (requested.group == 'org.eclipse.xtext' || requested.group == 'org.eclipse.xtend')
useVersion(versions.xtext_bootstrap)
- if (requested.group == 'com.google.inject' && requested.name == 'guice')
- useVersion(versions.guice)
}
}
exclude group: 'asm'
diff --git a/gradle/mwe2-workflows.gradle b/gradle/mwe2-workflows.gradle
index d9748661e..7c4a9dd50 100644
--- a/gradle/mwe2-workflows.gradle
+++ b/gradle/mwe2-workflows.gradle
@@ -12,7 +12,7 @@ dependencies {
if (!name.endsWith('bootstrap')) {
mwe2Compile project(':org.eclipse.xtext.xtext.generator')
}
- mwe2Runtime "org.eclipse.emf:org.eclipse.emf.mwe2.launch:$versions.emfMwe2"
+ mwe2Runtime 'org.eclipse.emf:org.eclipse.emf.mwe2.launch'
mwe2Runtime "org.eclipse.xtext:org.eclipse.xtext.common.types:$versions.xtext_bootstrap"
mwe2Runtime "org.eclipse.xtext:org.eclipse.xtext.ecore:$versions.xtext_bootstrap"
}
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
index 31248648a..4a72654a8 100644
--- a/gradle/versions.gradle
+++ b/gradle/versions.gradle
@@ -9,29 +9,5 @@ ext.versions = [
'xtext_bootstrap': '2.16.0',
'gradle_plugins': '0.1.0',
'xtext_gradle_plugin': '2.0.2',
- // When adjusting the `lsp4j` version here, do not forget to do the followings:
- // - Update the version in `IdeProjectDescriptor#pom`.
- // - Update the test expectations by running `CliWizardIntegrationTest#main`.
- // - Update the versions in the `/org.eclipse.xtext.ide/META-INF/MANIFEST.MF` and `/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF` files.
- 'lsp4j': '0.6.0',
- 'log4j': '1.2.16',
- 'equinoxCommon' : '3.9.0',
- 'equinoxRegistry' : '3.7.0',
- 'eclipseCore': '3.13.0',
- 'eclipseOSGI' : '3.12.100',
- 'emfCommon': '2.12.0',
- 'emfEcore': '2.12.0',
- 'emfChange': '2.11.0',
- 'emfCodegen': '2.11.0',
- 'emfMwe': '1.3.21.201705291010',
- 'emfMwe2': '2.9.1.201705291010',
- 'jdtCore': '3.13.102',
- 'xpand': '2.0.0',
- 'guice': '3.0',
- 'antlr': '3.2',
- 'asm': '7.0',
- 'icu': '52.1',
- 'junit': '4.12',
- 'junit5': '5.1.0',
- 'args4j': '2.33'
+ 'dependency_management_plugin' : '1.0.6.RELEASE'
]
diff --git a/org.eclipse.xtext.ide.tests/build.gradle b/org.eclipse.xtext.ide.tests/build.gradle
index 0cc43c0b4..2455c4f0b 100644
--- a/org.eclipse.xtext.ide.tests/build.gradle
+++ b/org.eclipse.xtext.ide.tests/build.gradle
@@ -5,9 +5,9 @@ dependencies {
compile project(':org.eclipse.xtext.testing')
compile project(':org.eclipse.xtext.testlanguages')
compile project(':org.eclipse.xtext.testlanguages.ide')
- compile "junit:junit:$versions.junit"
- compile "org.eclipse.lsp4j:org.eclipse.lsp4j:$versions.lsp4j"
- compile "org.eclipse.emf:org.eclipse.emf.ecore.change:$versions.emfChange"
+ compile 'junit:junit'
+ compile 'org.eclipse.lsp4j:org.eclipse.lsp4j'
+ compile 'org.eclipse.emf:org.eclipse.emf.ecore.change'
}
sourceSets.test.java {
diff --git a/org.eclipse.xtext.ide/build.gradle b/org.eclipse.xtext.ide/build.gradle
index c21cd176f..25010cb4f 100644
--- a/org.eclipse.xtext.ide/build.gradle
+++ b/org.eclipse.xtext.ide/build.gradle
@@ -3,6 +3,6 @@ description = 'Platform-independent language support.'
dependencies {
compile project(':org.eclipse.xtext')
- compile "org.eclipse.emf:org.eclipse.emf.ecore.change:$versions.emfChange"
- compile "org.eclipse.lsp4j:org.eclipse.lsp4j:$versions.lsp4j"
+ compile 'org.eclipse.emf:org.eclipse.emf.ecore.change'
+ compile 'org.eclipse.lsp4j:org.eclipse.lsp4j'
}
diff --git a/org.eclipse.xtext.testing/build.gradle b/org.eclipse.xtext.testing/build.gradle
index 91ccbcd6e..4acc4c8bf 100644
--- a/org.eclipse.xtext.testing/build.gradle
+++ b/org.eclipse.xtext.testing/build.gradle
@@ -4,10 +4,10 @@ description = 'Infrastructure for testing Xtext languages (supersedes org.eclips
dependencies {
compile project(':org.eclipse.xtext')
compile project(':org.eclipse.xtext.ide')
- compile "org.eclipse.lsp4j:org.eclipse.lsp4j:$versions.lsp4j"
- optional "junit:junit:$versions.junit"
- optional "org.junit.jupiter:junit-jupiter-api:$versions.junit5"
- optional "org.junit.jupiter:junit-jupiter-engine:$versions.junit5"
+ compile 'org.eclipse.lsp4j:org.eclipse.lsp4j'
+ optional 'junit:junit'
+ optional 'org.junit.jupiter:junit-jupiter-api'
+ optional 'org.junit.jupiter:junit-jupiter-engine'
}
sourceSets.test.java.srcDir 'tests'
diff --git a/org.eclipse.xtext.testlanguages/build.gradle b/org.eclipse.xtext.testlanguages/build.gradle
index 8053fd1e2..3b0b22cea 100644
--- a/org.eclipse.xtext.testlanguages/build.gradle
+++ b/org.eclipse.xtext.testlanguages/build.gradle
@@ -3,11 +3,9 @@ apply from: "${rootDir}/gradle/mwe2-workflows.gradle"
dependencies {
compile project(':org.eclipse.xtext')
compile project(':org.eclipse.xtext.testing')
- compile "org.eclipse.platform:org.eclipse.equinox.common:$versions.equinoxCommon"
- compile("org.eclipse.platform:org.eclipse.core.runtime:$versions.eclipseCore") {
- exclude group: "org.eclipse.platform", module: "org.eclipse.equinox.common"
- }
- compile "org.eclipse.emf:org.eclipse.emf.mwe2.runtime:$versions.emfMwe2"
+ compile 'org.eclipse.platform:org.eclipse.equinox.common'
+ compile 'org.eclipse.platform:org.eclipse.core.runtime'
+ compile 'org.eclipse.emf:org.eclipse.emf.mwe2.runtime'
}
// Include the mwe2 and xtext files from the main source set when executing the workflow
diff --git a/org.eclipse.xtext.tests/build.gradle b/org.eclipse.xtext.tests/build.gradle
index 295db712d..6e86d2cb1 100644
--- a/org.eclipse.xtext.tests/build.gradle
+++ b/org.eclipse.xtext.tests/build.gradle
@@ -5,13 +5,13 @@ dependencies {
compile project(':org.eclipse.xtext.xtext.generator')
compile project(':org.eclipse.xtext.xtext.wizard')
compile project(':org.eclipse.xtext.testlanguages')
- compile "junit:junit:$versions.junit"
- compile "org.eclipse.emf:org.eclipse.emf.common:$versions.emfCommon"
- compile "org.eclipse.emf:org.eclipse.emf.ecore.xmi:$versions.emfEcore"
+ compile 'junit:junit'
+ compile 'org.eclipse.emf:org.eclipse.emf.common'
+ compile 'org.eclipse.emf:org.eclipse.emf.ecore.xmi'
optional files('lib/simple.jar')
// The MWE2 workflow depends on emf-gen, so we have to include it in the test dependencies
testCompile sourceSets.mwe2.output
- testCompile "args4j:args4j:$versions.args4j"
+ testCompile 'args4j:args4j'
}
sourceSets.test {
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/build.gradle
index b64851a4a..9a7d597dc 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/build.gradle
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/build.gradle
@@ -4,6 +4,7 @@ buildscript {
}
dependencies {
classpath 'org.xtext:xtext-gradle-plugin:2.0.2'
+ classpath 'io.spring.gradle:dependency-management-plugin:1.0.6.RELEASE'
}
}
@@ -14,6 +15,12 @@ subprojects {
}
apply plugin: 'java'
+ apply plugin: 'io.spring.dependency-management'
+ dependencyManagement {
+ imports {
+ mavenBom "org.eclipse.xtext:xtext-dev-bom:unspecified"
+ }
+ }
apply plugin: 'org.xtext.xtend'
apply from: "${rootDir}/gradle/source-layout.gradle"
apply from: "${rootDir}/gradle/maven-deployment.gradle"
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/pom.xml
index 5d8a26cb3..c04e6ed47 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/pom.xml
@@ -28,6 +28,17 @@
org.xtext.example.full.repository
org.xtext.example.full.ui.tests
+
+
+
+ org.eclipse.xtext
+ xtext-dev-bom
+ ${xtextVersion}
+ pom
+ import
+
+
+
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/build.gradle
index 117c10edc..0e3cb2805 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/build.gradle
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/build.gradle
@@ -4,6 +4,7 @@ buildscript {
}
dependencies {
classpath 'org.xtext:xtext-gradle-plugin:2.0.2'
+ classpath 'io.spring.gradle:dependency-management-plugin:1.0.6.RELEASE'
}
}
@@ -14,6 +15,12 @@ subprojects {
}
apply plugin: 'java'
+ apply plugin: 'io.spring.dependency-management'
+ dependencyManagement {
+ imports {
+ mavenBom "org.eclipse.xtext:xtext-dev-bom:unspecified"
+ }
+ }
apply plugin: 'org.xtext.xtend'
apply from: "${rootDir}/gradle/source-layout.gradle"
apply from: "${rootDir}/gradle/maven-deployment.gradle"
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsGradleApp/org.xtext.example.lsGradleApp.parent/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsGradleApp/org.xtext.example.lsGradleApp.parent/build.gradle
index cbf67ea6d..e427fac58 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsGradleApp/org.xtext.example.lsGradleApp.parent/build.gradle
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsGradleApp/org.xtext.example.lsGradleApp.parent/build.gradle
@@ -4,6 +4,7 @@ buildscript {
}
dependencies {
classpath 'org.xtext:xtext-gradle-plugin:2.0.2'
+ classpath 'io.spring.gradle:dependency-management-plugin:1.0.6.RELEASE'
}
}
@@ -14,6 +15,12 @@ subprojects {
}
apply plugin: 'java'
+ apply plugin: 'io.spring.dependency-management'
+ dependencyManagement {
+ imports {
+ mavenBom "org.eclipse.xtext:xtext-dev-bom:unspecified"
+ }
+ }
apply plugin: 'org.xtext.xtend'
apply from: "${rootDir}/gradle/source-layout.gradle"
apply from: "${rootDir}/gradle/maven-deployment.gradle"
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsGradleFatjar/org.xtext.example.lsGradleFatjar.parent/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsGradleFatjar/org.xtext.example.lsGradleFatjar.parent/build.gradle
index 9cfaecceb..0e0941653 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsGradleFatjar/org.xtext.example.lsGradleFatjar.parent/build.gradle
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsGradleFatjar/org.xtext.example.lsGradleFatjar.parent/build.gradle
@@ -4,6 +4,7 @@ buildscript {
}
dependencies {
classpath 'org.xtext:xtext-gradle-plugin:2.0.2'
+ classpath 'io.spring.gradle:dependency-management-plugin:1.0.6.RELEASE'
}
}
@@ -14,6 +15,12 @@ subprojects {
}
apply plugin: 'java'
+ apply plugin: 'io.spring.dependency-management'
+ dependencyManagement {
+ imports {
+ mavenBom "org.eclipse.xtext:xtext-dev-bom:unspecified"
+ }
+ }
apply plugin: 'org.xtext.xtend'
apply from: "${rootDir}/gradle/source-layout.gradle"
apply from: "${rootDir}/gradle/maven-deployment.gradle"
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenApp/org.xtext.example.lsMavenApp.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenApp/org.xtext.example.lsMavenApp.parent/pom.xml
index 8c1ff38bb..30bc30f24 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenApp/org.xtext.example.lsMavenApp.parent/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenApp/org.xtext.example.lsMavenApp.parent/pom.xml
@@ -16,6 +16,17 @@
org.xtext.example.lsMavenApp
org.xtext.example.lsMavenApp.ide
+
+
+
+ org.eclipse.xtext
+ xtext-dev-bom
+ ${xtextVersion}
+ pom
+ import
+
+
+
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenFatjar/org.xtext.example.lsMavenFatjar.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenFatjar/org.xtext.example.lsMavenFatjar.parent/pom.xml
index b5d2459aa..6fd3bc08d 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenFatjar/org.xtext.example.lsMavenFatjar.parent/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenFatjar/org.xtext.example.lsMavenFatjar.parent/pom.xml
@@ -16,6 +16,17 @@
org.xtext.example.lsMavenFatjar
org.xtext.example.lsMavenFatjar.ide
+
+
+
+ org.eclipse.xtext
+ xtext-dev-bom
+ ${xtextVersion}
+ pom
+ import
+
+
+
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoApp/org.xtext.example.lsMavenTychoApp.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoApp/org.xtext.example.lsMavenTychoApp.parent/pom.xml
index e0cef11b9..9e8e8c1d5 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoApp/org.xtext.example.lsMavenTychoApp.parent/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoApp/org.xtext.example.lsMavenTychoApp.parent/pom.xml
@@ -25,6 +25,17 @@
org.xtext.example.lsMavenTychoApp.ui
org.xtext.example.lsMavenTychoApp.target
+
+
+
+ org.eclipse.xtext
+ xtext-dev-bom
+ ${xtextVersion}
+ pom
+ import
+
+
+
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/pom.xml
index b36eff9c4..2499843dc 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/pom.xml
@@ -25,6 +25,17 @@
org.xtext.example.lsMavenTychoFatjar.ui
org.xtext.example.lsMavenTychoFatjar.target
+
+
+
+ org.eclipse.xtext
+ xtext-dev-bom
+ ${xtextVersion}
+ pom
+ import
+
+
+
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/pom.xml
index 189fb29a2..e6004ac35 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/pom.xml
@@ -28,6 +28,17 @@
org.xtext.example.mavenTycho.tests
org.xtext.example.mavenTycho.ui.tests
+
+
+
+ org.eclipse.xtext
+ xtext-dev-bom
+ ${xtextVersion}
+ pom
+ import
+
+
+
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/pom.xml
index 767c8e044..4d9264117 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/pom.xml
@@ -28,6 +28,17 @@
org.xtext.example.mavenTychoJ9.tests
org.xtext.example.mavenTychoJ9.ui.tests
+
+
+
+ org.eclipse.xtext
+ xtext-dev-bom
+ ${xtextVersion}
+ pom
+ import
+
+
+
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/pom.xml
index 3b3b1db6b..c94ce73de 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/pom.xml
@@ -30,6 +30,17 @@
org.xtext.example.mavenTychoP2.tests
org.xtext.example.mavenTychoP2.ui.tests
+
+
+
+ org.eclipse.xtext
+ xtext-dev-bom
+ ${xtextVersion}
+ pom
+ import
+
+
+
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/pom.xml
index a65a42eea..40b95a5b1 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/pom.xml
@@ -17,6 +17,17 @@
org.xtext.example.plainMaven.ide
org.xtext.example.plainMaven.web
+
+
+
+ org.eclipse.xtext
+ xtext-dev-bom
+ ${xtextVersion}
+ pom
+ import
+
+
+
diff --git a/org.eclipse.xtext.util/build.gradle b/org.eclipse.xtext.util/build.gradle
index cd6a45674..d52ae93ff 100644
--- a/org.eclipse.xtext.util/build.gradle
+++ b/org.eclipse.xtext.util/build.gradle
@@ -3,10 +3,10 @@ description = 'Utility classes used throughout Xtext.'
dependencies {
compile "org.eclipse.xtend:org.eclipse.xtend.lib:$versions.xtext"
- compile "log4j:log4j:$versions.log4j"
- compile "org.eclipse.emf:org.eclipse.emf.common:$versions.emfCommon"
- compile "org.eclipse.emf:org.eclipse.emf.ecore:$versions.emfEcore"
- compile "com.google.inject:guice:$versions.guice"
+ compile 'log4j:log4j'
+ compile 'org.eclipse.emf:org.eclipse.emf.common'
+ compile 'org.eclipse.emf:org.eclipse.emf.ecore'
+ compile 'com.google.inject:guice'
}
// Set the value of the Maven-Version attribute
diff --git a/org.eclipse.xtext.xtext.generator/build.gradle b/org.eclipse.xtext.xtext.generator/build.gradle
index 0b86d7002..619c3dcc0 100644
--- a/org.eclipse.xtext.xtext.generator/build.gradle
+++ b/org.eclipse.xtext.xtext.generator/build.gradle
@@ -3,17 +3,12 @@ description = 'Generator for infrastructure of Xtext languages (supersedes org.e
dependencies {
compile project(':org.eclipse.xtext')
- compile "org.eclipse.emf:org.eclipse.emf.codegen:$versions.emfCodegen"
- compile "org.eclipse.emf:org.eclipse.emf.codegen.ecore:$versions.emfEcore"
- compile "org.eclipse.emf:org.eclipse.emf.mwe.utils:$versions.emfMwe"
- compile "org.eclipse.emf:org.eclipse.emf.mwe2.lib:$versions.emfMwe2"
- compile "com.ibm.icu:icu4j:$versions.icu"
- compile "org.eclipse.platform:org.eclipse.equinox.common:$versions.equinoxCommon"
- optional("org.eclipse.platform:org.eclipse.core.runtime:$versions.eclipseCore") {
- exclude group: "org.eclipse.platform", module: "org.eclipse.equinox.common"
- }
- optional("org.eclipse.jdt:org.eclipse.jdt.core:$versions.jdtCore") {
- exclude group: "org.eclipse.platform", module: "org.eclipse.equinox.common"
- exclude group: "org.eclipse.platform", module: "org.eclipse.core.runtime"
- }
+ compile 'org.eclipse.emf:org.eclipse.emf.codegen'
+ compile 'org.eclipse.emf:org.eclipse.emf.codegen.ecore'
+ compile 'org.eclipse.emf:org.eclipse.emf.mwe.utils'
+ compile 'org.eclipse.emf:org.eclipse.emf.mwe2.lib'
+ compile 'com.ibm.icu:icu4j'
+ compile 'org.eclipse.platform:org.eclipse.equinox.common'
+ optional 'org.eclipse.platform:org.eclipse.core.runtime'
+ optional 'org.eclipse.jdt:org.eclipse.jdt.core'
}
diff --git a/org.eclipse.xtext.xtext.wizard/build.gradle b/org.eclipse.xtext.xtext.wizard/build.gradle
index 2de5e01ee..0fa266b03 100644
--- a/org.eclipse.xtext.xtext.wizard/build.gradle
+++ b/org.eclipse.xtext.xtext.wizard/build.gradle
@@ -3,7 +3,7 @@ description = 'Platform-independent component for creating new Xtext projects.'
dependencies {
compile project(':org.eclipse.xtext')
- optional "args4j:args4j:$versions.args4j"
+ optional 'args4j:args4j'
}
sourceSets.main.resources.srcDir 'resources'
diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend
index a7806d803..60fde1af2 100644
--- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend
+++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend
@@ -85,6 +85,7 @@ class ParentProjectDescriptor extends ProjectDescriptor {
}
dependencies {
classpath 'org.xtext:xtext-gradle-plugin:«config.xtextVersion.xtextGradlePluginVersion»'
+ classpath 'io.spring.gradle:dependency-management-plugin:1.0.6.RELEASE'
}
}
@@ -100,6 +101,12 @@ class ParentProjectDescriptor extends ProjectDescriptor {
}
apply plugin: 'java'
+ apply plugin: 'io.spring.dependency-management'
+ dependencyManagement {
+ imports {
+ mavenBom "org.eclipse.xtext:xtext-dev-bom:«config.xtextVersion»"
+ }
+ }
apply plugin: 'org.xtext.xtend'
apply from: "${rootDir}/gradle/source-layout.gradle"
apply from: "${rootDir}/gradle/maven-deployment.gradle"
@@ -228,6 +235,17 @@ class ParentProjectDescriptor extends ProjectDescriptor {
«IF config.projectLayout == ProjectLayout.FLAT»../«ENDIF»«p.name»
«ENDFOR»
+
+
+
+ org.eclipse.xtext
+ xtext-dev-bom
+ ${xtextVersion}
+ pom
+ import
+
+
+
«IF config.needsTychoBuild»
diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/PomFile.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/PomFile.xtend
index 5b57058ec..b5451e376 100644
--- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/PomFile.xtend
+++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/PomFile.xtend
@@ -54,7 +54,9 @@ class PomFile extends TextFile {
«dep.groupId»
«dep.artifactId»
- «dep.version»
+ «IF dep.version !== null»
+ «dep.version»
+ «ENDIF»
«IF dep.scope != Scope.COMPILE»
«dep.scope.mavenNotation»
«ENDIF»
diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java
index b7e499b31..a225acae2 100644
--- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java
+++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java
@@ -153,6 +153,9 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.append(_xtextGradlePluginVersion, "\t\t");
_builder.append("\'");
_builder.newLineIfNotEmpty();
+ _builder.append("\t\t");
+ _builder.append("classpath \'io.spring.gradle:dependency-management-plugin:1.0.6.RELEASE\'");
+ _builder.newLine();
_builder.append("\t");
_builder.append("}");
_builder.newLine();
@@ -197,6 +200,27 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.append("apply plugin: \'java\'");
_builder.newLine();
_builder.append("\t");
+ _builder.append("apply plugin: \'io.spring.dependency-management\'");
+ _builder.newLine();
+ _builder.append("\t");
+ _builder.append("dependencyManagement {");
+ _builder.newLine();
+ _builder.append("\t\t");
+ _builder.append("imports {");
+ _builder.newLine();
+ _builder.append("\t\t\t");
+ _builder.append("mavenBom \"org.eclipse.xtext:xtext-dev-bom:");
+ XtextVersion _xtextVersion_1 = this.getConfig().getXtextVersion();
+ _builder.append(_xtextVersion_1, "\t\t\t");
+ _builder.append("\"");
+ _builder.newLineIfNotEmpty();
+ _builder.append("\t\t");
+ _builder.append("}");
+ _builder.newLine();
+ _builder.append("\t");
+ _builder.append("}");
+ _builder.newLine();
+ _builder.append("\t");
_builder.append("apply plugin: \'org.xtext.xtend\'");
_builder.newLine();
_builder.append("\t");
@@ -634,6 +658,37 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
}
_builder.append("");
_builder.newLine();
+ _builder.append("");
+ _builder.newLine();
+ _builder.append("\t");
+ _builder.append("");
+ _builder.newLine();
+ _builder.append("\t\t");
+ _builder.append("");
+ _builder.newLine();
+ _builder.append("\t\t\t");
+ _builder.append("org.eclipse.xtext");
+ _builder.newLine();
+ _builder.append("\t\t\t");
+ _builder.append("xtext-dev-bom");
+ _builder.newLine();
+ _builder.append("\t\t\t");
+ _builder.append("${xtextVersion}");
+ _builder.newLine();
+ _builder.append("\t\t\t");
+ _builder.append("pom");
+ _builder.newLine();
+ _builder.append("\t\t\t");
+ _builder.append("import");
+ _builder.newLine();
+ _builder.append("\t\t");
+ _builder.append("");
+ _builder.newLine();
+ _builder.append("\t");
+ _builder.append("");
+ _builder.newLine();
+ _builder.append("");
+ _builder.newLine();
_builder.append("");
_builder.newLine();
{
diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/PomFile.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/PomFile.java
index dc087b71e..301c9ddc9 100644
--- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/PomFile.java
+++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/PomFile.java
@@ -186,14 +186,20 @@ public class PomFile extends TextFile {
_builder.append(_artifactId, "\t\t\t");
_builder.append("");
_builder.newLineIfNotEmpty();
- _builder.append("\t");
- _builder.append("\t");
- _builder.append("\t");
- _builder.append("");
- String _version = dep.getVersion();
- _builder.append(_version, "\t\t\t");
- _builder.append("");
- _builder.newLineIfNotEmpty();
+ {
+ String _version = dep.getVersion();
+ boolean _tripleNotEquals = (_version != null);
+ if (_tripleNotEquals) {
+ _builder.append("\t");
+ _builder.append("\t");
+ _builder.append("\t");
+ _builder.append("");
+ String _version_1 = dep.getVersion();
+ _builder.append(_version_1, "\t\t\t");
+ _builder.append("");
+ _builder.newLineIfNotEmpty();
+ }
+ }
{
Scope _scope = dep.getScope();
boolean _notEquals_1 = (!Objects.equal(_scope, Scope.COMPILE));
diff --git a/org.eclipse.xtext/build.gradle b/org.eclipse.xtext/build.gradle
index 609febab5..8bcaba83b 100644
--- a/org.eclipse.xtext/build.gradle
+++ b/org.eclipse.xtext/build.gradle
@@ -4,22 +4,20 @@ description = 'Core component of Xtext.'
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.platform:org.eclipse.equinox.common:$versions.equinoxCommon"
+ compile 'log4j:log4j'
+ compile 'org.eclipse.platform:org.eclipse.equinox.common'
// remove me, once the following is fixed : https://bugs.eclipse.org/bugs/show_bug.cgi?id=510504
- compile "org.eclipse.platform:org.eclipse.osgi:$versions.eclipseOSGI"
- 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"
- compile "org.antlr:antlr-runtime:$versions.antlr"
- optional("org.eclipse.platform:org.eclipse.core.runtime:$versions.eclipseCore") {
- exclude group: "org.eclipse.platform", module: "org.eclipse.equinox.common"
- }
- 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"
- optional "org.ow2.asm:asm-commons:$versions.asm"
+ compile 'org.eclipse.platform:org.eclipse.osgi'
+ compile 'org.eclipse.emf:org.eclipse.emf.common'
+ compile 'org.eclipse.emf:org.eclipse.emf.ecore.xmi'
+ compile 'com.google.inject:guice'
+ compile 'org.antlr:antlr-runtime'
+ optional 'org.eclipse.platform:org.eclipse.core.runtime'
+ optional 'org.eclipse.platform:org.eclipse.equinox.registry'
+ optional 'org.eclipse.emf:org.eclipse.emf.mwe.utils'
+ optional 'org.eclipse.xpand:org.eclipse.xtend'
+ optional 'org.eclipse.xpand:org.eclipse.xtend.typesystem.emf'
+ optional 'org.ow2.asm:asm-commons'
}
sourceSets.main {