[camel-k] branch master updated: Add log4j-slf4j-impl as runtime dependency in default project build

[lburgazzoli]

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


The following commit(s) were added to refs/heads/master by this push:
     new df72451  Add log4j-slf4j-impl as runtime dependency in default project 
build
df72451 is described below

commit df724510ee3dae48a7bff7835ed689032e4c24da
Author: Antonin Stefanutti <anto...@stefanutti.fr>
AuthorDate: Mon Mar 25 11:17:26 2019 +0100

    Add log4j-slf4j-impl as runtime dependency in default project build
    
    This prepares support for other runtime, like Quarkus, that bring
    their own logging backend
---
 pkg/builder/builder_steps.go      |  8 ++++++++
 pkg/builder/builder_steps_test.go | 16 ++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/pkg/builder/builder_steps.go b/pkg/builder/builder_steps.go
index e2a7c04..a79b711 100644
--- a/pkg/builder/builder_steps.go
+++ b/pkg/builder/builder_steps.go
@@ -87,6 +87,14 @@ func GenerateProject(ctx *Context) error {
                }
        }
 
+       // Add Log4j 2 SLF4J binding as default logging impl
+       ctx.Project.AddDependency(maven.Dependency{
+               GroupID:    "org.apache.logging.log4j",
+               ArtifactID: "log4j-slf4j-impl",
+               Version:    "2.11.2",
+               Scope:      "runtime",
+       })
+
        return nil
 }
 
diff --git a/pkg/builder/builder_steps_test.go 
b/pkg/builder/builder_steps_test.go
index de88865..ed1cf51 100644
--- a/pkg/builder/builder_steps_test.go
+++ b/pkg/builder/builder_steps_test.go
@@ -125,7 +125,7 @@ func TestGenerateJvmProject(t *testing.T) {
        assert.Equal(t, "pom", 
ctx.Project.DependencyManagement.Dependencies[0].Type)
        assert.Equal(t, "import", 
ctx.Project.DependencyManagement.Dependencies[0].Scope)
 
-       assert.Equal(t, 3, len(ctx.Project.Dependencies))
+       assert.Equal(t, 4, len(ctx.Project.Dependencies))
        assert.Contains(t, ctx.Project.Dependencies, maven.Dependency{
                GroupID:    "org.apache.camel.k",
                ArtifactID: "camel-k-runtime-jvm",
@@ -140,6 +140,12 @@ func TestGenerateJvmProject(t *testing.T) {
                GroupID:    "org.apache.camel.k",
                ArtifactID: "camel-k-adapter-camel-2",
        })
+       assert.Contains(t, ctx.Project.Dependencies, maven.Dependency{
+               GroupID:    "org.apache.logging.log4j",
+               ArtifactID: "log4j-slf4j-impl",
+               Version:    "2.11.2",
+               Scope:      "runtime",
+       })
 }
 
 func TestGenerateGroovyProject(t *testing.T) {
@@ -174,7 +180,7 @@ func TestGenerateGroovyProject(t *testing.T) {
        assert.Equal(t, "pom", 
ctx.Project.DependencyManagement.Dependencies[0].Type)
        assert.Equal(t, "import", 
ctx.Project.DependencyManagement.Dependencies[0].Scope)
 
-       assert.Equal(t, 5, len(ctx.Project.Dependencies))
+       assert.Equal(t, 6, len(ctx.Project.Dependencies))
 
        assert.Contains(t, ctx.Project.Dependencies, maven.Dependency{
                GroupID:    "org.apache.camel.k",
@@ -200,6 +206,12 @@ func TestGenerateGroovyProject(t *testing.T) {
                GroupID:    "org.apache.camel",
                ArtifactID: "camel-groovy",
        })
+       assert.Contains(t, ctx.Project.Dependencies, maven.Dependency{
+               GroupID:    "org.apache.logging.log4j",
+               ArtifactID: "log4j-slf4j-impl",
+               Version:    "2.11.2",
+               Scope:      "runtime",
+       })
 }
 
 func TestGenerateProjectWithRepositories(t *testing.T) {