diff --git a/.bach/src/Project.java b/.bach/src/Project.java index 856a5171..865cce6b 100644 --- a/.bach/src/Project.java +++ b/.bach/src/Project.java @@ -1,12 +1,18 @@ import java.io.File; +import java.lang.module.ModuleFinder; import java.nio.file.Path; -import run.bach.Bach; +import run.bach.ModuleFinders; import run.bach.ToolCall; import run.bach.ToolRunner; import run.bach.workflow.Builder; +import run.bach.workflow.Folders; import run.bach.workflow.Structure; -import run.bach.workflow.Structure.*; +import run.bach.workflow.Structure.Basics; +import run.bach.workflow.Structure.DeclaredModule; +import run.bach.workflow.Structure.Space; +import run.bach.workflow.Structure.Spaces; import run.bach.workflow.Workflow; +import run.info.org.junit.JUnit; record Project(Workflow workflow) implements Builder { static final String VERSION = System.getProperty("--project-version", "11-ea"); @@ -32,10 +38,11 @@ static Project ofCurrentWorkingDirectory() { .with(testModule("test.examples")) .with(testModule("test.integration")); + var libraries = ModuleFinder.compose(ModuleFinders.ofProperties(JUnit.MODULES)); return new Project( new Workflow( - Bach.Folders.ofCurrentWorkingDirectory(), - new Structure(basics, new Spaces(main, test)), + Folders.ofCurrentWorkingDirectory(), + new Structure(basics, new Spaces(main, test), libraries), ToolRunner.ofSystem())); } diff --git a/.bach/src/run/bach b/.bach/src/run/bach index ee8a4020..94416e4e 160000 --- a/.bach/src/run/bach +++ b/.bach/src/run/bach @@ -1 +1 @@ -Subproject commit ee8a40207b1a7ac8e42fd24b19ad795a9707da8a +Subproject commit 94416e4e9fad71e57d5b42911dfd61a8861f9014 diff --git a/.bach/src/run/info/org/junit b/.bach/src/run/info/org/junit new file mode 160000 index 00000000..c147fe6d --- /dev/null +++ b/.bach/src/run/info/org/junit @@ -0,0 +1 @@ +Subproject commit c147fe6de3fcd64af529bf05404bc610019cd3c3 diff --git a/.gitignore b/.gitignore index ea81b89f..cf62abbe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,5 @@ - - +_site/ target/ src/doc/ -lib/*.jar pom.* *~ - -_site/ \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 86c28cfc..2828a91d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule ".bach/src/run/bach"] path = .bach/src/run/bach url = https://github.com/sormuras/run.bach +[submodule "junit"] + path = .bach/src/run/info/org/junit + url = https://github.com/junit-team/bach-info diff --git a/.idea/vcs.xml b/.idea/vcs.xml index d4a0bca9..4d5a22ce 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -3,5 +3,6 @@ + \ No newline at end of file diff --git a/lib/.gitignore b/lib/.gitignore new file mode 100644 index 00000000..d392f0e8 --- /dev/null +++ b/lib/.gitignore @@ -0,0 +1 @@ +*.jar diff --git a/lib/junit@5.10.2.properties b/lib/junit@5.10.2.properties deleted file mode 100644 index c4174336..00000000 --- a/lib/junit@5.10.2.properties +++ /dev/null @@ -1,23 +0,0 @@ -@description The testing framework for Java and the JVM -@home https://junit.org -@version 5.10.2 - -org.apiguardian.api=https://repo.maven.apache.org/maven2/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar#SIZE=6806 -org.junit.jupiter=https://repo.maven.apache.org/maven2/org/junit/jupiter/junit-jupiter/5.10.2/junit-jupiter-5.10.2.jar#SIZE=6359 -org.junit.jupiter.api=https://repo.maven.apache.org/maven2/org/junit/jupiter/junit-jupiter-api/5.10.2/junit-jupiter-api-5.10.2.jar#SIZE=210956 -org.junit.jupiter.engine=https://repo.maven.apache.org/maven2/org/junit/jupiter/junit-jupiter-engine/5.10.2/junit-jupiter-engine-5.10.2.jar#SIZE=244690 -org.junit.jupiter.migrationsupport=https://repo.maven.apache.org/maven2/org/junit/jupiter/junit-jupiter-migrationsupport/5.10.2/junit-jupiter-migrationsupport-5.10.2.jar#SIZE=27713 -org.junit.jupiter.params=https://repo.maven.apache.org/maven2/org/junit/jupiter/junit-jupiter-params/5.10.2/junit-jupiter-params-5.10.2.jar#SIZE=586027 -org.junit.platform.commons=https://repo.maven.apache.org/maven2/org/junit/platform/junit-platform-commons/1.10.2/junit-platform-commons-1.10.2.jar#SIZE=106232 -org.junit.platform.console=https://repo.maven.apache.org/maven2/org/junit/platform/junit-platform-console/1.10.2/junit-platform-console-1.10.2.jar#SIZE=545571 -org.junit.platform.engine=https://repo.maven.apache.org/maven2/org/junit/platform/junit-platform-engine/1.10.2/junit-platform-engine-1.10.2.jar#SIZE=204821 -org.junit.platform.jfr=https://repo.maven.apache.org/maven2/org/junit/platform/junit-platform-jfr/1.10.2/junit-platform-jfr-1.10.2.jar#SIZE=19138 -org.junit.platform.launcher=https://repo.maven.apache.org/maven2/org/junit/platform/junit-platform-launcher/1.10.2/junit-platform-launcher-1.10.2.jar#SIZE=183814 -org.junit.platform.reporting=https://repo.maven.apache.org/maven2/org/junit/platform/junit-platform-reporting/1.10.2/junit-platform-reporting-1.10.2.jar#SIZE=106950 -org.junit.platform.suite=https://repo.maven.apache.org/maven2/org/junit/platform/junit-platform-suite/1.10.2/junit-platform-suite-1.10.2.jar#SIZE=6362 -org.junit.platform.suite.api=https://repo.maven.apache.org/maven2/org/junit/platform/junit-platform-suite-api/1.10.2/junit-platform-suite-api-1.10.2.jar#SIZE=22575 -org.junit.platform.suite.commons=https://repo.maven.apache.org/maven2/org/junit/platform/junit-platform-suite-commons/1.10.2/junit-platform-suite-commons-1.10.2.jar#SIZE=17326 -org.junit.platform.suite.engine=https://repo.maven.apache.org/maven2/org/junit/platform/junit-platform-suite-engine/1.10.2/junit-platform-suite-engine-1.10.2.jar#SIZE=24117 -org.junit.platform.testkit=https://repo.maven.apache.org/maven2/org/junit/platform/junit-platform-testkit/1.10.2/junit-platform-testkit-1.10.2.jar#SIZE=44401 -org.junit.vintage.engine=https://repo.maven.apache.org/maven2/org/junit/vintage/junit-vintage-engine/5.10.2/junit-vintage-engine-5.10.2.jar#SIZE=67479 -org.opentest4j=https://repo.maven.apache.org/maven2/org/opentest4j/opentest4j/1.3.0/opentest4j-1.3.0.jar#SIZE=14304