diff --git a/WorkflowCLI/build.gradle b/WorkflowCLI/build.gradle index 02718412..1bf1f47b 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" } @@ -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 fc86d9d2..91c9d2af 100644 --- a/WorkflowConformance/build.gradle +++ b/WorkflowConformance/build.gradle @@ -14,14 +14,18 @@ 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: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 71504a1b..9d260ed2 100644 --- a/WorkflowDSL/build.gradle +++ b/WorkflowDSL/build.gradle @@ -7,7 +7,6 @@ plugins { } group = "de.monticore.lang" -sourceCompatibility = '11' test { useJUnitPlatform() @@ -26,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" @@ -41,6 +40,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/WorkflowDSL/src/main/java/de/monticore/bpmn/analysis/graph/GraphDotPrinter.java b/WorkflowDSL/src/main/java/de/monticore/bpmn/analysis/graph/GraphDotPrinter.java index 6c35d4fe..2d94a1bb 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 2e6749c0..0956baf7 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/build.gradle b/build.gradle index b31db8e0..16ddba25 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'))) { @@ -46,7 +46,7 @@ subprojects { } tasks.withType(Test).configureEach { - useJUnit() + useJUnitPlatform() testLogging { // controls whether test output is shown showStandardStreams = !("false").equals(getProperty('showTestOutput')) @@ -72,7 +72,7 @@ subprojects { } } reports { - junitXml.required = false + junitXml.required = true html.required = false } } diff --git a/gradle.properties b/gradle.properties index 6023918a..cc0a12a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,16 +15,14 @@ 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 -guava_version=31.1-jre -gson_version=2.10.1 +exec_version=1.12 +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 -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 -junit_jupiter_version=5.8.2 -cron_utils_version=9.1.6 +jgrapht_version=1.5.2 +jgraphx_version=3.4.1.3 +logback_version=1.5.22 +spotbugs_version=4.9.8 +junit_jupiter_version=6.0.3 +cron_utils_version=9.2.1 +shadow_version=8.3.9