Skip to content
Merged
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
3 changes: 2 additions & 1 deletion WorkflowCLI/build.gradle
Original file line number Diff line number Diff line change
@@ -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"
}
Expand All @@ -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 {
Expand Down
14 changes: 9 additions & 5 deletions WorkflowConformance/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions WorkflowDSL/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ plugins {
}

group = "de.monticore.lang"
sourceCompatibility = '11'

test {
useJUnitPlatform()
Expand All @@ -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"
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
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 {

public static String print(final Graph<ASTFlowElement, EndpointPair<ASTFlowElement>> graph)
throws IOException {
final GraphExporter<ASTFlowElement, EndpointPair<ASTFlowElement>> exporter = new DOTExporter<>(
ASTFlowElement::getName, null, null);
ASTFlowElement::getName);
// write dot file
final StringWriter writer = new StringWriter();
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'))) {
Expand Down Expand Up @@ -46,7 +46,7 @@ subprojects {
}

tasks.withType(Test).configureEach {
useJUnit()
useJUnitPlatform()
testLogging {
// controls whether test output is shown
showStandardStreams = !("false").equals(getProperty('showTestOutput'))
Expand All @@ -72,7 +72,7 @@ subprojects {
}
}
reports {
junitXml.required = false
junitXml.required = true
html.required = false
}
}
Expand Down
22 changes: 10 additions & 12 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading