Added support for displaying extensions dependencies in the dependency-tree command.

src/main/java/rife/bld/operations/DependencyTreeOperation.java

@@ -5,8 +5,11 @@
 package rife.bld.operations;
 
 import rife.bld.BaseProject;
+import rife.bld.BldVersion;
 import rife.bld.dependencies.*;
+import rife.bld.wrapper.Wrapper;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -22,6 +25,9 @@ public class DependencyTreeOperation extends AbstractOperation<DependencyTreeOpe
     private ArtifactRetriever retriever_ = null;
     private final List<Repository> repositories_ = new ArrayList<>();
     private final DependencyScopes dependencies_ = new DependencyScopes();
+    private final List<Repository> extensionRepositories_ = new ArrayList<>();
+    private final DependencyScopes extensionDependencies_ = new DependencyScopes();
+
     private final StringBuilder dependencyTree_ = new StringBuilder();
 
     /**
@@ -30,11 +36,14 @@ public class DependencyTreeOperation extends AbstractOperation<DependencyTreeOpe
      * @since 1.5.21
      */
     public void execute() {
+        var extensions_tree = executeGenerateExtensionsDependencies();
         var compile_tree = executeGenerateCompileDependencies();
         var provided_tree = executeGenerateProvidedDependencies();
         var runtime_tree = executeGenerateRuntimeDependencies();
         var test_tree = executeGenerateTestDependencies();
         dependencyTree_.setLength(0);
+        dependencyTree_.append(extensions_tree);
+        dependencyTree_.append(System.lineSeparator());
         dependencyTree_.append(compile_tree);
         dependencyTree_.append(System.lineSeparator());
         dependencyTree_.append(provided_tree);
@@ -44,12 +53,26 @@ public class DependencyTreeOperation extends AbstractOperation<DependencyTreeOpe
         dependencyTree_.append(test_tree);
         dependencyTree_.append(System.lineSeparator());
 
+        System.out.println(extensions_tree);
         System.out.println(compile_tree);
         System.out.println(provided_tree);
         System.out.println(runtime_tree);
         System.out.println(test_tree);
     }
 
