diff --git a/CHANGELOG.org b/CHANGELOG.org
index 2be2d75..725937d 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+* [5.3.5] - 2019-03-04
+
+** Removed
+
+ - Removed dependency upon net.kemitix:conditional to avoid circular
+ dependency
+
* [5.3.4] - 2019-03-01
** Dependencies
diff --git a/builder/pom.xml b/builder/pom.xml
index b175cf2..8a718dd 100644
--- a/builder/pom.xml
+++ b/builder/pom.xml
@@ -31,7 +31,6 @@
1.0.0
2.24.5
3.12.1
- 0.7.0
4.8.11
3.0.0
@@ -60,11 +59,6 @@
${lombok.version}
provided
-
- net.kemitix
- conditional
- ${conditional.version}
-
io.github.classgraph
classgraph
diff --git a/builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/Rule.java b/builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/Rule.java
index 73323a8..b72b71e 100644
--- a/builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/Rule.java
+++ b/builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/Rule.java
@@ -24,7 +24,6 @@ package net.kemitix.checkstyle.ruleset.builder;
import com.speedment.common.mapstream.MapStream;
import lombok.Getter;
import lombok.Setter;
-import net.kemitix.conditional.Value;
import java.net.URI;
import java.util.Comparator;
@@ -155,9 +154,11 @@ public class Rule {
final String ruleClassname,
final Rule rule
) {
- return Value.where(hasProperties(rule))
- .then(() -> moduleWithParameters(rule, ruleClassname))
- .otherwise(() -> moduleNoParameters(ruleClassname));
+ if (hasProperties(rule)) {
+ return moduleWithParameters(rule, ruleClassname);
+ } else {
+ return moduleNoParameters(ruleClassname);
+ }
}
private static String moduleNoParameters(