fix conflict

HaoZhang · HaoZhang · commit 51c2b441df20 · 2025-12-09T20:04:20.000+08:00
Signed-off-by: HaoZhang &lt;haozhan@microsoft.com&gt;
diff --git a/test/apis/component_recognizer_test.go b/test/apis/component_recognizer_test.go
@@ -132,6 +132,10 @@ func TestComponentDetectionOnSpring(t *testing.T) {
 	isComponentsInProject(t, "spring", 1, "java", "spring")
 }
 
+func TestComponentDetectionOnSpringCloud(t *testing.T) {
+	isComponentsInProject(t, "spring-cloud", 1, "java", "spring-cloud")
+}
+
 func TestComponentDetectionOnVertx(t *testing.T) {
 	isComponentsInProject(t, "vertx", 1, "java", "http-vertx")
 }

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,10 @@ func TestComponentDetectionOnSpring(t *testing.T) {`
`132`	`132`	`isComponentsInProject(t, "spring", 1, "java", "spring")`
`133`	`133`	`}`
`134`	`134`
	`135`	`+func TestComponentDetectionOnSpringCloud(t *testing.T) {`
	`136`	`+ isComponentsInProject(t, "spring-cloud", 1, "java", "spring-cloud")`
	`137`	`+}`
	`138`	`+`
`135`	`139`	`func TestComponentDetectionOnVertx(t *testing.T) {`
`136`	`140`	`isComponentsInProject(t, "vertx", 1, "java", "http-vertx")`
`137`	`141`	`}`