Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@ buildDir = file("$projectDir/target")

ext {
findbugs_version = "3.0.2"
guava_version = "31.1-jre"
guava_version = "33.5.0-jre"
antlr_version = "4.12.0"
plantuml_version = "1.2020.15"
jackson_version = "2.13.4"
junit_version = "5.9.0"
commons_cli_version = "1.5.0"
commons_lang_version = "3.11"
jupiter_version = "5.6.0"
jackson_version = "2.20.1"
junit_version = "5.14.1"
junit_platform_version = "1.14.1"
commons_cli_version = "1.11.0"
commons_lang_version = "3.20.0"
commons_text_version = "1.15.0"
freemarker_version = "2.3.31"
javaparser_version = "3.14.11"
mockito_version = "3.11.1"
Expand Down
7 changes: 4 additions & 3 deletions cd-runtime/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ plugins {


dependencies {
api 'de.se_rwth.commons:se-commons-logging:' + mc_version
api "de.se_rwth.commons:se-commons-logging:$mc_version"

implementation 'de.se_rwth.commons:se-commons-utilities:' + mc_version
implementation group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'
implementation "de.se_rwth.commons:se-commons-utilities:$mc_version"
implementation "org.apache.commons:commons-text:$commons_text_version"
implementation "de.monticore:monticore-runtime:$mc_version"
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
testImplementation "org.junit.vintage:junit-vintage-engine:$junit_version"
testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junit_platform_version"
}

description = 'CD: Runtime'
Expand Down
9 changes: 5 additions & 4 deletions cd2plantuml/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ description = "CD4Analysis: CD2PlantUml"
dependencies {
implementation(project(':cdlang'))

implementation "de.monticore:monticore-grammar:${project.properties['mc_version']}"
implementation "de.monticore:monticore-runtime:${project.properties['mc_version']}"
implementation "de.monticore:class2mc:${project.properties['mc_version']}"
implementation "de.monticore:monticore-grammar:$mc_version"
implementation "de.monticore:monticore-runtime:$mc_version"
implementation "de.monticore:class2mc:$mc_version"
implementation "de.se_rwth.commons:se-commons-logging:$commons_version"
implementation "de.se_rwth.commons:se-commons-utilities:$commons_version"
implementation "org.apache.commons:commons-lang3:$commons_lang_version"
Expand All @@ -15,7 +15,8 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
testImplementation "org.junit.vintage:junit-vintage-engine:$junit_version"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
testImplementation ("de.monticore:monticore-runtime:${project.properties['mc_version']}") capabilities {
testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junit_platform_version"
testImplementation ("de.monticore:monticore-runtime:$mc_version") capabilities {
requireCapability("de.monticore:monticore-runtime-tests") }
testImplementation "de.monticore:monticore-grammar-trafo:$mc_version"

Expand Down
9 changes: 5 additions & 4 deletions cd2smt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ dependencies {
implementation(project(':cdlang'))
implementation(project(':cddiff'))

implementation "de.monticore:monticore-grammar:${project.properties['mc_version']}"
implementation "de.monticore:monticore-runtime:${project.properties['mc_version']}"
implementation "de.monticore:class2mc:${project.properties['mc_version']}"
implementation "de.monticore:monticore-grammar:$mc_version"
implementation "de.monticore:monticore-runtime:$mc_version"
implementation "de.monticore:class2mc:$mc_version"
implementation "de.se_rwth.commons:se-commons-logging:$commons_version"
implementation "de.se_rwth.commons:se-commons-utilities:$commons_version"
implementation "org.apache.commons:commons-lang3:$commons_lang_version"
Expand All @@ -16,7 +16,8 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
testImplementation "org.junit.vintage:junit-vintage-engine:$junit_version"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
testImplementation ("de.monticore:monticore-runtime:${project.properties['mc_version']}") capabilities {
testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junit_platform_version"
testImplementation ("de.monticore:monticore-runtime:$mc_version") capabilities {
requireCapability("de.monticore:monticore-runtime-tests") }
testImplementation "de.monticore:monticore-grammar-trafo:$mc_version"

Expand Down
9 changes: 5 additions & 4 deletions cddiff/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ description = "CD4Analysis: CDDiff"
dependencies {
implementation(project(':cdlang'))

implementation "de.monticore:monticore-grammar:${project.properties['mc_version']}"
implementation "de.monticore:monticore-runtime:${project.properties['mc_version']}"
implementation "de.monticore:class2mc:${project.properties['mc_version']}"
implementation "de.monticore:monticore-grammar:$mc_version"
implementation "de.monticore:monticore-runtime:$mc_version"
implementation "de.monticore:class2mc:$mc_version"
implementation "de.se_rwth.commons:se-commons-logging:$commons_version"
implementation "de.se_rwth.commons:se-commons-utilities:$commons_version"
implementation "org.apache.commons:commons-lang3:$commons_lang_version"
Expand All @@ -15,7 +15,8 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
testImplementation "org.junit.vintage:junit-vintage-engine:$junit_version"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
testImplementation ("de.monticore:monticore-runtime:${project.properties['mc_version']}") capabilities {
testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junit_platform_version"
testImplementation ("de.monticore:monticore-runtime:$mc_version") capabilities {
requireCapability("de.monticore:monticore-runtime-tests") }
testImplementation "de.monticore:monticore-grammar-trafo:$mc_version"

Expand Down
7 changes: 4 additions & 3 deletions cdlang/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ configurations {
dependencies {
grammar("$var_path:monticore-grammar:$mc_version")
implementation "$var_path:monticore-grammar:$mc_version" // Dependency for the compat publication - otherwise not necessary
implementation "$var_path:class2mc:${project.properties['mc_version']}"
implementation "$var_path:class2mc:$mc_version"
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
implementation "org.apache.commons:commons-lang3:$commons_lang_version"

Expand All @@ -71,11 +71,12 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
testImplementation "org.junit.vintage:junit-vintage-engine:$junit_version"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
testImplementation ("de.monticore:monticore-runtime:${project.properties['mc_version']}") capabilities {
testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junit_platform_version"
testImplementation ("de.monticore:monticore-runtime:$mc_version") capabilities {
requireCapability("de.monticore:monticore-runtime-tests")
}
testImplementation "org.mockito:mockito-core:$mockito_version"
testImplementation group: 'com.google.code.findbugs', name: 'jsr305', version: findbugs_version
testImplementation "com.google.code.findbugs:jsr305:$findbugs_version"
testImplementation testFixtures("de.monticore:monticore-grammar:$mc_version")

//dependencies for trafo
Expand Down
9 changes: 5 additions & 4 deletions cdmerge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ description = "CD4Analysis: CDMerge"
dependencies {
implementation(project(':cdlang'))

implementation "de.monticore:monticore-grammar:${project.properties['mc_version']}"
implementation "de.monticore:monticore-runtime:${project.properties['mc_version']}"
implementation "de.monticore:class2mc:${project.properties['mc_version']}"
implementation "de.monticore:monticore-grammar:$mc_version"
implementation "de.monticore:monticore-runtime:$mc_version"
implementation "de.monticore:class2mc:$mc_version"
implementation "de.se_rwth.commons:se-commons-logging:$commons_version"
implementation "de.se_rwth.commons:se-commons-utilities:$commons_version"
implementation "org.apache.commons:commons-lang3:$commons_lang_version"
Expand All @@ -15,7 +15,8 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
testImplementation "org.junit.vintage:junit-vintage-engine:$junit_version"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
testImplementation ("de.monticore:monticore-runtime:${project.properties['mc_version']}") capabilities {
testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junit_platform_version"
testImplementation ("de.monticore:monticore-runtime:$mc_version") capabilities {
requireCapability("de.monticore:monticore-runtime-tests") }
testImplementation "de.monticore:monticore-grammar-trafo:$mc_version"

Expand Down
11 changes: 6 additions & 5 deletions cdtool/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ dependencies {
implementation(project(":cd2plantuml"))
implementation(project(":cd2smt"))

implementationWithoutExtras "de.monticore:monticore-grammar:${project.properties['mc_version']}"
implementationWithoutExtras "de.monticore:monticore-runtime:${project.properties['mc_version']}"
implementationWithoutExtras "de.monticore:class2mc:${project.properties['mc_version']}"
implementationWithoutExtras "de.monticore:monticore-grammar:$mc_version"
implementationWithoutExtras "de.monticore:monticore-runtime:$mc_version"
implementationWithoutExtras "de.monticore:class2mc:$mc_version"
implementationWithoutExtras "de.se_rwth.commons:se-commons-logging:$commons_version"
implementationWithoutExtras "de.se_rwth.commons:se-commons-utilities:$commons_version"
implementationWithoutExtras "com.google.guava:guava:$guava_version"
Expand All @@ -40,10 +40,11 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
testImplementation "org.junit.vintage:junit-vintage-engine:$junit_version"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
testImplementation ("de.monticore:monticore-runtime:${project.properties['mc_version']}") capabilities {
testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junit_platform_version"
testImplementation ("de.monticore:monticore-runtime:$mc_version") capabilities {
requireCapability("de.monticore:monticore-runtime-tests") }
testImplementation "org.mockito:mockito-core:$mockito_version"
testImplementation group: 'com.google.code.findbugs', name: 'jsr305', version: findbugs_version
testImplementation "com.google.code.findbugs:jsr305:$findbugs_version"
testImplementation "de.monticore:monticore-grammar-trafo:$mc_version"
testImplementation(project(':cdlang').sourceSets.test.output)
testImplementation project(path: ':cdlang')
Expand Down
4 changes: 2 additions & 2 deletions cdtool/cdgradle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ configurations {


dependencies {
implementation group: 'de.se_rwth.commons', name: 'se-commons-gradle', version: mc_version
cdTool group: 'de.monticore.lang', name: 'cd4analysis', version: mc_version
implementation "de.se_rwth.commons:se-commons-gradle:$mc_version"
cdTool "de.monticore.lang:cd4analysis:$mc_version"
compileOnly(project(":cdlang")) // As the main/cdtool dependency does not have an api dependency to cdlang

testImplementation "org.junit.jupiter:junit-jupiter:$junit_version"
Expand Down
25 changes: 13 additions & 12 deletions language-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,26 @@ dependencies {
implementation project(":cdlang")

// Dependencies of cd4analysis, all marked as runtime in pom => we need to specify them here
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation "com.google.code.findbugs:jsr305:$findbugs_version"
implementation "de.monticore:monticore-grammar:$mc_version"
implementation "de.se_rwth.commons:se-commons-logging:1.7.9"
implementation "de.se_rwth.commons:se-commons-utilities:1.7.9"
implementation "com.google.guava:guava:25.1-jre"
implementation "de.se_rwth.commons:se-commons-logging:$commons_version"
implementation "de.se_rwth.commons:se-commons-utilities:$commons_version"
implementation "com.google.guava:guava:$guava_version"
implementation "net.sourceforge.plantuml:plantuml:1.2020.15"
implementation "ch.qos.logback:logback-classic:1.2.3"
implementation "commons-cli:commons-cli:1.4"
implementation "org.apache.commons:commons-lang3:3.11"
implementation "ch.qos.logback:logback-classic:$logback_version"
implementation "commons-cli:commons-cli:$commons_cli_version"
implementation "org.apache.commons:commons-lang3:$commons_lang_version"

// MCLSG
implementation("de.monticore.language-server:monticore-language-server-runtime:$mc_version")
implementation "de.monticore.language-server:monticore-language-server-runtime:$mc_version"

// Testing
// JUnit Jupiter (JUnit 5) dependencies
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.2'
testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: logback_version
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junit_platform_version"
testImplementation "ch.qos.logback:logback-classic:$logback_version"
}

test {
Expand Down
7 changes: 4 additions & 3 deletions symtabdefinitiontool/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ description = "SymTabDefinition: Tool"
dependencies {
implementation(project(':cdlang'))

implementation "de.monticore:monticore-grammar:${project.properties['mc_version']}"
implementation "de.monticore:monticore-runtime:${project.properties['mc_version']}"
implementation "de.monticore:class2mc:${project.properties['mc_version']}"
implementation "de.monticore:monticore-grammar:$mc_version"
implementation "de.monticore:monticore-runtime:$mc_version"
implementation "de.monticore:class2mc:$mc_version"
implementation "de.se_rwth.commons:se-commons-logging:$commons_version"
implementation "de.se_rwth.commons:se-commons-utilities:$commons_version"
implementation "commons-cli:commons-cli:$commons_cli_version"
Expand All @@ -20,6 +20,7 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
testImplementation "org.junit.vintage:junit-vintage-engine:$junit_version"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junit_platform_version"
}

task toolJar(type: Jar) {
Expand Down
3 changes: 2 additions & 1 deletion symtabdefinitiontool/stdefgradle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@ configurations {
}

dependencies {
implementation group:'de.se_rwth.commons', name:'se-commons-gradle', version:mc_version
implementation "de.se_rwth.commons:se-commons-gradle:$commons_version"
stdefTool project(":cdlang")
compileOnly(project(":cdlang"))

testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
testImplementation "org.junit.vintage:junit-vintage-engine:$junit_version"
testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junit_platform_version"
testImplementation gradleTestKit()
}

Expand Down
6 changes: 3 additions & 3 deletions trafo-library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@ dependencies {
// add the compiled trafo java classes of the subproject to the classpath
implementation files(project(":cdlang").sourceSets.trafo.output.classesDirs)


implementation group: 'de.se_rwth.commons', name: 'se-commons-groovy', version: commons_version
implementation "de.se_rwth.commons:se-commons-groovy:$commons_version"

testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
testImplementation "org.junit.vintage:junit-vintage-engine:$junit_version"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junit_platform_version"

compileOnly 'org.freemarker:freemarker:2.3.28'
compileOnly "org.freemarker:freemarker:$freemarker_version"
}

configurations.configureEach {
Expand Down
Loading