diff --git a/.bach/src/run.bach/bach/info/org/jreleaser b/.bach/src/run.bach/bach/info/org/jreleaser deleted file mode 160000 index c71297ecb..000000000 --- a/.bach/src/run.bach/bach/info/org/jreleaser +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c71297ecb733a50fbaeb930bfa6aee3ed4e23a40 diff --git a/.bach/src/run.bach/bach/info/org/junit b/.bach/src/run.bach/bach/info/org/junit deleted file mode 160000 index 58d65e865..000000000 --- a/.bach/src/run.bach/bach/info/org/junit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 58d65e8653a1e05f5cbe2237151f616d58471f67 diff --git a/.bach/src/run.bach/run/Project.java b/.bach/src/run.bach/run/Project.java index ff41a524d..078534eb2 100644 --- a/.bach/src/run.bach/run/Project.java +++ b/.bach/src/run.bach/run/Project.java @@ -1,6 +1,5 @@ package run; -import bach.info.org.junit.JUnit; import java.lang.module.ModuleFinder; import java.nio.file.Files; import java.util.Optional; @@ -17,6 +16,7 @@ import run.bach.workflow.Structure.Space; import run.bach.workflow.Structure.Spaces; import run.bach.workflow.Workflow; +import run.info.org.junit.JUnit; public record Project(boolean verbose, Workflow workflow) implements Builder, Starter { static Project ofCurrentWorkingDirectory() { diff --git a/.bach/src/run.bach/run/demo/ModuleResolverDemo.java b/.bach/src/run.bach/run/demo/ModuleResolverDemo.java index c85c8e20f..944d7fc4f 100644 --- a/.bach/src/run.bach/run/demo/ModuleResolverDemo.java +++ b/.bach/src/run.bach/run/demo/ModuleResolverDemo.java @@ -1,13 +1,11 @@ package run.demo; -import bach.info.org.jreleaser.JReleaser; -import bach.info.org.junit.JUnit; import java.lang.module.ModuleFinder; import java.nio.file.Path; import run.bach.ModuleFinders; import run.bach.ModuleResolver; import run.bach.ToolFinder; -import run.bach.workflow.Folders; +import run.info.org.junit.JUnit; public class ModuleResolverDemo { public static void main(String... args) throws Exception { @@ -23,23 +21,26 @@ public static void main(String... args) throws Exception { resolver.resolveModule("org.junit.platform.console"); // to run tests resolver.resolveMissingModules(); - // "jreleaser" via the tool provider SPI - var jreleaserHome = - Folders.ofCurrentWorkingDirectory().tool(JReleaser.NAME + "@" + JReleaser.VERSION); - var jreleaserResolver = ModuleResolver.ofSingleDirectory(jreleaserHome, JReleaser.MODULES); - jreleaserResolver.resolveModule("org.jreleaser.tool"); - jreleaserResolver.resolveMissingModules(); + // // "jreleaser" via the tool provider SPI + // var jreleaserHome = + // Folders.ofCurrentWorkingDirectory().tool(JReleaser.NAME + "@" + JReleaser.VERSION); + // var jreleaserResolver = ModuleResolver.ofSingleDirectory(jreleaserHome, + // JReleaser.MODULES); + // jreleaserResolver.resolveModule("org.jreleaser.tool"); + // jreleaserResolver.resolveMissingModules(); var tools = ToolFinder.compose( ToolFinder.of("jar"), // provides "jar" tool ToolFinder.of("java"), // provides "java" tool ToolFinder.of(ModuleFinder.of(lib)), // provides "junit" tool - ToolFinder.of(ModuleFinder.of(jreleaserHome)), // provides "jreleaser" tool + // ToolFinder.of(ModuleFinder.of(jreleaserHome)), // provides "jreleaser" + // tool ToolFinder.ofInstaller() - .withJavaApplication("demo/release@uri", JReleaser.APPLICATION) - .withJavaApplication( - "demo/release@all", JReleaser.APPLICATION, JReleaser.APPLICATION_ASSETS) + // .withJavaApplication("demo/release@uri", JReleaser.APPLICATION) + // .withJavaApplication( + // "demo/release@all", JReleaser.APPLICATION, + // JReleaser.APPLICATION_ASSETS) .with(new Ant()) // provides "ant" tool ); @@ -47,9 +48,9 @@ public static void main(String... args) throws Exception { junit.run("--version"); junit.run("engines"); - tools.get("jreleaser").run("--version"); - tools.get("releaser1").run("--version"); - tools.get("releaser2").run("--version"); + // tools.get("jreleaser").run("--version"); + // tools.get("releaser1").run("--version"); + // tools.get("releaser2").run("--version"); tools.get("ant").run("-version"); } diff --git a/.bach/src/run.bach/run/info/org/junit b/.bach/src/run.bach/run/info/org/junit new file mode 160000 index 000000000..c147fe6de --- /dev/null +++ b/.bach/src/run.bach/run/info/org/junit @@ -0,0 +1 @@ +Subproject commit c147fe6de3fcd64af529bf05404bc610019cd3c3 diff --git a/.gitmodules b/.gitmodules index c419a9aa2..b337d8265 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "run.bach"] path = .bach/src/run.bach/run/bach url = https://github.com/sormuras/run.bach -[submodule "jreleaser"] - path = .bach/src/run.bach/bach/info/org/jreleaser - url = https://github.com/jreleaser/bach.info.org.jreleaser [submodule "junit"] - path = .bach/src/run.bach/bach/info/org/junit - url = https://github.com/junit-team/bach.info.org.junit + path = .bach/src/run.bach/run/info/org/junit + url = https://github.com/junit-team/bach-info diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 0c581a6a0..cb5149ebe 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -15,8 +15,7 @@ - - + \ No newline at end of file