2025.1.0

Author: pvlasov

capability-tests/pom.xml

@@ -4,7 +4,7 @@
 	  <parent>
 	    <artifactId>parent</artifactId>
 	    <groupId>org.nasdanika.core</groupId>
-	    <version>2024.12.0</version>
+	    <version>2025.1.0</version>
 	    <relativePath>..</relativePath>
 	  </parent>
 	<artifactId>capability-tests</artifactId>

capability/pom.xml

@@ -4,7 +4,7 @@
 	  <parent>
 	    <artifactId>parent</artifactId>
 	    <groupId>org.nasdanika.core</groupId>
-	    <version>2024.12.0</version>
+	    <version>2025.1.0</version>
 	    <relativePath>..</relativePath>
 	  </parent>
 	<artifactId>capability</artifactId>

cli/pom.xml

@@ -4,7 +4,7 @@
 	  <parent>
 	    <artifactId>parent</artifactId>
 	    <groupId>org.nasdanika.core</groupId>
-	    <version>2024.12.0</version>
+	    <version>2025.1.0</version>
 	    <relativePath>..</relativePath>
 	  </parent>
 	<artifactId>cli</artifactId>

cli/src/main/java/org/nasdanika/cli/AbstractLauncherCommand.java

@@ -13,6 +13,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -95,6 +96,15 @@ public abstract class AbstractLauncherCommand extends CommandBase {
 					"Supports .* and .** patterns"					
 			})
 	private String rootModules;	
+		
+	@Option(
+			names = {"--add-modules"}, 
+			description = {
+					"Comma-separated list of modules to add to",
+					"Java command --add-modules",
+					"Computed if not specified"
+			})
+	private String addModules;	
 
 	@Option(
 			names = {"-M", "--modules"}, 
@@ -366,6 +376,9 @@ protected void buildClasspath(Map<String, File> moduleMap, Map<String, ModuleRef
 	}
 
 	protected void buildAddModules(Collection<String> modulesToAdd, StringBuilder builder) {
+		if (!Util.isBlank(addModules)) {
+			modulesToAdd = Collections.singleton(addModules);
+		}
 		if (!modulesToAdd.isEmpty()) {
 			boolean firstModuleEntry = true;
 			for (String m: modulesToAdd) {

cli/src/test/java/org/nasdanika/cli/tests/BuildDistributionIT.java

@@ -55,6 +55,7 @@ public void generateLauncher() throws IOException {
 				"-b", "target/dist", 
 				"-M", "target/dist/modules", 
 				"-j", "#!/bin/bash\n\njava",
+				"--add-modules", "ALL-SYSTEM",
 				"-o", "nsd",
 //				"-r", "org.nasdanika.**",
 				"-p", ":",
@@ -65,6 +66,7 @@ public void generateLauncher() throws IOException {
 				"-M", "target/dist/modules", 
 				"-o", "nsd-debug",
 				"-j", "#!/bin/bash\n\njava -Xdebug -Xrunjdwp:transport=dt_socket,address=8998,server=y",
+				"--add-modules", "ALL-SYSTEM",
 //				"-r", "org.nasdanika.**",
 				"-p", ":",
 				"-a", "$@");		

common/pom.xml

@@ -4,7 +4,7 @@
 	  <parent>
 	    <artifactId>parent</artifactId>
 	    <groupId>org.nasdanika.core</groupId>
-	    <version>2024.12.0</version>
+	    <version>2025.1.0</version>
 	    <relativePath>..</relativePath>
 	  </parent>
 	<artifactId>common</artifactId>

common/src/main/java/org/nasdanika/common/Util.java

@@ -39,6 +39,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
+import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.function.ToIntFunction;
@@ -1256,12 +1257,6 @@ public <T> T compute(Context context, String key, String path, Class<T> type) {
 
 	/**
 	 * Walks the directory passing files and their paths to the listener.
-	 * @param source
-	 * @param target
-	 * @param cleanTarget
-	 * @param cleanPredicate
-	 * @param listener
-	 * @throws IOException
 	 */
 	public static void walk(String path, BiConsumer<File,String> listener, File... files) {
 		if (files != null) {
@@ -1276,6 +1271,21 @@ public static void walk(String path, BiConsumer<File,String> listener, File... f
 		}
 	}
 
+	/**
+	 * Walks the directory passing files and their paths to the visitor.
+	 * For directories visits children recursively if visitor returns true 
+	 */
+	public static void walk(String path, BiPredicate<File,String> visitor, File... files) {
+		if (files != null) {
+			for (File file: files) {
+				String filePath = path == null ? file.getName() : path + "/" + file.getName();
+				if (visitor.test(file, filePath) && file.isDirectory()) {
+					walk(filePath, visitor, file.listFiles());
+				}
+			}
+		}
+	}
+	
 	public static void copy(File source, File target, boolean cleanTarget, BiConsumer<File,File> listener) throws IOException {
 		if (cleanTarget && target.isDirectory()) {
 			delete(target.listFiles());

diagram/pom.xml

@@ -4,7 +4,7 @@
 	  <parent>
 	    <artifactId>parent</artifactId>
 	    <groupId>org.nasdanika.core</groupId>
-	    <version>2024.12.0</version>
+	    <version>2025.1.0</version>
 	    <relativePath>..</relativePath>
 	  </parent>
 	<artifactId>diagram</artifactId>

drawio.model/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>parent</artifactId>
 		<groupId>org.nasdanika.core</groupId>
-		<version>2024.12.0</version>
+		<version>2025.1.0</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>drawio-model</artifactId>

drawio/pom.xml

@@ -4,7 +4,7 @@
 	  <parent>
 	    <artifactId>parent</artifactId>
 	    <groupId>org.nasdanika.core</groupId>
-	    <version>2024.12.0</version>
+	    <version>2025.1.0</version>
 	    <relativePath>..</relativePath>
 	  </parent>
 	<artifactId>drawio</artifactId>