fix: Repository#collectDependency includes the processing project.

teletha · Dec 9, 2021 · 0ebc7fc · 0ebc7fc
1 parent eb8377a
commit 0ebc7fc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/main/java/bee/api/Project.java b/src/main/java/bee/api/Project.java
@@ -765,6 +765,15 @@ protected final void versionControlSystem(String uri) {
         }
     }
 
+    /**
+     * Convert this project to {@link Library}.
+     * 
+     * @return
+     */
+    public final Library asLibrary() {
+        return new Library(getGroup(), getProduct(), getVersion());
+    }
+
     /**
      * {@inheritDoc}
      */

diff --git a/src/main/java/bee/api/Repository.java b/src/main/java/bee/api/Repository.java
@@ -232,13 +232,7 @@ private Set<Library> collectDependency(Project project, Scope[] scopes, Set<Libr
                 }));
 
                 for (ArtifactResult dependency : result.getArtifactResults()) {
-                    Artifact artifact = dependency.getArtifact();
-
-                    // exclude itself
-                    if (!artifact.getGroupId().equalsIgnoreCase(project.getGroup()) || !artifact.getArtifactId()
-                            .equalsIgnoreCase(project.getProduct())) {
-                        set.add(new Library(artifact));
-                    }
+                    set.add(new Library(dependency.getArtifact()));
                 }
             } catch (Exception e) {
                 throw I.quiet(e);

diff --git a/src/main/java/bee/task/Eclipse.java b/src/main/java/bee/task/Eclipse.java
@@ -139,13 +139,13 @@ private void createClasspath(File file) {
         });
 
         // library
-        List<Library> libraries = I.signal(project.getDependency(Scope.Compile))
-                .concat(I.signal(project.getDependency(Scope.Annotation)))
-                .toList();
+        List<Library> libraries = I.signal(project.getDependency(Scope.Compile, Scope.Annotation)).toList();
+        libraries.remove(project.asLibrary());
 
         // test library
         Set<Library> tests = project.getDependency(Scope.Test);
         tests.removeAll(libraries);
+        tests.remove(project.asLibrary());
 
         for (Library library : tests) {
             File jar = library.getLocalJar();