removed dependencies level

Author: aloubyansky

core/deployment/src/main/java/io/quarkus/deployment/pkg/PackageConfig.java

@@ -183,33 +183,26 @@ interface JarConfig {
         boolean addRunnerSuffix();
 
         /**
-         * Whether to perform class reachability analysis and exclude non-reachable content
+         * Whether to perform class reachability analysis and exclude non-reachable classes
          * from the produced JAR.
          * <ul>
          * <li>{@code none} - No analysis or exclusion is performed.</li>
-         * <li>{@code dependencies} - Exclude entirely unused dependencies but keep all classes
-         * within used dependencies.</li>
-         * <li>{@code classes} - Exclude entirely unused dependencies and also exclude non-reachable
-         * classes from used dependencies.</li>
+         * <li>{@code classes} - Exclude non-reachable classes from dependencies.</li>
          * </ul>
          */
         @WithDefault("classes")
         TreeShakeLevel treeShake();
 
         /**
-         * The level of dependency tree shaking to apply.
+         * The level of tree shaking to apply.
          */
         enum TreeShakeLevel {
             /**
              * No analysis or exclusion is performed.
              */
             NONE,
             /**
-             * Exclude entirely unused dependencies.
-             */
-            DEPENDENCIES,
-            /**
-             * Exclude entirely unused dependencies and non-reachable classes from used dependencies.
+             * Exclude non-reachable classes from dependencies.
              */
             CLASSES
         }

core/deployment/src/main/java/io/quarkus/deployment/pkg/builditem/JarTreeShakeBuildItem.java

@@ -12,22 +12,18 @@
 /**
  * Build item that holds the results of dependency usage analysis for tree shaking.
  * Contains the tree shake level, the set of reachable class names (dot-separated),
- * the set of artifact keys for dependencies that have at least one reachable class,
  * and the sorted list of removed class resource paths per dependency.
  */
 public final class JarTreeShakeBuildItem extends SimpleBuildItem {
 
     private final TreeShakeLevel level;
     private final Set<String> reachableClassNames;
-    private final Set<ArtifactKey> usedDependencies;
     private final Map<ArtifactKey, List<String>> removedClasses;
 
     public JarTreeShakeBuildItem(TreeShakeLevel level, Set<String> reachableClassNames,
-            Set<ArtifactKey> usedDependencies,
             Map<ArtifactKey, List<String>> removedClasses) {
         this.level = level;
         this.reachableClassNames = reachableClassNames;
-        this.usedDependencies = usedDependencies;
         this.removedClasses = removedClasses;
     }
 
@@ -42,13 +38,6 @@ public Set<String> getReachableClassNames() {
         return reachableClassNames;
     }
 
-    /**
-     * @return artifact keys of dependencies that have at least one reachable class
-     */
-    public Set<ArtifactKey> getUsedDependencies() {
-        return usedDependencies;
-    }
-
     /**
      * @return sorted list of removed class resource paths (e.g. "com/example/Foo.class") per dependency
      */

core/deployment/src/main/java/io/quarkus/deployment/pkg/jar/AbstractFastJarBuilder.java

@@ -232,14 +232,6 @@ public JarBuildItem build() throws IOException {
         }
         final Map<ArtifactKey, List<Path>> copiedArtifacts = new HashMap<>();
         for (ResolvedDependency appDep : curateOutcome.getApplicationModel().getRuntimeDependencies()) {
-            // When tree shake level is DEPENDENCIES, skip entirely unused dependencies.
-            // At CLASSES level, keep all dependencies (only remove individual classes)
-            // since they may still contribute non-class resources.
-            if (treeShakeResult.getLevel() == PackageConfig.JarConfig.TreeShakeLevel.DEPENDENCIES
-                    && !treeShakeResult.getUsedDependencies().contains(appDep.getKey())) {
-                LOG.debugf("Tree shake: skipping unused dependency %s", appDep.getKey());
-                continue;
-            }
             if (!rebuild) {
                 copyDependency(parentFirstArtifactKeys, outputTarget, copiedArtifacts, mainLib, baseLib,
                         fastJarJarsBuilder::addDependency, fastJarJarsBuilder::addParentFirstDependency, true,

core/deployment/src/main/java/io/quarkus/deployment/pkg/jar/UberJarBuilder.java

@@ -140,12 +140,6 @@ public JarBuildItem build() throws IOException {
                         .build())
                 .setRunnerPath(runnerJar);
         for (ResolvedDependency dep : curateOutcome.getApplicationModel().getDependencies()) {
-            // At DEPENDENCIES level, unused deps are not packaged — exclude from manifest
-            if (treeShakeResult.getLevel() == PackageConfig.JarConfig.TreeShakeLevel.DEPENDENCIES
-                    && dep.isRuntimeCp()
-                    && !treeShakeResult.getUsedDependencies().contains(dep.getKey())) {
-                continue;
-            }
             final ApplicationComponent.Builder comp = ApplicationComponent.builder()
                     .setResolvedDependency(dep);
             if (!dep.getResolvedPaths().isEmpty()) {
@@ -200,15 +194,6 @@ private void buildUberJar0(Path runnerJar) throws IOException {
                     continue;
                 }
 
-                // When tree shake level is DEPENDENCIES, skip entirely unused dependencies.
-                // At CLASSES level, keep all dependencies (only remove individual classes)
-                // since they may still contribute non-class resources.
-                if (treeShakeResult.getLevel() == PackageConfig.JarConfig.TreeShakeLevel.DEPENDENCIES
-                        && !treeShakeResult.getUsedDependencies().contains(appDep.getKey())) {
-                    LOG.debugf("Tree shake: skipping unused dependency %s", appDep.getKey());
-                    continue;
-                }
-
                 for (Path resolvedDep : appDep.getResolvedPaths()) {
                     Set<String> transformedFilesByJar = transformedClasses.getTransformedFilesByJar().get(resolvedDep);
                     if (transformedFilesByJar != null) {

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarTreeShakeProcessor.java

@@ -32,7 +32,7 @@ void analyzeReachableClasses(
         if (treeShakeLevel == PackageConfig.JarConfig.TreeShakeLevel.NONE
                 || packageConfig.jar().type() == PackageConfig.JarConfig.JarType.MUTABLE_JAR) {
             treeShakeProducer
-                    .produce(new JarTreeShakeBuildItem(PackageConfig.JarConfig.TreeShakeLevel.NONE, Set.of(), Set.of(),
+                    .produce(new JarTreeShakeBuildItem(PackageConfig.JarConfig.TreeShakeLevel.NONE, Set.of(),
                             Map.of()));
             return;
         }

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarTreeShaker.java

@@ -18,7 +18,6 @@
 import java.util.Map;
 import java.util.Queue;
 import java.util.Set;
-import java.util.TreeMap;
 import java.util.function.Supplier;
 
 import org.jboss.logging.Logger;
@@ -56,7 +55,6 @@ class JarTreeShaker {
 
     private final Map<String, Supplier<byte[]>> appBytecode = new HashMap<>();
     private final Map<String, ArtifactKey> classToDep = new HashMap<>();
-    private final Map<ArtifactKey, Integer> depClassCount = new HashMap<>();
     private final Map<String, Set<String>> serviceProviders = new HashMap<>();
     private final Map<String, Set<String>> serviceLoaderCalls = new HashMap<>();
     private final Set<String> sisuNamedClasses = new HashSet<>();
@@ -163,24 +161,6 @@ private JarTreeShakeBuildItem runInternal() {
         }
 
         // Report
-
-        // Determine which dependencies have reachable classes
-        final Map<ArtifactKey, Integer> depReachableCount = countReachableClasses(reachable);
-
-        final Set<ArtifactKey> usedDeps = new HashSet<>();
-        final Map<ArtifactKey, int[]> usedDepsReport = new TreeMap<>(Comparator.comparing(ArtifactKey::toString));
-        int unusedCount = 0;
-        for (ResolvedDependency dep : appModel.getRuntimeDependencies()) {
-            final ArtifactKey key = dep.getKey();
-            int reached = depReachableCount.getOrDefault(key, 0);
-            if (reached > 0) {
-                usedDeps.add(key);
-                usedDepsReport.put(key, new int[] { reached, depClassCount.getOrDefault(key, 0) });
-            } else {
-                unusedCount++;
-            }
-        }
-
         log.info("============================================================");
         log.info("  Tree Shake: Dependency Usage Analysis");
         log.info("============================================================");
@@ -190,21 +170,16 @@ private JarTreeShakeBuildItem runInternal() {
                 removedClassCount,
                 totalDepClasses > 0 ? (removedClassCount * 100.0 / totalDepClasses) : 0.0,
                 formatSize(removedBytes));
-        log.infof("  Used dependencies       : %d", usedDeps.size());
-        log.infof("  Unused dependencies     : %d", unusedCount);
         log.info("------------------------------------------------------------");
         log.info("  DEPENDENCIES WITH REMOVED CLASSES:");
-        for (var entry : usedDepsReport.entrySet()) {
-            int[] counts = entry.getValue();
-            if (counts[0] < counts[1]) {
-                log.infof("    - %s  (%d / %d classes removed)",
-                        entry.getKey().toGacString(), counts[1] - counts[0], counts[1]);
-            }
-        }
+        removedClassesPerDep.entrySet().stream()
+                .sorted(Map.Entry.comparingByKey(Comparator.comparing(ArtifactKey::toGacString)))
+                .forEach(e -> log.infof("    - %s  (%d classes removed)",
+                        e.getKey().toGacString(), e.getValue().size()));
         log.info("============================================================");
         log.infof("Done in %s", (System.currentTimeMillis() - start));
 
-        return new JarTreeShakeBuildItem(treeShakeLevel, reachable, usedDeps, removedClassesPerDep);
+        return new JarTreeShakeBuildItem(treeShakeLevel, reachable, removedClassesPerDep);
     }
 
     private void collectRuntimeClasses() {
@@ -216,7 +191,6 @@ private void collectRuntimeClasses() {
             // Add all classes from quarkus-bootstrap-runner as roots (fast-jar runtime infrastructure)
             final boolean addClassesAsRoots = "quarkus-bootstrap-runner".equals(dep.getArtifactId());
 
-            final int[] classCount = new int[1];
             // Use walkRaw to get all entries including multi-release versions.
             // For multi-release entries, we pick the highest version <= appJavaVersion,
             // matching what JarFile.runtimeVersion() resolves at runtime.
@@ -254,7 +228,6 @@ private void collectRuntimeClasses() {
                     int currentVersion = depBytecodeVersion.getOrDefault(className, -1);
                     if (currentVersion < 0) {
                         classToDep.put(className, dep.getKey());
-                        classCount[0]++;
                     }
                     if (classJavaVersion > currentVersion) {
                         depBytecodeVersion.put(className, classJavaVersion);
@@ -283,7 +256,6 @@ private void collectRuntimeClasses() {
                     parseSisuNamedFile(visit.getPath());
                 }
             });
-            depClassCount.put(dep.getKey(), classCount[0]);
         }
     }
 
@@ -357,17 +329,6 @@ private void addStringClassReferenceRoots(Set<String> allKnownClasses) {
         }
     }
 
-    private Map<ArtifactKey, Integer> countReachableClasses(Set<String> reachable) {
-        final Map<ArtifactKey, Integer> depReachableCount = new HashMap<>();
-        for (String className : reachable) {
-            ArtifactKey dep = classToDep.get(className);
-            if (dep != null) {
-                depReachableCount.merge(dep, 1, Integer::sum);
-            }
-        }
-        return depReachableCount;
-    }
-
     private OpenPathTree openPathTree(ResolvedDependency dep) {
         var openPathTree = dep.getContentTree().open();
         openTrees.add(openPathTree);