[eclipse/xtext#1976] make core.runtime dep explicit

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
This commit is contained in:
Christian Dietrich 2021-06-16 11:13:09 +02:00
parent 206b7afb19
commit 6bf6041f62
2 changed files with 12 additions and 4 deletions

View file

@ -3,11 +3,19 @@ description = 'Generator for infrastructure of Xtext languages (supersedes org.e
dependencies { dependencies {
compile project(':org.eclipse.xtext') compile project(':org.eclipse.xtext')
compile 'org.eclipse.emf:org.eclipse.emf.codegen' compile('org.eclipse.emf:org.eclipse.emf.codegen') {
compile 'org.eclipse.emf:org.eclipse.emf.codegen.ecore' 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.ecore') {
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.mwe.utils' compile 'org.eclipse.emf:org.eclipse.emf.mwe.utils'
compile 'org.eclipse.emf:org.eclipse.emf.mwe2.lib' compile 'org.eclipse.emf:org.eclipse.emf.mwe2.lib'
compile 'org.eclipse.platform:org.eclipse.equinox.common' compile 'org.eclipse.platform:org.eclipse.equinox.common'
optional 'org.eclipse.platform:org.eclipse.core.runtime' compile ('org.eclipse.platform:org.eclipse.core.runtime') {
exclude group: 'org.eclipse.platform', module: 'org.eclipse.equinox.common'
}
optional 'org.eclipse.jdt:org.eclipse.jdt.core' optional 'org.eclipse.jdt:org.eclipse.jdt.core'
} }

View file

@ -12,7 +12,7 @@
<tycho-version>1.7.0</tycho-version> <tycho-version>1.7.0</tycho-version>
<root-dir>${basedir}/..</root-dir> <root-dir>${basedir}/..</root-dir>
<JENKINS_URL>https://ci.eclipse.org/xtext</JENKINS_URL> <JENKINS_URL>https://ci.eclipse.org/xtext</JENKINS_URL>
<upstreamBranch>master</upstreamBranch> <upstreamBranch>cd_xtext_issue1976</upstreamBranch>
</properties> </properties>
<repositories> <repositories>