From 37df1ba6278f2b6573ea89f44ce142d870d24934 Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Fri, 19 Dec 2025 16:03:38 +0100 Subject: [PATCH 01/11] updated gradle dependency syntax --- cd-runtime/build.gradle | 4 ++-- cd2plantuml/build.gradle | 8 ++++---- cd2smt/build.gradle | 8 ++++---- cddiff/build.gradle | 8 ++++---- cdlang/build.gradle | 6 +++--- cdmerge/build.gradle | 8 ++++---- cdtool/build.gradle | 10 +++++----- cdtool/cdgradle/build.gradle | 4 ++-- symtabdefinitiontool/build.gradle | 6 +++--- symtabdefinitiontool/stdefgradle/build.gradle | 2 +- trafo-library/build.gradle | 3 +-- 11 files changed, 33 insertions(+), 34 deletions(-) diff --git a/cd-runtime/build.gradle b/cd-runtime/build.gradle index 58ab440ff..55f639f16 100644 --- a/cd-runtime/build.gradle +++ b/cd-runtime/build.gradle @@ -6,10 +6,10 @@ 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 "de.monticore:monticore-runtime:$mc_version" testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version" testImplementation "org.junit.vintage:junit-vintage-engine:$junit_version" diff --git a/cd2plantuml/build.gradle b/cd2plantuml/build.gradle index 4fa46a195..123f72a1a 100644 --- a/cd2plantuml/build.gradle +++ b/cd2plantuml/build.gradle @@ -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" @@ -15,7 +15,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" - testImplementation ("de.monticore:monticore-runtime:${project.properties['mc_version']}") capabilities { + testImplementation ("de.monticore:monticore-runtime:$mc_version") capabilities { requireCapability("de.monticore:monticore-runtime-tests") } testImplementation "de.monticore:monticore-grammar-trafo:$mc_version" diff --git a/cd2smt/build.gradle b/cd2smt/build.gradle index 6ee7a8d8c..479ec860f 100644 --- a/cd2smt/build.gradle +++ b/cd2smt/build.gradle @@ -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" @@ -16,7 +16,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" - testImplementation ("de.monticore:monticore-runtime:${project.properties['mc_version']}") capabilities { + testImplementation ("de.monticore:monticore-runtime:$mc_version") capabilities { requireCapability("de.monticore:monticore-runtime-tests") } testImplementation "de.monticore:monticore-grammar-trafo:$mc_version" diff --git a/cddiff/build.gradle b/cddiff/build.gradle index 35a81373c..c487e7d7a 100644 --- a/cddiff/build.gradle +++ b/cddiff/build.gradle @@ -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" @@ -15,7 +15,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" - testImplementation ("de.monticore:monticore-runtime:${project.properties['mc_version']}") capabilities { + testImplementation ("de.monticore:monticore-runtime:$mc_version") capabilities { requireCapability("de.monticore:monticore-runtime-tests") } testImplementation "de.monticore:monticore-grammar-trafo:$mc_version" diff --git a/cdlang/build.gradle b/cdlang/build.gradle index e64f235b6..126a8a3fc 100644 --- a/cdlang/build.gradle +++ b/cdlang/build.gradle @@ -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" @@ -71,11 +71,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 { + 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 diff --git a/cdmerge/build.gradle b/cdmerge/build.gradle index 92e3b2edf..d2a9e6287 100644 --- a/cdmerge/build.gradle +++ b/cdmerge/build.gradle @@ -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" @@ -15,7 +15,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" - testImplementation ("de.monticore:monticore-runtime:${project.properties['mc_version']}") capabilities { + testImplementation ("de.monticore:monticore-runtime:$mc_version") capabilities { requireCapability("de.monticore:monticore-runtime-tests") } testImplementation "de.monticore:monticore-grammar-trafo:$mc_version" diff --git a/cdtool/build.gradle b/cdtool/build.gradle index 6dbfa1b91..1e6a2f70a 100644 --- a/cdtool/build.gradle +++ b/cdtool/build.gradle @@ -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" @@ -40,10 +40,10 @@ 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 { + 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') diff --git a/cdtool/cdgradle/build.gradle b/cdtool/cdgradle/build.gradle index b74061faf..a4d08b5a8 100644 --- a/cdtool/cdgradle/build.gradle +++ b/cdtool/cdgradle/build.gradle @@ -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" diff --git a/symtabdefinitiontool/build.gradle b/symtabdefinitiontool/build.gradle index 062365938..6be139da9 100644 --- a/symtabdefinitiontool/build.gradle +++ b/symtabdefinitiontool/build.gradle @@ -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" diff --git a/symtabdefinitiontool/stdefgradle/build.gradle b/symtabdefinitiontool/stdefgradle/build.gradle index 125d58787..0a4a6023c 100644 --- a/symtabdefinitiontool/stdefgradle/build.gradle +++ b/symtabdefinitiontool/stdefgradle/build.gradle @@ -11,7 +11,7 @@ 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")) diff --git a/trafo-library/build.gradle b/trafo-library/build.gradle index 50814b4bb..3c1c68130 100644 --- a/trafo-library/build.gradle +++ b/trafo-library/build.gradle @@ -55,8 +55,7 @@ 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" From fa59fa155d5152281b6520fcf8bdcd59a5229b69 Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Fri, 19 Dec 2025 16:05:10 +0100 Subject: [PATCH 02/11] add org.junit.platform:junit-platform-launcher dependency --- build.gradle | 1 + cd-runtime/build.gradle | 1 + cd2plantuml/build.gradle | 1 + cd2smt/build.gradle | 1 + cddiff/build.gradle | 1 + cdlang/build.gradle | 1 + cdmerge/build.gradle | 1 + cdtool/build.gradle | 1 + language-server/build.gradle | 1 + symtabdefinitiontool/build.gradle | 1 + symtabdefinitiontool/stdefgradle/build.gradle | 1 + trafo-library/build.gradle | 1 + 12 files changed, 12 insertions(+) diff --git a/build.gradle b/build.gradle index b5493b2bc..0603e07e2 100644 --- a/build.gradle +++ b/build.gradle @@ -22,6 +22,7 @@ ext { commons_cli_version = "1.5.0" commons_lang_version = "3.11" jupiter_version = "5.6.0" + junit_platform_version = "1.14.1" freemarker_version = "2.3.31" javaparser_version = "3.14.11" mockito_version = "3.11.1" diff --git a/cd-runtime/build.gradle b/cd-runtime/build.gradle index 55f639f16..f9db143af 100644 --- a/cd-runtime/build.gradle +++ b/cd-runtime/build.gradle @@ -13,6 +13,7 @@ dependencies { 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' diff --git a/cd2plantuml/build.gradle b/cd2plantuml/build.gradle index 123f72a1a..fb215d88f 100644 --- a/cd2plantuml/build.gradle +++ b/cd2plantuml/build.gradle @@ -15,6 +15,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" testImplementation ("de.monticore:monticore-runtime:$mc_version") capabilities { requireCapability("de.monticore:monticore-runtime-tests") } testImplementation "de.monticore:monticore-grammar-trafo:$mc_version" diff --git a/cd2smt/build.gradle b/cd2smt/build.gradle index 479ec860f..706956145 100644 --- a/cd2smt/build.gradle +++ b/cd2smt/build.gradle @@ -16,6 +16,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" testImplementation ("de.monticore:monticore-runtime:$mc_version") capabilities { requireCapability("de.monticore:monticore-runtime-tests") } testImplementation "de.monticore:monticore-grammar-trafo:$mc_version" diff --git a/cddiff/build.gradle b/cddiff/build.gradle index c487e7d7a..ae228b853 100644 --- a/cddiff/build.gradle +++ b/cddiff/build.gradle @@ -15,6 +15,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" testImplementation ("de.monticore:monticore-runtime:$mc_version") capabilities { requireCapability("de.monticore:monticore-runtime-tests") } testImplementation "de.monticore:monticore-grammar-trafo:$mc_version" diff --git a/cdlang/build.gradle b/cdlang/build.gradle index 126a8a3fc..e18167ce7 100644 --- a/cdlang/build.gradle +++ b/cdlang/build.gradle @@ -71,6 +71,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" testImplementation ("de.monticore:monticore-runtime:$mc_version") capabilities { requireCapability("de.monticore:monticore-runtime-tests") } diff --git a/cdmerge/build.gradle b/cdmerge/build.gradle index d2a9e6287..d138c3af8 100644 --- a/cdmerge/build.gradle +++ b/cdmerge/build.gradle @@ -15,6 +15,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" testImplementation ("de.monticore:monticore-runtime:$mc_version") capabilities { requireCapability("de.monticore:monticore-runtime-tests") } testImplementation "de.monticore:monticore-grammar-trafo:$mc_version" diff --git a/cdtool/build.gradle b/cdtool/build.gradle index 1e6a2f70a..93961e995 100644 --- a/cdtool/build.gradle +++ b/cdtool/build.gradle @@ -40,6 +40,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" testImplementation ("de.monticore:monticore-runtime:$mc_version") capabilities { requireCapability("de.monticore:monticore-runtime-tests") } testImplementation "org.mockito:mockito-core:$mockito_version" diff --git a/language-server/build.gradle b/language-server/build.gradle index 3aee5b64b..0861258e9 100644 --- a/language-server/build.gradle +++ b/language-server/build.gradle @@ -56,6 +56,7 @@ dependencies { 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 + testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junit_platform_version" } test { diff --git a/symtabdefinitiontool/build.gradle b/symtabdefinitiontool/build.gradle index 6be139da9..360e1f3eb 100644 --- a/symtabdefinitiontool/build.gradle +++ b/symtabdefinitiontool/build.gradle @@ -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) { diff --git a/symtabdefinitiontool/stdefgradle/build.gradle b/symtabdefinitiontool/stdefgradle/build.gradle index 0a4a6023c..465d63f4a 100644 --- a/symtabdefinitiontool/stdefgradle/build.gradle +++ b/symtabdefinitiontool/stdefgradle/build.gradle @@ -17,6 +17,7 @@ dependencies { 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() } diff --git a/trafo-library/build.gradle b/trafo-library/build.gradle index 3c1c68130..a14c819ad 100644 --- a/trafo-library/build.gradle +++ b/trafo-library/build.gradle @@ -61,6 +61,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" compileOnly 'org.freemarker:freemarker:2.3.28' } From f7c74b473062a885d16199a893cc7f7c7ab60028 Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Fri, 19 Dec 2025 16:06:11 +0100 Subject: [PATCH 03/11] bump org.apache.commons:commons-text from 1.10.0 to 1.15.0 --- build.gradle | 1 + cd-runtime/build.gradle | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0603e07e2..ff6964212 100644 --- a/build.gradle +++ b/build.gradle @@ -23,6 +23,7 @@ ext { commons_lang_version = "3.11" jupiter_version = "5.6.0" junit_platform_version = "1.14.1" + commons_lang_version = "3.20.0" freemarker_version = "2.3.31" javaparser_version = "3.14.11" mockito_version = "3.11.1" diff --git a/cd-runtime/build.gradle b/cd-runtime/build.gradle index f9db143af..c20b9c1ca 100644 --- a/cd-runtime/build.gradle +++ b/cd-runtime/build.gradle @@ -8,8 +8,8 @@ plugins { dependencies { api "de.se_rwth.commons:se-commons-logging:$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" From 6a57430964abba758d53044af976e64c3c9dc9fb Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Fri, 19 Dec 2025 16:07:28 +0100 Subject: [PATCH 04/11] bump org.freemarker:freemarker in the trafo-library from 2.3.28 to 2.3.31 --- trafo-library/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trafo-library/build.gradle b/trafo-library/build.gradle index a14c819ad..c8b3a5666 100644 --- a/trafo-library/build.gradle +++ b/trafo-library/build.gradle @@ -63,7 +63,7 @@ dependencies { 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 { From 2e2b7df7d7d124d15cefbb39947cfca0eb804f01 Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Fri, 19 Dec 2025 16:08:11 +0100 Subject: [PATCH 05/11] bump org.apache.commons:commons-text from 1.10.0 to 1.15.0 --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index ff6964212..50f9dcae8 100644 --- a/build.gradle +++ b/build.gradle @@ -24,6 +24,7 @@ ext { jupiter_version = "5.6.0" junit_platform_version = "1.14.1" 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" From 61950ef36eca55fc23b968cdbad93d85834fe6d0 Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Fri, 19 Dec 2025 16:08:56 +0100 Subject: [PATCH 06/11] bump org.apache.commons:commons-text from 1.10.0 to 1.15.0 --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 50f9dcae8..0d4a24d4b 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,6 @@ ext { 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" junit_platform_version = "1.14.1" commons_lang_version = "3.20.0" From 82d38e4a22796bfd2499d7c8df254e5c5ae8be34 Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Fri, 19 Dec 2025 16:09:46 +0100 Subject: [PATCH 07/11] updated language-server dependencies to use gradle version constants --- language-server/build.gradle | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/language-server/build.gradle b/language-server/build.gradle index 0861258e9..15a2ee3cb 100644 --- a/language-server/build.gradle +++ b/language-server/build.gradle @@ -37,26 +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 { From 24c73a08c6ccdeb094dbd18faf157eaa59516c79 Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Fri, 19 Dec 2025 16:10:28 +0100 Subject: [PATCH 08/11] bump commons-cli:commons-cli from 1.5.0 to 1.11.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0d4a24d4b..07a256cb4 100644 --- a/build.gradle +++ b/build.gradle @@ -19,9 +19,9 @@ ext { plantuml_version = "1.2020.15" jackson_version = "2.13.4" junit_version = "5.9.0" - commons_cli_version = "1.5.0" jupiter_version = "5.6.0" 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" From b2bd90d543cf7e13be7e54591ccd3001d2a1f6c4 Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Fri, 19 Dec 2025 16:11:21 +0100 Subject: [PATCH 09/11] bump org.junit.*:* from 5.9.0 to 5.14.1 --- build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 07a256cb4..9c1b05283 100644 --- a/build.gradle +++ b/build.gradle @@ -18,8 +18,7 @@ ext { antlr_version = "4.12.0" plantuml_version = "1.2020.15" jackson_version = "2.13.4" - junit_version = "5.9.0" - jupiter_version = "5.6.0" + junit_version = "5.14.1" junit_platform_version = "1.14.1" commons_cli_version = "1.11.0" commons_lang_version = "3.20.0" From 390b04048d8b6a664423f78f5776eefb96de1780 Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Fri, 19 Dec 2025 16:13:31 +0100 Subject: [PATCH 10/11] bump com.fasterxml.jackson.core:jackson-databind from 2.13.4 to 2.20.1 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9c1b05283..5688beeae 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ ext { guava_version = "31.1-jre" antlr_version = "4.12.0" plantuml_version = "1.2020.15" - jackson_version = "2.13.4" + jackson_version = "2.20.1" junit_version = "5.14.1" junit_platform_version = "1.14.1" commons_cli_version = "1.11.0" From 50c583c2a0874eddf8f938261ab3ac8c8e020a75 Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Fri, 19 Dec 2025 16:14:14 +0100 Subject: [PATCH 11/11] bump com.google.guava:guava from 31.1-jre to 33.5.0-jre --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5688beeae..e96837b31 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ 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.20.1"