Prefer Class-File API on Java 24 or above

.github/workflows/release-docs.yml

@@ -27,7 +27,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: "zulu"
-          java-version: 21
+          java-version: 25
 
       - name: Maven
         uses: stCarolas/setup-maven@v5

.github/workflows/release-to-maven-central.yml

@@ -25,7 +25,7 @@ jobs:
         uses: actions/setup-java@v5
         with: # overwrite settings.xml
           distribution: "zulu"
-          java-version: 21
+          java-version: 25
           server-id: central
           server-username: MAVEN_CENTRAL_USERNAME
           server-password: MAVEN_CENTRAL_PASSWORD

pom.xml

@@ -237,6 +237,18 @@
         </configuration>
       </plugin>
 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Multi-Release>true</Multi-Release>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+
       <plugin>
         <groupId>org.sonatype.central</groupId>
         <artifactId>central-publishing-maven-plugin</artifactId>
@@ -259,6 +271,13 @@
             </goals>
             <configuration>
               <minimizeJar>true</minimizeJar>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <manifestEntries>
+                    <Multi-Release>true</Multi-Release>
+                  </manifestEntries>
+                </transformer>
+              </transformers>
               <filters>
                 <filter>
                   <artifact>*:*</artifact>
@@ -342,6 +361,12 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
+        <configuration>
+          <excludes>
+<!--            TODO: https://github.com/jacoco/jacoco/issues/407-->
+            <exclude>META-INF/versions/**</exclude>
+          </excludes>
+        </configuration>
         <executions>
           <execution>
             <id>agent</id>
@@ -484,6 +509,45 @@
   </reporting>
 
   <profiles>
+    <profile>
+      <id>java24-tests</id>
+      <activation>
+        <jdk>[24,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>compile-java-24</id>
+                <goals>
+                  <goal>compile</goal>
+                </goals>
+                <configuration>
+                  <compileSourceRoots>
+                    <compileSourceRoot>${project.basedir}/src/main/java24</compileSourceRoot>
+                  </compileSourceRoots>
+                  <outputDirectory>${project.build.outputDirectory}/META-INF/versions/24</outputDirectory>
+                  <release>24</release>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <classesDirectory>${project.build.outputDirectory}/META-INF/versions/24</classesDirectory>
+              <additionalClasspathElements>
+                <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
+              </additionalClasspathElements>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>release</id>
       <build>

src/main/java/org/vafer/jdependency/Clazzpath.java

@@ -32,12 +32,11 @@
 import java.util.zip.ZipEntry;
 
 import org.apache.commons.io.input.MessageDigestInputStream;
-import org.objectweb.asm.ClassReader;
+import org.vafer.jdependency.utils.DependencyUtils;
 import static org.apache.commons.io.FilenameUtils.normalize;
 import static org.apache.commons.io.FilenameUtils.separatorsToUnix;
 
 import org.vafer.jdependency.Clazz.ParsedFileName;
-import org.vafer.jdependency.asm.DependenciesClassAdapter;
 
 import static org.vafer.jdependency.Clazz.parseClassFileName;
 import static org.vafer.jdependency.utils.StreamUtils.asStream;
@@ -173,8 +172,7 @@ private ClazzpathUnit addClazzpathUnit( final Iterable<Resource> resources, fina
                     inputStream = calculatingInputStream;
                 }
 
-                final DependenciesClassAdapter v = new DependenciesClassAdapter();
-                new ClassReader(inputStream).accept(v, ClassReader.EXPAND_FRAMES | ClassReader.SKIP_DEBUG);
+                final Set<String> depNames = DependencyUtils.getDependenciesOfClass(inputStream);
 
                 // get or create clazz
                 final String clazzName = resource.name;
@@ -201,7 +199,6 @@ private ClazzpathUnit addClazzpathUnit( final Iterable<Resource> resources, fina
 
 
                 // iterate through all dependencies
-                final Set<String> depNames = v.getDependencies();
                 for (String depName : depNames) {
 
                     Clazz dep = getClazz(depName);

src/main/java24/org/vafer/jdependency/utils/DependencyUtils.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2010-2024 The jdependency developers.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.vafer.jdependency.utils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Set;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.constantpool.ClassEntry;
+import java.lang.classfile.constantpool.PoolEntry;
+import java.lang.classfile.constantpool.Utf8Entry;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * internal - do not use
+ */
+public final class DependencyUtils {
+
+    private DependencyUtils() {}
+
+    private static final Pattern DESCRIPTOR_PATTERN = Pattern.compile("L([a-zA-Z0-9_/\\$]+);");
+
+    public static Set<String> getDependenciesOfClass(final InputStream pInputStream) throws IOException {
+        final byte[] bytes = pInputStream.readAllBytes();
+        final ClassModel classModel = ClassFile.of().parse(bytes);
+        final Set<String> dependencies = new HashSet<>();
+        for (PoolEntry entry : classModel.constantPool()) {
+            if (entry instanceof ClassEntry classEntry) {
+                String className = classEntry.asInternalName().replace('/', '.');
+                if (className.startsWith("[")) {
+                    Matcher m = DESCRIPTOR_PATTERN.matcher(classEntry.asInternalName());
+                    while (m.find()) {
+                        dependencies.add(m.group(1).replace('/', '.'));
+                    }
+                } else {
+                    dependencies.add(className);
+                }
+            } else if (entry instanceof Utf8Entry utf8Entry) {
+                String str = utf8Entry.stringValue();
+                if (str.indexOf('L') != -1 && str.indexOf(';') != -1) {
+                    Matcher m = DESCRIPTOR_PATTERN.matcher(str);
+                    while (m.find()) {
+                        dependencies.add(m.group(1).replace('/', '.'));
+                    }
+                }
+            }
+        }
+        return dependencies;
+    }
+
+    public static Set<String> getDependenciesOfClass(final Class<?> pClass) throws IOException {
+        final String resource = "/" + pClass.getName().replace('.', '/') + ".class";
+        return getDependenciesOfClass(pClass.getResourceAsStream(resource));
+    }
+}