+    /**
+     * Part of the {@link #execute} operation, generates the tree for the extensions.
+     *
+     * @since 2.0
+     */
+    protected String executeGenerateExtensionsDependencies() {
+        var extensions_tree = extensionDependencies().scope(compile).generateTransitiveDependencyTree(artifactRetriever(), extensionRepositories(), compile, runtime);
+        if (extensions_tree.isEmpty()) {
+            extensions_tree = "no dependencies" + System.lineSeparator();
+        }
+        return "extensions:" + System.lineSeparator() + extensions_tree;
+    }
+
     /**
      * Part of the {@link #execute} operation, generates the tree for the compile scope.
      *
@@ -110,6 +133,20 @@ public class DependencyTreeOperation extends AbstractOperation<DependencyTreeOpe
      * @since 1.5.21
      */
     public DependencyTreeOperation fromProject(BaseProject project) {
+        // add the repositories and dependencies from the extensions
+        var wrapper = new Wrapper();
+        wrapper.currentDir(project.workDirectory());
+        try {
+            wrapper.initWrapperProperties(BldVersion.getVersion());
+            for (var repository : wrapper.repositories()) {
+                extensionRepositories().add(Repository.resolveRepository(project.properties(), repository));
+            }
+            extensionDependencies().scope(compile).addAll(wrapper.extensions().stream().map(Dependency::parse).toList());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        // add the repositories and the dependencies from the project
         return artifactRetriever(project.artifactRetriever())
             .repositories(project.repositories())
             .dependencies(project.dependencies());
@@ -153,6 +190,44 @@ public class DependencyTreeOperation extends AbstractOperation<DependencyTreeOpe
         return this;
     }
 
+    /**
+     * Provides extension repositories to resolve the extension dependencies against.
+     *
+     * @param repositories extension repositories against which extension dependencies will be resolved
+     * @return this operation instance
+     * @since 2.0
+     */
+    public DependencyTreeOperation extensionRepositories(Repository... repositories) {
+        extensionRepositories_.addAll(List.of(repositories));
+        return this;
+    }
+
+    /**
+     * Provides a list of extension repositories to resolve the extension dependencies against.
+     * <p>
+     * A copy will be created to allow this list to be independently modifiable.
+     *
+     * @param repositories a list of extension repositories against which extension dependencies will be resolved
+     * @return this operation instance
+     * @since 2.0
+     */
+    public DependencyTreeOperation extensionRepositories(List<Repository> repositories) {
+        extensionRepositories_.addAll(repositories);
+        return this;
+    }
+
+    /**
+     * Provides scoped extension dependencies to generate a tree for.
+     *
+     * @param dependencies the extension dependencies that will be resolved for tree generation
+     * @return this operation instance
+     * @since 2.0
+     */
+    public DependencyTreeOperation extensionDependencies(DependencyScopes dependencies) {
+        extensionDependencies_.include(dependencies);
+        return this;
+    }
+
     /**
      * Provides the artifact retriever to use.
      *
@@ -189,6 +264,30 @@ public class DependencyTreeOperation extends AbstractOperation<DependencyTreeOpe
         return dependencies_;
     }
 
+    /**
+     * Retrieves the extension repositories in which the dependencies will be resolved.
+     * <p>
+     * This is a modifiable list that can be retrieved and changed.
+     *
+     * @return the extension repositories used for dependency resolution
+     * @since 2.0
+     */
+    public List<Repository> extensionRepositories() {
+        return extensionRepositories_;
+    }
+
+    /**
+     * Retrieves the scoped extension dependencies that will be used for tree generation.
+     * <p>
+     * This is a modifiable structure that can be retrieved and changed.
+     *
+     * @return the scoped extension dependencies
+     * @since 2.0
+     */
+    public DependencyScopes extensionDependencies() {
+        return extensionDependencies_;
+    }
+
     /**
      * Returns the artifact retriever that is used.
      *

src/main/java/rife/bld/wrapper/Wrapper.java

@@ -222,6 +222,91 @@ public class Wrapper {
         }
     }
 
+    /**
+     * Sets the current directory for the wrapper.
+     *
+     * @param dir the directory to set as the current directory
+     * @since 2.0
+     */
+    public void currentDir(File dir) {
+        currentDir_ = dir;
+    }
+
+    /**
+     * Initializes the properties set for the wrapper.
+     *
+     * @param version the bld version they should be using
+     * @throws IOException when an error occurred during the creation of the wrapper files
+     * @since 2.0
+     */
+    public void initWrapperProperties(String version)
+    throws IOException {
+        // ensure required properties are available
+        wrapperProperties_.put(PROPERTY_REPOSITORIES, MAVEN_CENTRAL);
+        wrapperProperties_.put(BLD_PROPERTY_VERSION, version);
+
+        // retrieve properties from possible locations
+        var config = libBldDirectory(WRAPPER_PROPERTIES);
+        if (config.exists()) {
+            wrapperPropertiesFile_ = config;
+            wrapperProperties_.load(new FileReader(config));
+        } else {
+            config = libDirectory(WRAPPER_PROPERTIES);
+            if (config.exists()) {
+                wrapperPropertiesFile_ = config;
+                wrapperProperties_.load(new FileReader(config));
+            }
+        }
+
+        // extract repositories
+        if (wrapperProperties_.containsKey(PROPERTY_REPOSITORIES)) {
+            for (var repository : wrapperProperties_.getProperty(PROPERTY_REPOSITORIES).split(",")) {
+                repository = repository.trim();
+                if (!repository.isBlank()) {
+                    repositories_.add(repository);
+                }
+            }
+        }
+        // extract wrapper extension specifications
+        for (var property : wrapperProperties_.entrySet()) {
+            if (property.getKey().toString().startsWith(PROPERTY_EXTENSION_PREFIX)) {
+                for (var extension : property.getValue().toString().split(",")) {
+                    extension = extension.trim();
+                    if (!extension.isBlank()) {
+                        extensions_.add(extension);
+                    }
+                }
+            }
+        }
+        // check whether extension sources or javadoc should be downloaded
+        downloadExtensionSources_ = Boolean.parseBoolean(wrapperProperties_.getProperty(PROPERTY_DOWNLOAD_EXTENSION_SOURCES, "false"));
+        downloadExtensionJavadoc_ = Boolean.parseBoolean(wrapperProperties_.getProperty(PROPERTY_DOWNLOAD_EXTENSION_JAVADOC, "false"));
+    }
+
+    /**
+     * Returns the set of extension repositories.
+     *
+     * @return the set of extension repositories
+     * @since 2.0
+     */
+    public Set<String> repositories() {
+        return repositories_;
+    }
+
+    /**
+     * Returns the set of extensions.
+     *
+     * @return the set of extensions
+     * @since 2.0
+     */
+    public Set<String> extensions() {
+        return extensions_;
+    }
+
+    public File wrapperPropertiesFile() {
+        return wrapperPropertiesFile_;
+    }
+
     private void addClassToJar(JarOutputStream jar, Class klass)
     throws IOException {
         addFileToJar(jar, klass.getName().replace('.', '/') + ".class");
@@ -328,50 +413,6 @@ public class Wrapper {
         return Path.of(currentDir_.getAbsolutePath(), "lib", "bld", path).toFile();
     }
 
-    private void initWrapperProperties(String version)
-    throws IOException {
-        // ensure required properties are available
-        wrapperProperties_.put(PROPERTY_REPOSITORIES, MAVEN_CENTRAL);
-        wrapperProperties_.put(BLD_PROPERTY_VERSION, version);
-
-        // retrieve properties from possible locations
-        var config = libBldDirectory(WRAPPER_PROPERTIES);
-        if (config.exists()) {
-            wrapperPropertiesFile_ = config;
-            wrapperProperties_.load(new FileReader(config));
-        } else {
-            config = libDirectory(WRAPPER_PROPERTIES);
-            if (config.exists()) {
-                wrapperPropertiesFile_ = config;
-                wrapperProperties_.load(new FileReader(config));
-            }
-        }
-
-        // extract repositories
-        if (wrapperProperties_.containsKey(PROPERTY_REPOSITORIES)) {
-            for (var repository : wrapperProperties_.getProperty(PROPERTY_REPOSITORIES).split(",")) {
-                repository = repository.trim();
-                if (!repository.isBlank()) {
-                    repositories_.add(repository);
-                }
-            }
-        }
-        // extract wrapper extension specifications
-        for (var property : wrapperProperties_.entrySet()) {
-            if (property.getKey().toString().startsWith(PROPERTY_EXTENSION_PREFIX)) {
-                for (var extension : property.getValue().toString().split(",")) {
-                    extension = extension.trim();
-                    if (!extension.isBlank()) {
-                        extensions_.add(extension);
-                    }
-                }
-            }
-        }
-        // check whether extension sources or javadoc should be downloaded
-        downloadExtensionSources_ = Boolean.parseBoolean(wrapperProperties_.getProperty(PROPERTY_DOWNLOAD_EXTENSION_SOURCES, "false"));
-        downloadExtensionJavadoc_ = Boolean.parseBoolean(wrapperProperties_.getProperty(PROPERTY_DOWNLOAD_EXTENSION_JAVADOC, "false"));
-    }
-
     private String getWrapperVersion()
     throws IOException {
         return wrapperProperties_.getProperty(BLD_PROPERTY_VERSION, getVersion());

src/test/java/rife/bld/operations/TestDependencyTreeOperation.java

@@ -5,8 +5,10 @@
 package rife.bld.operations;
 
 import org.junit.jupiter.api.Test;
+import rife.bld.BldVersion;
 import rife.bld.WebProject;
 import rife.bld.dependencies.*;
+import rife.bld.wrapper.Wrapper;
 import rife.tools.FileUtils;
 import rife.tools.StringUtils;
 
@@ -82,6 +84,9 @@ public class TestDependencyTreeOperation {
             var tree = operation.dependencyTree();
 
             assertEquals(StringUtils.convertLineSeparator("""
+                extensions:
+                no dependencies
+                
                 compile:
                 ├─ com.uwyn.rife2:rife2:1.5.20
                 ├─ com.stripe:stripe-java:20.136.0
@@ -154,6 +159,9 @@ public class TestDependencyTreeOperation {
             var tree = operation.dependencyTree();
 
             assertEquals(StringUtils.convertLineSeparator("""
+                extensions:
+                no dependencies
+                
                 compile:
                 no dependencies
                                 
@@ -231,6 +239,9 @@ public class TestDependencyTreeOperation {
             var tree = operation.dependencyTree();
 
             assertEquals(StringUtils.convertLineSeparator("""
+                extensions:
+                no dependencies
+                
                 compile:
                 ├─ com.uwyn.rife2:rife2:1.5.20
                 ├─ com.stripe:stripe-java:20.136.0
@@ -307,6 +318,9 @@ public class TestDependencyTreeOperation {
             var tree = operation.dependencyTree();
 
             assertEquals(StringUtils.convertLineSeparator("""
+                extensions:
+                no dependencies
+                
                 compile:
                 no dependencies
                                 
@@ -347,4 +361,144 @@ public class TestDependencyTreeOperation {
             FileUtils.deleteDirectory(tmp);
         }
     }
+
+    @Test
+    void testFromProjectExtensions()
+    throws Exception {
+        var tmp = Files.createTempDirectory("test").toFile();
+        try {
+            var project = new TestProject(tmp);
+            project.createProjectStructure();
+
+            var wrapper = new Wrapper();
+            wrapper.currentDir(tmp);
+            wrapper.createWrapperFiles(project.libBldDirectory(), BldVersion.getVersion());
+            wrapper.initWrapperProperties(BldVersion.getVersion());
+            var properties = FileUtils.readString(wrapper.wrapperPropertiesFile());
+            properties = StringUtils.replace(properties, "bld.extensions=", """
+                bld.extension-antlr=com.uwyn.rife2:bld-antlr4:1.2.8
+                bld.extension-archive=com.uwyn.rife2:bld-archive:0.4.8
+                bld.extension-tests=com.uwyn.rife2:bld-tests-badge:1.4.8""");
+            FileUtils.writeString(properties, wrapper.wrapperPropertiesFile());
+
+            project.repositories().add(Repository.MAVEN_CENTRAL);
+            project.dependencies().scope(Scope.compile)
+                .include(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,5,20)))
+                .include(new Dependency("com.stripe", "stripe-java", new VersionNumber(20,136,0)))
+                .include(new Dependency("org.json", "json", new VersionNumber(20230227)))
+                .include(new Dependency("com.itextpdf", "itext7-core", new VersionNumber(7,2,5)))
+                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2,0,7)))
+                .include(new Dependency("org.apache.thrift", "libthrift", new VersionNumber(0,17,0)))
+                .include(new Dependency("commons-codec", "commons-codec", new VersionNumber(1,15)))
+                .include(new Dependency("org.apache.httpcomponents", "httpcore", new VersionNumber(4,4,16)))
+                .include(new Dependency("com.google.zxing", "javase", new VersionNumber(3,5,1)));
+            project.dependencies().scope(Scope.runtime)
+                .include(new Dependency("org.postgresql", "postgresql", new VersionNumber(42,6,0)));
+            project.dependencies().scope(Scope.provided)
+                .include(new Dependency("org.jsoup", "jsoup", new VersionNumber(1,16,1)))
+                .include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(5,0,0)))
+                .include(new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11,0,15)).exclude("*", "jetty-jakarta-servlet-api"))
+                .include(new Dependency("org.eclipse.jetty", "jetty-servlet", new VersionNumber(11,0,15)).exclude("*", "jetty-jakarta-servlet-api"))
+                .include(new Dependency("org.apache.tomcat.embed", "tomcat-embed-core", new VersionNumber(10,1,12)))
+                .include(new Dependency("org.apache.tomcat.embed", "tomcat-embed-jasper", new VersionNumber(10,1,12)))
+                .include(new Dependency("net.imagej", "ij", VersionNumber.parse("1.54d")));
+            project.dependencies().scope(Scope.test)
+                .include(new Dependency("org.jsoup", "jsoup", new VersionNumber(1,16,1)))
+                .include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(5,0,0)))
+                .include(new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11,0,15)).exclude("*", "jetty-jakarta-servlet-api"))
+                .include(new Dependency("org.eclipse.jetty", "jetty-servlet", new VersionNumber(11,0,15)).exclude("*", "jetty-jakarta-servlet-api"))
+                .include(new Dependency("net.imagej", "ij", VersionNumber.parse("1.54d")));
+
+            var operation = new DependencyTreeOperation()
+                .fromProject(project);
+
+            operation.execute();
+
+            var tree = operation.dependencyTree();
+
+            assertEquals(StringUtils.convertLineSeparator("""
+                extensions:
+                ├─ com.uwyn.rife2:bld-antlr4:1.2.8
+                │  ├─ com.uwyn.rife2:bld:1.9.1
+                │  └─ org.antlr:antlr4:4.11.1
+                │     ├─ org.antlr:antlr4-runtime:4.11.1
+                │     ├─ org.antlr:antlr-runtime:3.5.3
+                │     ├─ org.antlr:ST4:4.3.4
+                │     ├─ org.abego.treelayout:org.abego.treelayout.core:1.0.3
+                │     ├─ org.glassfish:javax.json:1.1.4
+                │     └─ com.ibm.icu:icu4j:71.1
+                ├─ com.uwyn.rife2:bld-tests-badge:1.4.8
+                └─ com.uwyn.rife2:bld-archive:0.4.8
+                   └─ org.apache.commons:commons-compress:1.26.1
+                      ├─ commons-codec:commons-codec:1.16.1
+                      ├─ commons-io:commons-io:2.15.1
+                      └─ org.apache.commons:commons-lang3:3.14.0
+                
+                compile:
+                ├─ com.uwyn.rife2:rife2:1.5.20
+                ├─ com.stripe:stripe-java:20.136.0
+                ├─ org.json:json:20230227
+                ├─ com.itextpdf:itext7-core:7.2.5
+                │  ├─ com.itextpdf:barcodes:7.2.5
+                │  ├─ com.itextpdf:font-asian:7.2.5
+                │  ├─ com.itextpdf:forms:7.2.5
+                │  ├─ com.itextpdf:hyph:7.2.5
+                │  ├─ com.itextpdf:io:7.2.5
+                │  │  └─ com.itextpdf:commons:7.2.5
+                │  ├─ com.itextpdf:kernel:7.2.5
+                │  │  ├─ org.bouncycastle:bcpkix-jdk15on:1.70
+                │  │  │  └─ org.bouncycastle:bcutil-jdk15on:1.70
+                │  │  └─ org.bouncycastle:bcprov-jdk15on:1.70
+                │  ├─ com.itextpdf:layout:7.2.5
+                │  ├─ com.itextpdf:pdfa:7.2.5
+                │  ├─ com.itextpdf:sign:7.2.5
+                │  ├─ com.itextpdf:styled-xml-parser:7.2.5
+                │  └─ com.itextpdf:svg:7.2.5
+                ├─ org.slf4j:slf4j-simple:2.0.7
+                │  └─ org.slf4j:slf4j-api:2.0.7
+                ├─ org.apache.thrift:libthrift:0.17.0
+                ├─ commons-codec:commons-codec:1.15
+                ├─ org.apache.httpcomponents:httpcore:4.4.16
+                └─ com.google.zxing:javase:3.5.1
+                   ├─ com.google.zxing:core:3.5.1
+                   └─ com.beust:jcommander:1.82
+                                
+                provided:
+                ├─ org.jsoup:jsoup:1.16.1
+                ├─ jakarta.servlet:jakarta.servlet-api:5.0.0
+                ├─ org.eclipse.jetty:jetty-server:11.0.15
+                │  ├─ org.eclipse.jetty:jetty-http:11.0.15
+                │  │  └─ org.eclipse.jetty:jetty-util:11.0.15
+                │  ├─ org.eclipse.jetty:jetty-io:11.0.15
+                │  └─ org.slf4j:slf4j-api:2.0.5
+                ├─ org.eclipse.jetty:jetty-servlet:11.0.15
+                │  └─ org.eclipse.jetty:jetty-security:11.0.15
+                ├─ org.apache.tomcat.embed:tomcat-embed-core:10.1.12
+                │  └─ org.apache.tomcat:tomcat-annotations-api:10.1.12
+                ├─ org.apache.tomcat.embed:tomcat-embed-jasper:10.1.12
+                │  ├─ org.apache.tomcat.embed:tomcat-embed-el:10.1.12
+                │  └─ org.eclipse.jdt:ecj:3.33.0
+                └─ net.imagej:ij:1.54d
+                                
+                runtime:
+                └─ org.postgresql:postgresql:42.6.0
+                   └─ org.checkerframework:checker-qual:3.31.0
+                                
+                test:
+                ├─ org.jsoup:jsoup:1.16.1
+                ├─ jakarta.servlet:jakarta.servlet-api:5.0.0
+                ├─ org.eclipse.jetty:jetty-server:11.0.15
+                │  ├─ org.eclipse.jetty:jetty-http:11.0.15
+                │  │  └─ org.eclipse.jetty:jetty-util:11.0.15
+                │  ├─ org.eclipse.jetty:jetty-io:11.0.15
+                │  └─ org.slf4j:slf4j-api:2.0.5
+                ├─ org.eclipse.jetty:jetty-servlet:11.0.15
+                │  └─ org.eclipse.jetty:jetty-security:11.0.15
+                └─ net.imagej:ij:1.54d
+                
+                """), tree);
+        } finally {
+            FileUtils.deleteDirectory(tmp);
+        }
+    }
 }