You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/07/24 08:37:55 UTC
[camel-k] 02/03: Fix code
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 33bbfbf280378ad92d538bfd038e492d0d24f47e
Author: Dmitry Volodin <dm...@gmail.com>
AuthorDate: Mon Jul 22 18:51:57 2019 +0300
Fix code
---
.gitignore | 1 +
pkg/trait/dependencies.go | 2 +-
pkg/trait/dependencies_test.go | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 2513a32..35ad0f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -126,6 +126,7 @@ Session.vim
tags
### VisualStudioCode ###
+.vscode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
diff --git a/pkg/trait/dependencies.go b/pkg/trait/dependencies.go
index 67dfec7..453806c 100644
--- a/pkg/trait/dependencies.go
+++ b/pkg/trait/dependencies.go
@@ -50,7 +50,7 @@ func (t *dependenciesTrait) Apply(e *Environment) error {
util.StringSliceUniqueAdd(&dependencies, dep)
}
}
- for _, s := range append(e.Integration.Spec.Sources, e.Integration.Status.GeneratedSources...) {
+ for _, s := range e.Integration.Sources() {
meta := metadata.Extract(e.CamelCatalog, s)
switch s.InferLanguage() {
diff --git a/pkg/trait/dependencies_test.go b/pkg/trait/dependencies_test.go
index 1854915..102ab92 100644
--- a/pkg/trait/dependencies_test.go
+++ b/pkg/trait/dependencies_test.go
@@ -171,4 +171,4 @@ func TestIntegrationAutoGeneratedDeps(t *testing.T) {
[]string{"camel:direct", "camel:log", "mvn:org.apache.camel.k/camel-k-loader-java", "mvn:org.apache.camel.k/camel-k-loader-xml", "mvn:org.apache.camel.k/camel-k-runtime-main"},
e.Integration.Status.Dependencies,
)
-}
\ No newline at end of file
+}