Branch: refs/heads/master Home: https://github.com/windup/windup Commit: e59bb082e532114bfd143935b88aabbbf52f9308 https://github.com/windup/windup/commit/e59bb082e532114bfd143935b88aabbbf... Author: Jess Sightler <jesse.sightler(a)gmail.com&gt; Date: 2015-06-05 (Fri, 05 Jun 2015) Changed paths: M config/api/pom.xml M config/api/src/main/java/org/jboss/windup/config/Variables.java M config/api/src/main/java/org/jboss/windup/config/condition/GraphCondition.java M config/api/src/main/java/org/jboss/windup/config/query/Query.java M rules-base/api/src/main/java/org/jboss/windup/rules/files/condition/FileContent.java M rules-java-project/addon/src/main/java/org/jboss/windup/project/condition/Project.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/condition/JavaClass.java M rules-xml/addon/src/main/java/org/jboss/windup/rules/apps/xml/condition/XmlFile.java M rules-xml/tests/src/test/java/org/jboss/windup/rules/xml/XmlFileParameterizedTest.java Log Message: ----------- Tweak to allow multiple conditionals at the same stack-frame to combine results. This is useful in the case of conditonals that conditionals that are combined via "and" or "or". Commit: c03f6504443900be9128cafb9ad82d246487f809 https://github.com/windup/windup/commit/c03f6504443900be9128cafb9ad82d246... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com&gt; Date: 2015-06-05 (Fri, 05 Jun 2015) Changed paths: M config/api/pom.xml M config/api/src/main/java/org/jboss/windup/config/Variables.java M config/api/src/main/java/org/jboss/windup/config/condition/GraphCondition.java M config/api/src/main/java/org/jboss/windup/config/query/Query.java M rules-base/api/src/main/java/org/jboss/windup/rules/files/condition/FileContent.java M rules-java-project/addon/src/main/java/org/jboss/windup/project/condition/Project.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/condition/JavaClass.java M rules-xml/addon/src/main/java/org/jboss/windup/rules/apps/xml/condition/XmlFile.java M rules-xml/tests/src/test/java/org/jboss/windup/rules/xml/XmlFileParameterizedTest.java Log Message: ----------- Merge pull request #590 from jsight/javaclass_or_condition Tweak to allow multiple conditions to combine results Compare: https://github.com/windup/windup/compare/e8e91456d2c5...c03f65044439