This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 1729ac5daa73f8bc20f4556053ffbc34be4f027a Author: Doru Bercea <[email protected]> AuthorDate: Fri Nov 13 13:14:10 2020 -0500 Remove old modeline support for just dependencies from dependency resolution.. --- pkg/cmd/modeline.go | 5 ++--- pkg/cmd/util_dependencies.go | 25 ------------------------- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/pkg/cmd/modeline.go b/pkg/cmd/modeline.go index 9e3331f..6a3f0c1 100644 --- a/pkg/cmd/modeline.go +++ b/pkg/cmd/modeline.go @@ -161,7 +161,7 @@ func extractModelineOptions(ctx context.Context, sources []string) ([]modeline.O } for _, resolvedSource := range resolvedSources { - ops, err := ExtractModelineOptionsFromSource(resolvedSource) + ops, err := extractModelineOptionsFromSource(resolvedSource) if err != nil { return opts, err } @@ -172,8 +172,7 @@ func extractModelineOptions(ctx context.Context, sources []string) ([]modeline.O return opts, nil } -// ExtractModelineOptionsFromSource -- -func ExtractModelineOptionsFromSource(resolvedSource Source) ([]modeline.Option, error) { +func extractModelineOptionsFromSource(resolvedSource Source) ([]modeline.Option, error) { ops, err := modeline.Parse(resolvedSource.Location, resolvedSource.Content) if err != nil { return ops, errors.Wrapf(err, "cannot process file %s", resolvedSource.Location) diff --git a/pkg/cmd/util_dependencies.go b/pkg/cmd/util_dependencies.go index e21ca89..30722a7 100644 --- a/pkg/cmd/util_dependencies.go +++ b/pkg/cmd/util_dependencies.go @@ -96,31 +96,6 @@ func getTopLevelDependencies(catalog *camel.RuntimeCatalog, args []string) ([]st // Extract list of top-level dependencies. dependencies.Merge(trait.AddSourceDependencies(sourceSpec, catalog)) - - // Extract modeline dependencies from file and add them to the list of - // top-level dependencies. - resolvedSource, err := ResolveLocalSource(source, false) - if err != nil { - return []string{}, err - } - - opts, err := ExtractModelineOptionsFromSource(resolvedSource) - if err != nil { - return []string{}, err - } - - for _, o := range opts { - if o.Name == "dependency" { - // Make sure dependency is valid. - isValid := validateDependency(o.Value) - if !isValid { - return []string{}, errors.New("Unexpected type for modeline dependency: " + o.Value + ". " + additionalDependencyUsageMessage) - } - - // Only valid modeline dependencies are added to the top level dependencies list. - dependencies.Add(o.Value) - } - } } return dependencies.List(), nil
