Skip to content

Commit 1dc8f71

Browse files
jmlejmle
authored
🍒 Manually cherry pick maven-index-search work (konveyor#578)
* ✨ Add config for local Maven Index Search (konveyor#575) * Add config for local Maven Index Search Signed-off-by: Juan Manuel Leflet Estrada <jleflete@redhat.com> * Add generated tests Signed-off-by: Juan Manuel Leflet Estrada <jleflete@redhat.com> * Depend on latest analyzer Signed-off-by: Juan Manuel Leflet Estrada <jleflete@redhat.com> * Fix tests Signed-off-by: Juan Manuel Leflet Estrada <jleflete@redhat.com> --------- Signed-off-by: Juan Manuel Leflet Estrada <jleflete@redhat.com> * Fix kantra dependencies Signed-off-by: Juan Manuel Leflet Estrada <jleflete@redhat.com> --------- Signed-off-by: Juan Manuel Leflet Estrada <jleflete@redhat.com>
1 parent e0cc069 commit 1dc8f71

File tree

6 files changed

+608
-45
lines changed

6 files changed

+608
-45
lines changed

‎.github/workflows/release-artifacts.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ jobs:
5252
podman cp kantra-download:/usr/local/etc/maven.default.index . && zip -r kantra.linux.${{ matrix.arch }}.zip maven.default.index
5353
podman cp kantra-download:/usr/local/etc/task.gradle . && zip -r kantra.linux.${{ matrix.arch }}.zip task.gradle
5454
podman cp kantra-download:/usr/local/etc/task-v9.gradle . && zip -r kantra.linux.${{ matrix.arch }}.zip task-v9.gradle
55+
podman cp kantra-download:/usr/local/etc/maven-index.txt . && zip -r kantra.linux.${{ matrix.arch }}.zip maven-index.txt
56+
podman cp kantra-download:/usr/local/etc/maven-index.idx . && zip -r kantra.linux.${{ matrix.arch }}.zip maven-index.idx
5557
5658
podman cp kantra-download:/jdtls . && zip -r kantra.darwin.${{ matrix.arch }}.zip jdtls
5759
podman cp kantra-download:/bin/fernflower.jar . && zip kantra.darwin.${{ matrix.arch }}.zip fernflower.jar
@@ -60,6 +62,8 @@ jobs:
6062
podman cp kantra-download:/usr/local/etc/maven.default.index . && zip -r kantra.darwin.${{ matrix.arch }}.zip maven.default.index
6163
podman cp kantra-download:/usr/local/etc/task.gradle . && zip -r kantra.darwin.${{ matrix.arch }}.zip task.gradle
6264
podman cp kantra-download:/usr/local/etc/task-v9.gradle . && zip -r kantra.darwin.${{ matrix.arch }}.zip task-v9.gradle
65+
podman cp kantra-download:/usr/local/etc/maven-index.txt . && zip -r kantra.darwin.${{ matrix.arch }}.zip maven-index.txt
66+
podman cp kantra-download:/usr/local/etc/maven-index.idx . && zip -r kantra.darwin.${{ matrix.arch }}.zip maven-index.idx
6367
6468
podman cp kantra-download:/jdtls . && zip -r kantra.windows.${{ matrix.arch }}.zip jdtls
6569
podman cp kantra-download:/bin/fernflower.jar . && zip kantra.windows.${{ matrix.arch }}.zip fernflower.jar
@@ -68,6 +72,8 @@ jobs:
6872
podman cp kantra-download:/usr/local/etc/maven.default.index . && zip -r kantra.windows.${{ matrix.arch }}.zip maven.default.index
6973
podman cp kantra-download:/usr/local/etc/task.gradle . && zip -r kantra.windows.${{ matrix.arch }}.zip task.gradle
7074
podman cp kantra-download:/usr/local/etc/task-v9.gradle . && zip -r kantra.windows.${{ matrix.arch }}.zip task-v9.gradle
75+
podman cp kantra-download:/usr/local/etc/maven-index.txt . && zip -r kantra.windows.${{ matrix.arch }}.zip maven-index.txt
76+
podman cp kantra-download:/usr/local/etc/maven-index.idx . && zip -r kantra.windows.${{ matrix.arch }}.zip maven-index.idx
7177
7278
- name: Upload linux binary
7379
uses: actions/upload-release-asset@v1

‎cmd/analyze-bin.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,7 @@ func (a *analyzeCommand) makeJavaProviderConfig() provider.Config {
450450
"bundles": a.reqMap["bundle"],
451451
provider.LspServerPathConfigKey: a.reqMap["jdtls"],
452452
"depOpenSourceLabelsFile": filepath.Join(a.kantraDir, "maven.default.index"),
453+
"mavenIndexPath": filepath.Join(a.kantraDir),
453454
"disableMavenSearch": a.disableMavenSearch,
454455
"gradleSourcesTaskFile": filepath.Join(a.kantraDir, "task.gradle"),
455456
},

‎go.mod‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23.9
55
require (
66
github.com/cloudfoundry/go-cfclient/v3 v3.0.0-alpha.12.0.20250712142925-13a7dc5466ad
77
github.com/devfile/alizer v1.6.1
8-
github.com/fsnotify/fsnotify v1.7.0
8+
github.com/fsnotify/fsnotify v1.9.0
99
github.com/getkin/kin-openapi v0.108.0
1010
github.com/go-logr/logr v1.4.3
1111
github.com/konveyor/asset-generation v0.1.12
@@ -15,8 +15,8 @@ require (
1515
github.com/spf13/cobra v1.9.1
1616
github.com/stretchr/testify v1.10.0
1717
go.lsp.dev/uri v0.3.0
18-
go.opentelemetry.io/otel v1.34.0
19-
go.opentelemetry.io/otel/trace v1.34.0
18+
go.opentelemetry.io/otel v1.35.0
19+
go.opentelemetry.io/otel/trace v1.35.0
2020
go.yaml.in/yaml/v3 v3.0.4
2121
gopkg.in/yaml.v2 v2.4.0
2222
gopkg.in/yaml.v3 v3.0.1
@@ -30,13 +30,15 @@ require (
3030
github.com/Masterminds/goutils v1.1.1 // indirect
3131
github.com/Masterminds/semver/v3 v3.4.0 // indirect
3232
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
33+
github.com/Microsoft/go-winio v0.6.2 // indirect
3334
github.com/antchfx/xpath v1.3.1 // indirect
3435
github.com/bufbuild/protocompile v0.10.0 // indirect
3536
github.com/cbroglie/mustache v1.4.0 // indirect
3637
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect
3738
github.com/containerd/typeurl/v2 v2.1.1 // indirect
3839
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
3940
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
41+
github.com/dlclark/regexp2 v1.11.4 // indirect
4042
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
4143
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4244
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
@@ -76,24 +78,24 @@ require (
7678
github.com/modern-go/reflect2 v1.0.2 // indirect
7779
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
7880
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
79-
github.com/nxadm/tail v1.4.8 // indirect
81+
github.com/nxadm/tail v1.4.11 // indirect
8082
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
8183
github.com/pkg/errors v0.9.1 // indirect
8284
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
8385
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
8486
github.com/spf13/cast v1.7.0 // indirect
85-
github.com/swaggest/jsonschema-go v0.3.70 // indirect
86-
github.com/swaggest/openapi-go v0.2.50 // indirect
87-
github.com/swaggest/refl v1.3.0 // indirect
87+
github.com/swaggest/jsonschema-go v0.3.78 // indirect
88+
github.com/swaggest/openapi-go v0.2.58 // indirect
89+
github.com/swaggest/refl v1.4.0 // indirect
8890
github.com/vifraa/gopom v1.0.0 // indirect
8991
github.com/x448/float16 v0.8.4 // indirect
9092
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
9193
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
9294
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
9395
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
9496
go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect
95-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
96-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
97+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
98+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
9799
go.uber.org/automaxprocs v1.6.0 // indirect
98100
go.uber.org/multierr v1.11.0 // indirect
99101
go.uber.org/zap v1.27.0 // indirect
@@ -102,13 +104,14 @@ require (
102104
golang.org/x/mod v0.27.0 // indirect
103105
golang.org/x/net v0.43.0 // indirect
104106
golang.org/x/oauth2 v0.30.0 // indirect
107+
golang.org/x/sync v0.16.0 // indirect
105108
golang.org/x/sys v0.35.0 // indirect
106109
golang.org/x/term v0.34.0 // indirect
107110
golang.org/x/text v0.28.0 // indirect
108111
golang.org/x/time v0.9.0 // indirect
109112
golang.org/x/tools v0.36.0 // indirect
110-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
111-
google.golang.org/grpc v1.72.2 // indirect
113+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
114+
google.golang.org/grpc v1.73.0 // indirect
112115
google.golang.org/protobuf v1.36.7 // indirect
113116
gopkg.in/inf.v0 v0.9.1 // indirect
114117
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
@@ -132,8 +135,8 @@ require (
132135
github.com/bombsimon/logrusr/v3 v3.1.0
133136
github.com/codingconcepts/env v0.0.0-20200821220118-a8fbf8d84482
134137
github.com/inconshreveable/mousetrap v1.1.0 // indirect
135-
github.com/konveyor/analyzer-lsp v0.7.0-alpha.2.0.20250625194402-05dca9b4ac43
136-
github.com/konveyor/analyzer-lsp/external-providers/java-external-provider v0.0.0-20251002155814-929f77930cb6
138+
github.com/konveyor/analyzer-lsp v0.8.1-alpha.2.0.20251028123433-0431f774cad0
139+
github.com/konveyor/analyzer-lsp/external-providers/java-external-provider v0.0.0-20251028123433-0431f774cad0
137140
github.com/shopspring/decimal v1.4.0 // indirect
138141
github.com/sirupsen/logrus v1.9.3
139142
github.com/spf13/pflag v1.0.7 // indirect

0 commit comments

Comments
 (0)