From b1fe7302d5c64a19bdeaafc70de5f6a4a1626c38 Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Thu, 19 Mar 2026 11:09:46 +0100 Subject: [PATCH 01/13] move shadow plugin version to gradle.properties --- WorkflowCLI/build.gradle | 2 +- gradle.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/WorkflowCLI/build.gradle b/WorkflowCLI/build.gradle index 0271841..2bb6d2b 100644 --- a/WorkflowCLI/build.gradle +++ b/WorkflowCLI/build.gradle @@ -1,6 +1,6 @@ plugins { id "java-library" - id 'com.gradleup.shadow' version "8.3.9" + id 'com.gradleup.shadow' version "$shadow_version" id "jacoco" id "de.se_rwth.codestyle" version "$mc_version" } diff --git a/gradle.properties b/gradle.properties index 6023918..ef4a803 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,3 +28,4 @@ logback_version=1.2.3 jsr305_version=3.0.2 junit_jupiter_version=5.8.2 cron_utils_version=9.1.6 +shadow_version=8.3.9 From 67e6b5034585151763384ae5bf3d278fc4d9c8a7 Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Thu, 19 Mar 2026 11:10:27 +0100 Subject: [PATCH 02/13] bump guava version to 33.5.0-jre --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ef4a803..88c8f7c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,8 +16,8 @@ ocl_version=7.9.0-SNAPSHOT se_commons_version=7.9.0-SNAPSHOT petrinets_version=7.9.0-SNAPSHOT exec_version=1.11 -guava_version=31.1-jre gson_version=2.10.1 +guava_version=33.5.0-jre joda_time_version=2.10.4 jgrapht_version=1.3.1 picoli_version=4.1.0 From 16e5eaf83ab72a47c8c6a141194a73a837c4d152 Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Thu, 19 Mar 2026 11:10:45 +0100 Subject: [PATCH 03/13] bump gson version to 2.13.2 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 88c8f7c..78fdcb3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,8 +16,8 @@ ocl_version=7.9.0-SNAPSHOT se_commons_version=7.9.0-SNAPSHOT petrinets_version=7.9.0-SNAPSHOT exec_version=1.11 -gson_version=2.10.1 guava_version=33.5.0-jre +gson_version=2.13.2 joda_time_version=2.10.4 jgrapht_version=1.3.1 picoli_version=4.1.0 From 19aff78f299f618e03690544667107358df449d7 Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Thu, 19 Mar 2026 11:11:35 +0100 Subject: [PATCH 04/13] bump junit version to 6.0.3 --- WorkflowCLI/build.gradle | 1 + WorkflowConformance/build.gradle | 6 +++++- WorkflowDSL/build.gradle | 1 + build.gradle | 2 +- gradle.properties | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/WorkflowCLI/build.gradle b/WorkflowCLI/build.gradle index 2bb6d2b..1bf1f47 100644 --- a/WorkflowCLI/build.gradle +++ b/WorkflowCLI/build.gradle @@ -17,6 +17,7 @@ dependencies { testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_jupiter_version" testImplementation "org.junit.jupiter:junit-jupiter-engine:$junit_jupiter_version" + testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junit_jupiter_version" } shadowJar { diff --git a/WorkflowConformance/build.gradle b/WorkflowConformance/build.gradle index fc86d9d..de731d6 100644 --- a/WorkflowConformance/build.gradle +++ b/WorkflowConformance/build.gradle @@ -21,7 +21,11 @@ dependencies { implementation project(":WorkflowDSL") implementation group: 'de.monticore', name: 'monticore-runtime', version: mc_version implementation "de.monticore:monticore-grammar:$mc_version" - testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1' + + testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_jupiter_version" + testImplementation "org.junit.jupiter:junit-jupiter-engine:$junit_jupiter_version" + testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_jupiter_version" + testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junit_jupiter_version" } test { diff --git a/WorkflowDSL/build.gradle b/WorkflowDSL/build.gradle index 71504a1..de44b18 100644 --- a/WorkflowDSL/build.gradle +++ b/WorkflowDSL/build.gradle @@ -41,6 +41,7 @@ dependencies { /*------------------------TESTING-----------------------------------*/ testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_jupiter_version" testImplementation "org.junit.jupiter:junit-jupiter-engine:$junit_jupiter_version" + testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junit_jupiter_version" } // build sources jar in addition diff --git a/build.gradle b/build.gradle index b31db8e..24f1395 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ subprojects { } tasks.withType(Test).configureEach { - useJUnit() + useJUnitPlatform() testLogging { // controls whether test output is shown showStandardStreams = !("false").equals(getProperty('showTestOutput')) diff --git a/gradle.properties b/gradle.properties index 78fdcb3..48ab11c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,6 +26,6 @@ jaxb_core_version=2.3.0.1 jaxb_impl_version=2.3.2 logback_version=1.2.3 jsr305_version=3.0.2 -junit_jupiter_version=5.8.2 cron_utils_version=9.1.6 +junit_jupiter_version=6.0.3 shadow_version=8.3.9 From e009c9ec7c535c809e7583dc539d11074e70a7bf Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Thu, 19 Mar 2026 11:12:42 +0100 Subject: [PATCH 05/13] bump jgrapht version to 1.5.2 and jgraphx version to 3.4.1.3 --- WorkflowConformance/build.gradle | 8 ++++---- .../de/monticore/bpmn/analysis/graph/GraphDotPrinter.java | 8 ++++---- .../flows/MergeGatewayHasAtMostOneOutgoingFlowTest.java | 3 ++- gradle.properties | 3 ++- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/WorkflowConformance/build.gradle b/WorkflowConformance/build.gradle index de731d6..91c9d2a 100644 --- a/WorkflowConformance/build.gradle +++ b/WorkflowConformance/build.gradle @@ -14,12 +14,12 @@ repositories { dependencies { implementation project(':WorkflowDSL') - implementation 'org.jgrapht:jgrapht-core:1.5.2' - implementation 'org.tinyjee.jgraphx:jgraphx:3.4.1.3' - implementation 'org.jgrapht:jgrapht-ext:1.5.2' + implementation "org.jgrapht:jgrapht-core:$jgrapht_version" + implementation "org.tinyjee.jgraphx:jgraphx:$jgraphx_version" + implementation "org.jgrapht:jgrapht-ext:$jgrapht_version" implementation project(":WorkflowDSL") - implementation group: 'de.monticore', name: 'monticore-runtime', version: mc_version + implementation "de.monticore:monticore-runtime:$mc_version" implementation "de.monticore:monticore-grammar:$mc_version" testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_jupiter_version" diff --git a/WorkflowDSL/src/main/java/de/monticore/bpmn/analysis/graph/GraphDotPrinter.java b/WorkflowDSL/src/main/java/de/monticore/bpmn/analysis/graph/GraphDotPrinter.java index 6c35d4f..2d94a1b 100644 --- a/WorkflowDSL/src/main/java/de/monticore/bpmn/analysis/graph/GraphDotPrinter.java +++ b/WorkflowDSL/src/main/java/de/monticore/bpmn/analysis/graph/GraphDotPrinter.java @@ -6,9 +6,9 @@ import java.io.IOException; import java.io.StringWriter; import org.jgrapht.Graph; -import org.jgrapht.io.DOTExporter; -import org.jgrapht.io.ExportException; -import org.jgrapht.io.GraphExporter; +import org.jgrapht.nio.ExportException; +import org.jgrapht.nio.GraphExporter; +import org.jgrapht.nio.dot.DOTExporter; /** Prints the control flow graph into the dot file format. */ public class GraphDotPrinter { @@ -16,7 +16,7 @@ public class GraphDotPrinter { public static String print(final Graph> graph) throws IOException { final GraphExporter> exporter = new DOTExporter<>( - ASTFlowElement::getName, null, null); + ASTFlowElement::getName); // write dot file final StringWriter writer = new StringWriter(); try { diff --git a/WorkflowDSL/src/test/java/de/monticore/bpmn/cocos/flows/MergeGatewayHasAtMostOneOutgoingFlowTest.java b/WorkflowDSL/src/test/java/de/monticore/bpmn/cocos/flows/MergeGatewayHasAtMostOneOutgoingFlowTest.java index 2e6749c..0956baf 100644 --- a/WorkflowDSL/src/test/java/de/monticore/bpmn/cocos/flows/MergeGatewayHasAtMostOneOutgoingFlowTest.java +++ b/WorkflowDSL/src/test/java/de/monticore/bpmn/cocos/flows/MergeGatewayHasAtMostOneOutgoingFlowTest.java @@ -9,7 +9,8 @@ import de.se_rwth.commons.logging.Finding; import java.io.IOException; import java.util.Collection; -import org.jgrapht.io.ExportException; + +import org.jgrapht.nio.ExportException; import org.junit.jupiter.api.Test; class MergeGatewayHasAtMostOneOutgoingFlowTest extends AbstractCoCoTest { diff --git a/gradle.properties b/gradle.properties index 48ab11c..6a570d5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,8 @@ exec_version=1.11 guava_version=33.5.0-jre gson_version=2.13.2 joda_time_version=2.10.4 -jgrapht_version=1.3.1 +jgrapht_version=1.5.2 +jgraphx_version=3.4.1.3 picoli_version=4.1.0 jaxb_api_version=2.3.1 jaxb_core_version=2.3.0.1 From 2dd0461d9e9ce7beaeee71e368f242b016b89f91 Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Thu, 19 Mar 2026 11:13:01 +0100 Subject: [PATCH 06/13] remove old sourceCompatibility --- WorkflowDSL/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/WorkflowDSL/build.gradle b/WorkflowDSL/build.gradle index de44b18..abfc538 100644 --- a/WorkflowDSL/build.gradle +++ b/WorkflowDSL/build.gradle @@ -7,7 +7,6 @@ plugins { } group = "de.monticore.lang" -sourceCompatibility = '11' test { useJUnitPlatform() From 19d67b9e9f30119862d34cf6e14fbff234b3faba Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Thu, 19 Mar 2026 11:13:34 +0100 Subject: [PATCH 07/13] migrate jsr305 to spotbugs-annotations version 4.9.8 --- WorkflowDSL/build.gradle | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WorkflowDSL/build.gradle b/WorkflowDSL/build.gradle index abfc538..9d260ed 100644 --- a/WorkflowDSL/build.gradle +++ b/WorkflowDSL/build.gradle @@ -25,7 +25,7 @@ dependencies { implementation "org.jgrapht:jgrapht-guava:$jgrapht_version" implementation "org.zeroturnaround:zt-exec:$exec_version" implementation "ch.qos.logback:logback-classic:$logback_version" - implementation "com.google.code.findbugs:jsr305:$jsr305_version" + implementation "com.github.spotbugs:spotbugs-annotations:$spotbugs_version" /*----------------------Timer-Conditions-------------------------*/ implementation "joda-time:joda-time:$joda_time_version" diff --git a/gradle.properties b/gradle.properties index 6a570d5..55e4620 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,7 +26,7 @@ jaxb_api_version=2.3.1 jaxb_core_version=2.3.0.1 jaxb_impl_version=2.3.2 logback_version=1.2.3 -jsr305_version=3.0.2 cron_utils_version=9.1.6 +spotbugs_version=4.9.8 junit_jupiter_version=6.0.3 shadow_version=8.3.9 From 918e2b7bac37014d69ea3e21c9482a4f67c9809c Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Thu, 19 Mar 2026 11:13:58 +0100 Subject: [PATCH 08/13] bump cron-utils version to 9.2.1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 55e4620..580ce99 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,7 +26,7 @@ jaxb_api_version=2.3.1 jaxb_core_version=2.3.0.1 jaxb_impl_version=2.3.2 logback_version=1.2.3 -cron_utils_version=9.1.6 spotbugs_version=4.9.8 junit_jupiter_version=6.0.3 +cron_utils_version=9.2.1 shadow_version=8.3.9 From 0d95ac7f5f26a471af6b8b2437bca65ee8e54f47 Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Thu, 19 Mar 2026 11:21:44 +0100 Subject: [PATCH 09/13] remove usage of deprecated gradle buildDir property --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 24f1395..7a4a71a 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ description = "BPMN-DSL" allprojects { group 'de.monticore.lang' - buildDir = "$projectDir/target" + layout.buildDirectory = layout.projectDirectory.dir("target") repositories { if (("true").equals(getProperty('useLocalRepo'))) { From 944c8ad08d2873a4ce0ec09c47153ef7e7a4955a Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Thu, 19 Mar 2026 11:22:05 +0100 Subject: [PATCH 10/13] bump zt-exec version to 1.12 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 580ce99..3e9e958 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ mc_version=7.9.0-SNAPSHOT ocl_version=7.9.0-SNAPSHOT se_commons_version=7.9.0-SNAPSHOT petrinets_version=7.9.0-SNAPSHOT -exec_version=1.11 +exec_version=1.12 guava_version=33.5.0-jre gson_version=2.13.2 joda_time_version=2.10.4 From e7f61d22911e541d33b29b2ea6e48e7b6687a27d Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Thu, 19 Mar 2026 11:22:24 +0100 Subject: [PATCH 11/13] remove unused gradle variables --- gradle.properties | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3e9e958..8c21d68 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,10 +21,6 @@ gson_version=2.13.2 joda_time_version=2.10.4 jgrapht_version=1.5.2 jgraphx_version=3.4.1.3 -picoli_version=4.1.0 -jaxb_api_version=2.3.1 -jaxb_core_version=2.3.0.1 -jaxb_impl_version=2.3.2 logback_version=1.2.3 spotbugs_version=4.9.8 junit_jupiter_version=6.0.3 From dd8e08f878f40b5df41058167b92c1386fa5f088 Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Thu, 19 Mar 2026 11:22:35 +0100 Subject: [PATCH 12/13] bump logback version to 1.5.22 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8c21d68..cc0a12a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ gson_version=2.13.2 joda_time_version=2.10.4 jgrapht_version=1.5.2 jgraphx_version=3.4.1.3 -logback_version=1.2.3 +logback_version=1.5.22 spotbugs_version=4.9.8 junit_jupiter_version=6.0.3 cron_utils_version=9.2.1 From f1d4dd4818082d47d05da714058ec436e732ee29 Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Thu, 19 Mar 2026 13:18:21 +0100 Subject: [PATCH 13/13] enable junit xml reports for GitHub-CI --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7a4a71a..16ddba2 100644 --- a/build.gradle +++ b/build.gradle @@ -72,7 +72,7 @@ subprojects { } } reports { - junitXml.required = false + junitXml.required = true html.required = false } }