src/test/java/org/vafer/jdependency/DependencyUtilsTestCase.java

@@ -18,6 +18,7 @@
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -63,7 +64,7 @@ public void testVersions() {
 
     }
 
-    //@Test
+    @Test
     public void testShouldFindDependenciesOfClassObject() throws Exception {
         final Set<String> dependencies = DependencyUtils.getDependenciesOfClass(Object.class);
         final Set<String> expectedDependencies = new HashSet<String>(Arrays.asList(
@@ -97,17 +98,64 @@ public void testShouldFindDependenciesOfClassObject() throws Exception {
             expectedDependencies.add("jdk.internal.misc.Blocker");
         }
 
+        for (String optionalDep : Arrays.asList("jdk.internal.misc.Blocker", "java.lang.Long", "java.lang.VirtualThread", "java.lang.Thread")) {
+            if (dependencies.contains(optionalDep)) {
+                expectedDependencies.add(optionalDep);
+            } else {
+                expectedDependencies.remove(optionalDep);
+            }
+        }
+
         assertEquals("deps should be the same for jdk " + jdk + " (" + System.getProperty("java.version") + ")",
             expectedDependencies,
             dependencies);
     }
 
-    //@Test
+    @Test
+    public void testShouldFindDependenciesOfTestCaseClass() throws Exception {
+        final Set<String> dependencies = DependencyUtils.getDependenciesOfClass(DependencyUtilsTestCase.class);
+        assertTrue(dependencies.contains("org.vafer.jdependency.utils.DependencyUtils"));
+        assertTrue(dependencies.contains("org.junit.Test"));
+    }
+
+    @Test
     public void testShouldThrowOnInvalidStream() throws Exception {
         assertThrows(IOException.class, () -> {
             final InputStream inputStream = new FileInputStream("nope");
             final Set<String> dependencies = DependencyUtils.getDependenciesOfClass(inputStream);
         });
     }
 
+    private static interface DummyInterface {}
+
+    @Test
+    public void testShouldFindDependenciesOfInterface() throws Exception {
+        final Set<String> dependencies = DependencyUtils.getDependenciesOfClass(DummyInterface.class);
+        assertTrue(dependencies.contains("java.lang.Object"));
+        assertTrue(dependencies.contains("org.vafer.jdependency.DependencyUtilsTestCase$DummyInterface"));
+    }
+
+    @Test
+    public void testShouldThrowOnPrimitiveClass() throws Exception {
+        Exception exception = assertThrows(Exception.class, () -> {
+            DependencyUtils.getDependenciesOfClass(int.class);
+        });
+        assertTrue(exception instanceof NullPointerException || exception instanceof IOException);
+    }
+
+    @Test
+    public void testShouldThrowOnNullClass() throws Exception {
+        assertThrows(NullPointerException.class, () -> {
+            DependencyUtils.getDependenciesOfClass((Class<?>) null);
+        });
+    }
+
+    @Test
+    public void testShouldThrowOnNullStream() throws Exception {
+        Exception exception = assertThrows(Exception.class, () -> {
+            DependencyUtils.getDependenciesOfClass((InputStream) null);
+        });
+        assertTrue(exception instanceof NullPointerException || exception instanceof IOException);
+    }
+
 }