Merge upstream/main into fix/nodejs-referenced-import-search

Resolved conflict in nodejs/service_client.go by keeping the import-based
search implementation which supersedes the previous file batching optimization
from PR konveyor#970.

The import-based search provides better semantic accuracy by:
- Finding imports first (regex scan)
- Using LSP definitions to locate symbols
- Using LSP references to find all usages

This is fundamentally different from and more accurate than the workspace/symbol
approach that was being optimized in the upstream changes.

Signed-off-by: Todd Sanders <[email protected]>
Signed-off-by: tsanders <[email protected]>

Author: tsanders-rh

.github/workflows/benchmark.yml

@@ -37,10 +37,35 @@ jobs:
         go install golang.org/x/perf/cmd/benchstat@latest
         go mod tidy
         GOMAXPROCS=2 go test -run=^$ -bench=. -benchmem -count=6 $(go list ./... | grep -v 'event') |\
-          sed -e 's/cpu:.*/cpu:/g' -e 's/goarch:.*/goarch:/g' > benchmark_results
+          sed -e 's/cpu:.*/cpu:/g' -e 's/goarch:.*/goarch:/g' > benchmark_results.${{ matrix.os.name }}
 
     - name: Display Benchstat results
       shell: bash
       run: |
-        benchstat ./benchmarks/${{ matrix.os.name }} benchmark_results > benchmark.diff
+        benchstat ./benchmarks/${{ matrix.os.name }} benchmark_results.${{ matrix.os.name }} > benchmark.diff
         ./benchmarks/compare.sh benchmark.diff
+
+    - name: Upload benchmark results
+      uses: actions/upload-artifact@v4
+      if: always()
+      with:
+        name: benchmark-results-${{ matrix.os.name }}
+        path: benchmark_results.${{ matrix.os.name }}
+
+  combine-results:
+    runs-on: ubuntu-latest
+    needs: benchmark
+    if: always()
+    
+    steps:
+    - name: Download all benchmark results
+      uses: actions/download-artifact@v4
+      with:
+        pattern: benchmark-results-*
+        merge-multiple: true
+    
+    - name: Upload combined benchmark results
+      uses: actions/upload-artifact@v4
+      with:
+        name: benchmark-results-all
+        path: benchmark_results.*

.github/workflows/image-build.yaml

@@ -102,7 +102,7 @@ jobs:
       shell: bash
       run: |
         TAG=${GITHUB_REF_NAME/main/latest}
-        IMAGE_NAME=quay.io/konveyor/analyzer-lsp:${TAG}-windowsservercore-ltsc2022
+        IMAGE_NAME=quay.io/konveyor/analyzer-lsp:${TAG}-windowsservercore-ltsc2025
         docker build -t ${IMAGE_NAME} -f ./Dockerfile.windows .
         docker push ${IMAGE_NAME}
 
@@ -122,7 +122,7 @@ jobs:
       shell: bash
       run: |
         TAG=${GITHUB_REF_NAME/main/latest}
-        IMAGE_NAME=quay.io/konveyor/dotnet-external-provider:${TAG}-windowsservercore-ltsc2022
+        IMAGE_NAME=quay.io/konveyor/dotnet-external-provider:${TAG}-windowsservercore-ltsc2025
         docker build -t ${IMAGE_NAME} -f ./external-providers/dotnet-external-provider/Dockerfile.windows .
         docker push ${IMAGE_NAME}
 
@@ -136,7 +136,7 @@ jobs:
       run: |
         podman manifest create temp
         podman manifest add temp --all quay.io/konveyor/analyzer-lsp:${tag}
-        podman manifest add temp --all quay.io/konveyor/analyzer-lsp:${tag}-windowsservercore-ltsc2022
+        podman manifest add temp --all quay.io/konveyor/analyzer-lsp:${tag}-windowsservercore-ltsc2025
         podman tag temp quay.io/konveyor/analyzer-lsp:${tag}
     - name: Push manifest to Quay
       uses: redhat-actions/push-to-registry@main
@@ -159,7 +159,7 @@ jobs:
       run: |
         podman manifest create temp
         podman manifest add temp --all quay.io/konveyor/dotnet-external-provider:${tag}
-        podman manifest add temp --all quay.io/konveyor/dotnet-external-provider:${tag}-windowsservercore-ltsc2022
+        podman manifest add temp --all quay.io/konveyor/dotnet-external-provider:${tag}-windowsservercore-ltsc2025
         podman tag temp quay.io/konveyor/dotnet-external-provider:${tag}
     - name: Push manifest to Quay
       uses: redhat-actions/push-to-registry@main

.github/workflows/pr-testing.yml

@@ -30,23 +30,46 @@ jobs:
         with:
           go-version: '1.23.9'
 
-      - name: Test
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 17
+          cache: maven
+      
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
+
+      - name: Test Main
         run: go test -v ./...
 
