Skip to content

CDAP-12701 Use the SLF4JLog rather than depending on the Log implementation provided by the system. #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sagarkapare wants to merge 2 commits into from
Closed

CDAP-12701 Use the SLF4JLog rather than depending on the Log implementation provided by the system. #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d68de6
CDAP-12701 Use the SLF4JLog rather than depending on the Log implemen…
sagarkapare Nov 9, 2017
b6949f7
Resolved conflicts.
sagarkapare Nov 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<groupId>co.cask.plugins</groupId>
<artifactId>condition-plugins</artifactId>
<version>1.0.0</version>
<version>1.0.2-SNAPSHOT</version>
<name>Condition Plugin</name>
<description>A plugin for making control flow decision within a pipeline</description>
<packaging>jar</packaging>
Expand Down Expand Up @@ -63,6 +63,7 @@
<junit.version>4.11</junit.version>
<guava.version>13.0.1</guava.version>
<commons-jexl.version>3.0</commons-jexl.version>
<slf4j.version>1.7.5</slf4j.version>
</properties>

<repositories>
Expand All @@ -84,6 +85,26 @@
</pluginRepositories>

<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>co.cask.cdap</groupId>
<artifactId>cdap-api</artifactId>
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/co/cask/plugins/Conditional.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import co.cask.cdap.etl.api.condition.ConditionContext;
import co.cask.cdap.etl.api.condition.StageStatistics;

import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -64,6 +65,10 @@ public final class Conditional extends Condition {
private static final Logger LOG = LoggerFactory.getLogger(Conditional.class);
private ConditionConfig config;

static {
LogFactory.getFactory().setAttribute("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.SLF4JLog");
}

/**
* Create a expression handler by registering functions
* that can be used within the expression.
Expand Down