mirror of
https://github.com/sigmasternchen/xtext-core
synced 2025-03-15 08:18:55 +00:00
[#1009] Remove managed dependencies from build descriptors
- removed managed versions of - org.eclipse.emf.mwe2.launch - xtext-antlr-generator - org.junit:junit - org.junit.jupiter.api - xtext-dev-bom - updated test expectation - GradleBuildFile: Use single quoted dependencies for managed dependencies (where version is null) - added xtext-antlr-generator as optional dependency to Maven runtime module. This avoids download of antlr-generator-3.2.0-patch.jar from itemis server. - XtextVersion: pin xtext-antlr-version to 2.1.1. Still needed for Tycho based build for configuration of exec-maven-plugin. Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
This commit is contained in:
parent
fdf0d9e55c
commit
3017efb3f6
28 changed files with 106 additions and 75 deletions
|
@ -15,7 +15,7 @@ subprojects {
|
|||
|
||||
apply plugin: 'java'
|
||||
dependencies {
|
||||
compile platform("org.eclipse.xtext:xtext-dev-bom:unspecified")
|
||||
compile platform("org.eclipse.xtext:xtext-dev-bom:${xtextVersion}")
|
||||
}
|
||||
|
||||
apply plugin: 'org.xtext.xtend'
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
dependencies {
|
||||
compile project(':org.xtext.example.full')
|
||||
testCompile "junit:junit:4.12"
|
||||
testCompile 'junit:junit'
|
||||
testCompile "org.eclipse.xtext:org.eclipse.xtext.testing:${xtextVersion}"
|
||||
testCompile "org.eclipse.xtext:org.eclipse.xtext.xbase.testing:${xtextVersion}"
|
||||
}
|
||||
|
|
|
@ -9,10 +9,10 @@ configurations {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:2.9.1.201705291010"
|
||||
mwe2 'org.eclipse.emf:org.eclipse.emf.mwe2.launch'
|
||||
mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}"
|
||||
mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
|
||||
mwe2 "org.eclipse.xtext:xtext-antlr-generator:[2.1.1, 3)"
|
||||
mwe2 'org.eclipse.xtext:xtext-antlr-generator'
|
||||
}
|
||||
|
||||
task generateXtextLanguage(type: JavaExec) {
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
<artifactId>xtext-antlr-generator</artifactId>
|
||||
<version>[2.1.1, 3)</version>
|
||||
<version>2.1.1</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</plugin>
|
||||
|
|
|
@ -15,7 +15,7 @@ subprojects {
|
|||
|
||||
apply plugin: 'java'
|
||||
dependencies {
|
||||
compile platform("org.eclipse.xtext:xtext-dev-bom:unspecified")
|
||||
compile platform("org.eclipse.xtext:xtext-dev-bom:${xtextVersion}")
|
||||
}
|
||||
|
||||
apply plugin: 'org.xtext.xtend'
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
dependencies {
|
||||
testCompile "junit:junit:4.12"
|
||||
testCompile 'junit:junit'
|
||||
testCompile "org.eclipse.xtext:org.eclipse.xtext.testing:${xtextVersion}"
|
||||
testCompile "org.eclipse.xtext:org.eclipse.xtext.xbase.testing:${xtextVersion}"
|
||||
compile "org.eclipse.xtext:org.eclipse.xtext:${xtextVersion}"
|
||||
|
@ -12,10 +12,10 @@ configurations {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:2.9.1.201705291010"
|
||||
mwe2 'org.eclipse.emf:org.eclipse.emf.mwe2.launch'
|
||||
mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}"
|
||||
mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
|
||||
mwe2 "org.eclipse.xtext:xtext-antlr-generator:[2.1.1, 3)"
|
||||
mwe2 'org.eclipse.xtext:xtext-antlr-generator'
|
||||
}
|
||||
|
||||
task generateXtextLanguage(type: JavaExec) {
|
||||
|
|
|
@ -15,7 +15,7 @@ subprojects {
|
|||
|
||||
apply plugin: 'java'
|
||||
dependencies {
|
||||
compile platform("org.eclipse.xtext:xtext-dev-bom:unspecified")
|
||||
compile platform("org.eclipse.xtext:xtext-dev-bom:${xtextVersion}")
|
||||
}
|
||||
|
||||
apply plugin: 'org.xtext.xtend'
|
||||
|
|
|
@ -9,10 +9,10 @@ configurations {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:2.9.1.201705291010"
|
||||
mwe2 'org.eclipse.emf:org.eclipse.emf.mwe2.launch'
|
||||
mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}"
|
||||
mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
|
||||
mwe2 "org.eclipse.xtext:xtext-antlr-generator:[2.1.1, 3)"
|
||||
mwe2 'org.eclipse.xtext:xtext-antlr-generator'
|
||||
}
|
||||
|
||||
task generateXtextLanguage(type: JavaExec) {
|
||||
|
|
|
@ -15,7 +15,7 @@ subprojects {
|
|||
|
||||
apply plugin: 'java'
|
||||
dependencies {
|
||||
compile platform("org.eclipse.xtext:xtext-dev-bom:unspecified")
|
||||
compile platform("org.eclipse.xtext:xtext-dev-bom:${xtextVersion}")
|
||||
}
|
||||
|
||||
apply plugin: 'org.xtext.xtend'
|
||||
|
|
|
@ -9,10 +9,10 @@ configurations {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:2.9.1.201705291010"
|
||||
mwe2 'org.eclipse.emf:org.eclipse.emf.mwe2.launch'
|
||||
mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}"
|
||||
mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
|
||||
mwe2 "org.eclipse.xtext:xtext-antlr-generator:[2.1.1, 3)"
|
||||
mwe2 'org.eclipse.xtext:xtext-antlr-generator'
|
||||
}
|
||||
|
||||
task generateXtextLanguage(type: JavaExec) {
|
||||
|
|
|
@ -181,7 +181,11 @@
|
|||
<dependency>
|
||||
<groupId>org.eclipse.emf</groupId>
|
||||
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
|
||||
<version>2.9.1.201705291010</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
<artifactId>xtext-antlr-generator</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
|
@ -181,7 +181,11 @@
|
|||
<dependency>
|
||||
<groupId>org.eclipse.emf</groupId>
|
||||
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
|
||||
<version>2.9.1.201705291010</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
<artifactId>xtext-antlr-generator</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
<artifactId>xtext-antlr-generator</artifactId>
|
||||
<version>[2.1.1, 3)</version>
|
||||
<version>2.1.1</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</plugin>
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
<artifactId>xtext-antlr-generator</artifactId>
|
||||
<version>[2.1.1, 3)</version>
|
||||
<version>2.1.1</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</plugin>
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
<artifactId>xtext-antlr-generator</artifactId>
|
||||
<version>[2.1.1, 3)</version>
|
||||
<version>2.1.1</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</plugin>
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
<artifactId>xtext-antlr-generator</artifactId>
|
||||
<version>[2.1.1, 3)</version>
|
||||
<version>2.1.1</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</plugin>
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
<artifactId>xtext-antlr-generator</artifactId>
|
||||
<version>[2.1.1, 3)</version>
|
||||
<version>2.1.1</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</plugin>
|
||||
|
|
|
@ -186,7 +186,6 @@
|
|||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.12</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
@ -220,7 +219,11 @@
|
|||
<dependency>
|
||||
<groupId>org.eclipse.emf</groupId>
|
||||
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
|
||||
<version>2.9.1.201705291010</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.xtext</groupId>
|
||||
<artifactId>xtext-antlr-generator</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
|
@ -31,7 +31,7 @@ class XtextVersion {
|
|||
}
|
||||
|
||||
def getAntlrGeneratorVersion() {
|
||||
'[2.1.1, 3)'
|
||||
'2.1.1'
|
||||
}
|
||||
|
||||
def getXtendGradlePluginVersion() {
|
||||
|
|
|
@ -55,7 +55,7 @@ public class XtextVersion {
|
|||
}
|
||||
|
||||
public String getAntlrGeneratorVersion() {
|
||||
return "[2.1.1, 3)";
|
||||
return "2.1.1";
|
||||
}
|
||||
|
||||
public String getXtendGradlePluginVersion() {
|
||||
|
|
|
@ -27,7 +27,11 @@ class GradleBuildFile extends TextFile {
|
|||
compile project(':«p.name»')
|
||||
«ENDFOR»
|
||||
«FOR dep : mavenDependencies»
|
||||
«dep.scope.gradleNotation» "«dep.groupId»:«dep.artifactId»:«dep.version»"
|
||||
«IF dep.version !== null»
|
||||
«dep.scope.gradleNotation» "«dep.groupId»:«dep.artifactId»:«dep.version»"
|
||||
«ELSE»
|
||||
«dep.scope.gradleNotation» '«dep.groupId»:«dep.artifactId»'
|
||||
«ENDIF»
|
||||
«ENDFOR»
|
||||
}
|
||||
«ENDIF»
|
||||
|
|
|
@ -100,7 +100,7 @@ class ParentProjectDescriptor extends ProjectDescriptor {
|
|||
|
||||
apply plugin: 'java'
|
||||
dependencies {
|
||||
compile platform("org.eclipse.xtext:xtext-dev-bom:«config.xtextVersion»")
|
||||
compile platform("org.eclipse.xtext:xtext-dev-bom:${xtextVersion}")
|
||||
}
|
||||
|
||||
apply plugin: 'org.xtext.xtend'
|
||||
|
|
|
@ -89,7 +89,13 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
|
|||
maven [
|
||||
groupId = "org.eclipse.emf"
|
||||
artifactId = "org.eclipse.emf.mwe2.launch"
|
||||
version = config.xtextVersion.mweVersion
|
||||
optional = true
|
||||
]
|
||||
]
|
||||
deps += new ExternalDependency => [
|
||||
maven [
|
||||
groupId = "org.eclipse.xtext"
|
||||
artifactId = "xtext-antlr-generator"
|
||||
optional = true
|
||||
]
|
||||
]
|
||||
|
@ -280,10 +286,10 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:«config.xtextVersion.mweVersion»"
|
||||
mwe2 'org.eclipse.emf:org.eclipse.emf.mwe2.launch'
|
||||
mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}"
|
||||
mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
|
||||
mwe2 "org.eclipse.xtext:xtext-antlr-generator:«config.xtextVersion.antlrGeneratorVersion»"
|
||||
mwe2 'org.eclipse.xtext:xtext-antlr-generator'
|
||||
«IF fromExistingEcoreModels»
|
||||
mwe2 "org.eclipse.xtext:org.eclipse.xtext.generator:${xtextVersion}"
|
||||
mwe2 "org.eclipse.xpand:org.eclipse.xpand:2.0.0"
|
||||
|
|
|
@ -53,23 +53,20 @@ abstract class TestProjectDescriptor extends ProjectDescriptor {
|
|||
p2.version = "4.12.0"
|
||||
maven.groupId = "junit"
|
||||
maven.artifactId = "junit"
|
||||
maven.version = "4.12"
|
||||
maven.scope = Scope.TESTCOMPILE
|
||||
]
|
||||
}
|
||||
if (config.junitVersion == JUnitVersion.JUNIT_5) {
|
||||
deps += new ExternalDependency()=>[
|
||||
p2.bundleId = "org.junit.jupiter.api"
|
||||
p2.version = "[5.0.0,6.0.0)"
|
||||
p2.version = "[5.1.0,6.0.0)"
|
||||
maven.groupId = "org.junit.jupiter"
|
||||
maven.artifactId = "junit-jupiter-api"
|
||||
maven.version = "5.3.1"
|
||||
maven.scope = Scope.TESTCOMPILE
|
||||
]
|
||||
deps += new ExternalDependency()=>[
|
||||
maven.groupId = "org.junit.jupiter"
|
||||
maven.artifactId = "junit-jupiter-engine"
|
||||
maven.version = "5.3.1"
|
||||
maven.scope = Scope.TESTRUNTIME
|
||||
]
|
||||
}
|
||||
|
|
|
@ -56,20 +56,38 @@ public class GradleBuildFile extends TextFile {
|
|||
{
|
||||
Iterable<ExternalDependency.MavenCoordinates> _mavenDependencies = this.getMavenDependencies();
|
||||
for(final ExternalDependency.MavenCoordinates dep : _mavenDependencies) {
|
||||
_builder.append("\t");
|
||||
String _gradleNotation = dep.getScope().getGradleNotation();
|
||||
_builder.append(_gradleNotation, "\t");
|
||||
_builder.append(" \"");
|
||||
String _groupId = dep.getGroupId();
|
||||
_builder.append(_groupId, "\t");
|
||||
_builder.append(":");
|
||||
String _artifactId = dep.getArtifactId();
|
||||
_builder.append(_artifactId, "\t");
|
||||
_builder.append(":");
|
||||
String _version = dep.getVersion();
|
||||
_builder.append(_version, "\t");
|
||||
_builder.append("\"");
|
||||
_builder.newLineIfNotEmpty();
|
||||
{
|
||||
String _version = dep.getVersion();
|
||||
boolean _tripleNotEquals = (_version != null);
|
||||
if (_tripleNotEquals) {
|
||||
_builder.append("\t");
|
||||
String _gradleNotation = dep.getScope().getGradleNotation();
|
||||
_builder.append(_gradleNotation, "\t");
|
||||
_builder.append(" \"");
|
||||
String _groupId = dep.getGroupId();
|
||||
_builder.append(_groupId, "\t");
|
||||
_builder.append(":");
|
||||
String _artifactId = dep.getArtifactId();
|
||||
_builder.append(_artifactId, "\t");
|
||||
_builder.append(":");
|
||||
String _version_1 = dep.getVersion();
|
||||
_builder.append(_version_1, "\t");
|
||||
_builder.append("\"");
|
||||
_builder.newLineIfNotEmpty();
|
||||
} else {
|
||||
_builder.append("\t");
|
||||
String _gradleNotation_1 = dep.getScope().getGradleNotation();
|
||||
_builder.append(_gradleNotation_1, "\t");
|
||||
_builder.append(" \'");
|
||||
String _groupId_1 = dep.getGroupId();
|
||||
_builder.append(_groupId_1, "\t");
|
||||
_builder.append(":");
|
||||
String _artifactId_1 = dep.getArtifactId();
|
||||
_builder.append(_artifactId_1, "\t");
|
||||
_builder.append("\'");
|
||||
_builder.newLineIfNotEmpty();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
_builder.append("}");
|
||||
|
|
|
@ -198,11 +198,8 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
|
|||
_builder.append("dependencies {");
|
||||
_builder.newLine();
|
||||
_builder.append("\t\t");
|
||||
_builder.append("compile platform(\"org.eclipse.xtext:xtext-dev-bom:");
|
||||
XtextVersion _xtextVersion_1 = this.getConfig().getXtextVersion();
|
||||
_builder.append(_xtextVersion_1, "\t\t");
|
||||
_builder.append("\")");
|
||||
_builder.newLineIfNotEmpty();
|
||||
_builder.append("compile platform(\"org.eclipse.xtext:xtext-dev-bom:${xtextVersion}\")");
|
||||
_builder.newLine();
|
||||
_builder.append("\t");
|
||||
_builder.append("}");
|
||||
_builder.newLine();
|
||||
|
|
|
@ -145,13 +145,23 @@ public class RuntimeProjectDescriptor extends TestedProjectDescriptor {
|
|||
final Procedure1<ExternalDependency.MavenCoordinates> _function_3 = (ExternalDependency.MavenCoordinates it_1) -> {
|
||||
it_1.setGroupId("org.eclipse.emf");
|
||||
it_1.setArtifactId("org.eclipse.emf.mwe2.launch");
|
||||
it_1.setVersion(this.getConfig().getXtextVersion().getMweVersion());
|
||||
it_1.setOptional(true);
|
||||
};
|
||||
it.maven(_function_3);
|
||||
};
|
||||
ExternalDependency _doubleArrow_2 = ObjectExtensions.<ExternalDependency>operator_doubleArrow(_externalDependency_1, _function_2);
|
||||
deps.add(_doubleArrow_2);
|
||||
ExternalDependency _externalDependency_2 = new ExternalDependency();
|
||||
final Procedure1<ExternalDependency> _function_3 = (ExternalDependency it) -> {
|
||||
final Procedure1<ExternalDependency.MavenCoordinates> _function_4 = (ExternalDependency.MavenCoordinates it_1) -> {
|
||||
it_1.setGroupId("org.eclipse.xtext");
|
||||
it_1.setArtifactId("xtext-antlr-generator");
|
||||
it_1.setOptional(true);
|
||||
};
|
||||
it.maven(_function_4);
|
||||
};
|
||||
ExternalDependency _doubleArrow_3 = ObjectExtensions.<ExternalDependency>operator_doubleArrow(_externalDependency_2, _function_3);
|
||||
deps.add(_doubleArrow_3);
|
||||
}
|
||||
_xblockexpression = deps;
|
||||
}
|
||||
|
@ -588,11 +598,8 @@ public class RuntimeProjectDescriptor extends TestedProjectDescriptor {
|
|||
_builder.append("dependencies {");
|
||||
_builder.newLine();
|
||||
_builder.append("\t");
|
||||
_builder.append("mwe2 \"org.eclipse.emf:org.eclipse.emf.mwe2.launch:");
|
||||
String _mweVersion = this.getConfig().getXtextVersion().getMweVersion();
|
||||
_builder.append(_mweVersion, "\t");
|
||||
_builder.append("\"");
|
||||
_builder.newLineIfNotEmpty();
|
||||
_builder.append("mwe2 \'org.eclipse.emf:org.eclipse.emf.mwe2.launch\'");
|
||||
_builder.newLine();
|
||||
_builder.append("\t");
|
||||
_builder.append("mwe2 \"org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}\"");
|
||||
_builder.newLine();
|
||||
|
@ -600,11 +607,8 @@ public class RuntimeProjectDescriptor extends TestedProjectDescriptor {
|
|||
_builder.append("mwe2 \"org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}\"");
|
||||
_builder.newLine();
|
||||
_builder.append("\t");
|
||||
_builder.append("mwe2 \"org.eclipse.xtext:xtext-antlr-generator:");
|
||||
String _antlrGeneratorVersion = this.getConfig().getXtextVersion().getAntlrGeneratorVersion();
|
||||
_builder.append(_antlrGeneratorVersion, "\t");
|
||||
_builder.append("\"");
|
||||
_builder.newLineIfNotEmpty();
|
||||
_builder.append("mwe2 \'org.eclipse.xtext:xtext-antlr-generator\'");
|
||||
_builder.newLine();
|
||||
{
|
||||
boolean _isFromExistingEcoreModels = this.isFromExistingEcoreModels();
|
||||
if (_isFromExistingEcoreModels) {
|
||||
|
|
|
@ -95,9 +95,7 @@ public abstract class TestProjectDescriptor extends ProjectDescriptor {
|
|||
ExternalDependency.MavenCoordinates _maven_1 = it.getMaven();
|
||||
_maven_1.setArtifactId("junit");
|
||||
ExternalDependency.MavenCoordinates _maven_2 = it.getMaven();
|
||||
_maven_2.setVersion("4.12");
|
||||
ExternalDependency.MavenCoordinates _maven_3 = it.getMaven();
|
||||
_maven_3.setScope(Scope.TESTCOMPILE);
|
||||
_maven_2.setScope(Scope.TESTCOMPILE);
|
||||
};
|
||||
ExternalDependency _doubleArrow = ObjectExtensions.<ExternalDependency>operator_doubleArrow(_externalDependency, _function);
|
||||
deps.add(_doubleArrow);
|
||||
|
@ -110,15 +108,13 @@ public abstract class TestProjectDescriptor extends ProjectDescriptor {
|
|||
ExternalDependency.P2Coordinates _p2 = it.getP2();
|
||||
_p2.setBundleId("org.junit.jupiter.api");
|
||||
ExternalDependency.P2Coordinates _p2_1 = it.getP2();
|
||||
_p2_1.setVersion("[5.0.0,6.0.0)");
|
||||
_p2_1.setVersion("[5.1.0,6.0.0)");
|
||||
ExternalDependency.MavenCoordinates _maven = it.getMaven();
|
||||
_maven.setGroupId("org.junit.jupiter");
|
||||
ExternalDependency.MavenCoordinates _maven_1 = it.getMaven();
|
||||
_maven_1.setArtifactId("junit-jupiter-api");
|
||||
ExternalDependency.MavenCoordinates _maven_2 = it.getMaven();
|
||||
_maven_2.setVersion("5.3.1");
|
||||
ExternalDependency.MavenCoordinates _maven_3 = it.getMaven();
|
||||
_maven_3.setScope(Scope.TESTCOMPILE);
|
||||
_maven_2.setScope(Scope.TESTCOMPILE);
|
||||
};
|
||||
ExternalDependency _doubleArrow_1 = ObjectExtensions.<ExternalDependency>operator_doubleArrow(_externalDependency_1, _function_1);
|
||||
deps.add(_doubleArrow_1);
|
||||
|
@ -129,9 +125,7 @@ public abstract class TestProjectDescriptor extends ProjectDescriptor {
|
|||
ExternalDependency.MavenCoordinates _maven_1 = it.getMaven();
|
||||
_maven_1.setArtifactId("junit-jupiter-engine");
|
||||
ExternalDependency.MavenCoordinates _maven_2 = it.getMaven();
|
||||
_maven_2.setVersion("5.3.1");
|
||||
ExternalDependency.MavenCoordinates _maven_3 = it.getMaven();
|
||||
_maven_3.setScope(Scope.TESTRUNTIME);
|
||||
_maven_2.setScope(Scope.TESTRUNTIME);
|
||||
};
|
||||
ExternalDependency _doubleArrow_2 = ObjectExtensions.<ExternalDependency>operator_doubleArrow(_externalDependency_2, _function_2);
|
||||
deps.add(_doubleArrow_2);
|
||||
|
|
Loading…
Reference in a new issue