+      - name: Test Java External Provider
+        if: ${{ startsWith(matrix.goos, 'linux') }}
+        run: |
+          make extract-maven-index-files
+          cd external-providers/java-external-provider/
+          go test -v ./...
+      
+      - name: Test Java External Provider
+        if: ${{ !startsWith(matrix.goos, 'linux') }}
+        run: |
+          cd external-providers/java-external-provider/
+          go test -timeout=20m -v -skip 'TestConstructArtifactFromSHA' ./... 
+      
       - name: Build binaries
         env:
           GOOS: ${{ matrix.goos }}
           GOARCH: ${{ matrix.goarch }}
         run: make build
-
+      
       - name: Archive binaries (linux & mac)
         if: ${{ !startsWith(matrix.goos, 'windows') }}
         env:
           OS: ${{ matrix.goos }}
           OS_ARCH: ${{ matrix.goarch }}
         run: |
           zip -j analyzer-lsp-binaries.${{ env.OS }}-${{ env.OS_ARCH }}.zip build/*
-
+      
       - name: Archive binaries (windows)
         if: ${{ startsWith(matrix.goos, 'windows') }}
         env:
@@ -64,4 +87,3 @@ jobs:
           name: analyzer-lsp-binaries.${{ env.OS }}-${{ env.OS_ARCH }}.zip
           path: analyzer-lsp-binaries.${{ env.OS }}-${{ env.OS_ARCH }}.zip
           retention-days: 30
-

.gitignore

@@ -26,5 +26,11 @@ external-providers/generic-external-provider/debug/
 external-providers/dotnet-external-provider/bin/*
 external-providers/dotnet-external-provider/examples/HelloWorld/HelloWorld/bin/*
 external-providers/dotnet-external-provider/examples/HelloWorld/HelloWorld/obj/*
-maven-index.txt
-maven-index.idx
+external-providers/java-external-provider/pkg/java_external_provider/dependency/testdata/maven-index.idx
+external-providers/java-external-provider/pkg/java_external_provider/dependency/testdata/maven-index.txt
+.gradle/
+
+# Go test coverage files
+coverage.out
+*.coverprofile
+...

Dockerfile.windows

@@ -1,4 +1,4 @@
-FROM golang:1.22-windowsservercore-ltsc2022 as builder
+FROM golang:1.25-windowsservercore-ltsc2025 as builder
 WORKDIR /analyzer-lsp
 
 COPY cmd /analyzer-lsp/cmd
@@ -17,7 +17,7 @@ COPY go.sum /analyzer-lsp/go.sum
 
 RUN go build -o konveyor-analyzer.exe ./cmd/analyzer/main.go
 
-FROM mcr.microsoft.com/windows/servercore:ltsc2022
+FROM mcr.microsoft.com/windows/servercore:ltsc2025
 
 # Set the working directory inside the container
 WORKDIR C:/app

Makefile

@@ -104,7 +104,7 @@ run-external-providers-pod:
 	podman build -f demo-local.Dockerfile -t localhost/testing:latest
 
 run-demo-image:
-	podman run --entrypoint /usr/local/bin/konveyor-analyzer --pod=analyzer -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) -v $(PWD)/demo-dep-output.yaml:/analyzer-lsp/demo-dep-output.yaml:Z -v $(PWD)/demo-output.yaml:/analyzer-lsp/output.yaml:Z localhost/testing:latest --rules=/analyzer-lsp/rule-example.yaml --provider-settings=/analyzer-lsp/provider_settings.json --output-file=/analyzer-lsp/output.yaml --dep-output-file=/analyzer-lsp/demo-dep-output.yaml
+	podman run --entrypoint /usr/local/bin/konveyor-analyzer --pod=analyzer -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) -v $(PWD)/demo-dep-output.yaml:/analyzer-lsp/demo-dep-output.yaml:Z -v $(PWD)/demo-output.yaml:/analyzer-lsp/output.yaml:Z localhost/testing:latest --output-file=/analyzer-lsp/output.yaml --dep-output-file=/analyzer-lsp/demo-dep-output.yaml --dep-label-selector='!konveyor.io/dep-source=open-source'
 
 stop-external-providers-pod: stop-external-providers
 	podman pod kill analyzer
@@ -113,10 +113,9 @@ stop-external-providers-pod: stop-external-providers
 
 extract-maven-index-files:
 	podman run --name temp-jdtls -d quay.io/konveyor/jdtls-server-base:latest
-	podman cp temp-jdtls:/usr/local/etc/maven-index.txt $(PWD)/external-providers/java-external-provider/pkg/java_external_provider/testdata/
-	podman cp temp-jdtls:/usr/local/etc/maven-index.idx $(PWD)/external-providers/java-external-provider/pkg/java_external_provider/testdata/
+	podman cp temp-jdtls:/usr/local/etc/maven-index.txt $(PWD)/external-providers/java-external-provider/pkg/java_external_provider/dependency/testdata/
 	podman stop temp-jdtls || true
 	podman rm temp-jdtls || true
 
 run-index-benchmark:
-	cd $(PWD)/external-providers/java-external-provider/pkg/java_external_provider/ &&  go test -bench=BenchmarkConstructArtifactFromSHA -benchmem -benchtime=5s
+	cd $(PWD)/external-providers/java-external-provider/pkg/java_external_provider/dependency/ &&  go test -bench=. -benchmem -benchtime=5s