From 5e840d5dd2f2425bbe19d5ba4bcc114acbd5da3d Mon Sep 17 00:00:00 2001
From: luotianqi777 <luotianqi777@gmail.com>
Date: Fri, 24 Mar 2023 15:22:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4mvn=20tree=E4=B8=AD?=
 =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E4=BD=BF=E7=94=A8=E7=9A=84=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 analyzer/java/ext.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/analyzer/java/ext.go b/analyzer/java/ext.go
index afc27df..df283f8 100644
--- a/analyzer/java/ext.go
+++ b/analyzer/java/ext.go
@@ -135,18 +135,22 @@ func buildMvnDepTree(lines []string) *model.DepTree {
 		for line[level*3+2] == ' ' {
 			level++
 		}
-		tops = tops[:len(tops)-lastLevel+level-1]
 		root = tops[len(tops)-1]
 		tags := strings.Split(line[level*3:], ":")
 		if len(tags) < 4 {
 			logs.Error(errors.New("mvn parse error"))
 			break
 		}
+		scope := tags[len(tags)-1]
+		if scope == "test" || scope == "provided" {
+			continue
+		}
 		dep := model.NewDepTree(root)
 		dep.Vendor = tags[0]
 		dep.Name = tags[1]
 		dep.Version = model.NewVersion(tags[3])
 		dep.Language = language.Java
+		tops = tops[:len(tops)-lastLevel+level-1]
 		tops = append(tops, dep)
 		lastLevel = level
 	}
-- 
Gitee


From 1fc83cdf5a31072a2a52d7722f75e3276dffeecf Mon Sep 17 00:00:00 2001
From: luotianqi777 <luotianqi777@gmail.com>
Date: Mon, 10 Apr 2023 11:11:03 +0800
Subject: [PATCH 2/2] fix mvn parse error

---
 analyzer/java/ext.go | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/analyzer/java/ext.go b/analyzer/java/ext.go
index df283f8..5d16001 100644
--- a/analyzer/java/ext.go
+++ b/analyzer/java/ext.go
@@ -21,8 +21,6 @@ import (
 	"util/logs"
 	"util/model"
 	"util/temp"
-
-	"github.com/pkg/errors"
 )
 
 // MvnDepTree 调用mvn解析项目获取依赖树
@@ -138,8 +136,7 @@ func buildMvnDepTree(lines []string) *model.DepTree {
 		root = tops[len(tops)-1]
 		tags := strings.Split(line[level*3:], ":")
 		if len(tags) < 4 {
-			logs.Error(errors.New("mvn parse error"))
-			break
+			continue
 		}
 		scope := tags[len(tags)-1]
 		if scope == "test" || scope == "provided" {
-- 
Gitee