From f1f0654c7c81f371ac3fc787ca5529d4123975f4 Mon Sep 17 00:00:00 2001 From: Gabriele Cardosi Date: Wed, 13 Dec 2023 14:40:59 +0100 Subject: [PATCH 01/29] [incubator-kie-issues#83] Refactor InfixOpNode inside DMN core (#5621) * [incubator-kie-issues#83] WIP - Splitting structur and behaviour. Tests failing * [incubator-kie-issues#83] Working status. Same single test failing as in main * [incubator-kie-issues#83] Cleanup * [incubator-kie-issues#83] DivExecutor * [incubator-kie-issues#83] AddExecutor * [incubator-kie-issues#83] MultExecutor * [incubator-kie-issues#83] SubExecutor * [incubator-kie-issues#83] Fix DMNRuntimeListenerTest * [incubator-kie-issues#83] Fix as per PR review * [incubator-kie-issues#83] Remove duplicated code * [incubator-kie-issues#83] Renaming as per PR review --------- Co-authored-by: BAMOE CI --- .../feel11/CompiledFEELSemanticMappings.java | 51 +-- .../dmn/feel/codegen/feel11/Expressions.java | 7 +- .../kie/dmn/feel/lang/ast/BetweenNode.java | 51 ++- .../kie/dmn/feel/lang/ast/InfixOpNode.java | 427 +----------------- .../kie/dmn/feel/lang/ast/InfixOperator.java | 79 ++++ .../lang/ast/infixexecutors/AddExecutor.java | 127 ++++++ .../lang/ast/infixexecutors/AndExecutor.java | 58 +++ .../infixexecutors/ClassIdentifierTuple.java | 56 +++ .../lang/ast/infixexecutors/DivExecutor.java | 102 +++++ .../lang/ast/infixexecutors/EqExecutor.java | 46 ++ .../infixexecutors/EvaluatedParameters.java | 38 ++ .../lang/ast/infixexecutors/GtExecutor.java | 46 ++ .../lang/ast/infixexecutors/GteExecutor.java | 49 ++ .../ast/infixexecutors/InfixExecutor.java | 30 ++ .../infixexecutors/InfixExecutorUtils.java | 165 +++++++ .../lang/ast/infixexecutors/LtExecutor.java | 46 ++ .../lang/ast/infixexecutors/LteExecutor.java | 50 ++ .../lang/ast/infixexecutors/MultExecutor.java | 91 ++++ .../lang/ast/infixexecutors/NeExecutor.java | 47 ++ .../lang/ast/infixexecutors/OrExecutor.java | 58 +++ .../lang/ast/infixexecutors/PowExecutor.java | 50 ++ .../lang/ast/infixexecutors/SubExecutor.java | 104 +++++ .../dmn/feel/lang/ast/InfixOpNodeTest.java | 196 -------- .../dmn/feel/lang/ast/InfixOperatorTest.java | 127 ++++++ .../ClassidentifierTupleTest.java | 35 ++ .../InfixExecutorUtilsTest.java | 101 +++++ .../feel/parser/feel11/FEELParserTest.java | 66 +-- .../feel/runtime/FEELNumberCoercionTest.java | 2 +- .../validation/dtanalysis/DMNDTAnalyser.java | 2 +- 29 files changed, 1610 insertions(+), 697 deletions(-) create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/InfixOperator.java create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/AddExecutor.java create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/AndExecutor.java create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/ClassIdentifierTuple.java create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/DivExecutor.java create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/EqExecutor.java create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/EvaluatedParameters.java create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/GtExecutor.java create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/GteExecutor.java create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/InfixExecutor.java create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/InfixExecutorUtils.java create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/LtExecutor.java create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/LteExecutor.java create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/MultExecutor.java create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/NeExecutor.java create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/OrExecutor.java create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/PowExecutor.java create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/SubExecutor.java delete mode 100644 kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/InfixOpNodeTest.java create mode 100644 kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/InfixOperatorTest.java create mode 100644 kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/infixexecutors/ClassidentifierTupleTest.java create mode 100644 kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/infixexecutors/InfixExecutorUtilsTest.java diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/codegen/feel11/CompiledFEELSemanticMappings.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/codegen/feel11/CompiledFEELSemanticMappings.java index 9768f448f99..78326a136ff 100644 --- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/codegen/feel11/CompiledFEELSemanticMappings.java +++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/codegen/feel11/CompiledFEELSemanticMappings.java @@ -18,18 +18,9 @@ */ package org.kie.dmn.feel.codegen.feel11; -import java.math.MathContext; -import java.time.Period; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.function.Supplier; - -import ch.obermuhlner.math.big.BigDecimalMath; import org.kie.dmn.api.feel.runtime.events.FEELEvent; import org.kie.dmn.feel.lang.EvaluationContext; -import org.kie.dmn.feel.lang.ast.InfixOpNode; +import org.kie.dmn.feel.lang.ast.InfixOperator; import org.kie.dmn.feel.lang.types.impl.ComparablePeriod; import org.kie.dmn.feel.runtime.Range; import org.kie.dmn.feel.runtime.UnaryTest; @@ -39,6 +30,12 @@ import org.kie.dmn.feel.util.EvalHelper; import org.kie.dmn.feel.util.Msg; +import java.time.Period; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.function.Supplier; + /** * The purpose of this class is to offer import .* methods to compiled FEEL classes compiling expressions. * Implementing DMN FEEL spec chapter 10.3.2.12 Semantic mappings @@ -265,12 +262,13 @@ public static List list(T... a) { /** * FEEL spec Table 38 - * Delegates to {@link InfixOpNode} except evaluationcontext + * Delegates to {@link InfixOperator} except evaluationcontext + * * @deprecated does not support short-circuit of the operator */ @Deprecated public static Boolean and(Object left, Object right) { - return (Boolean) InfixOpNode.and(left, right, null); + return (Boolean) InfixOperator.AND.evaluate(left, right, null); } public static Boolean and(Boolean left, Supplier right) { @@ -300,14 +298,15 @@ public static Boolean and(boolean left, boolean right) { /** * FEEL spec Table 38 - * Delegates to {@link InfixOpNode} except evaluationcontext + * Delegates to {@link InfixOperator} except evaluationcontext + * * @deprecated does not support short-circuit of the operator */ @Deprecated public static Boolean or(Object left, Object right) { - return (Boolean) InfixOpNode.or(left, right, null); + return (Boolean) InfixOperator.OR.evaluate(left, right, null); } - + public static Boolean or(Boolean left, Supplier right) { if (left != null) { if (!left.booleanValue()) { @@ -335,38 +334,38 @@ public static Boolean or(boolean left, boolean right) { /** * FEEL spec Table 45 - * Delegates to {@link InfixOpNode} except evaluationcontext + * Delegates to {@link InfixOperator} except evaluationcontext */ public static Object add(final Object left, final Object right, final EvaluationContext context) { - return InfixOpNode.add(left, right, context); + return InfixOperator.ADD.evaluate(left, right, context); } /** * FEEL spec Table 45 - * Delegates to {@link InfixOpNode} except evaluationcontext + * Delegates to {@link InfixOperator} except evaluationcontext */ public static Object sub(final Object left, final Object right, final EvaluationContext context) { - return InfixOpNode.sub(left, right, context); + return InfixOperator.SUB.evaluate(left, right, context); } /** * FEEL spec Table 45 - * Delegates to {@link InfixOpNode} except evaluationcontext + * Delegates to {@link InfixOperator} except evaluationcontext */ public static Object mult(final Object left, final Object right, final EvaluationContext context) { - return InfixOpNode.mult(left, right, context); + return InfixOperator.MULT.evaluate(left, right, context); } /** * FEEL spec Table 45 - * Delegates to {@link InfixOpNode} except evaluationcontext + * Delegates to {@link InfixOperator} except evaluationcontext */ public static Object div(final Object left, final Object right, final EvaluationContext context) { - return InfixOpNode.div(left, right, context); + return InfixOperator.DIV.evaluate(left, right, context); } public static Object pow(final Object left, final Object right, final EvaluationContext context) { - return InfixOpNode.math(left, right, context, (l, r) -> BigDecimalMath.pow(l, r, MathContext.DECIMAL128)); + return InfixOperator.POW.evaluate(left, right, context); } /** @@ -375,7 +374,7 @@ public static Object pow(final Object left, final Object right, final Evaluation */ public static Boolean lte(Object left, Object right) { return or(lt(left, right), - eq(left, right)); // do not use Java || to avoid potential NPE due to FEEL 3vl. + eq(left, right)); // do not use Java || to avoid potential NPE due to FEEL 3vl. } /** @@ -392,7 +391,7 @@ public static Boolean lt(Object left, Object right) { */ public static Boolean gte(Object left, Object right) { return or(gt(left, right), - eq(left, right)); // do not use Java || to avoid potential NPE due to FEEL 3vl. + eq(left, right)); // do not use Java || to avoid potential NPE due to FEEL 3vl. } /** diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/codegen/feel11/Expressions.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/codegen/feel11/Expressions.java index 80d354626dc..b2ae13201f2 100644 --- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/codegen/feel11/Expressions.java +++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/codegen/feel11/Expressions.java @@ -39,10 +39,7 @@ import com.github.javaparser.ast.type.ClassOrInterfaceType; import com.github.javaparser.ast.type.Type; import com.github.javaparser.ast.type.UnknownType; -import org.kie.dmn.feel.lang.ast.InfixOpNode; -import org.kie.dmn.feel.lang.ast.QuantifiedExpressionNode; -import org.kie.dmn.feel.lang.ast.RangeNode; -import org.kie.dmn.feel.lang.ast.UnaryTestNode; +import org.kie.dmn.feel.lang.ast.*; import org.kie.dmn.feel.lang.impl.MapBackedType; import org.kie.dmn.feel.lang.impl.NamedParameter; import org.kie.dmn.feel.lang.types.GenFnType; @@ -110,7 +107,7 @@ public static Expression positive(Expression expression) { } public static MethodCallExpr binary( - InfixOpNode.InfixOperator operator, + InfixOperator operator, Expression l, Expression r) { switch (operator) { diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/BetweenNode.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/BetweenNode.java index feb773f5957..383c107cb83 100644 --- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/BetweenNode.java +++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/BetweenNode.java @@ -22,6 +22,7 @@ import org.kie.dmn.api.feel.runtime.events.FEELEvent.Severity; import org.kie.dmn.feel.lang.EvaluationContext; import org.kie.dmn.feel.lang.Type; +import org.kie.dmn.feel.lang.ast.infixexecutors.InfixExecutorUtils; import org.kie.dmn.feel.lang.types.BuiltInType; import org.kie.dmn.feel.util.EvalHelper; import org.kie.dmn.feel.util.Msg; @@ -34,7 +35,7 @@ public class BetweenNode private BaseNode end; public BetweenNode(ParserRuleContext ctx, BaseNode value, BaseNode start, BaseNode end) { - super( ctx ); + super(ctx); this.value = value; this.start = start; this.end = end; @@ -67,34 +68,52 @@ public void setEnd(BaseNode end) { @Override public Object evaluate(EvaluationContext ctx) { boolean problem = false; - if ( value == null ) { ctx.notifyEvt( astEvent(Severity.ERROR, Msg.createMessage(Msg.IS_NULL, "value")) ); problem = true; } - if ( start == null ) { ctx.notifyEvt( astEvent(Severity.ERROR, Msg.createMessage(Msg.IS_NULL, "start")) ); problem = true; } - if ( end == null ) { ctx.notifyEvt( astEvent(Severity.ERROR, Msg.createMessage(Msg.IS_NULL, "end")) ); problem = true; } + if (value == null) { + ctx.notifyEvt(astEvent(Severity.ERROR, Msg.createMessage(Msg.IS_NULL, "value"))); + problem = true; + } + if (start == null) { + ctx.notifyEvt(astEvent(Severity.ERROR, Msg.createMessage(Msg.IS_NULL, "start"))); + problem = true; + } + if (end == null) { + ctx.notifyEvt(astEvent(Severity.ERROR, Msg.createMessage(Msg.IS_NULL, "end"))); + problem = true; + } if (problem) return null; Object o_val = value.evaluate(ctx); Object o_s = start.evaluate(ctx); Object o_e = end.evaluate(ctx); - if ( o_val == null ) { ctx.notifyEvt( astEvent(Severity.ERROR, Msg.createMessage(Msg.IS_NULL, "value")) ); problem = true; } - if ( o_s == null ) { ctx.notifyEvt( astEvent(Severity.ERROR, Msg.createMessage(Msg.IS_NULL, "start")) ); problem = true; } - if ( o_e == null ) { ctx.notifyEvt( astEvent(Severity.ERROR, Msg.createMessage(Msg.IS_NULL, "end")) ); problem = true; } + if (o_val == null) { + ctx.notifyEvt(astEvent(Severity.ERROR, Msg.createMessage(Msg.IS_NULL, "value"))); + problem = true; + } + if (o_s == null) { + ctx.notifyEvt(astEvent(Severity.ERROR, Msg.createMessage(Msg.IS_NULL, "start"))); + problem = true; + } + if (o_e == null) { + ctx.notifyEvt(astEvent(Severity.ERROR, Msg.createMessage(Msg.IS_NULL, "end"))); + problem = true; + } if (problem) return null; - Object gte = InfixOpNode.or(EvalHelper.compare(o_val, o_s, ctx, (l, r) -> l.compareTo(r) > 0), - EvalHelper.isEqual(o_val, o_s, ctx), - ctx); // do not use Java || to avoid potential NPE due to FEEL 3vl. + Object gte = InfixExecutorUtils.or(EvalHelper.compare(o_val, o_s, ctx, (l, r) -> l.compareTo(r) > 0), + EvalHelper.isEqual(o_val, o_s, ctx), + ctx); // do not use Java || to avoid potential NPE due to FEEL 3vl. if (gte == null) { ctx.notifyEvt(astEvent(Severity.ERROR, Msg.createMessage(Msg.X_TYPE_INCOMPATIBLE_WITH_Y_TYPE, "value", "start"))); } - Object lte = InfixOpNode.or(EvalHelper.compare(o_val, o_e, ctx, (l, r) -> l.compareTo(r) < 0), - EvalHelper.isEqual(o_val, o_e, ctx), - ctx); // do not use Java || to avoid potential NPE due to FEEL 3vl. + Object lte = InfixExecutorUtils.or(EvalHelper.compare(o_val, o_e, ctx, (l, r) -> l.compareTo(r) < 0), + EvalHelper.isEqual(o_val, o_e, ctx), + ctx); // do not use Java || to avoid potential NPE due to FEEL 3vl. if (lte == null) { ctx.notifyEvt(astEvent(Severity.ERROR, Msg.createMessage(Msg.X_TYPE_INCOMPATIBLE_WITH_Y_TYPE, "value", "end"))); } - - return InfixOpNode.and(gte, lte, ctx); // do not use Java && to avoid potential NPE due to FEEL 3vl. + + return InfixExecutorUtils.and(gte, lte, ctx); // do not use Java && to avoid potential NPE due to FEEL 3vl. } @Override @@ -104,7 +123,7 @@ public Type getResultType() { @Override public ASTNode[] getChildrenNode() { - return new ASTNode[] { value, start, end }; + return new ASTNode[]{value, start, end}; } @Override diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/InfixOpNode.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/InfixOpNode.java index 5c4cc05df7b..69322892710 100644 --- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/InfixOpNode.java +++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/InfixOpNode.java @@ -18,80 +18,22 @@ */ package org.kie.dmn.feel.lang.ast; -import java.math.BigDecimal; -import java.math.MathContext; -import java.math.RoundingMode; -import java.time.Duration; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.OffsetDateTime; -import java.time.OffsetTime; -import java.time.ZoneOffset; -import java.time.ZonedDateTime; -import java.time.chrono.ChronoPeriod; -import java.time.temporal.ChronoUnit; -import java.time.temporal.Temporal; -import java.time.temporal.TemporalAmount; -import java.util.function.BinaryOperator; - -import ch.obermuhlner.math.big.BigDecimalMath; import org.antlr.v4.runtime.ParserRuleContext; -import org.kie.dmn.api.feel.runtime.events.FEELEvent; import org.kie.dmn.feel.lang.EvaluationContext; import org.kie.dmn.feel.lang.Type; import org.kie.dmn.feel.lang.types.BuiltInType; -import org.kie.dmn.feel.lang.types.impl.ComparablePeriod; -import org.kie.dmn.feel.runtime.events.InvalidParametersEvent; -import org.kie.dmn.feel.util.EvalHelper; -import org.kie.dmn.feel.util.Msg; public class InfixOpNode extends BaseNode { - public static enum InfixOperator { - ADD( "+" ), - SUB( "-" ), - MULT( "*" ), - DIV( "/" ), - POW( "**" ), - LTE( "<=" ), - LT( "<" ), - GT( ">" ), - GTE( ">=" ), - EQ( "=" ), - NE( "!=" ), - AND( "and" ), - OR( "or" ); - - public final String symbol; - - InfixOperator(String symbol) { - this.symbol = symbol; - } - - public static InfixOperator determineOperator(String symbol) { - for ( InfixOperator op : InfixOperator.values() ) { - if ( op.symbol.equals( symbol ) ) { - return op; - } - } - throw new IllegalArgumentException( "No operator found for symbol '" + symbol + "'" ); - } - - public boolean isBoolean() { - return this == LTE || this == LT || this == GT || this == GTE || this == EQ || this == NE || this == AND || this == OR; - } - } - private InfixOperator operator; - private BaseNode left; - private BaseNode right; + private BaseNode left; + private BaseNode right; public InfixOpNode(ParserRuleContext ctx, BaseNode left, String op, BaseNode right) { - super( ctx ); + super(ctx); this.left = left; - this.operator = InfixOperator.determineOperator( op ); + this.operator = InfixOperator.determineOperator(op); this.right = right; } @@ -126,40 +68,42 @@ public void setRight(BaseNode right) { @Override public Type getResultType() { // see FEEL spec Table 45. - if ( operator.isBoolean() ) { return BuiltInType.BOOLEAN; } - switch ( operator ) { + if (operator.isBoolean()) { + return BuiltInType.BOOLEAN; + } + switch (operator) { case ADD: case SUB: { - if ( left.getResultType() == BuiltInType.NUMBER && right.getResultType() == BuiltInType.NUMBER ) { + if (left.getResultType() == BuiltInType.NUMBER && right.getResultType() == BuiltInType.NUMBER) { return BuiltInType.NUMBER; - } else if ( left.getResultType() == BuiltInType.DATE_TIME && right.getResultType() == BuiltInType.DATE_TIME ) { + } else if (left.getResultType() == BuiltInType.DATE_TIME && right.getResultType() == BuiltInType.DATE_TIME) { return BuiltInType.DATE_TIME; - } else if ( left.getResultType() == BuiltInType.TIME && right.getResultType() == BuiltInType.TIME ) { + } else if (left.getResultType() == BuiltInType.TIME && right.getResultType() == BuiltInType.TIME) { return BuiltInType.TIME; - } else if ( left.getResultType() == BuiltInType.DURATION || right.getResultType() == BuiltInType.DURATION ) { - if ( left.getResultType() == BuiltInType.DATE_TIME || right.getResultType() == BuiltInType.DATE_TIME ) { + } else if (left.getResultType() == BuiltInType.DURATION || right.getResultType() == BuiltInType.DURATION) { + if (left.getResultType() == BuiltInType.DATE_TIME || right.getResultType() == BuiltInType.DATE_TIME) { return BuiltInType.DATE_TIME; - } else if ( left.getResultType() == BuiltInType.TIME || right.getResultType() == BuiltInType.TIME ) { + } else if (left.getResultType() == BuiltInType.TIME || right.getResultType() == BuiltInType.TIME) { return BuiltInType.TIME; - } else if ( left.getResultType() == BuiltInType.DURATION && right.getResultType() == BuiltInType.DURATION ) { + } else if (left.getResultType() == BuiltInType.DURATION && right.getResultType() == BuiltInType.DURATION) { return BuiltInType.DURATION; } - } else if ( left.getResultType() == BuiltInType.STRING && right.getResultType() == BuiltInType.STRING ) { + } else if (left.getResultType() == BuiltInType.STRING && right.getResultType() == BuiltInType.STRING) { return BuiltInType.STRING; } } case MULT: case DIV: { - if ( left.getResultType() == BuiltInType.NUMBER && right.getResultType() == BuiltInType.NUMBER ) { + if (left.getResultType() == BuiltInType.NUMBER && right.getResultType() == BuiltInType.NUMBER) { return BuiltInType.NUMBER; - } else if ( left.getResultType() == BuiltInType.DURATION || right.getResultType() == BuiltInType.DURATION ) { - if ( left.getResultType() == BuiltInType.NUMBER || right.getResultType() == BuiltInType.NUMBER ) { + } else if (left.getResultType() == BuiltInType.DURATION || right.getResultType() == BuiltInType.DURATION) { + if (left.getResultType() == BuiltInType.NUMBER || right.getResultType() == BuiltInType.NUMBER) { return BuiltInType.NUMBER; } } } case POW: { - if ( left.getResultType() == BuiltInType.NUMBER && right.getResultType() == BuiltInType.NUMBER ) { + if (left.getResultType() == BuiltInType.NUMBER && right.getResultType() == BuiltInType.NUMBER) { return BuiltInType.NUMBER; } } @@ -171,267 +115,12 @@ public Type getResultType() { @Override public Object evaluate(EvaluationContext ctx) { if (this.left == null) return null; - switch ( operator ) { - case ADD: - return add(this.left.evaluate(ctx), this.right.evaluate(ctx), ctx); - case SUB: - return sub(this.left.evaluate(ctx), this.right.evaluate(ctx), ctx); - case MULT: - return mult(this.left.evaluate(ctx), this.right.evaluate(ctx), ctx); - case DIV: - return div(this.left.evaluate(ctx), this.right.evaluate(ctx), ctx); - case POW: - return math(this.left.evaluate(ctx), this.right.evaluate(ctx), ctx, (l, r) -> BigDecimalMath.pow(l, r, MathContext.DECIMAL128)); - case AND: - Boolean leftAND = EvalHelper.getBooleanOrNull(this.left.evaluate(ctx)); - if (leftAND != null) { - if (leftAND.booleanValue()) { - return EvalHelper.getBooleanOrNull(this.right.evaluate(ctx)); - } else { - return Boolean.FALSE; //left hand operand is false, we do not need to evaluate right side - } - } else { - Boolean rightAND = EvalHelper.getBooleanOrNull(this.right.evaluate(ctx)); - return Boolean.FALSE.equals(rightAND) ? Boolean.FALSE : null; - } - case OR: - Boolean leftOR = EvalHelper.getBooleanOrNull(this.left.evaluate(ctx)); - if (leftOR != null) { - if (!leftOR.booleanValue()) { - return EvalHelper.getBooleanOrNull(this.right.evaluate(ctx)); - } else { - return Boolean.TRUE; //left hand operand is true, we do not need to evaluate right side - } - } else { - Boolean rightOR = EvalHelper.getBooleanOrNull(this.right.evaluate(ctx)); - return Boolean.TRUE.equals(rightOR) ? Boolean.TRUE : null; - } - case LTE: - Object leftLTE = this.left.evaluate(ctx); - Object rightLTE = this.right.evaluate(ctx); - return or(EvalHelper.compare(leftLTE, rightLTE, ctx, (l, r) -> l.compareTo(r) < 0), - EvalHelper.isEqual(leftLTE, rightLTE, ctx), - ctx); // do not use Java || to avoid potential NPE due to FEEL 3vl. - case LT: - return EvalHelper.compare(this.left.evaluate(ctx), this.right.evaluate(ctx), ctx, (l, r) -> l.compareTo(r) < 0); - case GT: - return EvalHelper.compare(this.left.evaluate(ctx), this.right.evaluate(ctx), ctx, (l, r) -> l.compareTo(r) > 0); - case GTE: - Object leftGTE = this.left.evaluate(ctx); - Object rightGTE = this.right.evaluate(ctx); - return or(EvalHelper.compare(leftGTE, rightGTE, ctx, (l, r) -> l.compareTo(r) > 0), - EvalHelper.isEqual(leftGTE, rightGTE, ctx), - ctx); // do not use Java || to avoid potential NPE due to FEEL 3vl. - case EQ: - return EvalHelper.isEqual(this.left.evaluate(ctx), this.right.evaluate(ctx), ctx); - case NE: - Boolean result = EvalHelper.isEqual(this.left.evaluate(ctx), this.right.evaluate(ctx), ctx); - return result != null ? !result : null; - default: - return null; - } - } - - public static Object add(Object left, Object right, EvaluationContext ctx) { - if ( left == null || right == null ) { - return null; - } else if ( left instanceof String && right instanceof String ) { - return left + ((String) right); - } else if (left instanceof ChronoPeriod && right instanceof ChronoPeriod) { - return new ComparablePeriod(((ChronoPeriod) left).plus((ChronoPeriod) right)); - } else if ( left instanceof Duration && right instanceof Duration ) { - return ((Duration) left).plus( (Duration) right); - } else if (left instanceof ZonedDateTime && right instanceof ChronoPeriod) { - return ((ZonedDateTime) left).plus((ChronoPeriod) right); - } else if (left instanceof OffsetDateTime && right instanceof ChronoPeriod) { - return ((OffsetDateTime) left).plus((ChronoPeriod) right); - } else if (left instanceof LocalDateTime && right instanceof ChronoPeriod) { - return ((LocalDateTime) left).plus((ChronoPeriod) right); - } else if (left instanceof LocalDate && right instanceof ChronoPeriod) { - return ((LocalDate) left).plus((ChronoPeriod) right); - } else if ( left instanceof ZonedDateTime && right instanceof Duration ) { - return ((ZonedDateTime) left).plus( (Duration) right); - } else if ( left instanceof OffsetDateTime && right instanceof Duration ) { - return ((OffsetDateTime) left).plus( (Duration) right); - } else if ( left instanceof LocalDateTime && right instanceof Duration ) { - return ((LocalDateTime) left).plus( (Duration) right); - } else if ( left instanceof LocalDate && right instanceof Duration ) { - return addLocalDateAndDuration((LocalDate) left, (Duration) right); - } else if (left instanceof ChronoPeriod && right instanceof ZonedDateTime) { - return ((ZonedDateTime) right).plus((ChronoPeriod) left); - } else if (left instanceof ChronoPeriod && right instanceof OffsetDateTime) { - return ((OffsetDateTime) right).plus((ChronoPeriod) left); - } else if (left instanceof ChronoPeriod && right instanceof LocalDateTime) { - return ((LocalDateTime) right).plus((ChronoPeriod) left); - } else if (left instanceof ChronoPeriod && right instanceof LocalDate) { - return ((LocalDate) right).plus((ChronoPeriod) left); - } else if ( left instanceof Duration && right instanceof ZonedDateTime ) { - return ((ZonedDateTime) right).plus( (Duration) left); - } else if ( left instanceof Duration && right instanceof OffsetDateTime ) { - return ((OffsetDateTime) right).plus( (Duration) left); - } else if ( left instanceof Duration && right instanceof LocalDateTime ) { - return ((LocalDateTime) right).plus( (Duration) left); - } else if ( left instanceof Duration && right instanceof LocalDate ) { - return addLocalDateAndDuration((LocalDate) right, (Duration) left); - } else if ( left instanceof LocalTime && right instanceof Duration ) { - return ((LocalTime) left).plus( (Duration) right); - } else if ( left instanceof Duration && right instanceof LocalTime ) { - return ((LocalTime) right).plus( (Duration) left); - } else if ( left instanceof OffsetTime && right instanceof Duration ) { - return ((OffsetTime) left).plus( (Duration) right); - } else if ( left instanceof Duration && right instanceof OffsetTime ) { - return ((OffsetTime) right).plus( (Duration) left); - } else if ( left instanceof Temporal && right instanceof Temporal ) { - ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.OPERATION_IS_UNDEFINED_FOR_PARAMETERS.getMask())); - return null; - } else { - return math( left, right, ctx, (l, r) -> l.add( r, MathContext.DECIMAL128 ) ); - } - } - - public static Object sub(Object left, Object right, EvaluationContext ctx) { - if ( left == null || right == null ) { - return null; - } else if ( left instanceof Temporal && right instanceof Temporal ) { - return subtractTemporals((Temporal) left, (Temporal) right, ctx); - } else if (left instanceof ChronoPeriod && right instanceof ChronoPeriod) { - return new ComparablePeriod(((ChronoPeriod) left).minus((ChronoPeriod) right)); - } else if ( left instanceof Duration && right instanceof Duration ) { - return ((Duration) left).minus( (Duration) right); - } else if (left instanceof ZonedDateTime && right instanceof ChronoPeriod) { - return ((ZonedDateTime) left).minus((ChronoPeriod) right); - } else if (left instanceof OffsetDateTime && right instanceof ChronoPeriod) { - return ((OffsetDateTime) left).minus((ChronoPeriod) right); - } else if (left instanceof LocalDateTime && right instanceof ChronoPeriod) { - return ((LocalDateTime) left).minus((ChronoPeriod) right); - } else if (left instanceof LocalDate && right instanceof ChronoPeriod) { - return ((LocalDate) left).minus((ChronoPeriod) right); - } else if ( left instanceof ZonedDateTime && right instanceof Duration ) { - return ((ZonedDateTime) left).minus( (Duration) right); - } else if ( left instanceof OffsetDateTime && right instanceof Duration ) { - return ((OffsetDateTime) left).minus( (Duration) right); - } else if ( left instanceof LocalDateTime && right instanceof Duration ) { - return ((LocalDateTime) left).minus( (Duration) right); - } else if ( left instanceof LocalDate && right instanceof Duration ) { - LocalDateTime leftLDT = LocalDateTime.of((LocalDate) left, LocalTime.MIDNIGHT); - LocalDateTime evaluated = leftLDT.minus((Duration) right); - return LocalDate.of(evaluated.getYear(), evaluated.getMonth(), evaluated.getDayOfMonth()); - } else if ( left instanceof LocalTime && right instanceof Duration ) { - return ((LocalTime) left).minus( (Duration) right); - } else if ( left instanceof OffsetTime && right instanceof Duration ) { - return ((OffsetTime) left).minus( (Duration) right); - } else { - return math( left, right, ctx, (l, r) -> l.subtract( r, MathContext.DECIMAL128 ) ); - } - } - - public static Object mult(Object left, Object right, EvaluationContext ctx) { - if ( left == null || right == null ) { - return null; - } else if (!isAllowedMultiplicationBasedOnSpec(left, right, ctx)) { - return null; - } else if ( left instanceof Duration && right instanceof Number ) { - final BigDecimal durationNumericValue = BigDecimal.valueOf(((Duration) left).toNanos()); - final BigDecimal rightDecimal = BigDecimal.valueOf(((Number) right).doubleValue()); - return Duration.ofNanos(durationNumericValue.multiply(rightDecimal).longValue()); - } else if ( left instanceof Number && right instanceof Duration ) { - return Duration.ofSeconds( EvalHelper.getBigDecimalOrNull( left ).multiply( EvalHelper.getBigDecimalOrNull( ((Duration)right).getSeconds() ), MathContext.DECIMAL128 ).longValue() ); - } else if (left instanceof ChronoPeriod && right instanceof Number) { - return ComparablePeriod.ofMonths(EvalHelper.getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) left)).multiply(EvalHelper.getBigDecimalOrNull(right), MathContext.DECIMAL128).intValue()); - } else if (left instanceof Number && right instanceof ChronoPeriod) { - return ComparablePeriod.ofMonths(EvalHelper.getBigDecimalOrNull(left).multiply(EvalHelper.getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) right)), MathContext.DECIMAL128).intValue()); - } else if (left instanceof ChronoPeriod && right instanceof ChronoPeriod) { - return EvalHelper.getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) left)).multiply(EvalHelper.getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) right)), MathContext.DECIMAL128); - } else { - return math( left, right, ctx, (l, r) -> l.multiply( r, MathContext.DECIMAL128 ) ); - } - } - - public static Object div(Object left, Object right, EvaluationContext ctx) { - if ( left == null || right == null ) { - return null; - } else if ( left instanceof Duration && right instanceof Number ) { - final BigDecimal durationNumericValue = BigDecimal.valueOf(((Duration) left).toNanos()); - final BigDecimal rightDecimal = BigDecimal.valueOf(((Number) right).doubleValue()); - return Duration.ofNanos(durationNumericValue.divide(rightDecimal, 0, RoundingMode.HALF_EVEN).longValue()); - } else if ( left instanceof Number && right instanceof TemporalAmount) { - ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.OPERATION_IS_UNDEFINED_FOR_PARAMETERS.getMask())); - return null; - } else if ( left instanceof Duration && right instanceof Duration ) { - return EvalHelper.getBigDecimalOrNull( ((Duration) left).getSeconds() ).divide( EvalHelper.getBigDecimalOrNull( ((Duration)right).getSeconds() ), MathContext.DECIMAL128 ); - } else if (left instanceof ChronoPeriod && right instanceof Number) { - final BigDecimal rightDecimal = EvalHelper.getBigDecimalOrNull(right); - if (rightDecimal.compareTo(BigDecimal.ZERO) == 0) { - ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.DIVISION_BY_ZERO.getMask())); - return null; - } else { - return ComparablePeriod.ofMonths(EvalHelper.getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) left)).divide(rightDecimal, MathContext.DECIMAL128).intValue()); - } - } else if (left instanceof ChronoPeriod && right instanceof ChronoPeriod) { - return EvalHelper.getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) left)).divide(EvalHelper.getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) right)), MathContext.DECIMAL128); - } else { - return math( left, right, ctx, (l, r) -> l.divide( r, MathContext.DECIMAL128 ) ); - } - } - - public static Object math(Object left, Object right, EvaluationContext ctx, BinaryOperator op) { - BigDecimal l = left instanceof String ? null : EvalHelper.getBigDecimalOrNull( left ); - BigDecimal r = right instanceof String ? null : EvalHelper.getBigDecimalOrNull( right ); - if ( l == null || r == null ) { - return null; - } - try { - return op.apply( l, r ); - } catch ( ArithmeticException e ) { - // happens in cases like division by 0 - ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.createMessage(Msg.GENERAL_ARITHMETIC_EXCEPTION, e.getMessage()))); - return null; - } - } - - /** - * Implements the ternary logic AND operation - * @deprecated this variant do not allow short-circuit of the operator - */ - @Deprecated - public static Object and(Object left, Object right, EvaluationContext ctx) { - Boolean l = EvalHelper.getBooleanOrNull( left ); - Boolean r = EvalHelper.getBooleanOrNull( right ); - // have to check for all nulls first to avoid NPE - if ( (l == null && r == null) || (l == null && r == true) || (r == null && l == true) ) { - return null; - } else if ( l == null || r == null ) { - return false; - } - return l && r; - } - - /** - * Implements the ternary logic OR operation - * @deprecated this variant do not allow short-circuit of the operator - */ - @Deprecated - public static Object or(Object left, Object right, EvaluationContext ctx) { - Boolean l = EvalHelper.getBooleanOrNull( left ); - Boolean r = EvalHelper.getBooleanOrNull( right ); - // have to check for all nulls first to avoid NPE - if ( (l == null && r == null) || (l == null && r == false) || (r == null && l == false) ) { - return null; - } else if ( l == null || r == null ) { - return true; - } - return l || r; - } - - private static LocalDate addLocalDateAndDuration(LocalDate left, Duration right) { - LocalDateTime leftLDT = LocalDateTime.of( left, LocalTime.MIDNIGHT); - LocalDateTime evaluated = leftLDT.plus(right); - return LocalDate.of(evaluated.getYear(), evaluated.getMonth(), evaluated.getDayOfMonth()); + return operator.evaluate(this, ctx); } @Override public ASTNode[] getChildrenNode() { - return new ASTNode[] { left, right }; + return new ASTNode[]{left, right}; } @Override @@ -439,76 +128,4 @@ public T accept(Visitor v) { return v.visit(this); } - private static Object subtractTemporals(final Temporal left, final Temporal right, final EvaluationContext ctx) { - // Based on the Table 57 in the spec, if it is only date, convert to date and time. - final Temporal leftTemporal = getTemporalForSubtraction(left); - final Temporal rightTemporal = getTemporalForSubtraction(right); - - if (isAllowedTemporalSubtractionBasedOnSpec(leftTemporal, rightTemporal, ctx)) { - return Duration.between(rightTemporal, leftTemporal); - } else { - return null; - } - } - - private static Temporal getTemporalForSubtraction(final Temporal temporal) { - if (temporal instanceof LocalDate) { - return ZonedDateTime.of((LocalDate) temporal, LocalTime.MIDNIGHT, ZoneOffset.UTC); - } else { - return temporal; - } - } - - /** - * Checks if the multiplication is supported by the DMN specification based on the objects specified as parameters. - * - * @param left Left parameter of the subtraction expression. - * @param right Right parameter of the subtraction expression. - * @param ctx Context that is used to notify about not allowed set of parameters. - * @return True, if the parameters are valid for multiplication based on the DMN specification. - * False, when multiplication is not defined for the specified set of parameters in the DMN spec, or is forbidden:
- * - Multiplication of two durations e is not allowed in the specification. - */ - static boolean isAllowedMultiplicationBasedOnSpec(final Object left, final Object right, final EvaluationContext ctx) { - if (left instanceof TemporalAmount && right instanceof TemporalAmount) { - ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.createMessage(Msg.INVALID_PARAMETERS_FOR_OPERATION, "multiplication", - left.getClass().getName(), - right.getClass().getName()))); - return false; - } - return true; - } - - /** - * Checks if the subtraction is supported by the DMN specification based on the temporals specified as parameters. - * - * @param leftTemporal Left temporal parameter of the subtraction expression. - * @param rightTemporal Right temporal parameter of the subtraction expression. - * @param ctx Context that is used to notify about not allowed set of parameters. - * @return True, if the temporal parameters are valid for subtraction based on the DMN specification. - * False, when subtraction is not defined for the specified set of parameters in the DMN spec, or is forbidden:
- * - Subtraction of a datetime with timezone and a datetime without a timezone is not defined in the specification. - * - Subtraction of a time and a datetime is not defined in the specification. - */ - private static boolean isAllowedTemporalSubtractionBasedOnSpec(final Temporal leftTemporal, final Temporal rightTemporal, final EvaluationContext ctx) { - // Both datetimes have a timezone or both timezones don't have it. Cannot combine timezoned datetime and datetime without a timezone. - if ((leftTemporal instanceof ZonedDateTime || leftTemporal instanceof OffsetDateTime) - && (rightTemporal instanceof LocalDateTime)) { - ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.createMessage(Msg.DATE_AND_TIME_TIMEZONE_NEEDED, "first", leftTemporal, "second", rightTemporal))); - return false; - } else if ((rightTemporal instanceof ZonedDateTime || rightTemporal instanceof OffsetDateTime) - && (leftTemporal instanceof LocalDateTime)) { - ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.createMessage(Msg.DATE_AND_TIME_TIMEZONE_NEEDED, "second", rightTemporal, "first", leftTemporal))); - return false; - } - - // Cannot combine time and date (or datetime) based on the DMN specification. - if ((!leftTemporal.isSupported(ChronoUnit.DAYS) && rightTemporal.isSupported(ChronoUnit.DAYS)) - || (!rightTemporal.isSupported(ChronoUnit.DAYS) && leftTemporal.isSupported(ChronoUnit.DAYS))) { - ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.OPERATION_IS_UNDEFINED_FOR_PARAMETERS.getMask())); - return false; - } - - return true; - } } diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/InfixOperator.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/InfixOperator.java new file mode 100644 index 00000000000..b881f1925f6 --- /dev/null +++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/InfixOperator.java @@ -0,0 +1,79 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.lang.ast; + +import org.kie.dmn.feel.lang.EvaluationContext; +import org.kie.dmn.feel.lang.ast.infixexecutors.*; + +/** + * Enum responsible to execute Infix operations. + * Each entry provide + * 1. the symbol of the operator + * 2. the actual InfixExecutor instance to be executed + */ +public enum InfixOperator { + ADD("+", AddExecutor.instance()), + SUB("-", SubExecutor.instance()), + MULT("*", MultExecutor.instance()), + DIV("/", DivExecutor.instance()), + POW("**", PowExecutor.instance()), + LTE("<=", LteExecutor.instance()), + LT("<", LtExecutor.instance()), + GT(">", GtExecutor.instance()), + GTE(">=", GteExecutor.instance()), + EQ("=", EqExecutor.instance()), + NE("!=", NeExecutor.instance()), + AND("and", AndExecutor.instance()), + OR("or", OrExecutor.instance()); + + public final String symbol; + private final InfixExecutor infixExecutor; + + InfixOperator(String symbol, + InfixExecutor infixExecutor) { + this.symbol = symbol; + this.infixExecutor = infixExecutor; + } + + public static InfixOperator determineOperator(String symbol) { + for (InfixOperator op : InfixOperator.values()) { + if (op.symbol.equals(symbol)) { + return op; + } + } + throw new IllegalArgumentException("No operator found for symbol '" + symbol + "'"); + } + + public boolean isBoolean() { + return this == LTE || this == LT || this == GT || this == GTE || this == EQ || this == NE || this == AND || this == OR; + } + + public String getSymbol() { + return symbol; + } + + public Object evaluate(final Object left, final Object right, EvaluationContext ctx) { + return infixExecutor.evaluate(left, right, ctx); + } + + public Object evaluate(InfixOpNode opNode, EvaluationContext ctx) { + return infixExecutor.evaluate(opNode, ctx); + } + +} diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/AddExecutor.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/AddExecutor.java new file mode 100644 index 00000000000..3af4d454fa4 --- /dev/null +++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/AddExecutor.java @@ -0,0 +1,127 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.lang.ast.infixexecutors; + +import org.kie.dmn.api.feel.runtime.events.FEELEvent; +import org.kie.dmn.feel.lang.EvaluationContext; +import org.kie.dmn.feel.lang.ast.InfixOpNode; +import org.kie.dmn.feel.lang.types.impl.ComparablePeriod; +import org.kie.dmn.feel.runtime.events.InvalidParametersEvent; +import org.kie.dmn.feel.util.Msg; + +import java.math.MathContext; +import java.time.*; +import java.time.chrono.ChronoPeriod; +import java.time.temporal.Temporal; +import java.util.HashMap; +import java.util.Map; +import java.util.function.BiFunction; + +import static org.kie.dmn.feel.lang.ast.infixexecutors.InfixExecutorUtils.addLocalDateAndDuration; +import static org.kie.dmn.feel.lang.ast.infixexecutors.InfixExecutorUtils.math; + +public class AddExecutor implements InfixExecutor { + + private static final AddExecutor INSTANCE = new AddExecutor(); + private final Map> addFunctionsByClassesTuple; + + private AddExecutor() { + addFunctionsByClassesTuple = getAddFunctionsByClassesTuple(); + } + + public static AddExecutor instance() { + return INSTANCE; + } + + @Override + public Object evaluate(Object left, Object right, EvaluationContext ctx) { + return evaluate(new EvaluatedParameters(left, right), ctx); + } + + @Override + public Object evaluate(InfixOpNode infixNode, EvaluationContext ctx) { + return evaluate(infixNode.getLeft().evaluate(ctx), infixNode.getRight().evaluate(ctx), ctx); + } + + private Object evaluate(EvaluatedParameters params, EvaluationContext ctx) { + if (params.getLeft() == null || params.getRight() == null) { + return null; + } + ClassIdentifierTuple identifierTuple = new ClassIdentifierTuple(params.getLeft(), params.getRight()); + if (addFunctionsByClassesTuple.containsKey(identifierTuple)) { + return addFunctionsByClassesTuple.get(identifierTuple).apply(params, ctx); + } else { + return math(params.getLeft(), params.getRight(), ctx, (l, r) -> l.add(r, MathContext.DECIMAL128)); + } + } + + private Map> getAddFunctionsByClassesTuple() { + Map> toReturn = new HashMap<>(); + toReturn.put(new ClassIdentifierTuple(String.class, String.class), (parameters, ctx) -> parameters.getLeft() + (String) parameters.getRight()); + toReturn.put(new ClassIdentifierTuple(ChronoPeriod.class, ChronoPeriod.class), (parameters, ctx) -> + new ComparablePeriod(((ChronoPeriod) parameters.getLeft()).plus((ChronoPeriod) parameters.getRight()))); + toReturn.put(new ClassIdentifierTuple(Duration.class, Duration.class), (parameters, ctx) -> + ((Duration) parameters.getLeft()).plus((Duration) parameters.getRight())); + toReturn.put(new ClassIdentifierTuple(ZonedDateTime.class, ChronoPeriod.class), (parameters, ctx) -> + ((ZonedDateTime) parameters.getLeft()).plus((ChronoPeriod) parameters.getRight())); + toReturn.put(new ClassIdentifierTuple(OffsetDateTime.class, ChronoPeriod.class), (parameters, ctx) -> + ((OffsetDateTime) parameters.getLeft()).plus((ChronoPeriod) parameters.getRight())); + toReturn.put(new ClassIdentifierTuple(LocalDateTime.class, ChronoPeriod.class), (parameters, ctx) -> + ((LocalDateTime) parameters.getLeft()).plus((ChronoPeriod) parameters.getRight())); + toReturn.put(new ClassIdentifierTuple(LocalDate.class, ChronoPeriod.class), (parameters, ctx) -> + ((LocalDate) parameters.getLeft()).plus((ChronoPeriod) parameters.getRight())); + toReturn.put(new ClassIdentifierTuple(ZonedDateTime.class, Duration.class), (parameters, ctx) -> + ((ZonedDateTime) parameters.getLeft()).plus((Duration) parameters.getRight())); + toReturn.put(new ClassIdentifierTuple(OffsetDateTime.class, Duration.class), (parameters, ctx) -> + ((OffsetDateTime) parameters.getLeft()).plus((Duration) parameters.getRight())); + toReturn.put(new ClassIdentifierTuple(LocalDateTime.class, Duration.class), (parameters, ctx) -> + ((LocalDateTime) parameters.getLeft()).plus((Duration) parameters.getRight())); + toReturn.put(new ClassIdentifierTuple(LocalDate.class, Duration.class), (parameters, ctx) -> + addLocalDateAndDuration((LocalDate) parameters.getLeft(), (Duration) parameters.getRight())); + toReturn.put(new ClassIdentifierTuple(ChronoPeriod.class, ZonedDateTime.class), (parameters, ctx) -> + ((ZonedDateTime) parameters.getRight()).plus((ChronoPeriod) parameters.getLeft())); + toReturn.put(new ClassIdentifierTuple(ChronoPeriod.class, OffsetDateTime.class), (parameters, ctx) -> + ((OffsetDateTime) parameters.getRight()).plus((ChronoPeriod) parameters.getLeft())); + toReturn.put(new ClassIdentifierTuple(ChronoPeriod.class, LocalDateTime.class), (parameters, ctx) -> + ((LocalDateTime) parameters.getRight()).plus((ChronoPeriod) parameters.getLeft())); + toReturn.put(new ClassIdentifierTuple(ChronoPeriod.class, LocalDate.class), (parameters, ctx) -> + ((LocalDate) parameters.getRight()).plus((ChronoPeriod) parameters.getLeft())); + toReturn.put(new ClassIdentifierTuple(Duration.class, ZonedDateTime.class), (parameters, ctx) -> + ((ZonedDateTime) parameters.getRight()).plus((Duration) parameters.getLeft())); + toReturn.put(new ClassIdentifierTuple(Duration.class, OffsetDateTime.class), (parameters, ctx) -> + ((OffsetDateTime) parameters.getRight()).plus((Duration) parameters.getLeft())); + toReturn.put(new ClassIdentifierTuple(Duration.class, LocalDateTime.class), (parameters, ctx) -> + ((LocalDateTime) parameters.getRight()).plus((Duration) parameters.getLeft())); + toReturn.put(new ClassIdentifierTuple(Duration.class, LocalDate.class), (parameters, ctx) -> + addLocalDateAndDuration((LocalDate) parameters.getRight(), (Duration) parameters.getLeft())); + toReturn.put(new ClassIdentifierTuple(LocalTime.class, Duration.class), (parameters, ctx) -> + ((LocalTime) parameters.getLeft()).plus((Duration) parameters.getRight())); + toReturn.put(new ClassIdentifierTuple(Duration.class, LocalTime.class), (parameters, ctx) -> + ((LocalTime) parameters.getRight()).plus((Duration) parameters.getLeft())); + toReturn.put(new ClassIdentifierTuple(OffsetTime.class, Duration.class), (parameters, ctx) -> + ((OffsetTime) parameters.getLeft()).plus((Duration) parameters.getRight())); + toReturn.put(new ClassIdentifierTuple(Duration.class, OffsetTime.class), (parameters, ctx) -> + ((OffsetTime) parameters.getRight()).plus((Duration) parameters.getLeft())); + toReturn.put(new ClassIdentifierTuple(Temporal.class, Temporal.class), (parameters, ctx) -> { + ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.OPERATION_IS_UNDEFINED_FOR_PARAMETERS.getMask())); + return null; + }); + return toReturn; + } +} diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/AndExecutor.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/AndExecutor.java new file mode 100644 index 00000000000..766c74ba659 --- /dev/null +++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/AndExecutor.java @@ -0,0 +1,58 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.lang.ast.infixexecutors; + +import org.kie.dmn.feel.lang.EvaluationContext; +import org.kie.dmn.feel.lang.ast.InfixOpNode; +import org.kie.dmn.feel.util.EvalHelper; + +import static org.kie.dmn.feel.lang.ast.infixexecutors.InfixExecutorUtils.and; + +public class AndExecutor implements InfixExecutor { + + private static final AndExecutor INSTANCE = new AndExecutor(); + + private AndExecutor() { + } + + public static AndExecutor instance() { + return INSTANCE; + } + + @Override + public Object evaluate(Object left, Object right, EvaluationContext ctx) { + return and(left, right, ctx); + } + + @Override + public Object evaluate(InfixOpNode infixNode, EvaluationContext ctx) { + Boolean leftAND = EvalHelper.getBooleanOrNull(infixNode.getLeft().evaluate(ctx)); + if (leftAND != null) { + if (leftAND.booleanValue()) { + return EvalHelper.getBooleanOrNull(infixNode.getRight().evaluate(ctx)); + } else { + return Boolean.FALSE; //left hand operand is false, we do not need to evaluate right side + } + } else { + Boolean rightAND = EvalHelper.getBooleanOrNull(infixNode.getRight().evaluate(ctx)); + return Boolean.FALSE.equals(rightAND) ? Boolean.FALSE : null; + } + } + +} diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/ClassIdentifierTuple.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/ClassIdentifierTuple.java new file mode 100644 index 00000000000..bbecdbccfb6 --- /dev/null +++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/ClassIdentifierTuple.java @@ -0,0 +1,56 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.lang.ast.infixexecutors; + +import java.util.Objects; + +public class ClassIdentifierTuple { + + private final Class LEFT_TYPE; + private final Class RIGHT_TYPE; + + + public ClassIdentifierTuple(Object leftObject, Object rightObject) { + this.LEFT_TYPE = leftObject != null ? leftObject.getClass() : null; + this.RIGHT_TYPE = rightObject != null ? rightObject.getClass() : null; + } + + public ClassIdentifierTuple(Class leftType, Class rightType) { + this.LEFT_TYPE = leftType; + this.RIGHT_TYPE = rightType; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + ClassIdentifierTuple that = (ClassIdentifierTuple) o; + return isEquals(LEFT_TYPE, that.LEFT_TYPE) && isEquals(RIGHT_TYPE, that.RIGHT_TYPE); + } + + @Override + public int hashCode() { + return 1; + } + + static boolean isEquals(Class thisClass, Class thatClass) { + return (thisClass != null && thatClass != null) && + (Objects.equals(thisClass, thatClass) || thatClass.isAssignableFrom(thisClass)); + } +} diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/DivExecutor.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/DivExecutor.java new file mode 100644 index 00000000000..9a2bb13479b --- /dev/null +++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/DivExecutor.java @@ -0,0 +1,102 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.lang.ast.infixexecutors; + +import org.kie.dmn.api.feel.runtime.events.FEELEvent; +import org.kie.dmn.feel.lang.EvaluationContext; +import org.kie.dmn.feel.lang.ast.InfixOpNode; +import org.kie.dmn.feel.lang.types.impl.ComparablePeriod; +import org.kie.dmn.feel.runtime.events.InvalidParametersEvent; +import org.kie.dmn.feel.util.EvalHelper; +import org.kie.dmn.feel.util.Msg; + +import java.math.BigDecimal; +import java.math.MathContext; +import java.math.RoundingMode; +import java.time.Duration; +import java.time.chrono.ChronoPeriod; +import java.time.temporal.TemporalAmount; +import java.util.HashMap; +import java.util.Map; +import java.util.function.BiFunction; + +import static org.kie.dmn.feel.lang.ast.infixexecutors.InfixExecutorUtils.math; + +public class DivExecutor implements InfixExecutor { + + private static final DivExecutor INSTANCE = new DivExecutor(); + private final Map> sumFunctionsByClassesTuple; + + private DivExecutor() { + sumFunctionsByClassesTuple = getSumFunctionsByClassesTuple(); + } + + public static DivExecutor instance() { + return INSTANCE; + } + + @Override + public Object evaluate(Object left, Object right, EvaluationContext ctx) { + return evaluate(new EvaluatedParameters(left, right), ctx); + } + + @Override + public Object evaluate(InfixOpNode infixNode, EvaluationContext ctx) { + return evaluate(infixNode.getLeft().evaluate(ctx), infixNode.getRight().evaluate(ctx), ctx); + } + + private Object evaluate(EvaluatedParameters params, EvaluationContext ctx) { + if (params.getLeft() == null || params.getRight() == null) { + return null; + } + ClassIdentifierTuple identifierTuple = new ClassIdentifierTuple(params.getLeft(), params.getRight()); + if (sumFunctionsByClassesTuple.containsKey(identifierTuple)) { + return sumFunctionsByClassesTuple.get(identifierTuple).apply(params, ctx); + } else { + return math(params.getLeft(), params.getRight(), ctx, (l, r) -> l.divide(r, MathContext.DECIMAL128)); + } + } + + private Map> getSumFunctionsByClassesTuple() { + Map> toReturn = new HashMap<>(); + toReturn.put(new ClassIdentifierTuple(Duration.class, Number.class), (parameters, ctx) -> { + final BigDecimal durationNumericValue = BigDecimal.valueOf(((Duration) parameters.getLeft()).toNanos()); + final BigDecimal rightDecimal = BigDecimal.valueOf(((Number) parameters.getRight()).doubleValue()); + return Duration.ofNanos(durationNumericValue.divide(rightDecimal, 0, RoundingMode.HALF_EVEN).longValue()); + }); + toReturn.put(new ClassIdentifierTuple(Number.class, TemporalAmount.class), (parameters, ctx) -> { + ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.OPERATION_IS_UNDEFINED_FOR_PARAMETERS.getMask())); + return null; + }); + toReturn.put(new ClassIdentifierTuple(Duration.class, Duration.class), (parameters, ctx) -> + EvalHelper.getBigDecimalOrNull(((Duration) parameters.getLeft()).getSeconds()).divide(EvalHelper.getBigDecimalOrNull(((Duration) parameters.getRight()).getSeconds()), MathContext.DECIMAL128)); + toReturn.put(new ClassIdentifierTuple(ChronoPeriod.class, Number.class), (parameters, ctx) -> { + final BigDecimal rightDecimal = EvalHelper.getBigDecimalOrNull(parameters.getRight()); + if (rightDecimal.compareTo(BigDecimal.ZERO) == 0) { + ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.DIVISION_BY_ZERO.getMask())); + return null; + } else { + return ComparablePeriod.ofMonths(EvalHelper.getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) parameters.getLeft())).divide(rightDecimal, MathContext.DECIMAL128).intValue()); + } + }); + toReturn.put(new ClassIdentifierTuple(ChronoPeriod.class, ChronoPeriod.class), (parameters, ctx) -> + EvalHelper.getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) parameters.getLeft())).divide(EvalHelper.getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) parameters.getRight())), MathContext.DECIMAL128)); + return toReturn; + } +} diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/EqExecutor.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/EqExecutor.java new file mode 100644 index 00000000000..144d12019ff --- /dev/null +++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/EqExecutor.java @@ -0,0 +1,46 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.lang.ast.infixexecutors; + +import org.kie.dmn.feel.lang.EvaluationContext; +import org.kie.dmn.feel.lang.ast.InfixOpNode; +import org.kie.dmn.feel.util.EvalHelper; + +public class EqExecutor implements InfixExecutor { + + private static final EqExecutor INSTANCE = new EqExecutor(); + + private EqExecutor() { + } + + public static EqExecutor instance() { + return INSTANCE; + } + + @Override + public Object evaluate(Object left, Object right, EvaluationContext ctx) { + return EvalHelper.isEqual(left, right, ctx); + } + + @Override + public Object evaluate(InfixOpNode infixNode, EvaluationContext ctx) { + return evaluate(infixNode.getLeft().evaluate(ctx), infixNode.getRight().evaluate(ctx), ctx); + } + +} diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/EvaluatedParameters.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/EvaluatedParameters.java new file mode 100644 index 00000000000..a4f14dfd4bd --- /dev/null +++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/EvaluatedParameters.java @@ -0,0 +1,38 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.lang.ast.infixexecutors; + +public class EvaluatedParameters { + + private final Object left; + private final Object right; + + public EvaluatedParameters(Object leftObject, Object rightObject) { + this.left = leftObject; + this.right = rightObject; + } + + public Object getLeft() { + return left; + } + + public Object getRight() { + return right; + } + } \ No newline at end of file diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/GtExecutor.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/GtExecutor.java new file mode 100644 index 00000000000..86a289ce5be --- /dev/null +++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/GtExecutor.java @@ -0,0 +1,46 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.lang.ast.infixexecutors; + +import org.kie.dmn.feel.lang.EvaluationContext; +import org.kie.dmn.feel.lang.ast.InfixOpNode; +import org.kie.dmn.feel.util.EvalHelper; + +public class GtExecutor implements InfixExecutor { + + private static final GtExecutor INSTANCE = new GtExecutor(); + + private GtExecutor() { + } + + public static GtExecutor instance() { + return INSTANCE; + } + + @Override + public Object evaluate(Object left, Object right, EvaluationContext ctx) { + return EvalHelper.compare(left, right, ctx, (l, r) -> l.compareTo(r) > 0); + } + + @Override + public Object evaluate(InfixOpNode infixNode, EvaluationContext ctx) { + return evaluate(infixNode.getLeft().evaluate(ctx), infixNode.getRight().evaluate(ctx), ctx); + } + +} diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/GteExecutor.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/GteExecutor.java new file mode 100644 index 00000000000..9a50dd40c29 --- /dev/null +++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/GteExecutor.java @@ -0,0 +1,49 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.lang.ast.infixexecutors; + +import org.kie.dmn.feel.lang.EvaluationContext; +import org.kie.dmn.feel.lang.ast.InfixOpNode; +import org.kie.dmn.feel.util.EvalHelper; + +import static org.kie.dmn.feel.lang.ast.infixexecutors.InfixExecutorUtils.or; + +public class GteExecutor implements InfixExecutor { + + private static final GteExecutor INSTANCE = new GteExecutor(); + + private GteExecutor() { + } + + public static GteExecutor instance() { + return INSTANCE; + } + + @Override + public Object evaluate(Object left, Object right, EvaluationContext ctx) { + return or(EvalHelper.compare(left, right, ctx, (l, r) -> l.compareTo(r) > 0), + EvalHelper.isEqual(left, right, ctx), + ctx); // do not use Java || to avoid potential NPE due to FEEL 3vl. + } + + @Override + public Object evaluate(InfixOpNode infixNode, EvaluationContext ctx) { + return evaluate(infixNode.getLeft().evaluate(ctx), infixNode.getRight().evaluate(ctx), ctx); + } +} diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/InfixExecutor.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/InfixExecutor.java new file mode 100644 index 00000000000..3a594555c83 --- /dev/null +++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/InfixExecutor.java @@ -0,0 +1,30 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.lang.ast.infixexecutors; + +import org.kie.dmn.feel.lang.EvaluationContext; +import org.kie.dmn.feel.lang.ast.InfixOpNode; + +public interface InfixExecutor { + + Object evaluate(final Object left, final Object right, EvaluationContext ctx); + + Object evaluate(InfixOpNode infixNode, EvaluationContext ctx); + +} diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/InfixExecutorUtils.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/InfixExecutorUtils.java new file mode 100644 index 00000000000..2ebd96768e3 --- /dev/null +++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/InfixExecutorUtils.java @@ -0,0 +1,165 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.lang.ast.infixexecutors; + +import org.kie.dmn.api.feel.runtime.events.FEELEvent; +import org.kie.dmn.feel.lang.EvaluationContext; +import org.kie.dmn.feel.runtime.events.InvalidParametersEvent; +import org.kie.dmn.feel.util.EvalHelper; +import org.kie.dmn.feel.util.Msg; + +import java.math.BigDecimal; +import java.time.*; +import java.time.temporal.ChronoUnit; +import java.time.temporal.Temporal; +import java.time.temporal.TemporalAmount; +import java.util.function.BinaryOperator; + +public class InfixExecutorUtils { + + /** + * Implements the ternary logic OR operation + * + * @deprecated this variant do not allow short-circuit of the operator + */ + @Deprecated + public static Object or(Object left, Object right, EvaluationContext ctx) { + Boolean l = EvalHelper.getBooleanOrNull(left); + Boolean r = EvalHelper.getBooleanOrNull(right); + // have to check for all nulls first to avoid NPE + if ((l == null && r == null) || (l == null && r == false) || (r == null && l == false)) { + return null; + } else if (l == null || r == null) { + return true; + } + return l || r; + } + + /** + * Implements the ternary logic AND operation + * + * @deprecated this variant do not allow short-circuit of the operator + */ + @Deprecated + public static Object and(Object left, Object right, EvaluationContext ctx) { + Boolean l = EvalHelper.getBooleanOrNull(left); + Boolean r = EvalHelper.getBooleanOrNull(right); + // have to check for all nulls first to avoid NPE + if ((l == null && r == null) || (l == null && r == true) || (r == null && l == true)) { + return null; + } else if (l == null || r == null) { + return false; + } + return l && r; + } + + static Object math(Object left, Object right, EvaluationContext ctx, BinaryOperator op) { + BigDecimal l = left instanceof String ? null : EvalHelper.getBigDecimalOrNull(left); + BigDecimal r = right instanceof String ? null : EvalHelper.getBigDecimalOrNull(right); + if (l == null || r == null) { + return null; + } + try { + return op.apply(l, r); + } catch (ArithmeticException e) { + // happens in cases like division by 0 + ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.createMessage(Msg.GENERAL_ARITHMETIC_EXCEPTION, e.getMessage()))); + return null; + } + } + + static LocalDate addLocalDateAndDuration(LocalDate left, Duration right) { + LocalDateTime leftLDT = LocalDateTime.of(left, LocalTime.MIDNIGHT); + LocalDateTime evaluated = leftLDT.plus(right); + return LocalDate.of(evaluated.getYear(), evaluated.getMonth(), evaluated.getDayOfMonth()); + } + + static Object subtractTemporals(final Temporal left, final Temporal right, final EvaluationContext ctx) { + // Based on the Table 57 in the spec, if it is only date, convert to date and time. + final Temporal leftTemporal = getTemporalForSubtraction(left); + final Temporal rightTemporal = getTemporalForSubtraction(right); + + if (isAllowedTemporalSubtractionBasedOnSpec(leftTemporal, rightTemporal, ctx)) { + return Duration.between(rightTemporal, leftTemporal); + } else { + return null; + } + } + + static Temporal getTemporalForSubtraction(final Temporal temporal) { + if (temporal instanceof LocalDate) { + return ZonedDateTime.of((LocalDate) temporal, LocalTime.MIDNIGHT, ZoneOffset.UTC); + } else { + return temporal; + } + } + + /** + * Checks if the multiplication is supported by the DMN specification based on the objects specified as parameters. + * + * @param left Left parameter of the subtraction expression. + * @param right Right parameter of the subtraction expression. + * @param ctx Context that is used to notify about not allowed set of parameters. + * @return True, if the parameters are valid for multiplication based on the DMN specification. + * False, when multiplication is not defined for the specified set of parameters in the DMN spec, or is forbidden:
+ * - Multiplication of two durations e is not allowed in the specification. + */ + static boolean isAllowedMultiplicationBasedOnSpec(final Object left, final Object right, final EvaluationContext ctx) { + if (left instanceof TemporalAmount && right instanceof TemporalAmount) { + ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.createMessage(Msg.INVALID_PARAMETERS_FOR_OPERATION, "multiplication", + left.getClass().getName(), + right.getClass().getName()))); + return false; + } + return true; + } + + /** + * Checks if the subtraction is supported by the DMN specification based on the temporals specified as parameters. + * + * @param leftTemporal Left temporal parameter of the subtraction expression. + * @param rightTemporal Right temporal parameter of the subtraction expression. + * @param ctx Context that is used to notify about not allowed set of parameters. + * @return True, if the temporal parameters are valid for subtraction based on the DMN specification. + * False, when subtraction is not defined for the specified set of parameters in the DMN spec, or is forbidden:
+ * - Subtraction of a datetime with timezone and a datetime without a timezone is not defined in the specification. + * - Subtraction of a time and a datetime is not defined in the specification. + */ + static boolean isAllowedTemporalSubtractionBasedOnSpec(final Temporal leftTemporal, final Temporal rightTemporal, final EvaluationContext ctx) { + // Both datetimes have a timezone or both timezones don't have it. Cannot combine timezoned datetime and datetime without a timezone. + if ((leftTemporal instanceof ZonedDateTime || leftTemporal instanceof OffsetDateTime) + && (rightTemporal instanceof LocalDateTime)) { + ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.createMessage(Msg.DATE_AND_TIME_TIMEZONE_NEEDED, "first", leftTemporal, "second", rightTemporal))); + return false; + } else if ((rightTemporal instanceof ZonedDateTime || rightTemporal instanceof OffsetDateTime) + && (leftTemporal instanceof LocalDateTime)) { + ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.createMessage(Msg.DATE_AND_TIME_TIMEZONE_NEEDED, "second", rightTemporal, "first", leftTemporal))); + return false; + } + + // Cannot combine time and date (or datetime) based on the DMN specification. + if ((!leftTemporal.isSupported(ChronoUnit.DAYS) && rightTemporal.isSupported(ChronoUnit.DAYS)) + || (!rightTemporal.isSupported(ChronoUnit.DAYS) && leftTemporal.isSupported(ChronoUnit.DAYS))) { + ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.OPERATION_IS_UNDEFINED_FOR_PARAMETERS.getMask())); + return false; + } + return true; + } + +} diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/LtExecutor.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/LtExecutor.java new file mode 100644 index 00000000000..0db56818b9f --- /dev/null +++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/LtExecutor.java @@ -0,0 +1,46 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.lang.ast.infixexecutors; + +import org.kie.dmn.feel.lang.EvaluationContext; +import org.kie.dmn.feel.lang.ast.InfixOpNode; +import org.kie.dmn.feel.util.EvalHelper; + +public class LtExecutor implements InfixExecutor { + + private static final LtExecutor INSTANCE = new LtExecutor(); + + private LtExecutor() { + } + + public static LtExecutor instance() { + return INSTANCE; + } + + @Override + public Object evaluate(Object left, Object right, EvaluationContext ctx) { + return EvalHelper.compare(left, right, ctx, (l, r) -> l.compareTo(r) < 0); + } + + @Override + public Object evaluate(InfixOpNode infixNode, EvaluationContext ctx) { + return evaluate(infixNode.getLeft().evaluate(ctx), infixNode.getRight().evaluate(ctx), ctx); + } + +} diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/LteExecutor.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/LteExecutor.java new file mode 100644 index 00000000000..d4f9d908860 --- /dev/null +++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/LteExecutor.java @@ -0,0 +1,50 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.lang.ast.infixexecutors; + +import org.kie.dmn.feel.lang.EvaluationContext; +import org.kie.dmn.feel.lang.ast.InfixOpNode; +import org.kie.dmn.feel.util.EvalHelper; + +import static org.kie.dmn.feel.lang.ast.infixexecutors.InfixExecutorUtils.or; + +public class LteExecutor implements InfixExecutor { + + private static final LteExecutor INSTANCE = new LteExecutor(); + + private LteExecutor() { + } + + public static LteExecutor instance() { + return INSTANCE; + } + + @Override + public Object evaluate(Object left, Object right, EvaluationContext ctx) { + return or(EvalHelper.compare(left, right, ctx, (l, r) -> l.compareTo(r) < 0), + EvalHelper.isEqual(left, right, ctx), + ctx); // do not use Java || to avoid potential NPE due to FEEL 3vl. + } + + @Override + public Object evaluate(InfixOpNode infixNode, EvaluationContext ctx) { + return evaluate(infixNode.getLeft().evaluate(ctx), infixNode.getRight().evaluate(ctx), ctx); + } + +} diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/MultExecutor.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/MultExecutor.java new file mode 100644 index 00000000000..3b435ce50b1 --- /dev/null +++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/MultExecutor.java @@ -0,0 +1,91 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.lang.ast.infixexecutors; + +import org.kie.dmn.feel.lang.EvaluationContext; +import org.kie.dmn.feel.lang.ast.InfixOpNode; +import org.kie.dmn.feel.lang.types.impl.ComparablePeriod; +import org.kie.dmn.feel.util.EvalHelper; + +import java.math.BigDecimal; +import java.math.MathContext; +import java.time.*; +import java.time.chrono.ChronoPeriod; +import java.util.HashMap; +import java.util.Map; +import java.util.function.BiFunction; + +import static org.kie.dmn.feel.lang.ast.infixexecutors.InfixExecutorUtils.isAllowedMultiplicationBasedOnSpec; +import static org.kie.dmn.feel.lang.ast.infixexecutors.InfixExecutorUtils.math; + +public class MultExecutor implements InfixExecutor { + + private static final MultExecutor INSTANCE = new MultExecutor(); + private final Map> multFunctionsByClassesTuple; + + private MultExecutor() { + multFunctionsByClassesTuple = getMultFunctionsByClassesTuple(); + } + + public static MultExecutor instance() { + return INSTANCE; + } + + @Override + public Object evaluate(Object left, Object right, EvaluationContext ctx) { + return evaluate(new EvaluatedParameters(left, right), ctx); + } + + @Override + public Object evaluate(InfixOpNode infixNode, EvaluationContext ctx) { + return evaluate(infixNode.getLeft().evaluate(ctx), infixNode.getRight().evaluate(ctx), ctx); + } + + private Object evaluate(EvaluatedParameters params, EvaluationContext ctx) { + if ( params.getLeft() == null || params.getRight() == null ) { + return null; + } else if (!isAllowedMultiplicationBasedOnSpec(params.getLeft(), params.getRight(), ctx)) { + return null; + } + ClassIdentifierTuple identifierTuple = new ClassIdentifierTuple(params.getLeft(), params.getRight()); + if (multFunctionsByClassesTuple.containsKey(identifierTuple)) { + return multFunctionsByClassesTuple.get(identifierTuple).apply(params, ctx); + } else { + return math( params.getLeft(), params.getRight(), ctx, (l, r) -> l.multiply( r, MathContext.DECIMAL128 ) ); + } + } + + private Map> getMultFunctionsByClassesTuple() { + Map> toReturn = new HashMap<>(); + toReturn.put(new ClassIdentifierTuple(Duration.class, Number.class), (parameters, ctx) -> { + final BigDecimal durationNumericValue = BigDecimal.valueOf(((Duration) parameters.getLeft()).toNanos()); + final BigDecimal rightDecimal = BigDecimal.valueOf(((Number) parameters.getRight()).doubleValue()); + return Duration.ofNanos(durationNumericValue.multiply(rightDecimal).longValue()); + }); + toReturn.put(new ClassIdentifierTuple(Number.class, Duration.class), (parameters, ctx) -> + Duration.ofSeconds(EvalHelper.getBigDecimalOrNull(parameters.getLeft()).multiply(EvalHelper.getBigDecimalOrNull(((Duration) parameters.getRight()).getSeconds()), MathContext.DECIMAL128).longValue())); + toReturn.put(new ClassIdentifierTuple(ChronoPeriod.class, Number.class), (parameters, ctx) -> + ComparablePeriod.ofMonths(EvalHelper.getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) parameters.getLeft())).multiply(EvalHelper.getBigDecimalOrNull(parameters.getRight()), MathContext.DECIMAL128).intValue())); + toReturn.put(new ClassIdentifierTuple(Number.class, ChronoPeriod.class), (parameters, ctx) -> + ComparablePeriod.ofMonths(EvalHelper.getBigDecimalOrNull(parameters.getLeft()).multiply(EvalHelper.getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) parameters.getRight())), MathContext.DECIMAL128).intValue())); + toReturn.put(new ClassIdentifierTuple(ChronoPeriod.class, ChronoPeriod.class), (parameters, ctx) -> + EvalHelper.getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) parameters.getLeft())).multiply(EvalHelper.getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) parameters.getRight())), MathContext.DECIMAL128)); + return toReturn; + } +} diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/NeExecutor.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/NeExecutor.java new file mode 100644 index 00000000000..4e285dae103 --- /dev/null +++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/NeExecutor.java @@ -0,0 +1,47 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.lang.ast.infixexecutors; + +import org.kie.dmn.feel.lang.EvaluationContext; +import org.kie.dmn.feel.lang.ast.InfixOpNode; +import org.kie.dmn.feel.util.EvalHelper; + +public class NeExecutor implements InfixExecutor { + + private static final NeExecutor INSTANCE = new NeExecutor(); + + private NeExecutor() { + } + + public static NeExecutor instance() { + return INSTANCE; + } + + @Override + public Object evaluate(Object left, Object right, EvaluationContext ctx) { + Boolean result = EvalHelper.isEqual(left, right, ctx); + return result != null ? !result : null; + } + + @Override + public Object evaluate(InfixOpNode infixNode, EvaluationContext ctx) { + return evaluate(infixNode.getLeft().evaluate(ctx), infixNode.getRight().evaluate(ctx), ctx); + } + +} diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/OrExecutor.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/OrExecutor.java new file mode 100644 index 00000000000..8c079bd9c9b --- /dev/null +++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/OrExecutor.java @@ -0,0 +1,58 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.lang.ast.infixexecutors; + +import org.kie.dmn.feel.lang.EvaluationContext; +import org.kie.dmn.feel.lang.ast.InfixOpNode; +import org.kie.dmn.feel.util.EvalHelper; + +import static org.kie.dmn.feel.lang.ast.infixexecutors.InfixExecutorUtils.or; + +public class OrExecutor implements InfixExecutor { + + private static final OrExecutor INSTANCE = new OrExecutor(); + + private OrExecutor() { + } + + public static OrExecutor instance() { + return INSTANCE; + } + + @Override + public Object evaluate(Object left, Object right, EvaluationContext ctx) { + return or(left, right, ctx); + } + + @Override + public Object evaluate(InfixOpNode infixNode, EvaluationContext ctx) { + Boolean leftOR = EvalHelper.getBooleanOrNull(infixNode.getLeft().evaluate(ctx)); + if (leftOR != null) { + if (!leftOR.booleanValue()) { + return EvalHelper.getBooleanOrNull(infixNode.getRight().evaluate(ctx)); + } else { + return Boolean.TRUE; //left hand operand is true, we do not need to evaluate right side + } + } else { + Boolean rightOR = EvalHelper.getBooleanOrNull(infixNode.getRight().evaluate(ctx)); + return Boolean.TRUE.equals(rightOR) ? Boolean.TRUE : null; + } + } + +} diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/PowExecutor.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/PowExecutor.java new file mode 100644 index 00000000000..8f0e09cb0c3 --- /dev/null +++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/PowExecutor.java @@ -0,0 +1,50 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.lang.ast.infixexecutors; + +import ch.obermuhlner.math.big.BigDecimalMath; +import org.kie.dmn.feel.lang.EvaluationContext; +import org.kie.dmn.feel.lang.ast.InfixOpNode; + +import java.math.MathContext; + +import static org.kie.dmn.feel.lang.ast.infixexecutors.InfixExecutorUtils.math; + +public class PowExecutor implements InfixExecutor { + + private static final PowExecutor INSTANCE = new PowExecutor(); + + private PowExecutor() { + } + + public static PowExecutor instance() { + return INSTANCE; + } + + @Override + public Object evaluate(Object left, Object right, EvaluationContext ctx) { + return math(left, right, ctx, (l, r) -> BigDecimalMath.pow(l, r, MathContext.DECIMAL128)); + } + + @Override + public Object evaluate(InfixOpNode infixNode, EvaluationContext ctx) { + return evaluate(infixNode.getLeft().evaluate(ctx), infixNode.getRight().evaluate(ctx), ctx); + } + +} diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/SubExecutor.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/SubExecutor.java new file mode 100644 index 00000000000..2516a3c0dbd --- /dev/null +++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/SubExecutor.java @@ -0,0 +1,104 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.lang.ast.infixexecutors; + +import org.kie.dmn.feel.lang.EvaluationContext; +import org.kie.dmn.feel.lang.ast.InfixOpNode; +import org.kie.dmn.feel.lang.types.impl.ComparablePeriod; + +import java.math.MathContext; +import java.time.*; +import java.time.chrono.ChronoPeriod; +import java.time.temporal.Temporal; +import java.util.HashMap; +import java.util.Map; +import java.util.function.BiFunction; + +import static org.kie.dmn.feel.lang.ast.infixexecutors.InfixExecutorUtils.math; +import static org.kie.dmn.feel.lang.ast.infixexecutors.InfixExecutorUtils.subtractTemporals; + +public class SubExecutor implements InfixExecutor { + + private static final SubExecutor INSTANCE = new SubExecutor(); + private final Map> subFunctionsByClassesTuple; + + private SubExecutor() { + subFunctionsByClassesTuple = getSubFunctionsByClassesTuple(); + } + + public static SubExecutor instance() { + return INSTANCE; + } + + @Override + public Object evaluate(Object left, Object right, EvaluationContext ctx) { + return evaluate(new EvaluatedParameters(left, right), ctx); + } + + @Override + public Object evaluate(InfixOpNode infixNode, EvaluationContext ctx) { + return evaluate(infixNode.getLeft().evaluate(ctx), infixNode.getRight().evaluate(ctx), ctx); + } + + private Object evaluate(EvaluatedParameters params, EvaluationContext ctx) { + if (params.getLeft() == null || params.getRight() == null) { + return null; + } + ClassIdentifierTuple identifierTuple = new ClassIdentifierTuple(params.getLeft(), params.getRight()); + if (subFunctionsByClassesTuple.containsKey(identifierTuple)) { + return subFunctionsByClassesTuple.get(identifierTuple).apply(params, ctx); + } else { + return math(params.getLeft(), params.getRight(), ctx, (l, r) -> l.subtract(r, MathContext.DECIMAL128)); + } + } + + private Map> getSubFunctionsByClassesTuple() { + Map> toReturn = new HashMap<>(); + toReturn.put(new ClassIdentifierTuple(Temporal.class, Temporal.class), (parameters, ctx) -> + subtractTemporals((Temporal) parameters.getLeft(), (Temporal) parameters.getRight(), ctx)); + toReturn.put(new ClassIdentifierTuple(ChronoPeriod.class, ChronoPeriod.class), (parameters, ctx) -> + new ComparablePeriod(((ChronoPeriod) parameters.getLeft()).minus((ChronoPeriod) parameters.getRight()))); + toReturn.put(new ClassIdentifierTuple(Duration.class, Duration.class), (parameters, ctx) -> + ((Duration) parameters.getLeft()).minus((Duration) parameters.getRight())); + toReturn.put(new ClassIdentifierTuple(ZonedDateTime.class, ChronoPeriod.class), (parameters, ctx) -> + ((ZonedDateTime) parameters.getLeft()).minus((ChronoPeriod) parameters.getRight())); + toReturn.put(new ClassIdentifierTuple(OffsetDateTime.class, ChronoPeriod.class), (parameters, ctx) -> + ((OffsetDateTime) parameters.getLeft()).minus((ChronoPeriod) parameters.getRight())); + toReturn.put(new ClassIdentifierTuple(LocalDateTime.class, ChronoPeriod.class), (parameters, ctx) -> + ((LocalDateTime) parameters.getLeft()).minus((ChronoPeriod) parameters.getRight())); + toReturn.put(new ClassIdentifierTuple(LocalDate.class, ChronoPeriod.class), (parameters, ctx) -> + ((LocalDate) parameters.getLeft()).minus((ChronoPeriod) parameters.getRight())); + toReturn.put(new ClassIdentifierTuple(ZonedDateTime.class, Duration.class), (parameters, ctx) -> + ((ZonedDateTime) parameters.getLeft()).minus((Duration) parameters.getRight())); + toReturn.put(new ClassIdentifierTuple(OffsetDateTime.class, Duration.class), (parameters, ctx) -> + ((OffsetDateTime) parameters.getLeft()).minus((Duration) parameters.getRight())); + toReturn.put(new ClassIdentifierTuple(LocalDateTime.class, Duration.class), (parameters, ctx) -> + ((LocalDateTime) parameters.getLeft()).minus((Duration) parameters.getRight())); + toReturn.put(new ClassIdentifierTuple(LocalDate.class, Duration.class), (parameters, ctx) -> { + LocalDateTime leftLDT = LocalDateTime.of((LocalDate) parameters.getLeft(), LocalTime.MIDNIGHT); + LocalDateTime evaluated = leftLDT.minus((Duration) parameters.getRight()); + return LocalDate.of(evaluated.getYear(), evaluated.getMonth(), evaluated.getDayOfMonth()); + }); + toReturn.put(new ClassIdentifierTuple(LocalTime.class, Duration.class), (parameters, ctx) -> + ((LocalTime) parameters.getLeft()).minus((Duration) parameters.getRight())); + toReturn.put(new ClassIdentifierTuple(OffsetTime.class, Duration.class), (parameters, ctx) -> + ((OffsetTime) parameters.getLeft()).minus((Duration) parameters.getRight())); + return toReturn; + } +} diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/InfixOpNodeTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/InfixOpNodeTest.java deleted file mode 100644 index 0d38ae29bc0..00000000000 --- a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/InfixOpNodeTest.java +++ /dev/null @@ -1,196 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.kie.dmn.feel.lang.ast; - -import java.math.BigDecimal; -import java.math.MathContext; -import java.time.Duration; -import java.time.LocalDate; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.function.BinaryOperator; -import java.util.function.Supplier; - -import ch.obermuhlner.math.big.BigDecimalMath; -import org.junit.Before; -import org.junit.Test; -import org.kie.dmn.feel.lang.EvaluationContext; - -import static java.time.temporal.ChronoUnit.DAYS; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - -public class InfixOpNodeTest { - - private static List> MATH_OPERATORS; - - @Before - public void setUp() throws Exception { - MATH_OPERATORS = new ArrayList<>(); - MATH_OPERATORS.add((l, r) -> l.add(r, MathContext.DECIMAL128)); - MATH_OPERATORS.add((l, r) -> l.subtract(r, MathContext.DECIMAL128)); - MATH_OPERATORS.add((l, r) -> l.multiply(r, MathContext.DECIMAL128)); - MATH_OPERATORS.add((l, r) -> l.divide(r, MathContext.DECIMAL128)); - MATH_OPERATORS.add((l, r) -> BigDecimalMath.pow(l, r, MathContext.DECIMAL128)); - } - - @Test - public void math_BothNumbers() { - final Random rnd = new Random(); - MATH_OPERATORS.forEach(operator -> { - BigDecimal left = BigDecimal.valueOf(rnd.nextDouble()); - BigDecimal right = BigDecimal.valueOf(rnd.nextDouble()); - BigDecimal expected = operator.apply(left, right); - Object retrieved = InfixOpNode.math(left, right, null, operator); - assertThat(retrieved).isNotNull() - .isInstanceOf(BigDecimal.class) - .isEqualTo(expected); - }); - } - - @Test - public void math_NumberAndString() { - final Random rnd = new Random(); - MATH_OPERATORS.forEach(operator -> { - BigDecimal left = BigDecimal.valueOf(rnd.nextDouble()); - String right = String.valueOf(rnd.nextDouble()); - Object retrieved = InfixOpNode.math(left, right, null, operator); - assertThat(retrieved).isNull(); - }); - } - - @Test - public void addLocalDateAndDuration() { - LocalDate left = LocalDate.of(2021, 1, 1); - Duration right = Duration.of(-1, ChronoUnit.HOURS); - LocalDate retrieved = (LocalDate) InfixOpNode.add(left, right, null); - assertThat(retrieved).isEqualTo(LocalDate.of(2020, 12, 31)); - right = Duration.of(-24, ChronoUnit.HOURS); - retrieved = (LocalDate) InfixOpNode.add(left, right, null); - assertThat(retrieved).isEqualTo(LocalDate.of(2020, 12, 31)); - right = Duration.of(-25, ChronoUnit.HOURS); - retrieved = (LocalDate) InfixOpNode.add(left, right, null); - assertThat(retrieved).isEqualTo(LocalDate.of(2020, 12, 30)); - right = Duration.of(1, ChronoUnit.HOURS); - retrieved = (LocalDate) InfixOpNode.add(left, right, null); - assertThat(retrieved).isEqualTo(LocalDate.of(2021, 1, 1)); - - left = LocalDate.of(2021, 1, 2); - right = Duration.of(1, ChronoUnit.HOURS); - retrieved = (LocalDate) InfixOpNode.add(left, right, null); - assertThat(retrieved).isEqualTo(LocalDate.of(2021, 1, 2)); - right = Duration.of(24, ChronoUnit.HOURS); - retrieved = (LocalDate) InfixOpNode.add(left, right, null); - assertThat(retrieved).isEqualTo(LocalDate.of(2021, 1, 3)); - right = Duration.of(25, ChronoUnit.HOURS); - retrieved = (LocalDate) InfixOpNode.add(left, right, null); - assertThat(retrieved).isEqualTo(LocalDate.of(2021, 1, 3)); - - left = LocalDate.of(2021, 1, 3); - right = Duration.of(25, ChronoUnit.HOURS); - retrieved = (LocalDate) InfixOpNode.add(left, right, null); - assertThat(retrieved).isEqualTo(LocalDate.of(2021, 1, 4)); - - left = LocalDate.of(2020, 12, 30); - right = Duration.of(-25, ChronoUnit.HOURS); - retrieved = (LocalDate) InfixOpNode.add(left, right, null); - assertThat(retrieved).isEqualTo(LocalDate.of(2020, 12, 28)); - - left = LocalDate.of(2020, 12, 31); - right = Duration.of(-1, ChronoUnit.HOURS); - retrieved = (LocalDate) InfixOpNode.add(left, right, null); - assertThat(retrieved).isEqualTo(LocalDate.of(2020, 12, 30)); - } - - @Test - public void subLocalDateAndDuration() { - LocalDate left = LocalDate.of(2021, 1, 1); - Duration right = Duration.of(-1, ChronoUnit.HOURS); - LocalDate retrieved = (LocalDate) InfixOpNode.sub(left, right, null); - assertThat(retrieved).isEqualTo(LocalDate.of(2021, 1, 1)); - right = Duration.of(-24, ChronoUnit.HOURS); - retrieved = (LocalDate) InfixOpNode.sub(left, right, null); - assertThat(retrieved).isEqualTo(LocalDate.of(2021, 1, 2)); - right = Duration.of(-25, ChronoUnit.HOURS); - retrieved = (LocalDate) InfixOpNode.sub(left, right, null); - assertThat(retrieved).isEqualTo(LocalDate.of(2021, 1, 2)); - right = Duration.of(1, ChronoUnit.HOURS); - retrieved = (LocalDate) InfixOpNode.sub(left, right, null); - assertThat(retrieved).isEqualTo(LocalDate.of(2020, 12, 31)); - - left = LocalDate.of(2021, 1, 2); - right = Duration.of(1, ChronoUnit.HOURS); - retrieved = (LocalDate) InfixOpNode.sub(left, right, null); - assertThat(retrieved).isEqualTo(LocalDate.of(2021, 1, 1)); - right = Duration.of(24, ChronoUnit.HOURS); - retrieved = (LocalDate) InfixOpNode.sub(left, right, null); - assertThat(retrieved).isEqualTo(LocalDate.of(2021, 1, 1)); - right = Duration.of(25, ChronoUnit.HOURS); - retrieved = (LocalDate) InfixOpNode.sub(left, right, null); - assertThat(retrieved).isEqualTo(LocalDate.of(2020, 12, 31)); - - left = LocalDate.of(2021, 1, 3); - right = Duration.of(25, ChronoUnit.HOURS); - retrieved = (LocalDate) InfixOpNode.sub(left, right, null); - assertThat(retrieved).isEqualTo(LocalDate.of(2021, 1, 1)); - - left = LocalDate.of(2020, 12, 30); - right = Duration.of(-25, ChronoUnit.HOURS); - retrieved = (LocalDate) InfixOpNode.sub(left, right, null); - assertThat(retrieved).isEqualTo(LocalDate.of(2020, 12, 31)); - - left = LocalDate.of(2020, 12, 31); - right = Duration.of(-1, ChronoUnit.HOURS); - retrieved = (LocalDate) InfixOpNode.sub(left, right, null); - assertThat(retrieved).isEqualTo(LocalDate.of(2020, 12, 31)); - } - @Test - public void mulDurationAndDuration() { - Object left = Duration.of(5, DAYS); - Object right = Duration.of(5, DAYS); - assertThat(InfixOpNode.mult(left, right, mock(EvaluationContext.class))).isNull(); - } - - - @Test - public void isAllowedMultiplicationBasedOnSpec() { - EvaluationContext evaluationContext = mock(EvaluationContext.class); - Object left = 23; - Object right = 354.5; - assertThat(InfixOpNode.isAllowedMultiplicationBasedOnSpec(left, right, evaluationContext)).isTrue(); - verify(evaluationContext, never()).notifyEvt(any()); - right = Duration.of(5, DAYS); - assertThat(InfixOpNode.isAllowedMultiplicationBasedOnSpec(left, right, evaluationContext)).isTrue(); - verify(evaluationContext, never()).notifyEvt(any()); - left = Duration.of(5, DAYS); - right = 354.5; - assertThat(InfixOpNode.isAllowedMultiplicationBasedOnSpec(left, right, evaluationContext)).isTrue(); - verify(evaluationContext, never()).notifyEvt(any()); - left = Duration.of(5, DAYS); - right = Duration.of(5, DAYS); - assertThat(InfixOpNode.isAllowedMultiplicationBasedOnSpec(left, right, evaluationContext)).isFalse(); - verify(evaluationContext, times(1)).notifyEvt(any(Supplier.class)); - } -} \ No newline at end of file diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/InfixOperatorTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/InfixOperatorTest.java new file mode 100644 index 00000000000..080ff45e44c --- /dev/null +++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/InfixOperatorTest.java @@ -0,0 +1,127 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.lang.ast; + +import org.junit.Test; +import org.kie.dmn.feel.lang.EvaluationContext; + +import java.time.Duration; +import java.time.LocalDate; +import java.time.temporal.ChronoUnit; + +import static java.time.temporal.ChronoUnit.DAYS; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + +public class InfixOperatorTest { + + @Test + public void addLocalDateAndDuration() { + LocalDate left = LocalDate.of(2021, 1, 1); + Duration right = Duration.of(-1, ChronoUnit.HOURS); + LocalDate retrieved = (LocalDate) InfixOperator.ADD.evaluate(left, right, null); + assertThat(retrieved).isEqualTo(LocalDate.of(2020, 12, 31)); + right = Duration.of(-24, ChronoUnit.HOURS); + retrieved = (LocalDate) InfixOperator.ADD.evaluate(left, right, null); + assertThat(retrieved).isEqualTo(LocalDate.of(2020, 12, 31)); + right = Duration.of(-25, ChronoUnit.HOURS); + retrieved = (LocalDate) InfixOperator.ADD.evaluate(left, right, null); + assertThat(retrieved).isEqualTo(LocalDate.of(2020, 12, 30)); + right = Duration.of(1, ChronoUnit.HOURS); + retrieved = (LocalDate) InfixOperator.ADD.evaluate(left, right, null); + assertThat(retrieved).isEqualTo(LocalDate.of(2021, 1, 1)); + + left = LocalDate.of(2021, 1, 2); + right = Duration.of(1, ChronoUnit.HOURS); + retrieved = (LocalDate) InfixOperator.ADD.evaluate(left, right, null); + assertThat(retrieved).isEqualTo(LocalDate.of(2021, 1, 2)); + right = Duration.of(24, ChronoUnit.HOURS); + retrieved = (LocalDate) InfixOperator.ADD.evaluate(left, right, null); + assertThat(retrieved).isEqualTo(LocalDate.of(2021, 1, 3)); + right = Duration.of(25, ChronoUnit.HOURS); + retrieved = (LocalDate) InfixOperator.ADD.evaluate(left, right, null); + assertThat(retrieved).isEqualTo(LocalDate.of(2021, 1, 3)); + + left = LocalDate.of(2021, 1, 3); + right = Duration.of(25, ChronoUnit.HOURS); + retrieved = (LocalDate) InfixOperator.ADD.evaluate(left, right, null); + assertThat(retrieved).isEqualTo(LocalDate.of(2021, 1, 4)); + + left = LocalDate.of(2020, 12, 30); + right = Duration.of(-25, ChronoUnit.HOURS); + retrieved = (LocalDate) InfixOperator.ADD.evaluate(left, right, null); + assertThat(retrieved).isEqualTo(LocalDate.of(2020, 12, 28)); + + left = LocalDate.of(2020, 12, 31); + right = Duration.of(-1, ChronoUnit.HOURS); + retrieved = (LocalDate) InfixOperator.ADD.evaluate(left, right, null); + assertThat(retrieved).isEqualTo(LocalDate.of(2020, 12, 30)); + } + + @Test + public void subLocalDateAndDuration() { + LocalDate left = LocalDate.of(2021, 1, 1); + Duration right = Duration.of(-1, ChronoUnit.HOURS); + LocalDate retrieved = (LocalDate) InfixOperator.SUB.evaluate(left, right, null); + assertThat(retrieved).isEqualTo(LocalDate.of(2021, 1, 1)); + right = Duration.of(-24, ChronoUnit.HOURS); + retrieved = (LocalDate) InfixOperator.SUB.evaluate(left, right, null); + assertThat(retrieved).isEqualTo(LocalDate.of(2021, 1, 2)); + right = Duration.of(-25, ChronoUnit.HOURS); + retrieved = (LocalDate) InfixOperator.SUB.evaluate(left, right, null); + assertThat(retrieved).isEqualTo(LocalDate.of(2021, 1, 2)); + right = Duration.of(1, ChronoUnit.HOURS); + retrieved = (LocalDate) InfixOperator.SUB.evaluate(left, right, null); + assertThat(retrieved).isEqualTo(LocalDate.of(2020, 12, 31)); + + left = LocalDate.of(2021, 1, 2); + right = Duration.of(1, ChronoUnit.HOURS); + retrieved = (LocalDate) InfixOperator.SUB.evaluate(left, right, null); + assertThat(retrieved).isEqualTo(LocalDate.of(2021, 1, 1)); + right = Duration.of(24, ChronoUnit.HOURS); + retrieved = (LocalDate) InfixOperator.SUB.evaluate(left, right, null); + assertThat(retrieved).isEqualTo(LocalDate.of(2021, 1, 1)); + right = Duration.of(25, ChronoUnit.HOURS); + retrieved = (LocalDate) InfixOperator.SUB.evaluate(left, right, null); + assertThat(retrieved).isEqualTo(LocalDate.of(2020, 12, 31)); + + left = LocalDate.of(2021, 1, 3); + right = Duration.of(25, ChronoUnit.HOURS); + retrieved = (LocalDate) InfixOperator.SUB.evaluate(left, right, null); + assertThat(retrieved).isEqualTo(LocalDate.of(2021, 1, 1)); + + left = LocalDate.of(2020, 12, 30); + right = Duration.of(-25, ChronoUnit.HOURS); + retrieved = (LocalDate) InfixOperator.SUB.evaluate(left, right, null); + assertThat(retrieved).isEqualTo(LocalDate.of(2020, 12, 31)); + + left = LocalDate.of(2020, 12, 31); + right = Duration.of(-1, ChronoUnit.HOURS); + retrieved = (LocalDate) InfixOperator.SUB.evaluate(left, right, null); + assertThat(retrieved).isEqualTo(LocalDate.of(2020, 12, 31)); + } + + @Test + public void mulDurationAndDuration() { + Object left = Duration.of(5, DAYS); + Object right = Duration.of(5, DAYS); + assertThat(InfixOperator.MULT.evaluate(left, right, mock(EvaluationContext.class))).isNull(); + } + +} \ No newline at end of file diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/infixexecutors/ClassidentifierTupleTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/infixexecutors/ClassidentifierTupleTest.java new file mode 100644 index 00000000000..70ecd6b7d25 --- /dev/null +++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/infixexecutors/ClassidentifierTupleTest.java @@ -0,0 +1,35 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.lang.ast.infixexecutors; + +import org.junit.Test; +import org.kie.dmn.feel.lang.types.impl.ComparablePeriod; + +import java.time.chrono.ChronoPeriod; + +import static org.junit.Assert.assertTrue; + + +public class ClassidentifierTupleTest { + + @Test + public void testClassidentifierTuple_isEquals() { + assertTrue(ClassIdentifierTuple.isEquals(ComparablePeriod.class, ChronoPeriod.class)); + } +} \ No newline at end of file diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/infixexecutors/InfixExecutorUtilsTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/infixexecutors/InfixExecutorUtilsTest.java new file mode 100644 index 00000000000..cce73e0cd5a --- /dev/null +++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/infixexecutors/InfixExecutorUtilsTest.java @@ -0,0 +1,101 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.dmn.feel.lang.ast.infixexecutors; + +import ch.obermuhlner.math.big.BigDecimalMath; +import org.junit.Before; +import org.junit.Test; +import org.kie.dmn.feel.lang.EvaluationContext; + +import java.math.BigDecimal; +import java.math.MathContext; +import java.time.Duration; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import java.util.function.BinaryOperator; +import java.util.function.Supplier; + +import static java.time.temporal.ChronoUnit.DAYS; +import static org.assertj.core.api.Assertions.assertThat; +import static org.kie.dmn.feel.lang.ast.infixexecutors.InfixExecutorUtils.isAllowedMultiplicationBasedOnSpec; +import static org.kie.dmn.feel.lang.ast.infixexecutors.InfixExecutorUtils.math; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + +public class InfixExecutorUtilsTest { + + private static List> MATH_OPERATORS; + + @Before + public void setUp() throws Exception { + MATH_OPERATORS = new ArrayList<>(); + MATH_OPERATORS.add((l, r) -> l.add(r, MathContext.DECIMAL128)); + MATH_OPERATORS.add((l, r) -> l.subtract(r, MathContext.DECIMAL128)); + MATH_OPERATORS.add((l, r) -> l.multiply(r, MathContext.DECIMAL128)); + MATH_OPERATORS.add((l, r) -> l.divide(r, MathContext.DECIMAL128)); + MATH_OPERATORS.add((l, r) -> BigDecimalMath.pow(l, r, MathContext.DECIMAL128)); + } + + @Test + public void math_BothNumbers() { + final Random rnd = new Random(); + MATH_OPERATORS.forEach(operator -> { + BigDecimal left = BigDecimal.valueOf(rnd.nextDouble()); + BigDecimal right = BigDecimal.valueOf(rnd.nextDouble()); + BigDecimal expected = operator.apply(left, right); + Object retrieved = math(left, right, null, operator); + assertThat(retrieved).isNotNull() + .isInstanceOf(BigDecimal.class) + .isEqualTo(expected); + }); + } + + @Test + public void math_NumberAndString() { + final Random rnd = new Random(); + MATH_OPERATORS.forEach(operator -> { + BigDecimal left = BigDecimal.valueOf(rnd.nextDouble()); + String right = String.valueOf(rnd.nextDouble()); + Object retrieved = math(left, right, null, operator); + assertThat(retrieved).isNull(); + }); + } + + @Test + public void isAllowedMultiplicationBasedOnSpecTest() { + EvaluationContext evaluationContext = mock(EvaluationContext.class); + Object left = 23; + Object right = 354.5; + assertThat(isAllowedMultiplicationBasedOnSpec(left, right, evaluationContext)).isTrue(); + verify(evaluationContext, never()).notifyEvt(any()); + right = Duration.of(5, DAYS); + assertThat(isAllowedMultiplicationBasedOnSpec(left, right, evaluationContext)).isTrue(); + verify(evaluationContext, never()).notifyEvt(any()); + left = Duration.of(5, DAYS); + right = 354.5; + assertThat(isAllowedMultiplicationBasedOnSpec(left, right, evaluationContext)).isTrue(); + verify(evaluationContext, never()).notifyEvt(any()); + left = Duration.of(5, DAYS); + right = Duration.of(5, DAYS); + assertThat(isAllowedMultiplicationBasedOnSpec(left, right, evaluationContext)).isFalse(); + verify(evaluationContext, times(1)).notifyEvt(any(Supplier.class)); + } + +} \ No newline at end of file diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/parser/feel11/FEELParserTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/parser/feel11/FEELParserTest.java index 1b65990a72c..5206b3d4407 100644 --- a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/parser/feel11/FEELParserTest.java +++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/parser/feel11/FEELParserTest.java @@ -26,35 +26,7 @@ import org.junit.Ignore; import org.junit.Test; import org.kie.dmn.feel.lang.Type; -import org.kie.dmn.feel.lang.ast.ASTNode; -import org.kie.dmn.feel.lang.ast.AtLiteralNode; -import org.kie.dmn.feel.lang.ast.BaseNode; -import org.kie.dmn.feel.lang.ast.BetweenNode; -import org.kie.dmn.feel.lang.ast.BooleanNode; -import org.kie.dmn.feel.lang.ast.ContextEntryNode; -import org.kie.dmn.feel.lang.ast.ContextNode; -import org.kie.dmn.feel.lang.ast.FilterExpressionNode; -import org.kie.dmn.feel.lang.ast.ForExpressionNode; -import org.kie.dmn.feel.lang.ast.FunctionDefNode; -import org.kie.dmn.feel.lang.ast.FunctionInvocationNode; -import org.kie.dmn.feel.lang.ast.IfExpressionNode; -import org.kie.dmn.feel.lang.ast.InNode; -import org.kie.dmn.feel.lang.ast.InfixOpNode; -import org.kie.dmn.feel.lang.ast.InstanceOfNode; -import org.kie.dmn.feel.lang.ast.IterationContextNode; -import org.kie.dmn.feel.lang.ast.ListNode; -import org.kie.dmn.feel.lang.ast.NameDefNode; -import org.kie.dmn.feel.lang.ast.NameRefNode; -import org.kie.dmn.feel.lang.ast.NamedParameterNode; -import org.kie.dmn.feel.lang.ast.NullNode; -import org.kie.dmn.feel.lang.ast.NumberNode; -import org.kie.dmn.feel.lang.ast.PathExpressionNode; -import org.kie.dmn.feel.lang.ast.QualifiedNameNode; -import org.kie.dmn.feel.lang.ast.QuantifiedExpressionNode; -import org.kie.dmn.feel.lang.ast.RangeNode; -import org.kie.dmn.feel.lang.ast.SignedUnaryNode; -import org.kie.dmn.feel.lang.ast.StringNode; -import org.kie.dmn.feel.lang.ast.TypeNode; +import org.kie.dmn.feel.lang.ast.*; import org.kie.dmn.feel.lang.impl.MapBackedType; import org.kie.dmn.feel.lang.types.BuiltInType; import org.kie.dmn.feel.util.Msg; @@ -294,7 +266,7 @@ public void testMultiplication() { assertThat( mult.getLeft()).isInstanceOf(NumberNode.class); assertThat( mult.getLeft().getText()).isEqualTo("10"); - assertThat( mult.getOperator()).isEqualTo(InfixOpNode.InfixOperator.MULT); + assertThat( mult.getOperator()).isEqualTo(InfixOperator.MULT); assertThat( mult.getRight()).isInstanceOf(NameRefNode.class); assertThat( mult.getRight().getText()).isEqualTo("x"); @@ -317,12 +289,12 @@ public void testDivision() { assertThat( div.getLeft()).isInstanceOf(NameRefNode.class); assertThat( div.getLeft().getText()).isEqualTo("y"); - assertThat( div.getOperator()).isEqualTo(InfixOpNode.InfixOperator.DIV); + assertThat( div.getOperator()).isEqualTo(InfixOperator.DIV); assertThat( div.getRight()).isInstanceOf(NumberNode.class); assertThat( div.getRight().getText()).isEqualTo("5"); - assertThat( mult.getOperator()).isEqualTo(InfixOpNode.InfixOperator.MULT); + assertThat( mult.getOperator()).isEqualTo(InfixOperator.MULT); assertThat( mult.getRight()).isInstanceOf(NameRefNode.class); assertThat( mult.getRight().getText()).isEqualTo("x"); @@ -341,7 +313,7 @@ public void testPower1() { assertThat( mult.getLeft()).isInstanceOf(NameRefNode.class); assertThat( mult.getLeft().getText()).isEqualTo("y"); - assertThat( mult.getOperator()).isEqualTo(InfixOpNode.InfixOperator.MULT); + assertThat( mult.getOperator()).isEqualTo(InfixOperator.MULT); assertThat( mult.getRight()).isInstanceOf(InfixOpNode.class); assertThat( mult.getRight().getText()).isEqualTo( "5 ** 3"); @@ -350,7 +322,7 @@ public void testPower1() { assertThat( exp.getLeft()).isInstanceOf(NumberNode.class); assertThat( exp.getLeft().getText()).isEqualTo("5"); - assertThat( exp.getOperator()).isEqualTo(InfixOpNode.InfixOperator.POW); + assertThat( exp.getOperator()).isEqualTo(InfixOperator.POW); assertThat( exp.getRight()).isInstanceOf(NumberNode.class); assertThat( exp.getRight().getText()).isEqualTo("3"); @@ -369,7 +341,7 @@ public void testPower2() { assertThat( exp.getLeft()).isInstanceOf(InfixOpNode.class); assertThat( exp.getLeft().getText()).isEqualTo( "y * 5"); - assertThat( exp.getOperator()).isEqualTo(InfixOpNode.InfixOperator.POW); + assertThat( exp.getOperator()).isEqualTo(InfixOperator.POW); assertThat( exp.getRight()).isInstanceOf(NumberNode.class); assertThat( exp.getRight().getText()).isEqualTo("3"); @@ -378,7 +350,7 @@ public void testPower2() { assertThat( mult.getLeft()).isInstanceOf(NameRefNode.class); assertThat( mult.getLeft().getText()).isEqualTo("y"); - assertThat( mult.getOperator()).isEqualTo(InfixOpNode.InfixOperator.MULT); + assertThat( mult.getOperator()).isEqualTo(InfixOperator.MULT); assertThat( mult.getRight()).isInstanceOf(NumberNode.class); assertThat( mult.getRight().getText()).isEqualTo("5"); @@ -397,7 +369,7 @@ public void testPower3() { assertThat( mult.getLeft()).isInstanceOf(InfixOpNode.class); assertThat( mult.getLeft().getText()).isEqualTo( "y ** 5"); - assertThat( mult.getOperator()).isEqualTo(InfixOpNode.InfixOperator.MULT); + assertThat( mult.getOperator()).isEqualTo(InfixOperator.MULT); assertThat( mult.getRight()).isInstanceOf(NumberNode.class); assertThat( mult.getRight().getText()).isEqualTo("3"); @@ -406,7 +378,7 @@ public void testPower3() { assertThat( exp.getLeft()).isInstanceOf(NameRefNode.class); assertThat( exp.getLeft().getText()).isEqualTo("y"); - assertThat( exp.getOperator()).isEqualTo(InfixOpNode.InfixOperator.POW); + assertThat( exp.getOperator()).isEqualTo(InfixOperator.POW); assertThat( exp.getRight()).isInstanceOf(NumberNode.class); assertThat( exp.getRight().getText()).isEqualTo("5"); @@ -425,7 +397,7 @@ public void testPower4() { assertThat( exp.getLeft()).isInstanceOf(NameRefNode.class); assertThat( exp.getLeft().getText()).isEqualTo("y"); - assertThat( exp.getOperator()).isEqualTo(InfixOpNode.InfixOperator.POW); + assertThat( exp.getOperator()).isEqualTo(InfixOperator.POW); assertThat( exp.getRight()).isInstanceOf(InfixOpNode.class); assertThat( exp.getRight().getText()).isEqualTo( "5 * 3"); @@ -434,7 +406,7 @@ public void testPower4() { assertThat( mult.getLeft()).isInstanceOf(NumberNode.class); assertThat( mult.getLeft().getText()).isEqualTo("5"); - assertThat( mult.getOperator()).isEqualTo(InfixOpNode.InfixOperator.MULT); + assertThat( mult.getOperator()).isEqualTo(InfixOperator.MULT); assertThat( mult.getRight()).isInstanceOf(NumberNode.class); assertThat( mult.getRight().getText()).isEqualTo("3"); @@ -453,7 +425,7 @@ public void testAdd1() { assertThat( add.getLeft()).isInstanceOf(NameRefNode.class); assertThat( add.getLeft().getText()).isEqualTo("y"); - assertThat( add.getOperator()).isEqualTo(InfixOpNode.InfixOperator.ADD); + assertThat( add.getOperator()).isEqualTo(InfixOperator.ADD); assertThat( add.getRight()).isInstanceOf(InfixOpNode.class); assertThat( add.getRight().getText()).isEqualTo( "5 * 3"); @@ -462,7 +434,7 @@ public void testAdd1() { assertThat( mult.getLeft()).isInstanceOf(NumberNode.class); assertThat( mult.getLeft().getText()).isEqualTo("5"); - assertThat( mult.getOperator()).isEqualTo(InfixOpNode.InfixOperator.MULT); + assertThat( mult.getOperator()).isEqualTo(InfixOperator.MULT); assertThat( mult.getRight()).isInstanceOf(NumberNode.class); assertThat( mult.getRight().getText()).isEqualTo("3"); @@ -481,7 +453,7 @@ public void testSub1() { assertThat( sub.getLeft()).isInstanceOf(InfixOpNode.class); assertThat( sub.getLeft().getText()).isEqualTo( "y - 5"); - assertThat( sub.getOperator()).isEqualTo(InfixOpNode.InfixOperator.POW); + assertThat( sub.getOperator()).isEqualTo(InfixOperator.POW); assertThat( sub.getRight()).isInstanceOf(NumberNode.class); assertThat( sub.getRight().getText()).isEqualTo("3"); @@ -490,7 +462,7 @@ public void testSub1() { assertThat( mult.getLeft()).isInstanceOf(NameRefNode.class); assertThat( mult.getLeft().getText()).isEqualTo("y"); - assertThat( mult.getOperator()).isEqualTo(InfixOpNode.InfixOperator.SUB); + assertThat( mult.getOperator()).isEqualTo(InfixOperator.SUB); assertThat( mult.getRight()).isInstanceOf(NumberNode.class); assertThat( mult.getRight().getText()).isEqualTo("5"); @@ -655,7 +627,7 @@ public void testConditionalLogicalOp() { assertThat( or.getLeft()).isInstanceOf(InfixOpNode.class); assertThat( or.getLeft().getText()).isEqualTo( "foo < 10 and bar = \"x\""); - assertThat( or.getOperator()).isEqualTo(InfixOpNode.InfixOperator.OR); + assertThat( or.getOperator()).isEqualTo(InfixOperator.OR); assertThat( or.getRight()).isInstanceOf(NameRefNode.class); assertThat( or.getRight().getText()).isEqualTo("baz"); @@ -664,7 +636,7 @@ public void testConditionalLogicalOp() { assertThat( and.getLeft()).isInstanceOf(InfixOpNode.class); assertThat( and.getLeft().getText()).isEqualTo( "foo < 10"); - assertThat( and.getOperator()).isEqualTo(InfixOpNode.InfixOperator.AND); + assertThat( and.getOperator()).isEqualTo(InfixOperator.AND); assertThat( and.getRight()).isInstanceOf(InfixOpNode.class); assertThat( and.getRight().getText()).isEqualTo( "bar = \"x\""); @@ -1052,7 +1024,7 @@ public void testInstanceOfExpressionAnd() { assertThat( andExpr.getResultType()).isEqualTo(BuiltInType.BOOLEAN); InfixOpNode and = (InfixOpNode) andExpr; - assertThat( and.getOperator()).isEqualTo(InfixOpNode.InfixOperator.AND); + assertThat( and.getOperator()).isEqualTo(InfixOperator.AND); assertThat( and.getLeft()).isInstanceOf(InstanceOfNode.class); assertThat( and.getRight()).isInstanceOf(InstanceOfNode.class); assertThat( and.getLeft().getText()).isEqualTo( "\"foo\" instance of string"); diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/FEELNumberCoercionTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/FEELNumberCoercionTest.java index 6647149ac06..38ac0869c61 100644 --- a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/FEELNumberCoercionTest.java +++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/FEELNumberCoercionTest.java @@ -25,7 +25,7 @@ import org.junit.Test; import org.kie.dmn.feel.FEEL; -import org.kie.dmn.feel.lang.ast.InfixOpNode.InfixOperator; +import org.kie.dmn.feel.lang.ast.InfixOperator; import static org.assertj.core.api.Assertions.assertThat; import static org.kie.dmn.feel.util.EvalHelper.getBigDecimalOrNull; diff --git a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/DMNDTAnalyser.java b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/DMNDTAnalyser.java index 7394fd67816..37521c58ae7 100644 --- a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/DMNDTAnalyser.java +++ b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/DMNDTAnalyser.java @@ -47,7 +47,7 @@ import org.kie.dmn.feel.lang.ast.BaseNode; import org.kie.dmn.feel.lang.ast.DashNode; import org.kie.dmn.feel.lang.ast.InfixOpNode; -import org.kie.dmn.feel.lang.ast.InfixOpNode.InfixOperator; +import org.kie.dmn.feel.lang.ast.InfixOperator; import org.kie.dmn.feel.lang.ast.NameRefNode; import org.kie.dmn.feel.lang.ast.NullNode; import org.kie.dmn.feel.lang.ast.RangeNode; From cb046fb6a0667b7ff63e0a0abf15b19035dd00bf Mon Sep 17 00:00:00 2001 From: Toshiya Kobayashi Date: Thu, 14 Dec 2023 16:49:19 +0900 Subject: [PATCH 02/29] [DROOLS-7540] Coercion from Interger literal to BigDecimal bind variable (#32) (#5622) - Bump mvel to 2.5.1.Final - Test cases --- build-parent/pom.xml | 2 +- .../codegen/execmodel/MvelDialectTest.java | 119 ++++++++++++++++++ 2 files changed, 120 insertions(+), 1 deletion(-) diff --git a/build-parent/pom.xml b/build-parent/pom.xml index ef2b4a41977..7c27474ade5 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -125,7 +125,7 @@ 1.1.6 1.5.1 5.9.2 - 2.5.0.Final + 2.5.1.Final 2.0.7 1.7.30 diff --git a/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/MvelDialectTest.java b/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/MvelDialectTest.java index b542ac41c5c..087dece997d 100644 --- a/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/MvelDialectTest.java +++ b/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/MvelDialectTest.java @@ -1775,4 +1775,123 @@ public void drools_fieldAccess() { assertThat(results.get("knowledgeRuntime")).isInstanceOf(KieRuntime.class); assertThat(results.get("kieRuntime")).isInstanceOf(KieRuntime.class); } + + @Test + public void integerToBigDecimalBindVariableCoercion_shouldNotCoerceToInteger() { + // DROOLS-7540 + String str = "package com.example.reproducer\n" + + "import " + Person.class.getCanonicalName() + ";\n" + + "global java.util.List results;\n" + + "rule R\n" + + " dialect \"mvel\"\n" + + " when\n" + + " Person($money : money)\n" + + " then\n" + + " $money = 5;\n" + + " results.add($money);\n" + + "end"; + + KieSession ksession = getKieSession(str); + List results = new ArrayList<>(); + ksession.setGlobal("results", results); + + Person person = new Person("John"); + person.setMoney(new BigDecimal("0")); + ksession.insert(person); + ksession.fireAllRules(); + + assertThat(results.get(0)).isInstanceOf(BigDecimal.class); + assertThat(results).contains(new BigDecimal("5")); + } + + @Test + public void integerToBigDecimalVariableCoercionTwice_shouldNotCoerceToInteger() { + // DROOLS-7540 + String str = "package com.example.reproducer\n" + + "import " + Person.class.getCanonicalName() + ";\n" + + "import " + BigDecimal.class.getCanonicalName() + ";\n" + + "global java.util.List results;\n" + + "rule R\n" + + " dialect \"mvel\"\n" + + " when\n" + + " Person()\n" + + " then\n" + + " BigDecimal $var1 = 5;\n" + + " $var1 = 5;\n" + // This causes the issue + " results.add($var1);\n" + + "end"; + + KieSession ksession = getKieSession(str); + List results = new ArrayList<>(); + ksession.setGlobal("results", results); + + Person person = new Person("John"); + person.setMoney(new BigDecimal("0")); + ksession.insert(person); + ksession.fireAllRules(); + + assertThat(results.get(0)).isInstanceOf(BigDecimal.class); + assertThat(results).contains(new BigDecimal("5")); + } + + @Test + public void integerToBigDecimalBindVariableCoercionAndAddition_shouldNotThrowClassCastException() { + // DROOLS-7540 + String str = "package com.example.reproducer\n" + + "import " + Person.class.getCanonicalName() + ";\n" + + "global java.util.List results;\n" + + "rule R\n" + + " dialect \"mvel\"\n" + + " when\n" + + " Person($money : money, $otherBigDecimalField : otherBigDecimalField)\n" + + " then\n" + + " $money = 5;\n" + + " $total = $money + $otherBigDecimalField;\n" + + " results.add($total);\n" + + "end"; + + KieSession ksession = getKieSession(str); + List results = new ArrayList<>(); + ksession.setGlobal("results", results); + + Person person = new Person("John"); + person.setMoney(new BigDecimal("0")); + person.setOtherBigDecimalField(new BigDecimal("10")); + ksession.insert(person); + ksession.fireAllRules(); + + assertThat(results).contains(new BigDecimal("15")); + } + + @Test + public void integerToBigDecimalVaribleSetFromBindVariableCoercionAndAddition_shouldNotThrowClassCastException() { + // DROOLS-7540 + String str = "package com.example.reproducer\n" + + "import " + Person.class.getCanonicalName() + ";\n" + + "import " + BigDecimal.class.getCanonicalName() + ";\n" + + "global java.util.List results;\n" + + "rule R\n" + + " dialect \"mvel\"\n" + + " when\n" + + " Person($money : money, $otherBigDecimalField : otherBigDecimalField)\n" + + " then\n" + + " BigDecimal $var1 = $money;\n" + + " BigDecimal $var2 = $otherBigDecimalField;\n" + + " $var1 = 5;\n" + + " BigDecimal $total = $var1 + $var2;\n" + + " results.add($total);\n" + + "end"; + + KieSession ksession = getKieSession(str); + List results = new ArrayList<>(); + ksession.setGlobal("results", results); + + Person person = new Person("John"); + person.setMoney(new BigDecimal("0")); + person.setOtherBigDecimalField(new BigDecimal("10")); + ksession.insert(person); + ksession.fireAllRules(); + + assertThat(results).contains(new BigDecimal("15")); + } } From 563de9b67ca82034fe4a6a0912454d2964dc1cd2 Mon Sep 17 00:00:00 2001 From: robot Date: Thu, 14 Dec 2023 08:54:18 +0000 Subject: [PATCH 03/29] Update version to 8.46.0-SNAPSHOT --- bom/drools-bom/pom.xml | 2 +- bom/kie-core-bom/pom.xml | 2 +- bom/kie-dmn-bom/pom.xml | 2 +- bom/kie-efesto-bom/pom.xml | 2 +- bom/kie-pmml-bom/pom.xml | 2 +- bom/pom.xml | 2 +- build-parent/pom.xml | 2 +- drools-alphanetwork-compiler/pom.xml | 2 +- drools-base/pom.xml | 2 +- drools-beliefs/pom.xml | 2 +- drools-commands/pom.xml | 2 +- drools-compiler/pom.xml | 2 +- drools-core/pom.xml | 2 +- drools-decisiontables/pom.xml | 2 +- drools-distribution/pom.xml | 2 +- drools-docs/pom.xml | 2 +- drools-drl/drools-drl-ast/pom.xml | 2 +- drools-drl/drools-drl-extensions/pom.xml | 2 +- drools-drl/drools-drl-parser/pom.xml | 2 +- drools-drl/pom.xml | 2 +- drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml | 2 +- drools-drlonyaml-parent/drools-drlonyaml-cli/pom.xml | 2 +- .../drools-drlonyaml-integration-tests/pom.xml | 2 +- drools-drlonyaml-parent/drools-drlonyaml-model/pom.xml | 2 +- drools-drlonyaml-parent/drools-drlonyaml-schemagen/pom.xml | 2 +- drools-drlonyaml-parent/drools-drlonyaml-todrl/pom.xml | 2 +- drools-drlonyaml-parent/pom.xml | 2 +- drools-ecj/pom.xml | 2 +- drools-engine-classic/pom.xml | 2 +- drools-engine/pom.xml | 2 +- drools-examples-api/default-kiesession-from-file/pom.xml | 2 +- drools-examples-api/default-kiesession/pom.xml | 2 +- drools-examples-api/kie-module-from-multiple-files/pom.xml | 2 +- drools-examples-api/kiebase-inclusion/pom.xml | 2 +- drools-examples-api/kiecontainer-from-kierepo/pom.xml | 2 +- drools-examples-api/kiefilesystem-example/pom.xml | 2 +- drools-examples-api/kiemodulemodel-example/pom.xml | 2 +- drools-examples-api/multiple-kbases/pom.xml | 2 +- drools-examples-api/named-kiesession-from-file/pom.xml | 2 +- drools-examples-api/named-kiesession/pom.xml | 2 +- drools-examples-api/pom.xml | 2 +- drools-examples-api/reactive-kiesession/pom.xml | 2 +- drools-examples/pom.xml | 2 +- drools-fastutil/pom.xml | 2 +- .../drools-impact-analysis-graph-common/pom.xml | 2 +- .../drools-impact-analysis-graph-graphviz/pom.xml | 2 +- drools-impact-analysis/drools-impact-analysis-graph/pom.xml | 2 +- drools-impact-analysis/drools-impact-analysis-itests/pom.xml | 2 +- drools-impact-analysis/drools-impact-analysis-model/pom.xml | 2 +- drools-impact-analysis/drools-impact-analysis-parser/pom.xml | 2 +- drools-impact-analysis/pom.xml | 2 +- drools-io/pom.xml | 2 +- drools-kiesession/pom.xml | 2 +- drools-legacy-test-util/pom.xml | 2 +- drools-metric/pom.xml | 2 +- drools-model/drools-canonical-model/pom.xml | 2 +- drools-model/drools-codegen-common/pom.xml | 2 +- drools-model/drools-model-codegen/pom.xml | 2 +- drools-model/drools-model-compiler/pom.xml | 2 +- drools-model/drools-mvel-compiler/pom.xml | 2 +- drools-model/drools-mvel-parser/pom.xml | 2 +- drools-model/pom.xml | 2 +- drools-mvel/pom.xml | 2 +- drools-persistence/drools-persistence-api/pom.xml | 2 +- drools-persistence/drools-persistence-jpa/pom.xml | 2 +- drools-persistence/pom.xml | 2 +- drools-quarkus-extension/drools-quarkus-deployment/pom.xml | 2 +- .../drools-quarkus-examples-multiunit/pom.xml | 2 +- .../drools-quarkus-examples-reactive/pom.xml | 2 +- drools-quarkus-extension/drools-quarkus-examples/pom.xml | 2 +- .../drools-quarkus-integration-test-hotreload/pom.xml | 2 +- .../drools-quarkus-integration-test/pom.xml | 2 +- drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml | 2 +- .../drools-quarkus-ruleunit-integration-test/pom.xml | 2 +- drools-quarkus-extension/drools-quarkus-util-deployment/pom.xml | 2 +- drools-quarkus-extension/drools-quarkus/pom.xml | 2 +- drools-quarkus-extension/pom.xml | 2 +- drools-reliability/drools-reliability-core/pom.xml | 2 +- drools-reliability/drools-reliability-h2mvstore/pom.xml | 2 +- drools-reliability/drools-reliability-infinispan/pom.xml | 2 +- drools-reliability/drools-reliability-tests/pom.xml | 2 +- drools-reliability/pom.xml | 2 +- drools-retediagram/pom.xml | 2 +- drools-ruleunits/drools-ruleunits-api/pom.xml | 2 +- drools-ruleunits/drools-ruleunits-dsl/pom.xml | 2 +- drools-ruleunits/drools-ruleunits-engine/pom.xml | 2 +- drools-ruleunits/drools-ruleunits-impl/pom.xml | 2 +- drools-ruleunits/pom.xml | 2 +- .../drools-scenario-simulation-api/pom.xml | 2 +- .../drools-scenario-simulation-backend/pom.xml | 2 +- .../drools-scenario-simulation-integrationtest/pom.xml | 2 +- drools-scenario-simulation/pom.xml | 2 +- drools-serialization-protobuf/pom.xml | 2 +- drools-templates/pom.xml | 2 +- drools-test-coverage/pom.xml | 2 +- drools-test-coverage/standalone/kie-ci-with-domain/pom.xml | 2 +- .../standalone/kie-ci-with-domain/test-domain/pom.xml | 2 +- .../standalone/kie-ci-with-domain/test-kjar/pom.xml | 2 +- .../standalone/kie-ci-with-domain/tests/pom.xml | 2 +- drools-test-coverage/standalone/kie-ci-without-domain/pom.xml | 2 +- .../standalone/kie-ci-without-domain/test-domain/pom.xml | 2 +- .../standalone/kie-ci-without-domain/test-kjar/pom.xml | 2 +- .../standalone/kie-ci-without-domain/tests/pom.xml | 2 +- drools-test-coverage/standalone/pom.xml | 2 +- drools-test-coverage/test-compiler-integration/pom.xml | 2 +- drools-test-coverage/test-integration-nomvel/pom.xml | 2 +- drools-test-coverage/test-integration-notms/pom.xml | 2 +- drools-test-coverage/test-integration-noxml/pom.xml | 2 +- drools-test-coverage/test-integration-ruleunits/pom.xml | 2 +- .../test-integration-ruleunits-jar/pom.xml | 2 +- .../test-integration-ruleunits-tests/pom.xml | 2 +- drools-test-coverage/test-suite/pom.xml | 2 +- drools-tms/pom.xml | 2 +- drools-traits/pom.xml | 2 +- drools-util/pom.xml | 2 +- drools-verifier/drools-verifier-api/pom.xml | 2 +- drools-verifier/drools-verifier-core/pom.xml | 2 +- drools-verifier/drools-verifier-drl/pom.xml | 2 +- drools-verifier/pom.xml | 2 +- drools-wiring/drools-wiring-api/pom.xml | 2 +- drools-wiring/drools-wiring-dynamic/pom.xml | 2 +- drools-wiring/drools-wiring-static/pom.xml | 2 +- drools-wiring/pom.xml | 2 +- drools-xml-support/pom.xml | 2 +- efesto/efesto-common-utils/pom.xml | 2 +- efesto/efesto-core/efesto-common-api/pom.xml | 2 +- efesto/efesto-core/efesto-common-core/pom.xml | 2 +- .../efesto-compilation-manager-api/pom.xml | 2 +- .../efesto-compilation-manager-core/pom.xml | 2 +- efesto/efesto-core/efesto-compilation-manager/pom.xml | 2 +- .../efesto-runtime-manager/efesto-runtime-manager-api/pom.xml | 2 +- .../efesto-runtime-manager/efesto-runtime-manager-core/pom.xml | 2 +- efesto/efesto-core/efesto-runtime-manager/pom.xml | 2 +- efesto/efesto-core/pom.xml | 2 +- efesto/efesto-dependencies/pom.xml | 2 +- efesto/pom.xml | 2 +- jpmml-migration-recipe/pom.xml | 2 +- kie-api/pom.xml | 2 +- kie-archetypes/kie-drools-dmn-archetype/pom.xml | 2 +- kie-archetypes/kie-drools-exec-model-archetype/pom.xml | 2 +- kie-archetypes/kie-drools-exec-model-ruleunit-archetype/pom.xml | 2 +- kie-archetypes/kie-drools-yaml-archetype/pom.xml | 2 +- kie-archetypes/pom.xml | 2 +- kie-ci/pom.xml | 2 +- kie-dmn/kie-dmn-api/pom.xml | 2 +- kie-dmn/kie-dmn-backend/pom.xml | 2 +- kie-dmn/kie-dmn-core-jsr223-jq/pom.xml | 2 +- kie-dmn/kie-dmn-core-jsr223/pom.xml | 2 +- kie-dmn/kie-dmn-core/pom.xml | 2 +- kie-dmn/kie-dmn-feel/pom.xml | 2 +- kie-dmn/kie-dmn-legacy-tests/pom.xml | 2 +- kie-dmn/kie-dmn-model/pom.xml | 2 +- kie-dmn/kie-dmn-openapi/pom.xml | 2 +- .../kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests-trusty/pom.xml | 2 +- kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/pom.xml | 2 +- kie-dmn/kie-dmn-pmml-tests-parent/pom.xml | 2 +- .../kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn-cli/pom.xml | 2 +- kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/pom.xml | 2 +- kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml | 2 +- kie-dmn/kie-dmn-signavio/pom.xml | 2 +- kie-dmn/kie-dmn-tck/pom.xml | 2 +- kie-dmn/kie-dmn-trisotech/pom.xml | 2 +- kie-dmn/kie-dmn-validation-bootstrap/pom.xml | 2 +- kie-dmn/kie-dmn-validation/pom.xml | 2 +- kie-dmn/kie-dmn-xls2dmn-cli/pom.xml | 2 +- kie-dmn/pom.xml | 2 +- kie-drl/kie-drl-api/pom.xml | 2 +- kie-drl/kie-drl-compilation-common/pom.xml | 2 +- .../kie-drl-kiesession-local-runtime/pom.xml | 2 +- .../kie-drl-implementations/kie-drl-kiesession-local/pom.xml | 2 +- .../kie-drl-map-input/kie-drl-map-input-runtime/pom.xml | 2 +- kie-drl/kie-drl-implementations/kie-drl-map-input/pom.xml | 2 +- kie-drl/kie-drl-implementations/pom.xml | 2 +- kie-drl/kie-drl-runtime-common/pom.xml | 2 +- kie-drl/kie-drl-tests-without-index-file/pom.xml | 2 +- kie-drl/kie-drl-tests/pom.xml | 2 +- kie-drl/pom.xml | 2 +- kie-internal/pom.xml | 2 +- kie-maven-plugin/pom.xml | 2 +- kie-memory-compiler/pom.xml | 2 +- kie-pmml-trusty/kie-pmml-api/pom.xml | 2 +- kie-pmml-trusty/kie-pmml-commons/pom.xml | 2 +- kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/pom.xml | 2 +- .../kie-pmml-compiler/kie-pmml-compiler-commons/pom.xml | 2 +- .../kie-pmml-compiler/kie-pmml-compiler-core/pom.xml | 2 +- kie-pmml-trusty/kie-pmml-compiler/pom.xml | 2 +- kie-pmml-trusty/kie-pmml-dependencies/pom.xml | 2 +- .../kie-pmml-evaluator/kie-pmml-evaluator-api/pom.xml | 2 +- .../kie-pmml-evaluator/kie-pmml-evaluator-core/pom.xml | 2 +- .../kie-pmml-evaluator/kie-pmml-evaluator-utils/pom.xml | 2 +- kie-pmml-trusty/kie-pmml-evaluator/pom.xml | 2 +- .../kie-pmml-models-clustering-compiler/pom.xml | 2 +- .../kie-pmml-models-clustering-evaluator/pom.xml | 2 +- .../kie-pmml-models-clustering-model/pom.xml | 2 +- .../kie-pmml-models-clustering-tests/pom.xml | 2 +- .../kie-pmml-models/kie-pmml-models-clustering/pom.xml | 2 +- .../kie-pmml-models-drools-common/pom.xml | 2 +- .../kie-pmml-models-drools-scorecard-compiler/pom.xml | 2 +- .../kie-pmml-models-drools-scorecard-evaluator/pom.xml | 2 +- .../kie-pmml-models-drools-scorecard-model/pom.xml | 2 +- .../kie-pmml-models-drools-scorecard-tests/pom.xml | 2 +- .../kie-pmml-models-drools-scorecard/pom.xml | 2 +- .../kie-pmml-models-drools-tree-compiler/pom.xml | 2 +- .../kie-pmml-models-drools-tree-evaluator/pom.xml | 2 +- .../kie-pmml-models-drools-tree-model/pom.xml | 2 +- .../kie-pmml-models-drools-tree-tests/pom.xml | 2 +- .../kie-pmml-models-drools/kie-pmml-models-drools-tree/pom.xml | 2 +- kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/pom.xml | 2 +- .../kie-pmml-models-mining-compiler/pom.xml | 2 +- .../kie-pmml-models-mining-evaluator/pom.xml | 2 +- .../kie-pmml-models-mining/kie-pmml-models-mining-model/pom.xml | 2 +- .../kie-pmml-models-mining/kie-pmml-models-mining-tests/pom.xml | 2 +- kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/pom.xml | 2 +- .../kie-pmml-models-regression-compiler/pom.xml | 2 +- .../kie-pmml-models-regression-evaluator/pom.xml | 2 +- .../kie-pmml-models-regression-model/pom.xml | 2 +- .../kie-pmml-models-regression-tests/pom.xml | 2 +- .../kie-pmml-models/kie-pmml-models-regression/pom.xml | 2 +- .../kie-pmml-models-scorecard-compiler/pom.xml | 2 +- .../kie-pmml-models-scorecard-evaluator/pom.xml | 2 +- .../kie-pmml-models-scorecard-model/pom.xml | 2 +- .../kie-pmml-models-scorecard-tests/pom.xml | 2 +- .../kie-pmml-models/kie-pmml-models-scorecard/pom.xml | 2 +- kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tests/pom.xml | 2 +- .../kie-pmml-models-tree/kie-pmml-models-tree-compiler/pom.xml | 2 +- .../kie-pmml-models-tree/kie-pmml-models-tree-evaluator/pom.xml | 2 +- .../kie-pmml-models-tree/kie-pmml-models-tree-model/pom.xml | 2 +- .../kie-pmml-models-tree/kie-pmml-models-tree-tests/pom.xml | 2 +- kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/pom.xml | 2 +- kie-pmml-trusty/kie-pmml-models/pom.xml | 2 +- kie-pmml-trusty/pom.xml | 2 +- kie-test-util/pom.xml | 2 +- kie-util/kie-util-maven-integration/pom.xml | 2 +- kie-util/kie-util-maven-support/pom.xml | 2 +- kie-util/kie-util-xml/pom.xml | 2 +- kie-util/pom.xml | 2 +- pom.xml | 2 +- 237 files changed, 237 insertions(+), 237 deletions(-) diff --git a/bom/drools-bom/pom.xml b/bom/drools-bom/pom.xml index 4219a530d3b..5b5041bd755 100644 --- a/bom/drools-bom/pom.xml +++ b/bom/drools-bom/pom.xml @@ -6,7 +6,7 @@ org.kie kie-core-bom - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../kie-core-bom/pom.xml diff --git a/bom/kie-core-bom/pom.xml b/bom/kie-core-bom/pom.xml index ae8a394988a..ded79ed27c2 100644 --- a/bom/kie-core-bom/pom.xml +++ b/bom/kie-core-bom/pom.xml @@ -6,7 +6,7 @@ org.kie drools-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../../pom.xml diff --git a/bom/kie-dmn-bom/pom.xml b/bom/kie-dmn-bom/pom.xml index 89d21bdfb26..a44ee6a2076 100644 --- a/bom/kie-dmn-bom/pom.xml +++ b/bom/kie-dmn-bom/pom.xml @@ -6,7 +6,7 @@ org.kie kie-core-bom - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../kie-core-bom/pom.xml diff --git a/bom/kie-efesto-bom/pom.xml b/bom/kie-efesto-bom/pom.xml index cc0668ba5d0..0eb8b276c2d 100644 --- a/bom/kie-efesto-bom/pom.xml +++ b/bom/kie-efesto-bom/pom.xml @@ -6,7 +6,7 @@ org.kie kie-core-bom - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../kie-core-bom/pom.xml diff --git a/bom/kie-pmml-bom/pom.xml b/bom/kie-pmml-bom/pom.xml index dd93396cd03..43bfb09a211 100644 --- a/bom/kie-pmml-bom/pom.xml +++ b/bom/kie-pmml-bom/pom.xml @@ -6,7 +6,7 @@ org.kie kie-core-bom - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../kie-core-bom/pom.xml diff --git a/bom/pom.xml b/bom/pom.xml index 0b46d81e8b8..e4031b78964 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -5,7 +5,7 @@ drools-parent org.kie - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 7c27474ade5..dd8ed8e6737 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -25,7 +25,7 @@ drools-parent org.kie - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-alphanetwork-compiler/pom.xml b/drools-alphanetwork-compiler/pom.xml index 1075b38644d..8e0327bff89 100644 --- a/drools-alphanetwork-compiler/pom.xml +++ b/drools-alphanetwork-compiler/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-base/pom.xml b/drools-base/pom.xml index 68468e2a459..e0884e4acc0 100644 --- a/drools-base/pom.xml +++ b/drools-base/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-beliefs/pom.xml b/drools-beliefs/pom.xml index 5465e504ddd..6e954649fe4 100644 --- a/drools-beliefs/pom.xml +++ b/drools-beliefs/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-commands/pom.xml b/drools-commands/pom.xml index ec180aca458..f18b1da317e 100644 --- a/drools-commands/pom.xml +++ b/drools-commands/pom.xml @@ -27,7 +27,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-compiler/pom.xml b/drools-compiler/pom.xml index 2e6f8099db3..30c41a04d4d 100644 --- a/drools-compiler/pom.xml +++ b/drools-compiler/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-core/pom.xml b/drools-core/pom.xml index 42092de7979..97feb88fdeb 100644 --- a/drools-core/pom.xml +++ b/drools-core/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-decisiontables/pom.xml b/drools-decisiontables/pom.xml index 8e619b0b2da..d5efaab1fe8 100644 --- a/drools-decisiontables/pom.xml +++ b/drools-decisiontables/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-distribution/pom.xml b/drools-distribution/pom.xml index ca2607bcc57..9869d8f3344 100644 --- a/drools-distribution/pom.xml +++ b/drools-distribution/pom.xml @@ -6,7 +6,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-docs/pom.xml b/drools-docs/pom.xml index 138a53dc190..83700b558a4 100755 --- a/drools-docs/pom.xml +++ b/drools-docs/pom.xml @@ -7,7 +7,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-drl/drools-drl-ast/pom.xml b/drools-drl/drools-drl-ast/pom.xml index d57333c2b26..6989033c2a1 100644 --- a/drools-drl/drools-drl-ast/pom.xml +++ b/drools-drl/drools-drl-ast/pom.xml @@ -26,7 +26,7 @@ org.drools drools-drl - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT org.drools diff --git a/drools-drl/drools-drl-extensions/pom.xml b/drools-drl/drools-drl-extensions/pom.xml index 8a14241f9d8..7c6cca52759 100644 --- a/drools-drl/drools-drl-extensions/pom.xml +++ b/drools-drl/drools-drl-extensions/pom.xml @@ -26,7 +26,7 @@ org.drools drools-drl - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT org.drools diff --git a/drools-drl/drools-drl-parser/pom.xml b/drools-drl/drools-drl-parser/pom.xml index 922a78b4f34..e26a471f363 100644 --- a/drools-drl/drools-drl-parser/pom.xml +++ b/drools-drl/drools-drl-parser/pom.xml @@ -26,7 +26,7 @@ org.drools drools-drl - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT org.drools diff --git a/drools-drl/pom.xml b/drools-drl/pom.xml index 8b13481d07f..913b2f62ee0 100644 --- a/drools-drl/pom.xml +++ b/drools-drl/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml index 9ebf47d3e7a..3e5c70447d6 100644 --- a/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml +++ b/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml @@ -23,7 +23,7 @@ org.drools drools-drlonyaml-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT drools-drlonyaml-cli-tests Drools :: DRL on YAML :: CLI tests diff --git a/drools-drlonyaml-parent/drools-drlonyaml-cli/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-cli/pom.xml index f3a7784cb23..6329794317b 100644 --- a/drools-drlonyaml-parent/drools-drlonyaml-cli/pom.xml +++ b/drools-drlonyaml-parent/drools-drlonyaml-cli/pom.xml @@ -23,7 +23,7 @@ org.drools drools-drlonyaml-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT drools-drlonyaml-cli Drools :: DRL on YAML :: CLI diff --git a/drools-drlonyaml-parent/drools-drlonyaml-integration-tests/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-integration-tests/pom.xml index 4acce993d56..9449a0e7896 100644 --- a/drools-drlonyaml-parent/drools-drlonyaml-integration-tests/pom.xml +++ b/drools-drlonyaml-parent/drools-drlonyaml-integration-tests/pom.xml @@ -23,7 +23,7 @@ org.drools drools-drlonyaml-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT drools-drlonyaml-integration-tests Drools :: DRL on YAML :: Integration Tests diff --git a/drools-drlonyaml-parent/drools-drlonyaml-model/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-model/pom.xml index c49ce93592d..da3b7ceaa0e 100644 --- a/drools-drlonyaml-parent/drools-drlonyaml-model/pom.xml +++ b/drools-drlonyaml-parent/drools-drlonyaml-model/pom.xml @@ -23,7 +23,7 @@ org.drools drools-drlonyaml-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT drools-drlonyaml-model Drools :: DRL on YAML :: model diff --git a/drools-drlonyaml-parent/drools-drlonyaml-schemagen/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-schemagen/pom.xml index 50a56ef4bdf..9eccf371b69 100644 --- a/drools-drlonyaml-parent/drools-drlonyaml-schemagen/pom.xml +++ b/drools-drlonyaml-parent/drools-drlonyaml-schemagen/pom.xml @@ -23,7 +23,7 @@ org.drools drools-drlonyaml-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT drools-drlonyaml-schemagen Drools :: DRL on YAML :: schema generator diff --git a/drools-drlonyaml-parent/drools-drlonyaml-todrl/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-todrl/pom.xml index ca6a18e6e48..09b295dcb62 100644 --- a/drools-drlonyaml-parent/drools-drlonyaml-todrl/pom.xml +++ b/drools-drlonyaml-parent/drools-drlonyaml-todrl/pom.xml @@ -23,7 +23,7 @@ org.drools drools-drlonyaml-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT drools-drlonyaml-todrl Drools :: DRL on YAML :: to DRL emitter diff --git a/drools-drlonyaml-parent/pom.xml b/drools-drlonyaml-parent/pom.xml index 66f2239ee3a..fe1607bb8e1 100644 --- a/drools-drlonyaml-parent/pom.xml +++ b/drools-drlonyaml-parent/pom.xml @@ -23,7 +23,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml org.drools diff --git a/drools-ecj/pom.xml b/drools-ecj/pom.xml index ec0bdd20958..1233cb21227 100644 --- a/drools-ecj/pom.xml +++ b/drools-ecj/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-engine-classic/pom.xml b/drools-engine-classic/pom.xml index 8207bbfd45b..2566108e014 100644 --- a/drools-engine-classic/pom.xml +++ b/drools-engine-classic/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-engine/pom.xml b/drools-engine/pom.xml index db6ce44e7b2..2b5cfc724c6 100644 --- a/drools-engine/pom.xml +++ b/drools-engine/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-examples-api/default-kiesession-from-file/pom.xml b/drools-examples-api/default-kiesession-from-file/pom.xml index d41a54fc876..93b50e77f72 100644 --- a/drools-examples-api/default-kiesession-from-file/pom.xml +++ b/drools-examples-api/default-kiesession-from-file/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT default-kiesession-from-file diff --git a/drools-examples-api/default-kiesession/pom.xml b/drools-examples-api/default-kiesession/pom.xml index 2b6f916be02..63ac93015d9 100644 --- a/drools-examples-api/default-kiesession/pom.xml +++ b/drools-examples-api/default-kiesession/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT default-kiesession diff --git a/drools-examples-api/kie-module-from-multiple-files/pom.xml b/drools-examples-api/kie-module-from-multiple-files/pom.xml index 02c31972a5a..5abde83c50b 100644 --- a/drools-examples-api/kie-module-from-multiple-files/pom.xml +++ b/drools-examples-api/kie-module-from-multiple-files/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-module-from-multiple-files diff --git a/drools-examples-api/kiebase-inclusion/pom.xml b/drools-examples-api/kiebase-inclusion/pom.xml index caf5f4f3c53..6be25acbad1 100644 --- a/drools-examples-api/kiebase-inclusion/pom.xml +++ b/drools-examples-api/kiebase-inclusion/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kiebase-inclusion diff --git a/drools-examples-api/kiecontainer-from-kierepo/pom.xml b/drools-examples-api/kiecontainer-from-kierepo/pom.xml index 065fca8fae9..c8f8653039f 100644 --- a/drools-examples-api/kiecontainer-from-kierepo/pom.xml +++ b/drools-examples-api/kiecontainer-from-kierepo/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kiecontainer-from-kierepo diff --git a/drools-examples-api/kiefilesystem-example/pom.xml b/drools-examples-api/kiefilesystem-example/pom.xml index c3db7cf436e..c4cca53c9ad 100644 --- a/drools-examples-api/kiefilesystem-example/pom.xml +++ b/drools-examples-api/kiefilesystem-example/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kiefilesystem-example diff --git a/drools-examples-api/kiemodulemodel-example/pom.xml b/drools-examples-api/kiemodulemodel-example/pom.xml index 8deb710a98b..aaf20d358fb 100644 --- a/drools-examples-api/kiemodulemodel-example/pom.xml +++ b/drools-examples-api/kiemodulemodel-example/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kiemodulemodel-example diff --git a/drools-examples-api/multiple-kbases/pom.xml b/drools-examples-api/multiple-kbases/pom.xml index 9636a806d8a..ad257060c71 100644 --- a/drools-examples-api/multiple-kbases/pom.xml +++ b/drools-examples-api/multiple-kbases/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT multiple-kbases diff --git a/drools-examples-api/named-kiesession-from-file/pom.xml b/drools-examples-api/named-kiesession-from-file/pom.xml index 411bec642f3..29d3560c386 100644 --- a/drools-examples-api/named-kiesession-from-file/pom.xml +++ b/drools-examples-api/named-kiesession-from-file/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT Drools :: API examples :: Named KieSession from File diff --git a/drools-examples-api/named-kiesession/pom.xml b/drools-examples-api/named-kiesession/pom.xml index 84cd75d19e8..64351994fa6 100644 --- a/drools-examples-api/named-kiesession/pom.xml +++ b/drools-examples-api/named-kiesession/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT named-kiesession diff --git a/drools-examples-api/pom.xml b/drools-examples-api/pom.xml index 81bd07d20f3..243c4c8248b 100644 --- a/drools-examples-api/pom.xml +++ b/drools-examples-api/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-examples-api/reactive-kiesession/pom.xml b/drools-examples-api/reactive-kiesession/pom.xml index 6ec8a00ef5e..6726fae6604 100644 --- a/drools-examples-api/reactive-kiesession/pom.xml +++ b/drools-examples-api/reactive-kiesession/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT reactive-kiesession diff --git a/drools-examples/pom.xml b/drools-examples/pom.xml index 0c29bff3b2f..70bdf107d8e 100644 --- a/drools-examples/pom.xml +++ b/drools-examples/pom.xml @@ -25,7 +25,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-fastutil/pom.xml b/drools-fastutil/pom.xml index e32492dab64..79e109ac38b 100644 --- a/drools-fastutil/pom.xml +++ b/drools-fastutil/pom.xml @@ -27,7 +27,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-common/pom.xml b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-common/pom.xml index 9c40c10fe93..862bc64dd1b 100644 --- a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-common/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-common/pom.xml @@ -25,7 +25,7 @@ drools-impact-analysis-graph org.drools - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/pom.xml b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/pom.xml index 7eda96fad51..f424681a20c 100644 --- a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/pom.xml @@ -25,7 +25,7 @@ drools-impact-analysis-graph org.drools - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-impact-analysis/drools-impact-analysis-graph/pom.xml b/drools-impact-analysis/drools-impact-analysis-graph/pom.xml index 911f98e191a..d42cb900dc5 100644 --- a/drools-impact-analysis/drools-impact-analysis-graph/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-graph/pom.xml @@ -25,7 +25,7 @@ drools-impact-analysis org.drools - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-impact-analysis/drools-impact-analysis-itests/pom.xml b/drools-impact-analysis/drools-impact-analysis-itests/pom.xml index f75835377ad..7015b8f36af 100644 --- a/drools-impact-analysis/drools-impact-analysis-itests/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-itests/pom.xml @@ -25,7 +25,7 @@ drools-impact-analysis org.drools - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-impact-analysis/drools-impact-analysis-model/pom.xml b/drools-impact-analysis/drools-impact-analysis-model/pom.xml index aadc2e5492c..3a8893de2e3 100644 --- a/drools-impact-analysis/drools-impact-analysis-model/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-model/pom.xml @@ -25,7 +25,7 @@ drools-impact-analysis org.drools - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-impact-analysis/drools-impact-analysis-parser/pom.xml b/drools-impact-analysis/drools-impact-analysis-parser/pom.xml index daa671a78cd..682bc401ffc 100644 --- a/drools-impact-analysis/drools-impact-analysis-parser/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-parser/pom.xml @@ -25,7 +25,7 @@ drools-impact-analysis org.drools - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-impact-analysis/pom.xml b/drools-impact-analysis/pom.xml index a59f6e20b97..4d8511b29ff 100644 --- a/drools-impact-analysis/pom.xml +++ b/drools-impact-analysis/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-io/pom.xml b/drools-io/pom.xml index cb1d5638663..06687764ce5 100644 --- a/drools-io/pom.xml +++ b/drools-io/pom.xml @@ -27,7 +27,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-kiesession/pom.xml b/drools-kiesession/pom.xml index d3f459e0430..bcb863d4ab4 100644 --- a/drools-kiesession/pom.xml +++ b/drools-kiesession/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-legacy-test-util/pom.xml b/drools-legacy-test-util/pom.xml index ea166eb7e66..e9d20aed154 100644 --- a/drools-legacy-test-util/pom.xml +++ b/drools-legacy-test-util/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-metric/pom.xml b/drools-metric/pom.xml index b309eb91868..27b400f440b 100644 --- a/drools-metric/pom.xml +++ b/drools-metric/pom.xml @@ -27,7 +27,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-model/drools-canonical-model/pom.xml b/drools-model/drools-canonical-model/pom.xml index bf5edab4f4b..76a8d5278c0 100644 --- a/drools-model/drools-canonical-model/pom.xml +++ b/drools-model/drools-canonical-model/pom.xml @@ -27,7 +27,7 @@ org.drools drools-model - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT Drools :: Canonical Model diff --git a/drools-model/drools-codegen-common/pom.xml b/drools-model/drools-codegen-common/pom.xml index 19e95a2cdb6..beade7d0f70 100644 --- a/drools-model/drools-codegen-common/pom.xml +++ b/drools-model/drools-codegen-common/pom.xml @@ -27,7 +27,7 @@ org.drools drools-model - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT org.drools diff --git a/drools-model/drools-model-codegen/pom.xml b/drools-model/drools-model-codegen/pom.xml index 0d836c6499a..59aafd869a0 100644 --- a/drools-model/drools-model-codegen/pom.xml +++ b/drools-model/drools-model-codegen/pom.xml @@ -27,7 +27,7 @@ org.drools drools-model - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT org.drools diff --git a/drools-model/drools-model-compiler/pom.xml b/drools-model/drools-model-compiler/pom.xml index 37904eb7c5a..99b50c2ae1b 100644 --- a/drools-model/drools-model-compiler/pom.xml +++ b/drools-model/drools-model-compiler/pom.xml @@ -27,7 +27,7 @@ org.drools drools-model - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT Drools :: Model :: Compiler diff --git a/drools-model/drools-mvel-compiler/pom.xml b/drools-model/drools-mvel-compiler/pom.xml index 4ffd852c401..0581f58cd68 100644 --- a/drools-model/drools-mvel-compiler/pom.xml +++ b/drools-model/drools-mvel-compiler/pom.xml @@ -27,7 +27,7 @@ org.drools drools-model - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT Drools :: MVEL Compiler diff --git a/drools-model/drools-mvel-parser/pom.xml b/drools-model/drools-mvel-parser/pom.xml index a18102dc4ea..7b9a45c4d19 100644 --- a/drools-model/drools-mvel-parser/pom.xml +++ b/drools-model/drools-mvel-parser/pom.xml @@ -24,7 +24,7 @@ org.drools drools-model - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT Drools :: MVEL Parser diff --git a/drools-model/pom.xml b/drools-model/pom.xml index a6d6fe71d2e..8697a510f7e 100644 --- a/drools-model/pom.xml +++ b/drools-model/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-mvel/pom.xml b/drools-mvel/pom.xml index 32920b00fc6..7372effd888 100644 --- a/drools-mvel/pom.xml +++ b/drools-mvel/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-persistence/drools-persistence-api/pom.xml b/drools-persistence/drools-persistence-api/pom.xml index c5b64655419..bf7d3d2b9bd 100644 --- a/drools-persistence/drools-persistence-api/pom.xml +++ b/drools-persistence/drools-persistence-api/pom.xml @@ -26,7 +26,7 @@ org.drools drools-persistence - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT drools-persistence-api diff --git a/drools-persistence/drools-persistence-jpa/pom.xml b/drools-persistence/drools-persistence-jpa/pom.xml index 7706d4c6556..7a3ec66da13 100644 --- a/drools-persistence/drools-persistence-jpa/pom.xml +++ b/drools-persistence/drools-persistence-jpa/pom.xml @@ -26,7 +26,7 @@ org.drools drools-persistence - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT drools-persistence-jpa diff --git a/drools-persistence/pom.xml b/drools-persistence/pom.xml index 00bef440d26..2f262cf6665 100644 --- a/drools-persistence/pom.xml +++ b/drools-persistence/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-quarkus-extension/drools-quarkus-deployment/pom.xml b/drools-quarkus-extension/drools-quarkus-deployment/pom.xml index 423625403da..86e7cf5b157 100644 --- a/drools-quarkus-extension/drools-quarkus-deployment/pom.xml +++ b/drools-quarkus-extension/drools-quarkus-deployment/pom.xml @@ -26,7 +26,7 @@ org.drools drools-quarkus-extension - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT Drools :: Quarkus Extension :: Deployment diff --git a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml index 2eb787ebc6b..7775183a6fe 100644 --- a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml +++ b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml @@ -26,7 +26,7 @@ org.drools drools-quarkus-examples - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT Drools :: Quarkus Extension :: Examples :: Reactive diff --git a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/pom.xml b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/pom.xml index afae02b4aa9..6d3e0dc0442 100644 --- a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/pom.xml +++ b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/pom.xml @@ -26,7 +26,7 @@ org.drools drools-quarkus-examples - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT Drools :: Quarkus Extension :: Examples :: Reactive diff --git a/drools-quarkus-extension/drools-quarkus-examples/pom.xml b/drools-quarkus-extension/drools-quarkus-examples/pom.xml index 22470a5c070..af6bd0eb318 100644 --- a/drools-quarkus-extension/drools-quarkus-examples/pom.xml +++ b/drools-quarkus-extension/drools-quarkus-examples/pom.xml @@ -26,7 +26,7 @@ org.drools drools-quarkus-extension - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT Drools :: Quarkus Extension :: Examples diff --git a/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/pom.xml b/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/pom.xml index 472853de637..a2f06a4e36e 100644 --- a/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/pom.xml +++ b/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/pom.xml @@ -26,7 +26,7 @@ org.drools drools-quarkus-extension - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT Drools :: Quarkus Extension :: Integration Test :: Hotreload diff --git a/drools-quarkus-extension/drools-quarkus-integration-test/pom.xml b/drools-quarkus-extension/drools-quarkus-integration-test/pom.xml index 335fd594651..7760a875dc4 100644 --- a/drools-quarkus-extension/drools-quarkus-integration-test/pom.xml +++ b/drools-quarkus-extension/drools-quarkus-integration-test/pom.xml @@ -26,7 +26,7 @@ org.drools drools-quarkus-extension - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT Drools :: Quarkus Extension :: Integration Test diff --git a/drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml b/drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml index b5a5eb028dd..65b5885a696 100644 --- a/drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml +++ b/drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml @@ -26,7 +26,7 @@ org.drools drools-quarkus-extension - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT Drools :: Quarkus Extension :: Quickstart Integration Test diff --git a/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/pom.xml b/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/pom.xml index 5eace980cfe..00076fa06bf 100644 --- a/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/pom.xml +++ b/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/pom.xml @@ -26,7 +26,7 @@ org.drools drools-quarkus-extension - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT Drools :: Quarkus Extension :: Integration Test with Rule Unit diff --git a/drools-quarkus-extension/drools-quarkus-util-deployment/pom.xml b/drools-quarkus-extension/drools-quarkus-util-deployment/pom.xml index 8d48b47cfe4..39ea799dde6 100644 --- a/drools-quarkus-extension/drools-quarkus-util-deployment/pom.xml +++ b/drools-quarkus-extension/drools-quarkus-util-deployment/pom.xml @@ -26,7 +26,7 @@ org.drools drools-quarkus-extension - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT Drools :: Quarkus Extension :: Util :: Deployment diff --git a/drools-quarkus-extension/drools-quarkus/pom.xml b/drools-quarkus-extension/drools-quarkus/pom.xml index a7691b98b52..f750a840a6e 100644 --- a/drools-quarkus-extension/drools-quarkus/pom.xml +++ b/drools-quarkus-extension/drools-quarkus/pom.xml @@ -26,7 +26,7 @@ org.drools drools-quarkus-extension - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT Drools :: Quarkus Extension :: Runtime diff --git a/drools-quarkus-extension/pom.xml b/drools-quarkus-extension/pom.xml index 7cf6b3e871f..06d4b6c3b86 100644 --- a/drools-quarkus-extension/pom.xml +++ b/drools-quarkus-extension/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-reliability/drools-reliability-core/pom.xml b/drools-reliability/drools-reliability-core/pom.xml index c7068938535..c88d3a7bf81 100644 --- a/drools-reliability/drools-reliability-core/pom.xml +++ b/drools-reliability/drools-reliability-core/pom.xml @@ -25,7 +25,7 @@ org.drools drools-reliability - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-reliability/drools-reliability-h2mvstore/pom.xml b/drools-reliability/drools-reliability-h2mvstore/pom.xml index 46125f79c37..75e21b2772b 100644 --- a/drools-reliability/drools-reliability-h2mvstore/pom.xml +++ b/drools-reliability/drools-reliability-h2mvstore/pom.xml @@ -25,7 +25,7 @@ org.drools drools-reliability - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-reliability/drools-reliability-infinispan/pom.xml b/drools-reliability/drools-reliability-infinispan/pom.xml index 1e735e0b826..487918d0d2d 100644 --- a/drools-reliability/drools-reliability-infinispan/pom.xml +++ b/drools-reliability/drools-reliability-infinispan/pom.xml @@ -25,7 +25,7 @@ org.drools drools-reliability - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-reliability/drools-reliability-tests/pom.xml b/drools-reliability/drools-reliability-tests/pom.xml index 270bbb193fb..b473f8678a2 100644 --- a/drools-reliability/drools-reliability-tests/pom.xml +++ b/drools-reliability/drools-reliability-tests/pom.xml @@ -25,7 +25,7 @@ org.drools drools-reliability - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-reliability/pom.xml b/drools-reliability/pom.xml index e9ac51adab6..ff408140e12 100644 --- a/drools-reliability/pom.xml +++ b/drools-reliability/pom.xml @@ -25,7 +25,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml 4.0.0 diff --git a/drools-retediagram/pom.xml b/drools-retediagram/pom.xml index 0b01f7ff5c0..56d1c9782b9 100644 --- a/drools-retediagram/pom.xml +++ b/drools-retediagram/pom.xml @@ -24,7 +24,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-ruleunits/drools-ruleunits-api/pom.xml b/drools-ruleunits/drools-ruleunits-api/pom.xml index 136a88a3ab5..60aa9dbf3dc 100755 --- a/drools-ruleunits/drools-ruleunits-api/pom.xml +++ b/drools-ruleunits/drools-ruleunits-api/pom.xml @@ -26,7 +26,7 @@ org.drools drools-ruleunits - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT org.drools diff --git a/drools-ruleunits/drools-ruleunits-dsl/pom.xml b/drools-ruleunits/drools-ruleunits-dsl/pom.xml index 7441a9b54dc..e934c03d416 100755 --- a/drools-ruleunits/drools-ruleunits-dsl/pom.xml +++ b/drools-ruleunits/drools-ruleunits-dsl/pom.xml @@ -26,7 +26,7 @@ org.drools drools-ruleunits - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT org.drools diff --git a/drools-ruleunits/drools-ruleunits-engine/pom.xml b/drools-ruleunits/drools-ruleunits-engine/pom.xml index bff104e553b..12b76c2184f 100644 --- a/drools-ruleunits/drools-ruleunits-engine/pom.xml +++ b/drools-ruleunits/drools-ruleunits-engine/pom.xml @@ -26,7 +26,7 @@ org.drools drools-ruleunits - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT drools-ruleunits-engine diff --git a/drools-ruleunits/drools-ruleunits-impl/pom.xml b/drools-ruleunits/drools-ruleunits-impl/pom.xml index 0c3d6198967..cdaeec7b16c 100755 --- a/drools-ruleunits/drools-ruleunits-impl/pom.xml +++ b/drools-ruleunits/drools-ruleunits-impl/pom.xml @@ -26,7 +26,7 @@ org.drools drools-ruleunits - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT org.drools diff --git a/drools-ruleunits/pom.xml b/drools-ruleunits/pom.xml index dddaf5a5184..098fdfd1bba 100644 --- a/drools-ruleunits/pom.xml +++ b/drools-ruleunits/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-scenario-simulation/drools-scenario-simulation-api/pom.xml b/drools-scenario-simulation/drools-scenario-simulation-api/pom.xml index 1e98db0011c..e27fc491e7b 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-api/pom.xml +++ b/drools-scenario-simulation/drools-scenario-simulation-api/pom.xml @@ -25,7 +25,7 @@ drools-scenario-simulation org.drools - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/pom.xml b/drools-scenario-simulation/drools-scenario-simulation-backend/pom.xml index 1f0d8a2434b..799532daea0 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/pom.xml +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/pom.xml @@ -25,7 +25,7 @@ drools-scenario-simulation org.drools - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/pom.xml b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/pom.xml index 65565db0f34..11ec6d899bd 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/pom.xml +++ b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/pom.xml @@ -25,7 +25,7 @@ drools-scenario-simulation org.drools - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-scenario-simulation/pom.xml b/drools-scenario-simulation/pom.xml index 8e7cc26bcc3..39fb27775a5 100644 --- a/drools-scenario-simulation/pom.xml +++ b/drools-scenario-simulation/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-serialization-protobuf/pom.xml b/drools-serialization-protobuf/pom.xml index 3c8814f2d05..53cabcc542b 100644 --- a/drools-serialization-protobuf/pom.xml +++ b/drools-serialization-protobuf/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-templates/pom.xml b/drools-templates/pom.xml index d6152f764d9..862b20c2a57 100644 --- a/drools-templates/pom.xml +++ b/drools-templates/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-test-coverage/pom.xml b/drools-test-coverage/pom.xml index 231f37b49d5..d762453cd29 100644 --- a/drools-test-coverage/pom.xml +++ b/drools-test-coverage/pom.xml @@ -27,7 +27,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-test-coverage/standalone/kie-ci-with-domain/pom.xml b/drools-test-coverage/standalone/kie-ci-with-domain/pom.xml index 114d021fac1..392762027d1 100644 --- a/drools-test-coverage/standalone/kie-ci-with-domain/pom.xml +++ b/drools-test-coverage/standalone/kie-ci-with-domain/pom.xml @@ -28,7 +28,7 @@ org.drools.testcoverage drools-standalone-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT drools-kie-ci-with-domain-parent diff --git a/drools-test-coverage/standalone/kie-ci-with-domain/test-domain/pom.xml b/drools-test-coverage/standalone/kie-ci-with-domain/test-domain/pom.xml index 203dd83f3b0..02ddd2f528b 100644 --- a/drools-test-coverage/standalone/kie-ci-with-domain/test-domain/pom.xml +++ b/drools-test-coverage/standalone/kie-ci-with-domain/test-domain/pom.xml @@ -28,7 +28,7 @@ org.drools.testcoverage drools-kie-ci-with-domain-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT drools-kie-ci-with-domain-test-domain diff --git a/drools-test-coverage/standalone/kie-ci-with-domain/test-kjar/pom.xml b/drools-test-coverage/standalone/kie-ci-with-domain/test-kjar/pom.xml index 128837f36bc..d13f40b44cc 100644 --- a/drools-test-coverage/standalone/kie-ci-with-domain/test-kjar/pom.xml +++ b/drools-test-coverage/standalone/kie-ci-with-domain/test-kjar/pom.xml @@ -28,7 +28,7 @@ org.drools.testcoverage drools-kie-ci-with-domain-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT drools-kie-ci-with-domain-test-kjar diff --git a/drools-test-coverage/standalone/kie-ci-with-domain/tests/pom.xml b/drools-test-coverage/standalone/kie-ci-with-domain/tests/pom.xml index cf6ee6e7478..daf9c8358e8 100644 --- a/drools-test-coverage/standalone/kie-ci-with-domain/tests/pom.xml +++ b/drools-test-coverage/standalone/kie-ci-with-domain/tests/pom.xml @@ -28,7 +28,7 @@ org.drools.testcoverage drools-kie-ci-with-domain-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT drools-kie-ci-with-domain-tests diff --git a/drools-test-coverage/standalone/kie-ci-without-domain/pom.xml b/drools-test-coverage/standalone/kie-ci-without-domain/pom.xml index fee188e731b..a99b211273e 100644 --- a/drools-test-coverage/standalone/kie-ci-without-domain/pom.xml +++ b/drools-test-coverage/standalone/kie-ci-without-domain/pom.xml @@ -28,7 +28,7 @@ org.drools.testcoverage drools-standalone-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT drools-kie-ci-without-domain-parent diff --git a/drools-test-coverage/standalone/kie-ci-without-domain/test-domain/pom.xml b/drools-test-coverage/standalone/kie-ci-without-domain/test-domain/pom.xml index fd52c34ca44..0fd2323fdb3 100644 --- a/drools-test-coverage/standalone/kie-ci-without-domain/test-domain/pom.xml +++ b/drools-test-coverage/standalone/kie-ci-without-domain/test-domain/pom.xml @@ -28,7 +28,7 @@ org.drools.testcoverage drools-kie-ci-without-domain-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT drools-kie-ci-without-domain-test-domain diff --git a/drools-test-coverage/standalone/kie-ci-without-domain/test-kjar/pom.xml b/drools-test-coverage/standalone/kie-ci-without-domain/test-kjar/pom.xml index 6f6f69b4c65..c65051d86df 100644 --- a/drools-test-coverage/standalone/kie-ci-without-domain/test-kjar/pom.xml +++ b/drools-test-coverage/standalone/kie-ci-without-domain/test-kjar/pom.xml @@ -28,7 +28,7 @@ org.drools.testcoverage drools-kie-ci-without-domain-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT drools-kie-ci-without-domain-test-kjar diff --git a/drools-test-coverage/standalone/kie-ci-without-domain/tests/pom.xml b/drools-test-coverage/standalone/kie-ci-without-domain/tests/pom.xml index 9aed5bac7f7..83a42a715c4 100644 --- a/drools-test-coverage/standalone/kie-ci-without-domain/tests/pom.xml +++ b/drools-test-coverage/standalone/kie-ci-without-domain/tests/pom.xml @@ -28,7 +28,7 @@ org.drools.testcoverage drools-kie-ci-without-domain-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT drools-kie-ci-without-domain-tests diff --git a/drools-test-coverage/standalone/pom.xml b/drools-test-coverage/standalone/pom.xml index 225f940a165..ac12e2e49d0 100644 --- a/drools-test-coverage/standalone/pom.xml +++ b/drools-test-coverage/standalone/pom.xml @@ -28,7 +28,7 @@ org.drools.testcoverage drools-test-coverage-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT drools-standalone-parent diff --git a/drools-test-coverage/test-compiler-integration/pom.xml b/drools-test-coverage/test-compiler-integration/pom.xml index 49ba51a98be..357f8fb74ec 100644 --- a/drools-test-coverage/test-compiler-integration/pom.xml +++ b/drools-test-coverage/test-compiler-integration/pom.xml @@ -26,7 +26,7 @@ drools-test-coverage-parent org.drools.testcoverage - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-test-coverage/test-integration-nomvel/pom.xml b/drools-test-coverage/test-integration-nomvel/pom.xml index 5ff7b47f21a..f76e70c8058 100644 --- a/drools-test-coverage/test-integration-nomvel/pom.xml +++ b/drools-test-coverage/test-integration-nomvel/pom.xml @@ -26,7 +26,7 @@ drools-test-coverage-parent org.drools.testcoverage - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-test-coverage/test-integration-notms/pom.xml b/drools-test-coverage/test-integration-notms/pom.xml index 20bbff6bd2f..fc332872e08 100644 --- a/drools-test-coverage/test-integration-notms/pom.xml +++ b/drools-test-coverage/test-integration-notms/pom.xml @@ -26,7 +26,7 @@ drools-test-coverage-parent org.drools.testcoverage - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-test-coverage/test-integration-noxml/pom.xml b/drools-test-coverage/test-integration-noxml/pom.xml index 217e09e7cca..acdc2110f18 100644 --- a/drools-test-coverage/test-integration-noxml/pom.xml +++ b/drools-test-coverage/test-integration-noxml/pom.xml @@ -26,7 +26,7 @@ drools-test-coverage-parent org.drools.testcoverage - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-test-coverage/test-integration-ruleunits/pom.xml b/drools-test-coverage/test-integration-ruleunits/pom.xml index 8df277e6a92..093a52dceac 100644 --- a/drools-test-coverage/test-integration-ruleunits/pom.xml +++ b/drools-test-coverage/test-integration-ruleunits/pom.xml @@ -26,7 +26,7 @@ drools-test-coverage-parent org.drools.testcoverage - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-jar/pom.xml b/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-jar/pom.xml index 3bd52db4494..ed43b4b9272 100644 --- a/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-jar/pom.xml +++ b/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-jar/pom.xml @@ -26,7 +26,7 @@ test-integration-ruleunits org.drools.testcoverage - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-tests/pom.xml b/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-tests/pom.xml index 8696d9c7b87..f4b9e6da6bb 100644 --- a/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-tests/pom.xml +++ b/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-tests/pom.xml @@ -26,7 +26,7 @@ test-integration-ruleunits org.drools.testcoverage - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-test-coverage/test-suite/pom.xml b/drools-test-coverage/test-suite/pom.xml index e7f61605266..6eefc3e28c4 100644 --- a/drools-test-coverage/test-suite/pom.xml +++ b/drools-test-coverage/test-suite/pom.xml @@ -28,7 +28,7 @@ org.drools.testcoverage drools-test-coverage-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT drools-test-suite diff --git a/drools-tms/pom.xml b/drools-tms/pom.xml index 52ccebf93fa..367417f0758 100644 --- a/drools-tms/pom.xml +++ b/drools-tms/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-traits/pom.xml b/drools-traits/pom.xml index b717b853857..3ba095bb36c 100644 --- a/drools-traits/pom.xml +++ b/drools-traits/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-util/pom.xml b/drools-util/pom.xml index 415a3ac2581..ae537454a0c 100644 --- a/drools-util/pom.xml +++ b/drools-util/pom.xml @@ -27,7 +27,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-verifier/drools-verifier-api/pom.xml b/drools-verifier/drools-verifier-api/pom.xml index a66a20184f8..d1e724eb50c 100644 --- a/drools-verifier/drools-verifier-api/pom.xml +++ b/drools-verifier/drools-verifier-api/pom.xml @@ -26,7 +26,7 @@ org.drools drools-verifier - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-verifier/drools-verifier-core/pom.xml b/drools-verifier/drools-verifier-core/pom.xml index 28ce4467959..aa0b05f6efb 100644 --- a/drools-verifier/drools-verifier-core/pom.xml +++ b/drools-verifier/drools-verifier-core/pom.xml @@ -25,7 +25,7 @@ drools-verifier org.drools - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/drools-verifier/drools-verifier-drl/pom.xml b/drools-verifier/drools-verifier-drl/pom.xml index 36821ffabdd..9b6b501518d 100644 --- a/drools-verifier/drools-verifier-drl/pom.xml +++ b/drools-verifier/drools-verifier-drl/pom.xml @@ -26,7 +26,7 @@ org.drools drools-verifier - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT drools-verifier-drl diff --git a/drools-verifier/pom.xml b/drools-verifier/pom.xml index 17cda824e53..bdbd2c6afd1 100644 --- a/drools-verifier/pom.xml +++ b/drools-verifier/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-wiring/drools-wiring-api/pom.xml b/drools-wiring/drools-wiring-api/pom.xml index e15aaff05b5..59bde229b16 100755 --- a/drools-wiring/drools-wiring-api/pom.xml +++ b/drools-wiring/drools-wiring-api/pom.xml @@ -26,7 +26,7 @@ org.drools drools-wiring - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT org.drools diff --git a/drools-wiring/drools-wiring-dynamic/pom.xml b/drools-wiring/drools-wiring-dynamic/pom.xml index b207771d957..f03da3d19ee 100755 --- a/drools-wiring/drools-wiring-dynamic/pom.xml +++ b/drools-wiring/drools-wiring-dynamic/pom.xml @@ -26,7 +26,7 @@ org.drools drools-wiring - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT org.drools diff --git a/drools-wiring/drools-wiring-static/pom.xml b/drools-wiring/drools-wiring-static/pom.xml index 1cc4ac9701e..8a559cc87be 100755 --- a/drools-wiring/drools-wiring-static/pom.xml +++ b/drools-wiring/drools-wiring-static/pom.xml @@ -26,7 +26,7 @@ org.drools drools-wiring - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT org.drools diff --git a/drools-wiring/pom.xml b/drools-wiring/pom.xml index 1b0be1851f6..b4a11cc99fe 100644 --- a/drools-wiring/pom.xml +++ b/drools-wiring/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-xml-support/pom.xml b/drools-xml-support/pom.xml index dbc8ffd59a9..8a617cc402e 100644 --- a/drools-xml-support/pom.xml +++ b/drools-xml-support/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/efesto/efesto-common-utils/pom.xml b/efesto/efesto-common-utils/pom.xml index d04739c0653..c5d9bdfb802 100644 --- a/efesto/efesto-common-utils/pom.xml +++ b/efesto/efesto-common-utils/pom.xml @@ -27,7 +27,7 @@ org.kie efesto - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT efesto-common-utils diff --git a/efesto/efesto-core/efesto-common-api/pom.xml b/efesto/efesto-core/efesto-common-api/pom.xml index 4abc6af3351..091dbf1ab58 100644 --- a/efesto/efesto-core/efesto-common-api/pom.xml +++ b/efesto/efesto-core/efesto-common-api/pom.xml @@ -27,7 +27,7 @@ org.kie efesto-core - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT efesto-common-api diff --git a/efesto/efesto-core/efesto-common-core/pom.xml b/efesto/efesto-core/efesto-common-core/pom.xml index a1b8d8dfddf..71eaba144c9 100644 --- a/efesto/efesto-core/efesto-common-core/pom.xml +++ b/efesto/efesto-core/efesto-common-core/pom.xml @@ -27,7 +27,7 @@ org.kie efesto-core - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT efesto-common-core diff --git a/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-api/pom.xml b/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-api/pom.xml index c2d30943af4..31fec980e81 100644 --- a/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-api/pom.xml +++ b/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-api/pom.xml @@ -27,7 +27,7 @@ org.kie efesto-compilation-manager - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT efesto-compilation-manager-api diff --git a/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-core/pom.xml b/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-core/pom.xml index 014ef2bd832..d2f8105cd43 100644 --- a/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-core/pom.xml +++ b/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-core/pom.xml @@ -39,7 +39,7 @@ org.kie efesto-compilation-manager - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT efesto-compilation-manager-core diff --git a/efesto/efesto-core/efesto-compilation-manager/pom.xml b/efesto/efesto-core/efesto-compilation-manager/pom.xml index 76bf18454e3..6ab2912c753 100644 --- a/efesto/efesto-core/efesto-compilation-manager/pom.xml +++ b/efesto/efesto-core/efesto-compilation-manager/pom.xml @@ -27,7 +27,7 @@ org.kie efesto-core - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT pom diff --git a/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-api/pom.xml b/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-api/pom.xml index 1a86dfa3b0b..f8e7ff014cb 100644 --- a/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-api/pom.xml +++ b/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-api/pom.xml @@ -27,7 +27,7 @@ org.kie efesto-runtime-manager - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT efesto-runtime-manager-api diff --git a/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/pom.xml b/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/pom.xml index 37395b6167e..9d49428f86d 100644 --- a/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/pom.xml +++ b/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/pom.xml @@ -27,7 +27,7 @@ org.kie efesto-runtime-manager - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT efesto-runtime-manager-core diff --git a/efesto/efesto-core/efesto-runtime-manager/pom.xml b/efesto/efesto-core/efesto-runtime-manager/pom.xml index 6749f94a474..b89f22d3c91 100644 --- a/efesto/efesto-core/efesto-runtime-manager/pom.xml +++ b/efesto/efesto-core/efesto-runtime-manager/pom.xml @@ -27,7 +27,7 @@ org.kie efesto-core - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT pom diff --git a/efesto/efesto-core/pom.xml b/efesto/efesto-core/pom.xml index dc54b246e4c..bdb5b5991d8 100644 --- a/efesto/efesto-core/pom.xml +++ b/efesto/efesto-core/pom.xml @@ -27,7 +27,7 @@ org.kie efesto - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT pom diff --git a/efesto/efesto-dependencies/pom.xml b/efesto/efesto-dependencies/pom.xml index cc1d1ee5e29..d4c9ef7817f 100644 --- a/efesto/efesto-dependencies/pom.xml +++ b/efesto/efesto-dependencies/pom.xml @@ -25,7 +25,7 @@ efesto org.kie - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/efesto/pom.xml b/efesto/pom.xml index a8d7adbe6ee..4dd86f47e9c 100644 --- a/efesto/pom.xml +++ b/efesto/pom.xml @@ -27,7 +27,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/jpmml-migration-recipe/pom.xml b/jpmml-migration-recipe/pom.xml index 055a1e40b0d..81a0719f44a 100644 --- a/jpmml-migration-recipe/pom.xml +++ b/jpmml-migration-recipe/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/kie-api/pom.xml b/kie-api/pom.xml index 2e9ebda2be0..183162d7f17 100644 --- a/kie-api/pom.xml +++ b/kie-api/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/kie-archetypes/kie-drools-dmn-archetype/pom.xml b/kie-archetypes/kie-drools-dmn-archetype/pom.xml index aa7e6094007..6a8b8d044f5 100644 --- a/kie-archetypes/kie-drools-dmn-archetype/pom.xml +++ b/kie-archetypes/kie-drools-dmn-archetype/pom.xml @@ -24,7 +24,7 @@ org.kie kie-archetypes - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-drools-dmn-archetype diff --git a/kie-archetypes/kie-drools-exec-model-archetype/pom.xml b/kie-archetypes/kie-drools-exec-model-archetype/pom.xml index e12b110a15a..4a760e940b1 100644 --- a/kie-archetypes/kie-drools-exec-model-archetype/pom.xml +++ b/kie-archetypes/kie-drools-exec-model-archetype/pom.xml @@ -24,7 +24,7 @@ org.kie kie-archetypes - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-drools-exec-model-archetype diff --git a/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/pom.xml b/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/pom.xml index 29606922214..e3819d8fc45 100644 --- a/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/pom.xml +++ b/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/pom.xml @@ -24,7 +24,7 @@ org.kie kie-archetypes - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-drools-exec-model-ruleunit-archetype diff --git a/kie-archetypes/kie-drools-yaml-archetype/pom.xml b/kie-archetypes/kie-drools-yaml-archetype/pom.xml index b684ef46d9a..1a7b7c63880 100644 --- a/kie-archetypes/kie-drools-yaml-archetype/pom.xml +++ b/kie-archetypes/kie-drools-yaml-archetype/pom.xml @@ -24,7 +24,7 @@ org.kie kie-archetypes - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-drools-yaml-archetype diff --git a/kie-archetypes/pom.xml b/kie-archetypes/pom.xml index 3b9d4eb99de..cb5ef4806ce 100644 --- a/kie-archetypes/pom.xml +++ b/kie-archetypes/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/kie-ci/pom.xml b/kie-ci/pom.xml index 353541dfa35..8f5a8f84f77 100644 --- a/kie-ci/pom.xml +++ b/kie-ci/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/kie-dmn/kie-dmn-api/pom.xml b/kie-dmn/kie-dmn-api/pom.xml index 23f4e95a2cd..f0f678c47d2 100644 --- a/kie-dmn/kie-dmn-api/pom.xml +++ b/kie-dmn/kie-dmn-api/pom.xml @@ -27,7 +27,7 @@ org.kie kie-dmn - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-dmn-api diff --git a/kie-dmn/kie-dmn-backend/pom.xml b/kie-dmn/kie-dmn-backend/pom.xml index 6726a681cef..0eabb95f9f9 100644 --- a/kie-dmn/kie-dmn-backend/pom.xml +++ b/kie-dmn/kie-dmn-backend/pom.xml @@ -27,7 +27,7 @@ org.kie kie-dmn - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-dmn-backend diff --git a/kie-dmn/kie-dmn-core-jsr223-jq/pom.xml b/kie-dmn/kie-dmn-core-jsr223-jq/pom.xml index 492be9ad8cf..661b87db6da 100644 --- a/kie-dmn/kie-dmn-core-jsr223-jq/pom.xml +++ b/kie-dmn/kie-dmn-core-jsr223-jq/pom.xml @@ -23,7 +23,7 @@ org.kie kie-dmn - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-dmn-core-jsr223-jq KIE :: Decision Model Notation :: JSR-223 JQ ScriptEngine diff --git a/kie-dmn/kie-dmn-core-jsr223/pom.xml b/kie-dmn/kie-dmn-core-jsr223/pom.xml index a7dc14441f4..9bdd20601f7 100644 --- a/kie-dmn/kie-dmn-core-jsr223/pom.xml +++ b/kie-dmn/kie-dmn-core-jsr223/pom.xml @@ -23,7 +23,7 @@ org.kie kie-dmn - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-dmn-core-jsr223 KIE :: Decision Model Notation :: Core JSR-223 diff --git a/kie-dmn/kie-dmn-core/pom.xml b/kie-dmn/kie-dmn-core/pom.xml index e55daeaceba..2add1f66756 100644 --- a/kie-dmn/kie-dmn-core/pom.xml +++ b/kie-dmn/kie-dmn-core/pom.xml @@ -27,7 +27,7 @@ kie-dmn org.kie - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-dmn-core diff --git a/kie-dmn/kie-dmn-feel/pom.xml b/kie-dmn/kie-dmn-feel/pom.xml index ab7e6244b04..4c38b6a7336 100644 --- a/kie-dmn/kie-dmn-feel/pom.xml +++ b/kie-dmn/kie-dmn-feel/pom.xml @@ -27,7 +27,7 @@ org.kie kie-dmn - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-dmn-feel diff --git a/kie-dmn/kie-dmn-legacy-tests/pom.xml b/kie-dmn/kie-dmn-legacy-tests/pom.xml index 9b630cd5d81..a47b9a64400 100644 --- a/kie-dmn/kie-dmn-legacy-tests/pom.xml +++ b/kie-dmn/kie-dmn-legacy-tests/pom.xml @@ -23,7 +23,7 @@ org.kie kie-dmn - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-dmn-legacy-tests diff --git a/kie-dmn/kie-dmn-model/pom.xml b/kie-dmn/kie-dmn-model/pom.xml index 82cc8414c1e..2cafe5c03ad 100644 --- a/kie-dmn/kie-dmn-model/pom.xml +++ b/kie-dmn/kie-dmn-model/pom.xml @@ -27,7 +27,7 @@ kie-dmn org.kie - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-dmn-model diff --git a/kie-dmn/kie-dmn-openapi/pom.xml b/kie-dmn/kie-dmn-openapi/pom.xml index 9f0f46d211d..27a7588cf67 100644 --- a/kie-dmn/kie-dmn-openapi/pom.xml +++ b/kie-dmn/kie-dmn-openapi/pom.xml @@ -23,7 +23,7 @@ org.kie kie-dmn - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-dmn-openapi diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests-trusty/pom.xml b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests-trusty/pom.xml index 1a92672a977..36e719f5fed 100644 --- a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests-trusty/pom.xml +++ b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests-trusty/pom.xml @@ -25,7 +25,7 @@ kie-dmn-pmml-tests-parent org.kie - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/pom.xml b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/pom.xml index 6751b8fa07e..a00be0eb217 100644 --- a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/pom.xml +++ b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/pom.xml @@ -25,7 +25,7 @@ kie-dmn-pmml-tests-parent org.kie - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/pom.xml b/kie-dmn/kie-dmn-pmml-tests-parent/pom.xml index 366af61b419..08a405f28fe 100644 --- a/kie-dmn/kie-dmn-pmml-tests-parent/pom.xml +++ b/kie-dmn/kie-dmn-pmml-tests-parent/pom.xml @@ -25,7 +25,7 @@ kie-dmn org.kie - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 pom diff --git a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn-cli/pom.xml b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn-cli/pom.xml index 814380c895e..468c7ea1b5e 100644 --- a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn-cli/pom.xml +++ b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn-cli/pom.xml @@ -23,7 +23,7 @@ org.kie kie-dmn-ruleset2dmn-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-dmn-ruleset2dmn-cli diff --git a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/pom.xml b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/pom.xml index 595ea5ce156..29d70f61394 100644 --- a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/pom.xml +++ b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/pom.xml @@ -23,7 +23,7 @@ org.kie kie-dmn-ruleset2dmn-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-dmn-ruleset2dmn diff --git a/kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml b/kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml index a6a723eb8ab..6b02aa7a2b2 100644 --- a/kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml +++ b/kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml @@ -23,7 +23,7 @@ org.kie kie-dmn - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-dmn-ruleset2dmn-parent pom diff --git a/kie-dmn/kie-dmn-signavio/pom.xml b/kie-dmn/kie-dmn-signavio/pom.xml index 2439b7ddb9b..b6754c2f392 100644 --- a/kie-dmn/kie-dmn-signavio/pom.xml +++ b/kie-dmn/kie-dmn-signavio/pom.xml @@ -23,7 +23,7 @@ org.kie kie-dmn - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-dmn-signavio diff --git a/kie-dmn/kie-dmn-tck/pom.xml b/kie-dmn/kie-dmn-tck/pom.xml index e6f4647b103..81121a0c9b8 100644 --- a/kie-dmn/kie-dmn-tck/pom.xml +++ b/kie-dmn/kie-dmn-tck/pom.xml @@ -26,7 +26,7 @@ kie-dmn org.kie - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 pom diff --git a/kie-dmn/kie-dmn-trisotech/pom.xml b/kie-dmn/kie-dmn-trisotech/pom.xml index e6da98641d3..fde1d5226cd 100644 --- a/kie-dmn/kie-dmn-trisotech/pom.xml +++ b/kie-dmn/kie-dmn-trisotech/pom.xml @@ -25,7 +25,7 @@ org.kie kie-dmn - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-dmn-trisotech diff --git a/kie-dmn/kie-dmn-validation-bootstrap/pom.xml b/kie-dmn/kie-dmn-validation-bootstrap/pom.xml index 02b183f883a..5e8ee5f2f9d 100644 --- a/kie-dmn/kie-dmn-validation-bootstrap/pom.xml +++ b/kie-dmn/kie-dmn-validation-bootstrap/pom.xml @@ -25,7 +25,7 @@ org.kie kie-dmn - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-dmn-validation-bootstrap diff --git a/kie-dmn/kie-dmn-validation/pom.xml b/kie-dmn/kie-dmn-validation/pom.xml index f07f93f7977..727f8aa7a68 100644 --- a/kie-dmn/kie-dmn-validation/pom.xml +++ b/kie-dmn/kie-dmn-validation/pom.xml @@ -23,7 +23,7 @@ org.kie kie-dmn - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-dmn-validation jar diff --git a/kie-dmn/kie-dmn-xls2dmn-cli/pom.xml b/kie-dmn/kie-dmn-xls2dmn-cli/pom.xml index 1f2bc4765c9..354a8bb822f 100644 --- a/kie-dmn/kie-dmn-xls2dmn-cli/pom.xml +++ b/kie-dmn/kie-dmn-xls2dmn-cli/pom.xml @@ -23,7 +23,7 @@ org.kie kie-dmn - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-dmn-xls2dmn-cli jar diff --git a/kie-dmn/pom.xml b/kie-dmn/pom.xml index f91e9a70725..f0010781fca 100644 --- a/kie-dmn/pom.xml +++ b/kie-dmn/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/kie-drl/kie-drl-api/pom.xml b/kie-drl/kie-drl-api/pom.xml index 9d6e47297fc..c7e7b9fffd9 100644 --- a/kie-drl/kie-drl-api/pom.xml +++ b/kie-drl/kie-drl-api/pom.xml @@ -25,7 +25,7 @@ kie-drl org.kie - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-drl/kie-drl-compilation-common/pom.xml b/kie-drl/kie-drl-compilation-common/pom.xml index 1e28ad9046a..407d7325931 100644 --- a/kie-drl/kie-drl-compilation-common/pom.xml +++ b/kie-drl/kie-drl-compilation-common/pom.xml @@ -25,7 +25,7 @@ kie-drl org.kie - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/kie-drl-kiesession-local-runtime/pom.xml b/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/kie-drl-kiesession-local-runtime/pom.xml index 038712c663e..894441b5266 100644 --- a/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/kie-drl-kiesession-local-runtime/pom.xml +++ b/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/kie-drl-kiesession-local-runtime/pom.xml @@ -25,7 +25,7 @@ kie-drl-kiesession-local org.kie - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/pom.xml b/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/pom.xml index 37935844692..5bfe225af2d 100644 --- a/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/pom.xml +++ b/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/pom.xml @@ -25,7 +25,7 @@ kie-drl-implementations org.kie - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 pom diff --git a/kie-drl/kie-drl-implementations/kie-drl-map-input/kie-drl-map-input-runtime/pom.xml b/kie-drl/kie-drl-implementations/kie-drl-map-input/kie-drl-map-input-runtime/pom.xml index 6ac9940fb7b..a50217799a9 100644 --- a/kie-drl/kie-drl-implementations/kie-drl-map-input/kie-drl-map-input-runtime/pom.xml +++ b/kie-drl/kie-drl-implementations/kie-drl-map-input/kie-drl-map-input-runtime/pom.xml @@ -26,7 +26,7 @@ kie-drl-map-input org.kie - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT kie-drl-map-input-runtime diff --git a/kie-drl/kie-drl-implementations/kie-drl-map-input/pom.xml b/kie-drl/kie-drl-implementations/kie-drl-map-input/pom.xml index 94ad6154c72..9189bcb0518 100644 --- a/kie-drl/kie-drl-implementations/kie-drl-map-input/pom.xml +++ b/kie-drl/kie-drl-implementations/kie-drl-map-input/pom.xml @@ -25,7 +25,7 @@ kie-drl-implementations org.kie - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 pom diff --git a/kie-drl/kie-drl-implementations/pom.xml b/kie-drl/kie-drl-implementations/pom.xml index b8982276af6..6530d40440e 100644 --- a/kie-drl/kie-drl-implementations/pom.xml +++ b/kie-drl/kie-drl-implementations/pom.xml @@ -27,7 +27,7 @@ kie-drl org.kie - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT KIE :: DRL :: Implementations diff --git a/kie-drl/kie-drl-runtime-common/pom.xml b/kie-drl/kie-drl-runtime-common/pom.xml index dc1af215142..6d6d19759fb 100644 --- a/kie-drl/kie-drl-runtime-common/pom.xml +++ b/kie-drl/kie-drl-runtime-common/pom.xml @@ -25,7 +25,7 @@ kie-drl org.kie - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-drl/kie-drl-tests-without-index-file/pom.xml b/kie-drl/kie-drl-tests-without-index-file/pom.xml index da66e39b4da..f257190ff59 100644 --- a/kie-drl/kie-drl-tests-without-index-file/pom.xml +++ b/kie-drl/kie-drl-tests-without-index-file/pom.xml @@ -25,7 +25,7 @@ kie-drl org.kie - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-drl/kie-drl-tests/pom.xml b/kie-drl/kie-drl-tests/pom.xml index bdf6c6d3795..00d65fe85d4 100644 --- a/kie-drl/kie-drl-tests/pom.xml +++ b/kie-drl/kie-drl-tests/pom.xml @@ -25,7 +25,7 @@ kie-drl org.kie - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-drl/pom.xml b/kie-drl/pom.xml index cb27a3fa8c6..3ce72ba34a7 100644 --- a/kie-drl/pom.xml +++ b/kie-drl/pom.xml @@ -27,7 +27,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/kie-internal/pom.xml b/kie-internal/pom.xml index b73b2477666..85f776de10f 100644 --- a/kie-internal/pom.xml +++ b/kie-internal/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/kie-maven-plugin/pom.xml b/kie-maven-plugin/pom.xml index 6483ad51852..16fa86657ae 100644 --- a/kie-maven-plugin/pom.xml +++ b/kie-maven-plugin/pom.xml @@ -27,7 +27,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/kie-memory-compiler/pom.xml b/kie-memory-compiler/pom.xml index cbdbea3bae6..7982be9f8f2 100644 --- a/kie-memory-compiler/pom.xml +++ b/kie-memory-compiler/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/kie-pmml-trusty/kie-pmml-api/pom.xml b/kie-pmml-trusty/kie-pmml-api/pom.xml index b3c24f454bc..938b5affaa0 100644 --- a/kie-pmml-trusty/kie-pmml-api/pom.xml +++ b/kie-pmml-trusty/kie-pmml-api/pom.xml @@ -25,7 +25,7 @@ kie-pmml-trusty org.kie - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-commons/pom.xml b/kie-pmml-trusty/kie-pmml-commons/pom.xml index 45c8734fa4f..d9d231d6b3f 100644 --- a/kie-pmml-trusty/kie-pmml-commons/pom.xml +++ b/kie-pmml-trusty/kie-pmml-commons/pom.xml @@ -25,7 +25,7 @@ org.kie kie-pmml-trusty - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/pom.xml b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/pom.xml index 605282e1b25..dec1881eb3f 100644 --- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/pom.xml +++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/pom.xml @@ -25,7 +25,7 @@ org.kie kie-pmml-compiler - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/pom.xml b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/pom.xml index e1d888731d5..9fdb3f70aa9 100644 --- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/pom.xml +++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/pom.xml @@ -25,7 +25,7 @@ org.kie kie-pmml-compiler - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-core/pom.xml b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-core/pom.xml index 55dd8e36591..c36d086282d 100644 --- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-core/pom.xml +++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-core/pom.xml @@ -25,7 +25,7 @@ org.kie kie-pmml-compiler - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-compiler/pom.xml index a05b02dab8e..cdf2de1396a 100644 --- a/kie-pmml-trusty/kie-pmml-compiler/pom.xml +++ b/kie-pmml-trusty/kie-pmml-compiler/pom.xml @@ -25,7 +25,7 @@ org.kie kie-pmml-trusty - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-dependencies/pom.xml b/kie-pmml-trusty/kie-pmml-dependencies/pom.xml index 75c4f782510..10f15f4f843 100644 --- a/kie-pmml-trusty/kie-pmml-dependencies/pom.xml +++ b/kie-pmml-trusty/kie-pmml-dependencies/pom.xml @@ -25,7 +25,7 @@ org.kie kie-pmml-trusty - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-api/pom.xml b/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-api/pom.xml index aada4fd85a8..caa05f09213 100644 --- a/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-api/pom.xml +++ b/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-api/pom.xml @@ -25,7 +25,7 @@ org.kie kie-pmml-evaluator - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-core/pom.xml b/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-core/pom.xml index bc263e4544a..47ff9f4e3d0 100644 --- a/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-core/pom.xml +++ b/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-core/pom.xml @@ -25,7 +25,7 @@ org.kie kie-pmml-evaluator - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-utils/pom.xml b/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-utils/pom.xml index 5cbc7f06332..42707cf8484 100644 --- a/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-utils/pom.xml +++ b/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-utils/pom.xml @@ -25,7 +25,7 @@ kie-pmml-evaluator org.kie - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-evaluator/pom.xml index 844fef4bb51..6fd1be5de84 100644 --- a/kie-pmml-trusty/kie-pmml-evaluator/pom.xml +++ b/kie-pmml-trusty/kie-pmml-evaluator/pom.xml @@ -24,7 +24,7 @@ org.kie kie-pmml-trusty - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 pom diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-compiler/pom.xml index 35f97762224..28e50828878 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-compiler/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-compiler/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-clustering - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-evaluator/pom.xml index aff176a5197..ff25ead6ce7 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-evaluator/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-evaluator/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-clustering - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-model/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-model/pom.xml index 2f2795527c9..9bcd6d28e43 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-model/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-model/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-clustering - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/pom.xml index e78728e36aa..28ebf9d493a 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-clustering - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/pom.xml index cd3a78df5d8..27c37b9878e 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 pom diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/pom.xml index 9b6fb40f42b..3cee5846362 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/pom.xml @@ -25,7 +25,7 @@ org.kie kie-pmml-models-drools - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-compiler/pom.xml index 9d5732ac2cc..3f647355e0d 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-compiler/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-compiler/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-drools-scorecard - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-evaluator/pom.xml index 05d07d7edb9..84d4a6ebe9d 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-evaluator/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-evaluator/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-drools-scorecard - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-model/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-model/pom.xml index e42e86ef80f..170a54e348f 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-model/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-model/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-drools-scorecard - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/pom.xml index eb49f7fa11b..8cd77cc9a89 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-drools-scorecard - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/pom.xml index 2ed5b884718..1969461504c 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-drools - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 pom diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-compiler/pom.xml index 7b29b143623..716d80b3aa7 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-compiler/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-compiler/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-drools-tree - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-evaluator/pom.xml index 55574196290..f0544d62f6f 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-evaluator/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-evaluator/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-drools-tree - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-model/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-model/pom.xml index 95525b20b87..549766273ca 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-model/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-model/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-drools-tree - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/pom.xml index 1e8c0f65251..81fb2c280e9 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-drools-tree - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/pom.xml index 7d34c596ad3..81ddeaa5a6f 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-drools - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 pom diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/pom.xml index fc72a5c5035..13249fc9df1 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/pom.xml index 2dc483c3a04..c0c7433580c 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-mining - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-evaluator/pom.xml index 93491b13333..41d203533c7 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-evaluator/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-evaluator/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-mining - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-model/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-model/pom.xml index 953a5aa8ba3..d7d8c20b86f 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-model/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-model/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-mining - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/pom.xml index 34cc05a9ddc..64c0bccc196 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-mining - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/pom.xml index dc65cbe6bb1..a64f8262e70 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 pom diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/pom.xml index b14d8eda108..93b1e933ed0 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/pom.xml @@ -25,7 +25,7 @@ org.kie kie-pmml-models-regression - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-evaluator/pom.xml index a08d611e914..eb80cde5849 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-evaluator/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-evaluator/pom.xml @@ -25,7 +25,7 @@ org.kie kie-pmml-models-regression - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-model/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-model/pom.xml index c0e201ac130..a7ba740c909 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-model/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-model/pom.xml @@ -25,7 +25,7 @@ org.kie kie-pmml-models-regression - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/pom.xml index 2367db9129c..adefd80d1bd 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/pom.xml @@ -25,7 +25,7 @@ org.kie kie-pmml-models-regression - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/pom.xml index 1af8ef726f1..11993c1c928 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/pom.xml @@ -25,7 +25,7 @@ org.kie kie-pmml-models - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 pom diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-compiler/pom.xml index 67fc90f4164..6bdcb38cd3c 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-compiler/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-compiler/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-scorecard - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-evaluator/pom.xml index 76bfd50d4ba..530bd6d048c 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-evaluator/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-evaluator/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-scorecard - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-model/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-model/pom.xml index f3fa07de21f..0b093e4a802 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-model/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-model/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-scorecard - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/pom.xml index 482e06e0f87..b4a0fc9dc4d 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-scorecard - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/pom.xml index 9306a90e1d7..038a9a1cdd2 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 pom diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tests/pom.xml index 584f28b851f..c3cbcf31561 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tests/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tests/pom.xml @@ -25,7 +25,7 @@ kie-pmml-models org.kie - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-compiler/pom.xml index 952c4a2f9ab..ab9b3c7fda8 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-compiler/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-compiler/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-tree - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-evaluator/pom.xml index 93cac08382a..b69e91a357f 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-evaluator/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-evaluator/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-tree - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-model/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-model/pom.xml index 76e491d014b..508cb042203 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-model/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-model/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-tree - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/pom.xml index 87af1f5651e..17417332349 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models-tree - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/pom.xml index ea7ffdc42c3..cadfd56cea2 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-models - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 pom diff --git a/kie-pmml-trusty/kie-pmml-models/pom.xml b/kie-pmml-trusty/kie-pmml-models/pom.xml index 91dee043af2..8c8eee7842b 100644 --- a/kie-pmml-trusty/kie-pmml-models/pom.xml +++ b/kie-pmml-trusty/kie-pmml-models/pom.xml @@ -23,7 +23,7 @@ org.kie kie-pmml-trusty - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-pmml-trusty/pom.xml b/kie-pmml-trusty/pom.xml index 4085e3afc19..d42732b386c 100644 --- a/kie-pmml-trusty/pom.xml +++ b/kie-pmml-trusty/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/kie-test-util/pom.xml b/kie-test-util/pom.xml index e9c13c7c03b..693809b2105 100644 --- a/kie-test-util/pom.xml +++ b/kie-test-util/pom.xml @@ -25,7 +25,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/kie-util/kie-util-maven-integration/pom.xml b/kie-util/kie-util-maven-integration/pom.xml index c66f30d4d44..dd1556e250f 100644 --- a/kie-util/kie-util-maven-integration/pom.xml +++ b/kie-util/kie-util-maven-integration/pom.xml @@ -25,7 +25,7 @@ org.kie kie-util - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-util/kie-util-maven-support/pom.xml b/kie-util/kie-util-maven-support/pom.xml index 6cf33b38a0d..5051bd50930 100644 --- a/kie-util/kie-util-maven-support/pom.xml +++ b/kie-util/kie-util-maven-support/pom.xml @@ -25,7 +25,7 @@ org.kie kie-util - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-util/kie-util-xml/pom.xml b/kie-util/kie-util-xml/pom.xml index b4b51dcae7b..ed9651688ec 100644 --- a/kie-util/kie-util-xml/pom.xml +++ b/kie-util/kie-util-xml/pom.xml @@ -25,7 +25,7 @@ org.kie kie-util - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT 4.0.0 diff --git a/kie-util/pom.xml b/kie-util/pom.xml index 7b98b5c3677..2f04814da3f 100644 --- a/kie-util/pom.xml +++ b/kie-util/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/pom.xml b/pom.xml index f32a88e1dcd..2e2dfadedc7 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.kie drools-parent pom - 8.45.0-SNAPSHOT + 8.46.0-SNAPSHOT Drools :: Parent From 911a20056f95d2a964b560ac9d2c93fd4b5cb389 Mon Sep 17 00:00:00 2001 From: Roberto Oliveira Date: Tue, 16 Jan 2024 17:24:12 +0100 Subject: [PATCH 04/29] Bump to Quarkus 3.2 LTS and Jakarta namespace (#5625) * bump to 999-SNAPSHOT * restore version 9.46.0-SNAPSHOT * TEMPORARY: adjust pipeline config * CI - limit generated jobs * CI: update mvn and jdk in GHA --------- Co-authored-by: jstastny-cz # Conflicts: # .ci/environments/quarkus-3/patches/0001_before_sh.patch # .ci/environments/quarkus-3/quarkus3.yml # .ci/jenkins/config/branch.yaml --- .github/workflows/pr-downstream-full.yml | 4 +- .github/workflows/pr-downstream.yml | 4 +- .github/workflows/pr-drools-ansible.yml | 2 +- .github/workflows/pr-drools-docs.yml | 4 +- .github/workflows/pr-drools.yml | 4 +- bom/drools-bom/pom.xml | 2 +- bom/kie-core-bom/pom.xml | 2 +- bom/kie-dmn-bom/pom.xml | 2 +- bom/kie-efesto-bom/pom.xml | 2 +- bom/kie-pmml-bom/pom.xml | 2 +- bom/pom.xml | 2 +- build-parent/pom.xml | 132 ++++++++---------- drools-alphanetwork-compiler/pom.xml | 2 +- drools-base/pom.xml | 7 +- drools-beliefs/pom.xml | 2 +- drools-commands/pom.xml | 2 +- .../drools/commands/GetVariableCommand.java | 10 +- .../drools/commands/jaxb/JaxbListAdapter.java | 2 +- .../drools/commands/jaxb/JaxbListWrapper.java | 10 +- .../drools/commands/jaxb/JaxbMapAdapter.java | 2 +- .../commands/jaxb/JaxbObjectObjectPair.java | 10 +- .../commands/jaxb/JaxbStringObjectPair.java | 12 +- .../commands/jaxb/JaxbUnknownAdapter.java | 2 +- .../drools/commands/jaxb/ObjectFactory.java | 2 +- .../runtime/AdvanceSessionTimeCommand.java | 8 +- .../runtime/BatchExecutionCommandImpl.java | 14 +- .../commands/runtime/DisposeCommand.java | 6 +- .../commands/runtime/ExecutionResultImpl.java | 10 +- .../commands/runtime/ExecutionResultsMap.java | 2 +- .../commands/runtime/FlatQueryResults.java | 14 +- .../commands/runtime/GetFactCountCommand.java | 8 +- .../commands/runtime/GetGlobalCommand.java | 8 +- .../drools/commands/runtime/GetIdCommand.java | 8 +- .../runtime/GetSessionTimeCommand.java | 8 +- .../commands/runtime/ObjectFactory.java | 2 +- .../runtime/QueryResultsJaxbAdapter.java | 2 +- .../commands/runtime/SetGlobalCommand.java | 12 +- .../runtime/pmml/ApplyPmmlModelCommand.java | 12 +- .../process/AbortProcessInstanceCommand.java | 8 +- .../runtime/process/AbortWorkItemCommand.java | 8 +- .../process/CompleteWorkItemCommand.java | 12 +- ...reateCorrelatedProcessInstanceCommand.java | 12 +- .../process/CreateProcessInstanceCommand.java | 12 +- .../GetProcessEventListenersCommand.java | 6 +- .../runtime/process/GetProcessIdsCommand.java | 8 +- ...rocessInstanceByCorrelationKeyCommand.java | 12 +- .../process/GetProcessInstanceCommand.java | 8 +- .../process/GetProcessInstancesCommand.java | 8 +- .../runtime/process/GetWorkItemCommand.java | 8 +- .../process/GetWorkItemIdsCommand.java | 8 +- .../runtime/process/ObjectFactory.java | 2 +- .../runtime/process/ReTryWorkItemCommand.java | 10 +- .../RegisterWorkItemHandlerCommand.java | 8 +- .../SetProcessInstanceVariablesCommand.java | 12 +- .../runtime/process/SignalEventCommand.java | 12 +- .../StartCorrelatedProcessCommand.java | 14 +- .../runtime/process/StartProcessCommand.java | 16 +-- .../StartProcessFromNodeIdsCommand.java | 12 +- .../process/StartProcessInstanceCommand.java | 6 +- .../rule/AgendaGroupSetFocusCommand.java | 8 +- .../rule/ClearActivationGroupCommand.java | 8 +- .../runtime/rule/ClearAgendaCommand.java | 6 +- .../runtime/rule/ClearAgendaGroupCommand.java | 8 +- .../rule/ClearRuleFlowGroupCommand.java | 8 +- .../commands/runtime/rule/DeleteCommand.java | 8 +- .../rule/DeleteFromEntryPointCommand.java | 8 +- .../runtime/rule/DeleteObjectCommand.java | 8 +- .../runtime/rule/EnableAuditLogCommand.java | 8 +- .../runtime/rule/FireAllRulesCommand.java | 12 +- .../runtime/rule/FireUntilHaltCommand.java | 10 +- .../rule/GetAgendaEventListenersCommand.java | 2 +- .../runtime/rule/GetEntryPointCommand.java | 2 +- .../runtime/rule/GetEntryPointsCommand.java | 2 +- .../runtime/rule/GetFactHandleCommand.java | 2 +- .../GetFactHandleInEntryPointCommand.java | 2 +- .../runtime/rule/GetFactHandlesCommand.java | 6 +- .../runtime/rule/GetObjectCommand.java | 12 +- .../rule/GetObjectInEntryPointCommand.java | 8 +- .../runtime/rule/GetObjectsCommand.java | 8 +- .../rule/GetObjectsInEntryPointCommand.java | 6 +- .../runtime/rule/InsertElementsCommand.java | 10 +- .../runtime/rule/InsertObjectCommand.java | 12 +- .../rule/InsertObjectInEntryPointCommand.java | 8 +- .../commands/runtime/rule/ModifyCommand.java | 10 +- .../commands/runtime/rule/ObjectFactory.java | 2 +- .../commands/runtime/rule/QueryCommand.java | 8 +- .../commands/runtime/rule/UpdateCommand.java | 12 +- .../rule/UpdateInEntryPointCommand.java | 4 +- drools-compiler/pom.xml | 7 +- .../kproject/models/KieBaseModelImpl.java | 2 +- .../impl/DroolsJaxbHelperProviderImpl.java | 4 +- drools-core/pom.xml | 7 +- .../core/ClassObjectSerializationFilter.java | 8 +- .../org/drools/core/base/ArrayElements.java | 8 +- .../base/RuleNameEndsWithAgendaFilter.java | 8 +- .../core/base/RuleNameEqualsAgendaFilter.java | 8 +- .../base/RuleNameMatchesAgendaFilter.java | 8 +- .../base/RuleNameStartsWithAgendaFilter.java | 8 +- .../drools/core/common/DefaultFactHandle.java | 8 +- .../core/common/DisconnectedFactHandle.java | 14 +- .../org/drools/core/common/ObjectFactory.java | 2 +- .../core/common/QueryElementFactHandle.java | 6 +- .../core/util/AbstractBaseLinkedListNode.java | 6 +- drools-decisiontables/pom.xml | 2 +- drools-distribution/pom.xml | 2 +- drools-docs/pom.xml | 2 +- ...ogito-migrate-drl-implement-ruleunits.adoc | 2 +- drools-drl/drools-drl-ast/pom.xml | 2 +- drools-drl/drools-drl-extensions/pom.xml | 2 +- drools-drl/drools-drl-parser/pom.xml | 2 +- drools-drl/pom.xml | 2 +- .../drools-drlonyaml-cli-tests/pom.xml | 2 +- .../drools-drlonyaml-cli/pom.xml | 2 +- .../pom.xml | 2 +- .../drools-drlonyaml-model/pom.xml | 2 +- .../drools-drlonyaml-schemagen/pom.xml | 2 +- .../drools-drlonyaml-todrl/pom.xml | 2 +- drools-drlonyaml-parent/pom.xml | 2 +- drools-ecj/pom.xml | 2 +- drools-engine-classic/pom.xml | 2 +- drools-engine/pom.xml | 2 +- .../default-kiesession-from-file/pom.xml | 2 +- .../default-kiesession/pom.xml | 2 +- .../kie-module-from-multiple-files/pom.xml | 2 +- drools-examples-api/kiebase-inclusion/pom.xml | 2 +- .../kiecontainer-from-kierepo/pom.xml | 2 +- .../kiefilesystem-example/pom.xml | 2 +- .../kiemodulemodel-example/pom.xml | 2 +- drools-examples-api/multiple-kbases/pom.xml | 2 +- .../named-kiesession-from-file/pom.xml | 2 +- drools-examples-api/named-kiesession/pom.xml | 2 +- drools-examples-api/pom.xml | 2 +- .../reactive-kiesession/pom.xml | 2 +- drools-examples/pom.xml | 2 +- drools-fastutil/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../drools-impact-analysis-graph/pom.xml | 2 +- .../drools-impact-analysis-itests/pom.xml | 2 +- .../drools-impact-analysis-model/pom.xml | 2 +- .../drools-impact-analysis-parser/pom.xml | 2 +- drools-impact-analysis/pom.xml | 2 +- drools-io/pom.xml | 2 +- drools-kiesession/pom.xml | 2 +- drools-legacy-test-util/pom.xml | 2 +- .../java/org/drools/mvel/compiler/Person.java | 4 +- .../src/test/resources/META-INF/kmodule.xml | 2 +- drools-metric/pom.xml | 2 +- drools-model/drools-canonical-model/pom.xml | 2 +- drools-model/drools-codegen-common/pom.xml | 2 +- .../QuarkusDroolsModelBuildContext.java | 4 +- .../di/DependencyInjectionAnnotator.java | 8 +- .../impl/CDIDependencyInjectionAnnotator.java | 16 +-- drools-model/drools-model-codegen/pom.xml | 2 +- .../config/RuleConfigQuarkusTemplate.java | 6 +- .../rules/ProjectRuntimeQuarkusTemplate.java | 2 +- .../RestObjectMapperQuarkusTemplate.java | 2 +- .../ruleunits/RestQueryJavaTemplate.java | 10 +- .../ruleunits/RestQueryQuarkusTemplate.java | 12 +- .../ruleunits/RuleUnitQuarkusTemplate.java | 6 +- drools-model/drools-model-compiler/pom.xml | 2 +- drools-model/drools-mvel-compiler/pom.xml | 2 +- drools-model/drools-mvel-parser/pom.xml | 2 +- .../org/drools/mvel/parser/MvelParser.java | 6 +- .../src/main/javacc/mvel.jj | 32 +++-- drools-model/pom.xml | 2 +- drools-mvel/pom.xml | 7 +- .../java/org/drools/mvel/compiler/Person.java | 4 +- .../drools-persistence-api/pom.xml | 7 +- .../api/PersistenceContextManager.java | 2 +- ...nsactionSynchronizationRegistryHelper.java | 2 +- .../jta/JtaTransactionManager.java | 30 ++-- .../jta/JtaTransactionManagerFactory.java | 4 +- .../JtaTransactionSynchronizationAdapter.java | 4 +- .../jta/TransactionLockInterceptor.java | 2 +- .../drools-persistence-jpa/pom.xml | 16 +-- ...iggerUpdateTransactionSynchronization.java | 2 +- .../drools/persistence/info/SessionInfo.java | 18 +-- .../drools/persistence/info/WorkItemInfo.java | 18 +-- .../AbstractPersistenceContextManager.java | 4 +- .../jpa/JpaPersistenceContext.java | 4 +- .../jpa/JpaPersistenceContextManager.java | 2 +- .../jpa/OptimisticLockRetryInterceptor.java | 2 +- .../jpa/marshaller/EntityPersister.java | 2 +- .../JPAPlaceholderResolverStrategy.java | 10 +- .../jpa/marshaller/MappedVariable.java | 14 +- .../jpa/marshaller/VariableEntity.java | 10 +- .../META-INF/persistence.xml | 6 +- .../jta/JtaTransactionManagerFactoryTest.java | 14 +- .../jta/JtaTransactionManagerTest.java | 8 +- .../jta/TransactionTestCommand.java | 4 +- .../jta/TransactionTestObject.java | 14 +- .../JpaPersistentStatefulSessionTest.java | 2 +- .../map/impl/JpaBasedPersistenceTest.java | 2 +- .../JpaPersistentStatefulSessionTest.java | 2 +- .../session/ReloadSessionTest.java | 4 +- .../util/DroolsPersistenceUtil.java | 2 +- drools-persistence/pom.xml | 2 +- .../drools-quarkus-deployment/pom.xml | 26 ++-- .../deployment/DroolsAssetsProcessor.java | 2 +- .../drools-quarkus-examples-multiunit/pom.xml | 12 +- .../examples/multiunit/RuntimeTest.java | 2 +- .../drools-quarkus-examples-reactive/pom.xml | 12 +- .../ruleunit/examples/reactive/Adaptor.java | 6 +- .../KafkaTestResourceLifecycleManager.java | 2 +- .../examples/reactive/RuntimeTest.java | 8 +- .../drools-quarkus-examples/pom.xml | 2 +- .../pom.xml | 12 +- .../test/hotreload/FindAdultEndpoint.java | 12 +- .../drools-quarkus-integration-test/pom.xml | 12 +- .../drools/quarkus/test/TestableResource.java | 19 ++- .../org/drools/quarkus/test/RuntimeTest.java | 9 +- .../drools-quarkus-quickstart-test/pom.xml | 12 +- .../quickstart/test/HomeAlertsBean.java | 4 +- .../quarkus/quickstart/test/BeanTest.java | 2 +- .../quarkus/quickstart/test/RuntimeIT.java | 2 +- .../pom.xml | 12 +- .../ruleunit/test/TestableResource.java | 8 +- .../ruleunit/test/RuntimeDslRuleUnitTest.java | 2 +- .../quarkus/ruleunit/test/RuntimeTest.java | 2 +- .../drools-quarkus-util-deployment/pom.xml | 2 +- .../DroolsQuarkusResourceUtils.java | 4 +- .../drools-quarkus/pom.xml | 14 +- drools-quarkus-extension/pom.xml | 2 +- .../drools-reliability-core/pom.xml | 2 +- .../drools-reliability-h2mvstore/pom.xml | 2 +- .../drools-reliability-infinispan/pom.xml | 6 +- .../drools-reliability-tests/pom.xml | 8 +- drools-reliability/pom.xml | 2 +- drools-retediagram/pom.xml | 2 +- drools-ruleunits/drools-ruleunits-api/pom.xml | 2 +- drools-ruleunits/drools-ruleunits-dsl/pom.xml | 2 +- .../drools-ruleunits-engine/pom.xml | 2 +- .../drools-ruleunits-impl/pom.xml | 2 +- .../impl/SimpleRuleUnitVariable.java | 14 +- drools-ruleunits/pom.xml | 2 +- .../drools-scenario-simulation-api/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- drools-scenario-simulation/pom.xml | 2 +- drools-serialization-protobuf/pom.xml | 2 +- drools-templates/pom.xml | 2 +- drools-test-coverage/pom.xml | 2 +- .../standalone/kie-ci-with-domain/pom.xml | 2 +- .../kie-ci-with-domain/test-domain/pom.xml | 2 +- .../kie-ci-with-domain/test-kjar/pom.xml | 2 +- .../kie-ci-with-domain/tests/pom.xml | 2 +- .../standalone/kie-ci-without-domain/pom.xml | 2 +- .../kie-ci-without-domain/test-domain/pom.xml | 2 +- .../kie-ci-without-domain/test-kjar/pom.xml | 2 +- .../kie-ci-without-domain/tests/pom.xml | 2 +- drools-test-coverage/standalone/pom.xml | 2 +- .../test-compiler-integration/pom.xml | 2 +- .../java/org/drools/mvel/compiler/Person.java | 4 +- .../mvel/integrationtests/KieBuilderTest.java | 4 +- .../mvel/integrationtests/QueryTest.java | 2 +- .../src/test/resources/META-INF/kmodule.xml | 2 +- .../test-integration-nomvel/pom.xml | 7 +- .../test-integration-notms/pom.xml | 2 +- .../test-integration-noxml/pom.xml | 2 +- .../test-integration-ruleunits/pom.xml | 2 +- .../test-integration-ruleunits-jar/pom.xml | 2 +- .../test-integration-ruleunits-tests/pom.xml | 2 +- drools-test-coverage/test-suite/pom.xml | 2 +- drools-tms/pom.xml | 2 +- drools-traits/pom.xml | 11 +- .../META-INF/persistence.xml | 6 +- .../persistence/DroolsPersistenceUtil.java | 2 +- drools-util/pom.xml | 2 +- drools-verifier/drools-verifier-api/pom.xml | 2 +- drools-verifier/drools-verifier-core/pom.xml | 2 +- drools-verifier/drools-verifier-drl/pom.xml | 2 +- drools-verifier/pom.xml | 2 +- drools-wiring/drools-wiring-api/pom.xml | 2 +- drools-wiring/drools-wiring-dynamic/pom.xml | 7 +- drools-wiring/drools-wiring-static/pom.xml | 2 +- drools-wiring/pom.xml | 2 +- drools-xml-support/pom.xml | 2 +- .../xml/support/CommandSerializationTest.java | 6 +- efesto/efesto-common-utils/pom.xml | 2 +- efesto/efesto-core/efesto-common-api/pom.xml | 2 +- efesto/efesto-core/efesto-common-core/pom.xml | 2 +- .../efesto-compilation-manager-api/pom.xml | 2 +- .../efesto-compilation-manager-core/pom.xml | 2 +- .../efesto-compilation-manager/pom.xml | 2 +- .../efesto-runtime-manager-api/pom.xml | 2 +- .../efesto-runtime-manager-core/pom.xml | 2 +- .../efesto-runtime-manager/pom.xml | 2 +- efesto/efesto-core/pom.xml | 2 +- efesto/efesto-dependencies/pom.xml | 2 +- efesto/pom.xml | 2 +- jpmml-migration-recipe/pom.xml | 2 +- kie-api/pom.xml | 2 +- .../kie/api/builder/model/KieBaseModel.java | 2 +- .../api/builder/model/KieSessionModel.java | 2 +- .../api/internal/utils/KieServiceLoader.java | 2 +- .../java/org/kie/api/pmml/AbstractOutput.java | 10 +- .../org/kie/api/pmml/DoubleFieldOutput.java | 6 +- .../org/kie/api/pmml/IntegerFieldOutput.java | 6 +- .../java/org/kie/api/pmml/PMML4DataField.java | 8 +- .../org/kie/api/pmml/PMML4OutputField.java | 10 +- .../java/org/kie/api/pmml/PMML4Result.java | 14 +- .../org/kie/api/pmml/PMMLRequestData.java | 12 +- .../java/org/kie/api/pmml/ParameterInfo.java | 12 +- .../org/kie/api/pmml/StringFieldOutput.java | 6 +- .../kie/api/runtime/query/QueryContext.java | 10 +- .../java/org/kie/api/task/model/Status.java | 2 +- .../src/test/resources/org/kie/api/kmod1.xml | 6 +- .../kie-drools-dmn-archetype/pom.xml | 2 +- .../kie-drools-exec-model-archetype/pom.xml | 2 +- .../pom.xml | 2 +- .../kie-drools-yaml-archetype/pom.xml | 2 +- kie-archetypes/pom.xml | 2 +- kie-ci/pom.xml | 2 +- kie-dmn/kie-dmn-api/pom.xml | 2 +- kie-dmn/kie-dmn-backend/pom.xml | 2 +- kie-dmn/kie-dmn-core-jsr223-jq/pom.xml | 2 +- kie-dmn/kie-dmn-core-jsr223/pom.xml | 2 +- kie-dmn/kie-dmn-core/pom.xml | 2 +- .../kie/dmn/core/pmml/DMNImportPMMLInfo.java | 4 +- .../java/org/kie/dmn/core/pmml/PMMLInfo.java | 8 +- kie-dmn/kie-dmn-feel/pom.xml | 2 +- .../java/org/kie/dmn/feel/util/Generated.java | 2 +- .../dmn/feel/jandex/AbstractJandexTest.java | 6 +- kie-dmn/kie-dmn-legacy-tests/pom.xml | 7 +- kie-dmn/kie-dmn-model/pom.xml | 2 +- .../kie/dmn/model/v1_2/dmndi/DMNDiagram.java | 2 +- .../dmn/model/v1_2/dmndi/DiagramElement.java | 2 +- .../kie/dmn/model/v1_3/dmndi/DMNDiagram.java | 2 +- .../dmn/model/v1_3/dmndi/DiagramElement.java | 2 +- .../model/jandex/KieDMNModelJandexTest.java | 6 +- kie-dmn/kie-dmn-openapi/pom.xml | 7 +- .../kie-dmn-pmml-tests-trusty/pom.xml | 2 +- .../kie-dmn-pmml-tests/pom.xml | 7 +- kie-dmn/kie-dmn-pmml-tests-parent/pom.xml | 2 +- .../kie-dmn-ruleset2dmn-cli/pom.xml | 2 +- .../kie-dmn-ruleset2dmn/pom.xml | 2 +- .../org/kie/dmn/ruleset2dmn/Converter.java | 9 +- .../kie/dmn/ruleset2dmn/SimpleRuleRow.java | 4 +- kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml | 2 +- kie-dmn/kie-dmn-signavio/pom.xml | 2 +- kie-dmn/kie-dmn-tck/pom.xml | 2 +- kie-dmn/kie-dmn-trisotech/pom.xml | 2 +- kie-dmn/kie-dmn-validation-bootstrap/pom.xml | 2 +- kie-dmn/kie-dmn-validation/pom.xml | 2 +- .../dtanalysis/mcdc/MCDC2TCKGenerator.java | 8 +- .../dtanalysis/mcdc/dmntck/ObjectFactory.java | 6 +- .../dtanalysis/mcdc/dmntck/TestCaseType.java | 6 +- .../dtanalysis/mcdc/dmntck/TestCases.java | 20 +-- .../dtanalysis/mcdc/dmntck/ValueType.java | 22 +-- .../dtanalysis/mcdc/dmntck/package-info.java | 6 +- kie-dmn/kie-dmn-xls2dmn-cli/pom.xml | 2 +- kie-dmn/pom.xml | 2 +- kie-drl/kie-drl-api/pom.xml | 2 +- kie-drl/kie-drl-compilation-common/pom.xml | 2 +- .../kie-drl-kiesession-local-runtime/pom.xml | 2 +- .../kie-drl-kiesession-local/pom.xml | 2 +- .../kie-drl-map-input-runtime/pom.xml | 2 +- .../kie-drl-map-input/pom.xml | 2 +- kie-drl/kie-drl-implementations/pom.xml | 2 +- kie-drl/kie-drl-runtime-common/pom.xml | 2 +- .../kie-drl-tests-without-index-file/pom.xml | 2 +- kie-drl/kie-drl-tests/pom.xml | 2 +- kie-drl/pom.xml | 2 +- kie-internal/pom.xml | 19 ++- .../help/DroolsJaxbHelperProvider.java | 4 +- .../builder/help/KnowledgeBuilderHelper.java | 4 +- .../jaxb/CorrelationKeyXmlAdapter.java | 2 +- .../jaxb/LocalDateTimeXmlAdapter.java | 2 +- .../internal/jaxb/LocalDateXmlAdapter.java | 2 +- .../internal/jaxb/LocalTimeXmlAdapter.java | 2 +- .../jaxb/OffsetDateTimeXmlAdapter.java | 2 +- .../jaxb/StringKeyObjectValueEntry.java | 12 +- .../jaxb/StringKeyObjectValueMap.java | 8 +- .../StringKeyObjectValueMapXmlAdapter.java | 2 +- .../jaxb/StringKeyStringValueEntry.java | 8 +- .../jaxb/StringKeyStringValueMap.java | 8 +- .../StringKeyStringValueMapXmlAdapter.java | 2 +- .../org/kie/internal/query/QueryContext.java | 6 +- .../org/kie/internal/query/QueryFilter.java | 6 +- .../kie/internal/query/data/QueryData.java | 8 +- .../internal/query/data/QueryParameters.java | 12 +- .../runtime/conf/DeploymentDescriptor.java | 4 +- .../kie/internal/runtime/conf/MergeMode.java | 2 +- .../runtime/conf/NamedObjectModel.java | 10 +- .../internal/runtime/conf/ObjectModel.java | 12 +- .../runtime/conf/RuntimeStrategy.java | 2 +- .../deploy/DeploymentDescriptorIO.java | 8 +- .../deploy/DeploymentDescriptorImpl.java | 14 +- .../manager/deploy/TransientObjectModel.java | 2 +- .../internal/task/api/model/AccessType.java | 2 +- .../task/api/model/SubTasksStrategy.java | 2 +- .../manager/deploy/JaxbMarshalingTest.java | 6 +- kie-maven-plugin/pom.xml | 2 +- kie-memory-compiler/pom.xml | 2 +- kie-pmml-trusty/kie-pmml-api/pom.xml | 2 +- .../org/kie/pmml/api/PMMLRuntimeFactory.java | 2 +- kie-pmml-trusty/kie-pmml-commons/pom.xml | 2 +- .../kie-pmml-compiler-api/pom.xml | 2 +- .../api/dto/CommonCompilationDTO.java | 2 +- .../pmml/compiler/api/utils/ModelUtils.java | 30 ++-- .../pmml/compiler/api/mocks/TestModel.java | 10 ++ .../api/testutils/PMMLModelTestUtils.java | 66 ++++----- .../compiler/api/utils/ModelUtilsTest.java | 61 ++++---- .../kie-pmml-compiler-commons/pom.xml | 2 +- .../KiePMMLDerivedFieldFactory.java | 2 +- .../KiePMMLDiscretizeFactory.java | 2 +- .../KiePMMLFieldColumnPairFactory.java | 2 +- .../KiePMMLFieldRefFactory.java | 2 +- .../KiePMMLMiningFieldFactory.java | 8 +- .../KiePMMLModelFactoryUtils.java | 4 +- .../KiePMMLNormContinuousFactory.java | 2 +- .../KiePMMLNormDiscreteFactory.java | 2 +- .../KiePMMLOutputFieldFactory.java | 4 +- .../KiePMMLParameterFieldFactory.java | 2 +- .../KiePMMLSimplePredicateFactory.java | 4 +- .../KiePMMLSimpleSetPredicateFactory.java | 2 +- .../KiePMMLTextIndexFactory.java | 2 +- .../KiePMMLDerivedFieldInstanceFactory.java | 5 +- .../KiePMMLDiscretizeInstanceFactory.java | 2 +- ...KiePMMLFieldColumnPairInstanceFactory.java | 2 +- .../KiePMMLFieldRefInstanceFactory.java | 2 +- .../KiePMMLMiningFieldInstanceFactory.java | 2 +- .../KiePMMLNormContinuousInstanceFactory.java | 2 +- .../KiePMMLNormDiscreteInstanceFactory.java | 2 +- .../KiePMMLOutputFieldInstanceFactory.java | 4 +- .../KiePMMLParameterFieldInstanceFactory.java | 2 +- ...KiePMMLSimplePredicateInstanceFactory.java | 4 +- ...PMMLSimpleSetPredicateInstanceFactory.java | 2 +- .../KiePMMLTargetInstanceFactory.java | 2 +- .../KiePMMLTextIndexInstanceFactory.java | 2 +- .../compiler/commons/utils/KiePMMLUtil.java | 9 +- .../KiePMMLApplyFactoryTest.java | 9 +- .../KiePMMLDefineFunctionFactoryTest.java | 16 +-- .../KiePMMLDerivedFieldFactoryTest.java | 25 ++-- .../KiePMMLDiscretizeFactoryTest.java | 3 +- .../KiePMMLFieldColumnPairFactoryTest.java | 3 +- .../KiePMMLFieldRefFactoryTest.java | 3 +- .../KiePMMLInlineTableFactoryTest.java | 2 +- ...iePMMLLocalTransformationsFactoryTest.java | 3 +- .../KiePMMLMapValuesFactoryTest.java | 2 +- .../KiePMMLMiningFieldFactoryTest.java | 9 +- .../KiePMMLNormContinuousFactoryTest.java | 3 +- .../KiePMMLNormDiscreteFactoryTest.java | 3 +- .../KiePMMLParameterFieldFactoryTest.java | 3 +- .../KiePMMLRowFactoryTest.java | 4 +- .../KiePMMLSimplePredicateFactoryTest.java | 6 +- .../KiePMMLSimpleSetPredicateFactoryTest.java | 6 +- .../KiePMMLTextIndexFactoryTest.java | 3 +- ...MLTransformationDictionaryFactoryTest.java | 9 +- .../InstanceFactoriesTestCommon.java | 32 ++--- ...calTransformationsInstanceFactoryTest.java | 2 +- ...ormationDictionaryInstanceFactoryTest.java | 2 +- .../commons/utils/JavaParserUtilsTest.java | 3 +- .../commons/utils/KiePMMLUtilTest.java | 35 +++-- .../kie-pmml-compiler-core/pom.xml | 2 +- .../compiler/testingutils/TestingModel.java | 10 ++ kie-pmml-trusty/kie-pmml-compiler/pom.xml | 2 +- kie-pmml-trusty/kie-pmml-dependencies/pom.xml | 2 +- .../kie-pmml-evaluator-api/pom.xml | 2 +- .../kie-pmml-evaluator-core/pom.xml | 2 +- .../kie-pmml-evaluator-utils/pom.xml | 2 +- kie-pmml-trusty/kie-pmml-evaluator/pom.xml | 2 +- .../pom.xml | 2 +- .../KiePMMLClusteringModelFactory.java | 4 +- .../KiePMMLClusteringModelFactoryTest.java | 9 +- .../pom.xml | 2 +- .../kie-pmml-models-clustering-model/pom.xml | 2 +- .../kie-pmml-models-clustering-tests/pom.xml | 2 +- .../kie-pmml-models-clustering/pom.xml | 2 +- .../kie-pmml-models-drools-common/pom.xml | 2 +- .../KiePMMLDataDictionaryASTFactory.java | 4 +- .../KiePMMLDerivedFieldASTFactory.java | 4 +- .../KiePMMLSimplePredicateASTFactory.java | 6 +- .../KiePMMLSimpleSetPredicateASTFactory.java | 4 +- .../drools/utils/KiePMMLASTFactoryUtils.java | 6 +- ...iePMMLCompoundPredicateASTFactoryTest.java | 4 +- .../KiePMMLDataDictionaryASTFactoryTest.java | 8 +- .../KiePMMLDerivedFieldASTFactoryTest.java | 5 +- .../KiePMMLSimplePredicateASTFactoryTest.java | 4 +- .../factories/KiePMMLDescrRhsFactoryTest.java | 5 +- .../provider/DroolsModelProviderTest.java | 6 +- .../utils/KiePMMLASTFactoryUtilsTest.java | 6 +- .../drools/utils/KiePMMLASTTestUtils.java | 5 +- .../KiePMMLDroolsModelFactoryUtilsTest.java | 3 +- .../pom.xml | 2 +- ...cardModelCharacteristicASTFactoryTest.java | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../kie-pmml-models-drools-scorecard/pom.xml | 2 +- .../pom.xml | 2 +- .../KiePMMLTreeModelFactoryTest.java | 2 +- .../pom.xml | 2 +- .../kie-pmml-models-drools-tree-model/pom.xml | 2 +- .../kie-pmml-models-drools-tree-tests/pom.xml | 2 +- .../kie-pmml-models-drools-tree/pom.xml | 2 +- .../kie-pmml-models-drools/pom.xml | 2 +- .../kie-pmml-models-mining-compiler/pom.xml | 2 +- .../factories/AbstractKiePMMLFactoryTest.java | 2 +- .../KiePMMLMiningModelFactoryTest.java | 2 +- .../factories/KiePMMLSegmentFactoryTest.java | 2 +- .../KiePMMLSegmentationFactoryTest.java | 2 +- .../kie-pmml-models-mining-evaluator/pom.xml | 2 +- .../kie-pmml-models-mining-model/pom.xml | 2 +- .../kie-pmml-models-mining-tests/pom.xml | 2 +- .../kie-pmml-models-mining/pom.xml | 2 +- .../pom.xml | 2 +- ...RegressionModelImplementationProvider.java | 6 +- .../KiePMMLRegressionTableFactory.java | 16 +-- ...LRegressionTableRegressionFactoryTest.java | 3 +- ...KiePMMLClassificationTableFactoryTest.java | 15 +- .../KiePMMLRegressionModelFactoryTest.java | 10 +- .../KiePMMLRegressionTableFactoryTest.java | 25 ++-- .../pom.xml | 2 +- .../kie-pmml-models-regression-model/pom.xml | 2 +- .../kie-pmml-models-regression-tests/pom.xml | 2 +- .../kie-pmml-models-regression/pom.xml | 2 +- .../pom.xml | 2 +- ...KiePMMLComplexPartialScoreFactoryTest.java | 10 +- .../pom.xml | 2 +- .../kie-pmml-models-scorecard-model/pom.xml | 2 +- .../kie-pmml-models-scorecard-tests/pom.xml | 2 +- .../kie-pmml-models-scorecard/pom.xml | 2 +- .../kie-pmml-models-tests/pom.xml | 2 +- .../kie-pmml-models-tree-compiler/pom.xml | 2 +- .../kie-pmml-models-tree-evaluator/pom.xml | 2 +- .../kie-pmml-models-tree-model/pom.xml | 2 +- .../kie-pmml-models-tree-tests/pom.xml | 2 +- .../kie-pmml-models-tree/pom.xml | 2 +- kie-pmml-trusty/kie-pmml-models/pom.xml | 2 +- kie-pmml-trusty/pom.xml | 2 +- kie-test-util/pom.xml | 2 +- .../org/kie/test/util/db/PersistenceUtil.java | 4 +- .../db/internal/PoolingDataSourceFactory.java | 4 +- .../PoolingDataSourceWrapperImpl.java | 4 +- kie-util/kie-util-maven-integration/pom.xml | 2 +- kie-util/kie-util-maven-support/pom.xml | 2 +- kie-util/kie-util-xml/pom.xml | 2 +- kie-util/pom.xml | 2 +- pom.xml | 2 +- 541 files changed, 1457 insertions(+), 1469 deletions(-) diff --git a/.github/workflows/pr-downstream-full.yml b/.github/workflows/pr-downstream-full.yml index 3fb5cb4ffbc..e3f02055d22 100644 --- a/.github/workflows/pr-downstream-full.yml +++ b/.github/workflows/pr-downstream-full.yml @@ -23,8 +23,8 @@ jobs: strategy: matrix: os: [ubuntu-latest] - java-version: [11] - maven-version: ['3.8.7'] + java-version: [17] + maven-version: ['3.9.3'] fail-fast: false runs-on: ${{ matrix.os }} name: Build Chain (${{ matrix.os }} / Java-${{ matrix.java-version }} / Maven-${{ matrix.maven-version }}) diff --git a/.github/workflows/pr-downstream.yml b/.github/workflows/pr-downstream.yml index e412502a418..668a5d67de2 100644 --- a/.github/workflows/pr-downstream.yml +++ b/.github/workflows/pr-downstream.yml @@ -22,8 +22,8 @@ jobs: matrix: job_name: [ kogito-runtimes, kogito-apps, kogito-quarkus-examples, kogito-springboot-examples, serverless-workflow-examples, kie-jpmml-integration ] os: [ubuntu-latest] - java-version: [11] - maven-version: ['3.8.7'] + java-version: [17] + maven-version: ['3.9.3'] include: - job_name: kogito-runtimes repository: kogito-runtimes diff --git a/.github/workflows/pr-drools-ansible.yml b/.github/workflows/pr-drools-ansible.yml index 0db53b48aa6..e59633d3923 100644 --- a/.github/workflows/pr-drools-ansible.yml +++ b/.github/workflows/pr-drools-ansible.yml @@ -22,7 +22,7 @@ jobs: matrix: os: [ubuntu-latest] java-version: [17] - maven-version: ['3.8.7'] + maven-version: ['3.9.3'] fail-fast: false runs-on: ${{ matrix.os }} name: Ansible Integration / ${{ matrix.os }} / Java-${{ matrix.java-version }} / Maven-${{ matrix.maven-version }} diff --git a/.github/workflows/pr-drools-docs.yml b/.github/workflows/pr-drools-docs.yml index d2c55b9e2bc..babb27e59c2 100644 --- a/.github/workflows/pr-drools-docs.yml +++ b/.github/workflows/pr-drools-docs.yml @@ -15,8 +15,8 @@ jobs: strategy: matrix: os: [ubuntu-latest] - java-version: [11] - maven-version: ['3.8.7'] + java-version: [17] + maven-version: ['3.9.3'] fail-fast: false runs-on: ${{ matrix.os }} name: ${{ matrix.os }} / Java-${{ matrix.java-version }} / Maven-${{ matrix.maven-version }} diff --git a/.github/workflows/pr-drools.yml b/.github/workflows/pr-drools.yml index f7bf51a9fa8..a70d116a641 100644 --- a/.github/workflows/pr-drools.yml +++ b/.github/workflows/pr-drools.yml @@ -21,8 +21,8 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - java-version: [11] - maven-version: ['3.8.7'] + java-version: [17] + maven-version: ['3.9.3'] fail-fast: false runs-on: ${{ matrix.os }} name: ${{ matrix.os }} / Java-${{ matrix.java-version }} / Maven-${{ matrix.maven-version }} diff --git a/bom/drools-bom/pom.xml b/bom/drools-bom/pom.xml index 5b5041bd755..29113e6069d 100644 --- a/bom/drools-bom/pom.xml +++ b/bom/drools-bom/pom.xml @@ -6,7 +6,7 @@ org.kie kie-core-bom - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../kie-core-bom/pom.xml diff --git a/bom/kie-core-bom/pom.xml b/bom/kie-core-bom/pom.xml index ded79ed27c2..218e56abd2f 100644 --- a/bom/kie-core-bom/pom.xml +++ b/bom/kie-core-bom/pom.xml @@ -6,7 +6,7 @@ org.kie drools-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../../pom.xml diff --git a/bom/kie-dmn-bom/pom.xml b/bom/kie-dmn-bom/pom.xml index a44ee6a2076..29f0e66e8c9 100644 --- a/bom/kie-dmn-bom/pom.xml +++ b/bom/kie-dmn-bom/pom.xml @@ -6,7 +6,7 @@ org.kie kie-core-bom - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../kie-core-bom/pom.xml diff --git a/bom/kie-efesto-bom/pom.xml b/bom/kie-efesto-bom/pom.xml index 0eb8b276c2d..057bfbf01c8 100644 --- a/bom/kie-efesto-bom/pom.xml +++ b/bom/kie-efesto-bom/pom.xml @@ -6,7 +6,7 @@ org.kie kie-core-bom - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../kie-core-bom/pom.xml diff --git a/bom/kie-pmml-bom/pom.xml b/bom/kie-pmml-bom/pom.xml index 43bfb09a211..bfcad96f6e9 100644 --- a/bom/kie-pmml-bom/pom.xml +++ b/bom/kie-pmml-bom/pom.xml @@ -6,7 +6,7 @@ org.kie kie-core-bom - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../kie-core-bom/pom.xml diff --git a/bom/pom.xml b/bom/pom.xml index e4031b78964..abca80b30b5 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -5,7 +5,7 @@ drools-parent org.kie - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT 4.0.0 diff --git a/build-parent/pom.xml b/build-parent/pom.xml index dd8ed8e6737..75c04d16d64 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -25,7 +25,7 @@ drools-parent org.kie - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT 4.0.0 @@ -55,10 +55,10 @@ - Version properties must be sorted alphabetically (other form of sorting were found to be unclear and ambiguous). --> 1.2.9 - 1.15 + 1.16.0 3.2.2 1.1.1 - 2.11.0 + 2.13.0 1.10.0 2.15.2 2.15.2 @@ -72,10 +72,10 @@ 2.3.0 1.4.20 0.18.0 - 4.7.1 - 1.10.2 - 2.16.12.Final - 3.1.1 + 4.7.4 + 1.11.1 + 3.2.9.Final + 3.4.0 8.5.11 4.13.1 1.8.0 @@ -88,43 +88,43 @@ 4.4.15 3.8.6 1.7.3 - 3.5.1 + 3.5.3 2.0.28 5.1.0 - 9.0.21 + 10.1.7 3.23.1 3.33.0 2.3.32 - 2.3.6 + 4.0.4 1.3 - 5.6.12.Final + 6.2.13.Final 2.3.0 14.0.13.Final 3.26.0-GA - 5.13.1.Final + 6.0.1.Final 7.6.1.Final 3.1.6.Final - 2.0.1 - 2.0.2 - 1.2.1 - 1.2.1 - 1.0 - 1.3.5 + 3.0.3 + 4.0.1 + 2.0.1 + 2.1.2 + 2.0.1 + 2.1.1 3.2.6 2.3.6 2.0.0 - 1.3.3 - 2.1.6 - 2.3.3 - 2.2.3 - 4.0.3 - 2.3.3 - 1.0.2 - 1.1.6 - 1.1.6 - 1.5.1 - 5.9.2 + 2.0.1 + 3.1.0 + 4.0.1 + 3.1.0 + 6.0.0 + 4.0.0 + 3.0.0 + 1.1.2 + 2.1.2 + 1.6.4 + 5.9.3 2.5.1.Final 2.0.7 1.7.30 @@ -138,7 +138,7 @@ - 4.13.0 + 4.10.1 3.13.0 4.15.0.Final 1.1.0 @@ -171,7 +171,7 @@ 2.22.1 3.6.4 - 3.6.0 + 3.7.1 0.9.1 3.3.4 1.24.0 @@ -200,18 +200,18 @@ 3.8.1 3.3.0 - 1.12.18 + 1.14.7 - 42.5.4 + 42.6.0 2.0.1 - 3.0.5 + 3.1.2 ${version.io.smallrye.jandex} - 1.0.11 + 3.0.3 - 3.24.2 + 3.25.3 - 32.0.1-jre + 32.0.0-jre @@ -232,7 +232,7 @@ 3.3.0 3.4.0 - 3.6.0 + 3.6.2 @@ -283,7 +283,7 @@ com.fasterxml.jackson.module - jackson-module-jaxb-annotations + jackson-module-jakarta-xmlbind-annotations ${version.com.fasterxml.jackson.annotations} @@ -292,8 +292,8 @@ ${version.com.fasterxml.jackson} - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider + com.fasterxml.jackson.jakarta.rs + jackson-jakarta-rs-json-provider ${version.com.fasterxml.jackson} @@ -367,9 +367,9 @@ ${version.com.sun.xml.bind} - com.sun.xml.bind - jaxb-impl - ${version.com.sun.xml.bind} + org.glassfish.jaxb + jaxb-runtime + 4.0.3 com.sun.xml.bind @@ -419,8 +419,8 @@ - org.glassfish - jakarta.json + org.eclipse.parsson + parsson ${version.jakarta.json} @@ -455,8 +455,8 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation ${version.jakarta.activation} @@ -791,12 +791,12 @@ - org.hibernate + org.hibernate.orm hibernate-envers ${version.org.hibernate} - org.hibernate + org.hibernate.orm hibernate-jpamodelgen ${version.org.hibernate} @@ -1113,7 +1113,7 @@ - org.hibernate + org.hibernate.orm hibernate-core ${version.org.hibernate} @@ -1135,31 +1135,16 @@ - - org.hibernate - hibernate-entitymanager - ${version.org.hibernate} - - - javax.persistence - javax.persistence-api - - - org.jboss.spec.javax.transaction - jboss-transaction-api_1.2_spec - - - - javax.validation - validation-api - ${version.javax.validation} + jakarta.validation + jakarta.validation-api + 3.0.2 - javax.validation - validation-api - ${version.javax.validation} + jakarta.validation + jakarta.validation-api + 3.0.2 sources @@ -1430,6 +1415,9 @@ javax.inject.* + + + com.google.inject.* org.xmlpull.v1.XmlPullParserException org.xmlpull.v1.XmlPullParser diff --git a/drools-alphanetwork-compiler/pom.xml b/drools-alphanetwork-compiler/pom.xml index 8e0327bff89..197fc0b52c8 100644 --- a/drools-alphanetwork-compiler/pom.xml +++ b/drools-alphanetwork-compiler/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-base/pom.xml b/drools-base/pom.xml index e0884e4acc0..fa5f01b22a2 100644 --- a/drools-base/pom.xml +++ b/drools-base/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../build-parent/pom.xml @@ -82,11 +82,6 @@ jaxb-core provided - - com.sun.xml.bind - jaxb-impl - provided - jakarta.xml.bind jakarta.xml.bind-api diff --git a/drools-beliefs/pom.xml b/drools-beliefs/pom.xml index 6e954649fe4..360e3589447 100644 --- a/drools-beliefs/pom.xml +++ b/drools-beliefs/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-commands/pom.xml b/drools-commands/pom.xml index f18b1da317e..312d3c4e7bb 100644 --- a/drools-commands/pom.xml +++ b/drools-commands/pom.xml @@ -27,7 +27,7 @@ org.kie drools-build-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-commands/src/main/java/org/drools/commands/GetVariableCommand.java b/drools-commands/src/main/java/org/drools/commands/GetVariableCommand.java index 5fc6fea50ef..55f012280bf 100644 --- a/drools-commands/src/main/java/org/drools/commands/GetVariableCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/GetVariableCommand.java @@ -18,11 +18,11 @@ */ package org.drools.commands; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListAdapter.java b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListAdapter.java index 2ef2899704a..102e011254c 100644 --- a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListAdapter.java +++ b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListAdapter.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Set; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.drools.commands.jaxb.JaxbListWrapper.JaxbWrapperType; import org.slf4j.Logger; diff --git a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListWrapper.java b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListWrapper.java index 3731c9cedf2..fab61b1b75f 100644 --- a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListWrapper.java +++ b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListWrapper.java @@ -18,11 +18,11 @@ */ package org.drools.commands.jaxb; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * This is actually a wrapper for the following collections: diff --git a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbMapAdapter.java b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbMapAdapter.java index 0086b7b657a..413d2595b44 100644 --- a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbMapAdapter.java +++ b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbMapAdapter.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbObjectObjectPair.java b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbObjectObjectPair.java index 4eed12a05b1..3d76ab5f2a0 100644 --- a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbObjectObjectPair.java +++ b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbObjectObjectPair.java @@ -18,11 +18,11 @@ */ package org.drools.commands.jaxb; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; @XmlAccessorType(XmlAccessType.NONE) public class JaxbObjectObjectPair { diff --git a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbStringObjectPair.java b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbStringObjectPair.java index cdbd1691683..0b95499a295 100644 --- a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbStringObjectPair.java +++ b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbStringObjectPair.java @@ -18,12 +18,12 @@ */ package org.drools.commands.jaxb; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; @XmlAccessorType(XmlAccessType.NONE) @XmlSeeAlso({JaxbListWrapper.class}) diff --git a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbUnknownAdapter.java b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbUnknownAdapter.java index 176f5a6e0f5..3c28fa5670b 100644 --- a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbUnknownAdapter.java +++ b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbUnknownAdapter.java @@ -31,7 +31,7 @@ import java.util.Map.Entry; import java.util.Set; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.drools.core.QueryResultsImpl; import org.drools.core.common.DisconnectedFactHandle; diff --git a/drools-commands/src/main/java/org/drools/commands/jaxb/ObjectFactory.java b/drools-commands/src/main/java/org/drools/commands/jaxb/ObjectFactory.java index 6406f23fe13..b243b5191ab 100644 --- a/drools-commands/src/main/java/org/drools/commands/jaxb/ObjectFactory.java +++ b/drools-commands/src/main/java/org/drools/commands/jaxb/ObjectFactory.java @@ -18,7 +18,7 @@ */ package org.drools.commands.jaxb; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; @XmlRegistry public class ObjectFactory { diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/AdvanceSessionTimeCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/AdvanceSessionTimeCommand.java index 38df33a7f85..56276dd5c5d 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/AdvanceSessionTimeCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/AdvanceSessionTimeCommand.java @@ -19,10 +19,10 @@ package org.drools.commands.runtime; import java.util.concurrent.TimeUnit; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.drools.commands.IdentifiableResult; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/BatchExecutionCommandImpl.java b/drools-commands/src/main/java/org/drools/commands/runtime/BatchExecutionCommandImpl.java index 4970214a046..e11edabef1a 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/BatchExecutionCommandImpl.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/BatchExecutionCommandImpl.java @@ -20,13 +20,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import org.drools.commands.fluent.Batch; import org.drools.commands.runtime.pmml.ApplyPmmlModelCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/DisposeCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/DisposeCommand.java index be75a9796ad..62154e0afb7 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/DisposeCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/DisposeCommand.java @@ -18,9 +18,9 @@ */ package org.drools.commands.runtime; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.drools.commands.impl.NotTransactionalCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultImpl.java b/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultImpl.java index 7bd405dc160..4b3b07309e8 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultImpl.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultImpl.java @@ -22,11 +22,11 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.jaxb.JaxbMapAdapter; import org.kie.api.runtime.ExecutionResults; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultsMap.java b/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultsMap.java index 0056413ec4b..7d4be781abc 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultsMap.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultsMap.java @@ -21,7 +21,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.jaxb.JaxbMapAdapter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/FlatQueryResults.java b/drools-commands/src/main/java/org/drools/commands/runtime/FlatQueryResults.java index d853414697d..997333593a5 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/FlatQueryResults.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/FlatQueryResults.java @@ -25,13 +25,13 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.jaxb.JaxbListAdapter; import org.drools.commands.jaxb.JaxbListWrapper; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/GetFactCountCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/GetFactCountCommand.java index cab731bc8f4..29063bbc693 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/GetFactCountCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/GetFactCountCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/GetGlobalCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/GetGlobalCommand.java index 27b4865b694..71c9b28373a 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/GetGlobalCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/GetGlobalCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.drools.commands.IdentifiableResult; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/GetIdCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/GetIdCommand.java index 983a6bcfce0..c0972f2fa81 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/GetIdCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/GetIdCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/GetSessionTimeCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/GetSessionTimeCommand.java index 032e7b4eb97..87b0b3d821b 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/GetSessionTimeCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/GetSessionTimeCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.drools.commands.IdentifiableResult; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/ObjectFactory.java b/drools-commands/src/main/java/org/drools/commands/runtime/ObjectFactory.java index 458b82e1644..c78c199adc6 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/ObjectFactory.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/ObjectFactory.java @@ -18,7 +18,7 @@ */ package org.drools.commands.runtime; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; @XmlRegistry diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/QueryResultsJaxbAdapter.java b/drools-commands/src/main/java/org/drools/commands/runtime/QueryResultsJaxbAdapter.java index b89d48c644f..bb4631870bd 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/QueryResultsJaxbAdapter.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/QueryResultsJaxbAdapter.java @@ -18,7 +18,7 @@ */ package org.drools.commands.runtime; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.drools.core.QueryResultsImpl; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/SetGlobalCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/SetGlobalCommand.java index 986a3920854..21c5b0b9f53 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/SetGlobalCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/SetGlobalCommand.java @@ -18,12 +18,12 @@ */ package org.drools.commands.runtime; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.IdentifiableResult; import org.drools.commands.jaxb.JaxbUnknownAdapter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/pmml/ApplyPmmlModelCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/pmml/ApplyPmmlModelCommand.java index 45487d20b14..0afdc97077d 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/pmml/ApplyPmmlModelCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/pmml/ApplyPmmlModelCommand.java @@ -21,12 +21,12 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlRootElement; import org.drools.commands.IdentifiableResult; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortProcessInstanceCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortProcessInstanceCommand.java index b198432940f..e08edd6530c 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortProcessInstanceCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortProcessInstanceCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.process; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortWorkItemCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortWorkItemCommand.java index 8a1acc9175f..20617cda7a5 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortWorkItemCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortWorkItemCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.process; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/CompleteWorkItemCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/CompleteWorkItemCommand.java index 5f063d2cc9d..5e770ecfc07 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/CompleteWorkItemCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/CompleteWorkItemCommand.java @@ -21,12 +21,12 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.jaxb.JaxbMapAdapter; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateCorrelatedProcessInstanceCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateCorrelatedProcessInstanceCommand.java index 28df02f2bd3..088a6dce463 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateCorrelatedProcessInstanceCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateCorrelatedProcessInstanceCommand.java @@ -21,12 +21,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.IdentifiableResult; import org.drools.commands.jaxb.JaxbMapAdapter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateProcessInstanceCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateProcessInstanceCommand.java index 4b6249c07d9..aea9aa29d92 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateProcessInstanceCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateProcessInstanceCommand.java @@ -21,12 +21,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.IdentifiableResult; import org.drools.commands.jaxb.JaxbMapAdapter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessEventListenersCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessEventListenersCommand.java index 718504c30e1..1d96fd6fdcc 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessEventListenersCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessEventListenersCommand.java @@ -19,9 +19,9 @@ package org.drools.commands.runtime.process; import java.util.Collection; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; import org.kie.api.command.ExecutableCommand; import org.kie.api.event.process.ProcessEventListener; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessIdsCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessIdsCommand.java index f3b25ddfe74..fc1c8196b99 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessIdsCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessIdsCommand.java @@ -20,10 +20,10 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.command.ExecutableCommand; import org.kie.api.definition.process.Process; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceByCorrelationKeyCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceByCorrelationKeyCommand.java index 57e4771a89a..7cc196e4b46 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceByCorrelationKeyCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceByCorrelationKeyCommand.java @@ -18,12 +18,12 @@ */ package org.drools.commands.runtime.process; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceCommand.java index 04359a21741..116b6c8a367 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.process; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstancesCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstancesCommand.java index 81eea329090..32c6e91af2f 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstancesCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstancesCommand.java @@ -20,10 +20,10 @@ import java.util.ArrayList; import java.util.Collection; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemCommand.java index cdebb4536e1..8edc6eb7bdc 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.process; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.drools.core.process.WorkItem; import org.drools.core.process.WorkItemManager; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemIdsCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemIdsCommand.java index 52d3faf9f5e..e13dad84214 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemIdsCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemIdsCommand.java @@ -21,10 +21,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.drools.core.process.WorkItem; import org.drools.core.process.WorkItemManager; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/ObjectFactory.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/ObjectFactory.java index 3e562063057..33bf5f12390 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/ObjectFactory.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/ObjectFactory.java @@ -19,7 +19,7 @@ package org.drools.commands.runtime.process; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; @XmlRegistry diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/ReTryWorkItemCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/ReTryWorkItemCommand.java index f1092a1f369..a98b83314f5 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/ReTryWorkItemCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/ReTryWorkItemCommand.java @@ -21,11 +21,11 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.core.process.WorkItemManager; import org.drools.commands.jaxb.JaxbMapAdapter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/RegisterWorkItemHandlerCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/RegisterWorkItemHandlerCommand.java index efa4b6c9b91..d30993a3e89 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/RegisterWorkItemHandlerCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/RegisterWorkItemHandlerCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.process; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.jaxb.JaxbUnknownAdapter; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/SetProcessInstanceVariablesCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/SetProcessInstanceVariablesCommand.java index 853bdf56262..96d113d426a 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/SetProcessInstanceVariablesCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/SetProcessInstanceVariablesCommand.java @@ -21,12 +21,12 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.jaxb.JaxbMapAdapter; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/SignalEventCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/SignalEventCommand.java index 927298a7c29..b5867b56362 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/SignalEventCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/SignalEventCommand.java @@ -18,12 +18,12 @@ */ package org.drools.commands.runtime.process; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.jaxb.JaxbUnknownAdapter; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartCorrelatedProcessCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartCorrelatedProcessCommand.java index f96051e049b..37140e853b2 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartCorrelatedProcessCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartCorrelatedProcessCommand.java @@ -21,13 +21,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.IdentifiableResult; import org.drools.commands.jaxb.JaxbMapAdapter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessCommand.java index 7d60ff3ab80..2aa2fa1fe51 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessCommand.java @@ -21,14 +21,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.IdentifiableResult; import org.drools.commands.jaxb.JaxbMapAdapter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessFromNodeIdsCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessFromNodeIdsCommand.java index 69cd161651b..99f96c11b9d 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessFromNodeIdsCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessFromNodeIdsCommand.java @@ -20,12 +20,12 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.kie.api.runtime.Context; import org.kie.api.runtime.ExecutionResults; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessInstanceCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessInstanceCommand.java index 5a7239447de..24598b5605a 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessInstanceCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessInstanceCommand.java @@ -18,9 +18,9 @@ */ package org.drools.commands.runtime.process; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/AgendaGroupSetFocusCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/AgendaGroupSetFocusCommand.java index cc8d5328e9d..0ada06b0a74 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/AgendaGroupSetFocusCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/AgendaGroupSetFocusCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearActivationGroupCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearActivationGroupCommand.java index 0a3ac217400..ab62bd194ad 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearActivationGroupCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearActivationGroupCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaCommand.java index 7fa3ec07208..c75db608176 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaCommand.java @@ -18,9 +18,9 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaGroupCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaGroupCommand.java index 59ff66b1454..f894f9ca163 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaGroupCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaGroupCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearRuleFlowGroupCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearRuleFlowGroupCommand.java index 75aa16956df..3c3b31461c1 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearRuleFlowGroupCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearRuleFlowGroupCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.drools.core.common.ReteEvaluator; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteCommand.java index e7b813a9916..2671b4521d7 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.drools.core.common.DisconnectedFactHandle; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteFromEntryPointCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteFromEntryPointCommand.java index dbdb2275b53..c93c83b1c8c 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteFromEntryPointCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteFromEntryPointCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; import org.drools.core.common.DisconnectedFactHandle; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteObjectCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteObjectCommand.java index 6e2d286e426..88f585b2003 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteObjectCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteObjectCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.util.StringUtils; import org.drools.commands.jaxb.JaxbUnknownAdapter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/EnableAuditLogCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/EnableAuditLogCommand.java index 812fc30baf1..5055346bebb 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/EnableAuditLogCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/EnableAuditLogCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.KieServices; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireAllRulesCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireAllRulesCommand.java index 4d41b24de69..6ed31da31d0 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireAllRulesCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireAllRulesCommand.java @@ -18,12 +18,12 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.IdentifiableResult; import org.drools.commands.jaxb.JaxbUnknownAdapter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireUntilHaltCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireUntilHaltCommand.java index bc4545d39b3..d4fb71df07e 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireUntilHaltCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireUntilHaltCommand.java @@ -18,11 +18,11 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.core.common.InternalWorkingMemory; import org.drools.commands.jaxb.JaxbUnknownAdapter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetAgendaEventListenersCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetAgendaEventListenersCommand.java index d138313dcbf..787878bf6d0 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetAgendaEventListenersCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetAgendaEventListenersCommand.java @@ -19,7 +19,7 @@ package org.drools.commands.runtime.rule; import java.util.Collection; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; import org.kie.api.command.ExecutableCommand; import org.kie.api.event.rule.AgendaEventListener; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointCommand.java index 55b5fa7ecb9..6c0b549a265 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointCommand.java @@ -18,7 +18,7 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; import org.drools.commands.EntryPointCreator; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointsCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointsCommand.java index d0667678ea9..4f6cb06d74f 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointsCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointsCommand.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collection; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; import org.drools.commands.EntryPointCreator; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleCommand.java index 4e3f871dc92..05b34f44233 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleCommand.java @@ -18,7 +18,7 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; import org.drools.core.common.InternalFactHandle; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleInEntryPointCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleInEntryPointCommand.java index 419e108ba31..cddfbf37d25 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleInEntryPointCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleInEntryPointCommand.java @@ -18,7 +18,7 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; import org.drools.core.common.InternalFactHandle; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandlesCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandlesCommand.java index 8507d5836e0..9b4373b2f06 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandlesCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandlesCommand.java @@ -20,9 +20,9 @@ import java.util.ArrayList; import java.util.Collection; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; import org.drools.core.common.InternalFactHandle; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectCommand.java index 0c42b317686..a9e78c4bd0d 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectCommand.java @@ -18,12 +18,12 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; import org.drools.commands.IdentifiableResult; import org.drools.core.common.DefaultFactHandle; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectInEntryPointCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectInEntryPointCommand.java index bcead60ab85..09429c60006 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectInEntryPointCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectInEntryPointCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; import org.drools.commands.IdentifiableResult; import org.drools.core.common.DefaultFactHandle; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsCommand.java index 5f0df58eaec..41214fcccf7 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsCommand.java @@ -21,10 +21,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; import org.drools.commands.IdentifiableResult; import org.drools.core.ClassObjectSerializationFilter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsInEntryPointCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsInEntryPointCommand.java index fdd9184caf1..add47b6171b 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsInEntryPointCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsInEntryPointCommand.java @@ -21,9 +21,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; import org.drools.commands.IdentifiableResult; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertElementsCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertElementsCommand.java index d310d5b7701..f7d42e08bc5 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertElementsCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertElementsCommand.java @@ -21,11 +21,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.IdentifiableResult; import org.drools.commands.runtime.ExecutionResultImpl; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectCommand.java index f6712f538df..40c21a187f6 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectCommand.java @@ -18,12 +18,12 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.IdentifiableResult; import org.drools.core.common.DefaultFactHandle; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectInEntryPointCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectInEntryPointCommand.java index 682f17534a1..bf0226eb346 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectInEntryPointCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectInEntryPointCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; import org.drools.commands.IdentifiableResult; import org.drools.core.common.DefaultFactHandle; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ModifyCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ModifyCommand.java index 19eb642aed2..d437e09b76d 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ModifyCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ModifyCommand.java @@ -21,11 +21,11 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.drools.base.base.CoreComponentsBuilder; import org.drools.core.common.DisconnectedFactHandle; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ObjectFactory.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ObjectFactory.java index 43dc943295d..e58a43fe698 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ObjectFactory.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ObjectFactory.java @@ -18,7 +18,7 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; import org.drools.commands.runtime.rule.ModifyCommand.SetterImpl; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/QueryCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/QueryCommand.java index f1393f83aa2..888d0bf5af1 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/QueryCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/QueryCommand.java @@ -21,10 +21,10 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; import org.drools.commands.IdentifiableResult; import org.drools.commands.runtime.FlatQueryResults; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateCommand.java index 59e46cce81e..d14df732516 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateCommand.java @@ -20,12 +20,12 @@ import java.util.Arrays; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.core.common.DisconnectedFactHandle; import org.drools.commands.jaxb.JaxbUnknownAdapter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateInEntryPointCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateInEntryPointCommand.java index 752e90bb275..ab29649f32a 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateInEntryPointCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateInEntryPointCommand.java @@ -20,8 +20,8 @@ import java.util.Arrays; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; import org.drools.core.common.DisconnectedFactHandle; import org.kie.api.command.ExecutableCommand; diff --git a/drools-compiler/pom.xml b/drools-compiler/pom.xml index 30c41a04d4d..de12663f490 100644 --- a/drools-compiler/pom.xml +++ b/drools-compiler/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../build-parent/pom.xml @@ -128,11 +128,6 @@ jaxb-core provided - - com.sun.xml.bind - jaxb-impl - provided - jakarta.xml.bind jakarta.xml.bind-api diff --git a/drools-compiler/src/main/java/org/drools/compiler/kproject/models/KieBaseModelImpl.java b/drools-compiler/src/main/java/org/drools/compiler/kproject/models/KieBaseModelImpl.java index c64a98e84ba..c4c1361de06 100644 --- a/drools-compiler/src/main/java/org/drools/compiler/kproject/models/KieBaseModelImpl.java +++ b/drools-compiler/src/main/java/org/drools/compiler/kproject/models/KieBaseModelImpl.java @@ -73,7 +73,7 @@ public class KieBaseModelImpl private KieModuleModel kModule; - private String scope = "javax.enterprise.context.ApplicationScoped"; + private String scope = "jakarta.enterprise.context.ApplicationScoped"; private List ruleTemplates = new ArrayList<>(); diff --git a/drools-compiler/src/main/java/org/drools/compiler/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java b/drools-compiler/src/main/java/org/drools/compiler/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java index 6b8db5a0935..60be4ac0b66 100644 --- a/drools-compiler/src/main/java/org/drools/compiler/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java +++ b/drools-compiler/src/main/java/org/drools/compiler/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java @@ -31,8 +31,8 @@ import java.util.Map; import java.util.Map.Entry; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import com.sun.codemodel.CodeWriter; import com.sun.codemodel.JCodeModel; diff --git a/drools-core/pom.xml b/drools-core/pom.xml index 97feb88fdeb..c211045c17c 100644 --- a/drools-core/pom.xml +++ b/drools-core/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../build-parent/pom.xml @@ -95,11 +95,6 @@ jaxb-core provided - - com.sun.xml.bind - jaxb-impl - provided - jakarta.xml.bind jakarta.xml.bind-api diff --git a/drools-core/src/main/java/org/drools/core/ClassObjectSerializationFilter.java b/drools-core/src/main/java/org/drools/core/ClassObjectSerializationFilter.java index 1dbb032c7e7..8330b82548f 100644 --- a/drools-core/src/main/java/org/drools/core/ClassObjectSerializationFilter.java +++ b/drools-core/src/main/java/org/drools/core/ClassObjectSerializationFilter.java @@ -18,10 +18,10 @@ */ package org.drools.core; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.runtime.ClassObjectFilter; import org.kie.api.runtime.ObjectFilter; diff --git a/drools-core/src/main/java/org/drools/core/base/ArrayElements.java b/drools-core/src/main/java/org/drools/core/base/ArrayElements.java index 9301d93da1a..09535a5ce9d 100644 --- a/drools-core/src/main/java/org/drools/core/base/ArrayElements.java +++ b/drools-core/src/main/java/org/drools/core/base/ArrayElements.java @@ -20,10 +20,10 @@ import java.util.Arrays; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; @XmlType(name="array-elements") @XmlAccessorType(XmlAccessType.NONE) diff --git a/drools-core/src/main/java/org/drools/core/base/RuleNameEndsWithAgendaFilter.java b/drools-core/src/main/java/org/drools/core/base/RuleNameEndsWithAgendaFilter.java index 50ea110d72a..3f838d12589 100644 --- a/drools-core/src/main/java/org/drools/core/base/RuleNameEndsWithAgendaFilter.java +++ b/drools-core/src/main/java/org/drools/core/base/RuleNameEndsWithAgendaFilter.java @@ -20,10 +20,10 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.runtime.rule.AgendaFilter; import org.kie.api.runtime.rule.Match; diff --git a/drools-core/src/main/java/org/drools/core/base/RuleNameEqualsAgendaFilter.java b/drools-core/src/main/java/org/drools/core/base/RuleNameEqualsAgendaFilter.java index 398651d8249..aa7388b8e7d 100644 --- a/drools-core/src/main/java/org/drools/core/base/RuleNameEqualsAgendaFilter.java +++ b/drools-core/src/main/java/org/drools/core/base/RuleNameEqualsAgendaFilter.java @@ -20,10 +20,10 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.runtime.rule.AgendaFilter; import org.kie.api.runtime.rule.Match; diff --git a/drools-core/src/main/java/org/drools/core/base/RuleNameMatchesAgendaFilter.java b/drools-core/src/main/java/org/drools/core/base/RuleNameMatchesAgendaFilter.java index 55a226bd99e..8512f85eac6 100644 --- a/drools-core/src/main/java/org/drools/core/base/RuleNameMatchesAgendaFilter.java +++ b/drools-core/src/main/java/org/drools/core/base/RuleNameMatchesAgendaFilter.java @@ -22,10 +22,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.runtime.rule.AgendaFilter; import org.kie.api.runtime.rule.Match; diff --git a/drools-core/src/main/java/org/drools/core/base/RuleNameStartsWithAgendaFilter.java b/drools-core/src/main/java/org/drools/core/base/RuleNameStartsWithAgendaFilter.java index 285b2602674..8b9c211c9ea 100644 --- a/drools-core/src/main/java/org/drools/core/base/RuleNameStartsWithAgendaFilter.java +++ b/drools-core/src/main/java/org/drools/core/base/RuleNameStartsWithAgendaFilter.java @@ -20,10 +20,10 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.runtime.rule.AgendaFilter; import org.kie.api.runtime.rule.Match; diff --git a/drools-core/src/main/java/org/drools/core/common/DefaultFactHandle.java b/drools-core/src/main/java/org/drools/core/common/DefaultFactHandle.java index 649d119b360..3e5cd249ec2 100644 --- a/drools-core/src/main/java/org/drools/core/common/DefaultFactHandle.java +++ b/drools-core/src/main/java/org/drools/core/common/DefaultFactHandle.java @@ -23,10 +23,10 @@ import java.util.function.Predicate; import java.util.stream.Stream; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.drools.base.factmodel.traits.TraitTypeEnum; import org.drools.base.rule.EntryPointId; diff --git a/drools-core/src/main/java/org/drools/core/common/DisconnectedFactHandle.java b/drools-core/src/main/java/org/drools/core/common/DisconnectedFactHandle.java index f3b76bf1444..4eae2aafa38 100644 --- a/drools-core/src/main/java/org/drools/core/common/DisconnectedFactHandle.java +++ b/drools-core/src/main/java/org/drools/core/common/DisconnectedFactHandle.java @@ -25,13 +25,13 @@ import java.util.function.Consumer; import java.util.function.Predicate; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlSeeAlso; import org.drools.base.factmodel.traits.TraitTypeEnum; import org.drools.base.rule.EntryPointId; diff --git a/drools-core/src/main/java/org/drools/core/common/ObjectFactory.java b/drools-core/src/main/java/org/drools/core/common/ObjectFactory.java index d3c1b5d3e70..52799274d7e 100644 --- a/drools-core/src/main/java/org/drools/core/common/ObjectFactory.java +++ b/drools-core/src/main/java/org/drools/core/common/ObjectFactory.java @@ -18,7 +18,7 @@ */ package org.drools.core.common; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; @XmlRegistry public class ObjectFactory { diff --git a/drools-core/src/main/java/org/drools/core/common/QueryElementFactHandle.java b/drools-core/src/main/java/org/drools/core/common/QueryElementFactHandle.java index 97be135e6f2..04f6eef60d0 100644 --- a/drools-core/src/main/java/org/drools/core/common/QueryElementFactHandle.java +++ b/drools-core/src/main/java/org/drools/core/common/QueryElementFactHandle.java @@ -22,9 +22,9 @@ import java.util.function.Consumer; import java.util.function.Predicate; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; import org.drools.base.factmodel.traits.TraitTypeEnum; import org.drools.base.rule.EntryPointId; diff --git a/drools-core/src/main/java/org/drools/core/util/AbstractBaseLinkedListNode.java b/drools-core/src/main/java/org/drools/core/util/AbstractBaseLinkedListNode.java index e37c37fc310..a9aec456b6a 100644 --- a/drools-core/src/main/java/org/drools/core/util/AbstractBaseLinkedListNode.java +++ b/drools-core/src/main/java/org/drools/core/util/AbstractBaseLinkedListNode.java @@ -18,9 +18,9 @@ */ package org.drools.core.util; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; /** * Provides a abstract base implementation that an object can extend so that it can be used in a LinkedList. diff --git a/drools-decisiontables/pom.xml b/drools-decisiontables/pom.xml index d5efaab1fe8..1c8f945a143 100644 --- a/drools-decisiontables/pom.xml +++ b/drools-decisiontables/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-distribution/pom.xml b/drools-distribution/pom.xml index 9869d8f3344..ce287c16f54 100644 --- a/drools-distribution/pom.xml +++ b/drools-distribution/pom.xml @@ -6,7 +6,7 @@ org.kie drools-build-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-docs/pom.xml b/drools-docs/pom.xml index 83700b558a4..16d0b1a53b0 100755 --- a/drools-docs/pom.xml +++ b/drools-docs/pom.xml @@ -7,7 +7,7 @@ org.kie drools-build-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-docs/src/modules/ROOT/pages/migration-guide/migration-v7-to-kogito/_proc-kogito-migrate-drl-implement-ruleunits.adoc b/drools-docs/src/modules/ROOT/pages/migration-guide/migration-v7-to-kogito/_proc-kogito-migrate-drl-implement-ruleunits.adoc index 111c12b6c3c..4cc2968027d 100644 --- a/drools-docs/src/modules/ROOT/pages/migration-guide/migration-v7-to-kogito/_proc-kogito-migrate-drl-implement-ruleunits.adoc +++ b/drools-docs/src/modules/ROOT/pages/migration-guide/migration-v7-to-kogito/_proc-kogito-migrate-drl-implement-ruleunits.adoc @@ -127,7 +127,7 @@ The following is an example of a REST endpoint that takes a rule unit as input a @Path("/find-approved") public class LoanUnitQueryFindApprovedEndpoint { - @javax.inject.Inject + @jakarta.inject.Inject RuleUnit ruleUnit; public LoanUnitQueryFindApprovedEndpoint() { diff --git a/drools-drl/drools-drl-ast/pom.xml b/drools-drl/drools-drl-ast/pom.xml index 6989033c2a1..ec0a6387c31 100644 --- a/drools-drl/drools-drl-ast/pom.xml +++ b/drools-drl/drools-drl-ast/pom.xml @@ -26,7 +26,7 @@ org.drools drools-drl - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT org.drools diff --git a/drools-drl/drools-drl-extensions/pom.xml b/drools-drl/drools-drl-extensions/pom.xml index 7c6cca52759..78c32643518 100644 --- a/drools-drl/drools-drl-extensions/pom.xml +++ b/drools-drl/drools-drl-extensions/pom.xml @@ -26,7 +26,7 @@ org.drools drools-drl - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT org.drools diff --git a/drools-drl/drools-drl-parser/pom.xml b/drools-drl/drools-drl-parser/pom.xml index e26a471f363..9676f32dc85 100644 --- a/drools-drl/drools-drl-parser/pom.xml +++ b/drools-drl/drools-drl-parser/pom.xml @@ -26,7 +26,7 @@ org.drools drools-drl - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT org.drools diff --git a/drools-drl/pom.xml b/drools-drl/pom.xml index 913b2f62ee0..3e14d841491 100644 --- a/drools-drl/pom.xml +++ b/drools-drl/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml index 3e5c70447d6..328d895a431 100644 --- a/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml +++ b/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml @@ -23,7 +23,7 @@ org.drools drools-drlonyaml-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT drools-drlonyaml-cli-tests Drools :: DRL on YAML :: CLI tests diff --git a/drools-drlonyaml-parent/drools-drlonyaml-cli/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-cli/pom.xml index 6329794317b..89ae43d7c4c 100644 --- a/drools-drlonyaml-parent/drools-drlonyaml-cli/pom.xml +++ b/drools-drlonyaml-parent/drools-drlonyaml-cli/pom.xml @@ -23,7 +23,7 @@ org.drools drools-drlonyaml-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT drools-drlonyaml-cli Drools :: DRL on YAML :: CLI diff --git a/drools-drlonyaml-parent/drools-drlonyaml-integration-tests/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-integration-tests/pom.xml index 9449a0e7896..ddf5fba5537 100644 --- a/drools-drlonyaml-parent/drools-drlonyaml-integration-tests/pom.xml +++ b/drools-drlonyaml-parent/drools-drlonyaml-integration-tests/pom.xml @@ -23,7 +23,7 @@ org.drools drools-drlonyaml-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT drools-drlonyaml-integration-tests Drools :: DRL on YAML :: Integration Tests diff --git a/drools-drlonyaml-parent/drools-drlonyaml-model/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-model/pom.xml index da3b7ceaa0e..154766237f0 100644 --- a/drools-drlonyaml-parent/drools-drlonyaml-model/pom.xml +++ b/drools-drlonyaml-parent/drools-drlonyaml-model/pom.xml @@ -23,7 +23,7 @@ org.drools drools-drlonyaml-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT drools-drlonyaml-model Drools :: DRL on YAML :: model diff --git a/drools-drlonyaml-parent/drools-drlonyaml-schemagen/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-schemagen/pom.xml index 9eccf371b69..7902be5b094 100644 --- a/drools-drlonyaml-parent/drools-drlonyaml-schemagen/pom.xml +++ b/drools-drlonyaml-parent/drools-drlonyaml-schemagen/pom.xml @@ -23,7 +23,7 @@ org.drools drools-drlonyaml-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT drools-drlonyaml-schemagen Drools :: DRL on YAML :: schema generator diff --git a/drools-drlonyaml-parent/drools-drlonyaml-todrl/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-todrl/pom.xml index 09b295dcb62..947b5959527 100644 --- a/drools-drlonyaml-parent/drools-drlonyaml-todrl/pom.xml +++ b/drools-drlonyaml-parent/drools-drlonyaml-todrl/pom.xml @@ -23,7 +23,7 @@ org.drools drools-drlonyaml-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT drools-drlonyaml-todrl Drools :: DRL on YAML :: to DRL emitter diff --git a/drools-drlonyaml-parent/pom.xml b/drools-drlonyaml-parent/pom.xml index fe1607bb8e1..1e8996b466c 100644 --- a/drools-drlonyaml-parent/pom.xml +++ b/drools-drlonyaml-parent/pom.xml @@ -23,7 +23,7 @@ org.kie drools-build-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../build-parent/pom.xml org.drools diff --git a/drools-ecj/pom.xml b/drools-ecj/pom.xml index 1233cb21227..0a9f1a4be0e 100644 --- a/drools-ecj/pom.xml +++ b/drools-ecj/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-engine-classic/pom.xml b/drools-engine-classic/pom.xml index 2566108e014..e11a55dcde6 100644 --- a/drools-engine-classic/pom.xml +++ b/drools-engine-classic/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-engine/pom.xml b/drools-engine/pom.xml index 2b5cfc724c6..9c0fe6e116c 100644 --- a/drools-engine/pom.xml +++ b/drools-engine/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-examples-api/default-kiesession-from-file/pom.xml b/drools-examples-api/default-kiesession-from-file/pom.xml index 93b50e77f72..19592f8aae2 100644 --- a/drools-examples-api/default-kiesession-from-file/pom.xml +++ b/drools-examples-api/default-kiesession-from-file/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT default-kiesession-from-file diff --git a/drools-examples-api/default-kiesession/pom.xml b/drools-examples-api/default-kiesession/pom.xml index 63ac93015d9..33fcd56c93a 100644 --- a/drools-examples-api/default-kiesession/pom.xml +++ b/drools-examples-api/default-kiesession/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT default-kiesession diff --git a/drools-examples-api/kie-module-from-multiple-files/pom.xml b/drools-examples-api/kie-module-from-multiple-files/pom.xml index 5abde83c50b..a8b14fdd656 100644 --- a/drools-examples-api/kie-module-from-multiple-files/pom.xml +++ b/drools-examples-api/kie-module-from-multiple-files/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT kie-module-from-multiple-files diff --git a/drools-examples-api/kiebase-inclusion/pom.xml b/drools-examples-api/kiebase-inclusion/pom.xml index 6be25acbad1..65078f14f19 100644 --- a/drools-examples-api/kiebase-inclusion/pom.xml +++ b/drools-examples-api/kiebase-inclusion/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT kiebase-inclusion diff --git a/drools-examples-api/kiecontainer-from-kierepo/pom.xml b/drools-examples-api/kiecontainer-from-kierepo/pom.xml index c8f8653039f..91231fe5980 100644 --- a/drools-examples-api/kiecontainer-from-kierepo/pom.xml +++ b/drools-examples-api/kiecontainer-from-kierepo/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT kiecontainer-from-kierepo diff --git a/drools-examples-api/kiefilesystem-example/pom.xml b/drools-examples-api/kiefilesystem-example/pom.xml index c4cca53c9ad..c425cd37d55 100644 --- a/drools-examples-api/kiefilesystem-example/pom.xml +++ b/drools-examples-api/kiefilesystem-example/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT kiefilesystem-example diff --git a/drools-examples-api/kiemodulemodel-example/pom.xml b/drools-examples-api/kiemodulemodel-example/pom.xml index aaf20d358fb..d0580834e72 100644 --- a/drools-examples-api/kiemodulemodel-example/pom.xml +++ b/drools-examples-api/kiemodulemodel-example/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT kiemodulemodel-example diff --git a/drools-examples-api/multiple-kbases/pom.xml b/drools-examples-api/multiple-kbases/pom.xml index ad257060c71..63a7a44622b 100644 --- a/drools-examples-api/multiple-kbases/pom.xml +++ b/drools-examples-api/multiple-kbases/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT multiple-kbases diff --git a/drools-examples-api/named-kiesession-from-file/pom.xml b/drools-examples-api/named-kiesession-from-file/pom.xml index 29d3560c386..0143d764b47 100644 --- a/drools-examples-api/named-kiesession-from-file/pom.xml +++ b/drools-examples-api/named-kiesession-from-file/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT Drools :: API examples :: Named KieSession from File diff --git a/drools-examples-api/named-kiesession/pom.xml b/drools-examples-api/named-kiesession/pom.xml index 64351994fa6..5e959770239 100644 --- a/drools-examples-api/named-kiesession/pom.xml +++ b/drools-examples-api/named-kiesession/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT named-kiesession diff --git a/drools-examples-api/pom.xml b/drools-examples-api/pom.xml index 243c4c8248b..ece2104a726 100644 --- a/drools-examples-api/pom.xml +++ b/drools-examples-api/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-examples-api/reactive-kiesession/pom.xml b/drools-examples-api/reactive-kiesession/pom.xml index 6726fae6604..2be3fac933a 100644 --- a/drools-examples-api/reactive-kiesession/pom.xml +++ b/drools-examples-api/reactive-kiesession/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT reactive-kiesession diff --git a/drools-examples/pom.xml b/drools-examples/pom.xml index 70bdf107d8e..f8e8c3d83b8 100644 --- a/drools-examples/pom.xml +++ b/drools-examples/pom.xml @@ -25,7 +25,7 @@ org.kie drools-build-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-fastutil/pom.xml b/drools-fastutil/pom.xml index 79e109ac38b..b1555c678c1 100644 --- a/drools-fastutil/pom.xml +++ b/drools-fastutil/pom.xml @@ -27,7 +27,7 @@ org.kie drools-build-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-common/pom.xml b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-common/pom.xml index 862bc64dd1b..5b89620c265 100644 --- a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-common/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-common/pom.xml @@ -25,7 +25,7 @@ drools-impact-analysis-graph org.drools - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT 4.0.0 diff --git a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/pom.xml b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/pom.xml index f424681a20c..86b6d5abeda 100644 --- a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/pom.xml @@ -25,7 +25,7 @@ drools-impact-analysis-graph org.drools - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT 4.0.0 diff --git a/drools-impact-analysis/drools-impact-analysis-graph/pom.xml b/drools-impact-analysis/drools-impact-analysis-graph/pom.xml index d42cb900dc5..5ec3219a0a9 100644 --- a/drools-impact-analysis/drools-impact-analysis-graph/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-graph/pom.xml @@ -25,7 +25,7 @@ drools-impact-analysis org.drools - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT 4.0.0 diff --git a/drools-impact-analysis/drools-impact-analysis-itests/pom.xml b/drools-impact-analysis/drools-impact-analysis-itests/pom.xml index 7015b8f36af..a08236b8db5 100644 --- a/drools-impact-analysis/drools-impact-analysis-itests/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-itests/pom.xml @@ -25,7 +25,7 @@ drools-impact-analysis org.drools - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT 4.0.0 diff --git a/drools-impact-analysis/drools-impact-analysis-model/pom.xml b/drools-impact-analysis/drools-impact-analysis-model/pom.xml index 3a8893de2e3..9f5ae9a7716 100644 --- a/drools-impact-analysis/drools-impact-analysis-model/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-model/pom.xml @@ -25,7 +25,7 @@ drools-impact-analysis org.drools - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT 4.0.0 diff --git a/drools-impact-analysis/drools-impact-analysis-parser/pom.xml b/drools-impact-analysis/drools-impact-analysis-parser/pom.xml index 682bc401ffc..625032e446f 100644 --- a/drools-impact-analysis/drools-impact-analysis-parser/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-parser/pom.xml @@ -25,7 +25,7 @@ drools-impact-analysis org.drools - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT 4.0.0 diff --git a/drools-impact-analysis/pom.xml b/drools-impact-analysis/pom.xml index 4d8511b29ff..1856e1d8979 100644 --- a/drools-impact-analysis/pom.xml +++ b/drools-impact-analysis/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-io/pom.xml b/drools-io/pom.xml index 06687764ce5..170c040b935 100644 --- a/drools-io/pom.xml +++ b/drools-io/pom.xml @@ -27,7 +27,7 @@ org.kie drools-build-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-kiesession/pom.xml b/drools-kiesession/pom.xml index bcb863d4ab4..cb430877ced 100644 --- a/drools-kiesession/pom.xml +++ b/drools-kiesession/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-legacy-test-util/pom.xml b/drools-legacy-test-util/pom.xml index e9d20aed154..5f5953ddf71 100644 --- a/drools-legacy-test-util/pom.xml +++ b/drools-legacy-test-util/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-legacy-test-util/src/test/java/org/drools/mvel/compiler/Person.java b/drools-legacy-test-util/src/test/java/org/drools/mvel/compiler/Person.java index 64eb8809ad9..dc8e7e8d69d 100644 --- a/drools-legacy-test-util/src/test/java/org/drools/mvel/compiler/Person.java +++ b/drools-legacy-test-util/src/test/java/org/drools/mvel/compiler/Person.java @@ -20,8 +20,8 @@ import org.drools.base.factmodel.traits.Traitable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; import java.io.Serializable; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/drools-legacy-test-util/src/test/resources/META-INF/kmodule.xml b/drools-legacy-test-util/src/test/resources/META-INF/kmodule.xml index ba432d56502..5c4fd952307 100644 --- a/drools-legacy-test-util/src/test/resources/META-INF/kmodule.xml +++ b/drools-legacy-test-util/src/test/resources/META-INF/kmodule.xml @@ -32,7 +32,7 @@ - + diff --git a/drools-metric/pom.xml b/drools-metric/pom.xml index 27b400f440b..5c777c109a7 100644 --- a/drools-metric/pom.xml +++ b/drools-metric/pom.xml @@ -27,7 +27,7 @@ org.kie drools-build-parent - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-model/drools-canonical-model/pom.xml b/drools-model/drools-canonical-model/pom.xml index 76a8d5278c0..578754fe234 100644 --- a/drools-model/drools-canonical-model/pom.xml +++ b/drools-model/drools-canonical-model/pom.xml @@ -27,7 +27,7 @@ org.drools drools-model - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT Drools :: Canonical Model diff --git a/drools-model/drools-codegen-common/pom.xml b/drools-model/drools-codegen-common/pom.xml index beade7d0f70..8b6e2ff7e7d 100644 --- a/drools-model/drools-codegen-common/pom.xml +++ b/drools-model/drools-codegen-common/pom.xml @@ -27,7 +27,7 @@ org.drools drools-model - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT org.drools diff --git a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/context/QuarkusDroolsModelBuildContext.java b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/context/QuarkusDroolsModelBuildContext.java index 9a4b9005f7b..ff25830536c 100644 --- a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/context/QuarkusDroolsModelBuildContext.java +++ b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/context/QuarkusDroolsModelBuildContext.java @@ -24,8 +24,8 @@ public class QuarkusDroolsModelBuildContext extends AbstractDroolsModelBuildContext { public static final String CONTEXT_NAME = "Quarkus"; - public static final String QUARKUS_REST = "javax.ws.rs.Path"; - public static final String QUARKUS_DI = "javax.inject.Inject"; + public static final String QUARKUS_REST = "jakarta.ws.rs.Path"; + public static final String QUARKUS_DI = "jakarta.inject.Inject"; public final boolean hasRest; public final boolean hasDI; diff --git a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/DependencyInjectionAnnotator.java b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/DependencyInjectionAnnotator.java index e31288ebea4..133e55e4334 100644 --- a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/DependencyInjectionAnnotator.java +++ b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/DependencyInjectionAnnotator.java @@ -18,6 +18,9 @@ */ package org.drools.codegen.common.di; +import java.util.ArrayList; +import java.util.List; + import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.expr.ArrayInitializerExpr; import com.github.javaparser.ast.expr.Expression; @@ -29,9 +32,6 @@ import com.github.javaparser.ast.expr.StringLiteralExpr; import com.github.javaparser.ast.nodeTypes.NodeWithAnnotations; -import java.util.ArrayList; -import java.util.List; - /** * Generic abstraction for dependency injection annotations that allow to * use different frameworks based needs. @@ -183,7 +183,7 @@ default > T withSecurityRoles(T node, String[] rolesExpr.add(new StringLiteralExpr(role.trim())); } - node.addAnnotation(new SingleMemberAnnotationExpr(new Name("javax.annotation.security.RolesAllowed"), new ArrayInitializerExpr(NodeList.nodeList(rolesExpr)))); + node.addAnnotation(new SingleMemberAnnotationExpr(new Name("jakarta.annotation.security.RolesAllowed"), new ArrayInitializerExpr(NodeList.nodeList(rolesExpr)))); } return node; } diff --git a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/impl/CDIDependencyInjectionAnnotator.java b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/impl/CDIDependencyInjectionAnnotator.java index 47e33bd14cb..0631364e819 100644 --- a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/impl/CDIDependencyInjectionAnnotator.java +++ b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/impl/CDIDependencyInjectionAnnotator.java @@ -36,7 +36,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot @Override public > T withProduces(T node, boolean isDefault) { - node.addAndGetAnnotation("javax.enterprise.inject.Produces"); + node.addAndGetAnnotation("jakarta.enterprise.inject.Produces"); if (isDefault) { node.addAndGetAnnotation("io.quarkus.arc.DefaultBean"); } @@ -45,13 +45,13 @@ public > T withProduces(T node, boolean isDefau @Override public > T withNamed(T node, String name) { - node.addAnnotation(new SingleMemberAnnotationExpr(new Name("javax.inject.Named"), new StringLiteralExpr(name))); + node.addAnnotation(new SingleMemberAnnotationExpr(new Name("jakarta.inject.Named"), new StringLiteralExpr(name))); return node; } @Override public > T withApplicationComponent(T node) { - node.addAnnotation("javax.enterprise.context.ApplicationScoped"); + node.addAnnotation("jakarta.enterprise.context.ApplicationScoped"); return node; } @@ -62,7 +62,7 @@ public > T withNamedApplicationComponent(T node @Override public > T withSingletonComponent(T node) { - node.addAnnotation("javax.inject.Singleton"); + node.addAnnotation("jakarta.inject.Singleton"); return node; } @@ -73,7 +73,7 @@ public > T withNamedSingletonComponent(T node, @Override public > T withInjection(T node, boolean lazy) { - node.addAnnotation("javax.inject.Inject"); + node.addAnnotation("jakarta.inject.Inject"); return node; } @@ -107,7 +107,7 @@ public MethodCallExpr withMessageProducer(MethodCallExpr produceMethod, String c @Override public String optionalInstanceInjectionType() { - return "javax.enterprise.inject.Instance"; + return "jakarta.enterprise.inject.Instance"; } @Override @@ -134,7 +134,7 @@ public Expression getMultiInstance(String fieldName) { @Override public String applicationComponentType() { - return "javax.enterprise.context.ApplicationScoped"; + return "jakarta.enterprise.context.ApplicationScoped"; } @Override @@ -174,7 +174,7 @@ public > T withFactoryClass(T node) { @Override public > T withFactoryMethod(T node) { - node.addAnnotation("javax.enterprise.inject.Produces"); + node.addAnnotation("jakarta.enterprise.inject.Produces"); return node; } diff --git a/drools-model/drools-model-codegen/pom.xml b/drools-model/drools-model-codegen/pom.xml index 59aafd869a0..c9948110b94 100644 --- a/drools-model/drools-model-codegen/pom.xml +++ b/drools-model/drools-model-codegen/pom.xml @@ -27,7 +27,7 @@ org.drools drools-model - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT org.drools diff --git a/drools-model/drools-model-codegen/src/main/resources/class-templates/config/RuleConfigQuarkusTemplate.java b/drools-model/drools-model-codegen/src/main/resources/class-templates/config/RuleConfigQuarkusTemplate.java index b9850908b87..c54f3c8d7a9 100644 --- a/drools-model/drools-model-codegen/src/main/resources/class-templates/config/RuleConfigQuarkusTemplate.java +++ b/drools-model/drools-model-codegen/src/main/resources/class-templates/config/RuleConfigQuarkusTemplate.java @@ -18,17 +18,17 @@ */ package $Package$; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.kie.kogito.drools.core.config.AbstractRuleConfig; import org.kie.api.event.rule.AgendaEventListener; import org.kie.api.event.rule.RuleRuntimeEventListener; import org.kie.kogito.rules.RuleEventListenerConfig; -@javax.inject.Singleton +@jakarta.inject.Singleton class RuleConfig extends AbstractRuleConfig implements org.kie.kogito.rules.RuleConfig { - @javax.inject.Inject + @jakarta.inject.Inject public RuleConfig( Instance ruleEventListenerConfigs, Instance agendaEventListeners, diff --git a/drools-model/drools-model-codegen/src/main/resources/class-templates/rules/ProjectRuntimeQuarkusTemplate.java b/drools-model/drools-model-codegen/src/main/resources/class-templates/rules/ProjectRuntimeQuarkusTemplate.java index 6bad1995aa1..ee69deb295e 100644 --- a/drools-model/drools-model-codegen/src/main/resources/class-templates/rules/ProjectRuntimeQuarkusTemplate.java +++ b/drools-model/drools-model-codegen/src/main/resources/class-templates/rules/ProjectRuntimeQuarkusTemplate.java @@ -27,7 +27,7 @@ import org.kie.api.runtime.KieRuntimeBuilder; import org.drools.modelcompiler.KieBaseBuilder; -@javax.enterprise.context.ApplicationScoped +@jakarta.enterprise.context.ApplicationScoped public class ProjectRuntime implements KieRuntimeBuilder { private static final ProjectModel model = new ProjectModel(); diff --git a/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestObjectMapperQuarkusTemplate.java b/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestObjectMapperQuarkusTemplate.java index 6bc3c5e4050..36fc0b8ec40 100644 --- a/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestObjectMapperQuarkusTemplate.java +++ b/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestObjectMapperQuarkusTemplate.java @@ -23,7 +23,7 @@ import java.io.IOException; import com.fasterxml.jackson.databind.JavaType; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestQueryJavaTemplate.java b/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestQueryJavaTemplate.java index 3cd2a6b68d1..c441dfd850e 100644 --- a/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestQueryJavaTemplate.java +++ b/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestQueryJavaTemplate.java @@ -19,11 +19,11 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.drools.ruleunits.api.RuleUnit; import org.drools.ruleunits.api.RuleUnitInstance; diff --git a/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestQueryQuarkusTemplate.java b/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestQueryQuarkusTemplate.java index 338697d185f..7780623f58b 100644 --- a/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestQueryQuarkusTemplate.java +++ b/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestQueryQuarkusTemplate.java @@ -19,11 +19,11 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.drools.ruleunits.api.RuleUnit; import org.drools.ruleunits.api.RuleUnitInstance; @@ -32,7 +32,7 @@ @Path("/$endpointName$") public class $unit$Query$name$Endpoint { - @javax.inject.Inject + @jakarta.inject.Inject RuleUnit<$UnitType$> ruleUnit; public $unit$Query$name$Endpoint() { } diff --git a/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RuleUnitQuarkusTemplate.java b/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RuleUnitQuarkusTemplate.java index faf8610793a..aabad8800ea 100644 --- a/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RuleUnitQuarkusTemplate.java +++ b/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RuleUnitQuarkusTemplate.java @@ -28,7 +28,7 @@ import org.drools.ruleunits.impl.ReteEvaluatorBasedRuleUnitInstance; import org.drools.ruleunits.impl.sessions.RuleUnitExecutorImpl; -@javax.enterprise.context.ApplicationScoped +@jakarta.enterprise.context.ApplicationScoped public class CLASS_NAME extends AbstractRuleUnit { private static final InternalRuleBase ruleBase = KieBaseBuilder.createKieBaseFromModel(new RULE_UNIT_MODEL(), $KieBaseOptions$); @@ -43,8 +43,8 @@ public CLASS_NAME() { this((RuleUnits) null); } - @javax.inject.Inject - public CLASS_NAME(javax.enterprise.inject.Instance ruleUnits) { + @jakarta.inject.Inject + public CLASS_NA(jakarta.enterprise.inject.Instance ruleUnits) { this(ruleUnits == null || ruleUnits.isUnsatisfied() ? AbstractRuleUnits.DummyRuleUnits.INSTANCE : ruleUnits.get()); } diff --git a/drools-model/drools-model-compiler/pom.xml b/drools-model/drools-model-compiler/pom.xml index 99b50c2ae1b..d42dea084d3 100644 --- a/drools-model/drools-model-compiler/pom.xml +++ b/drools-model/drools-model-compiler/pom.xml @@ -27,7 +27,7 @@ org.drools drools-model - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT Drools :: Model :: Compiler diff --git a/drools-model/drools-mvel-compiler/pom.xml b/drools-model/drools-mvel-compiler/pom.xml index 0581f58cd68..79e1cc9203f 100644 --- a/drools-model/drools-mvel-compiler/pom.xml +++ b/drools-model/drools-mvel-compiler/pom.xml @@ -27,7 +27,7 @@ org.drools drools-model - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT Drools :: MVEL Compiler diff --git a/drools-model/drools-mvel-parser/pom.xml b/drools-model/drools-mvel-parser/pom.xml index 7b9a45c4d19..7c063510ec3 100644 --- a/drools-model/drools-mvel-parser/pom.xml +++ b/drools-model/drools-mvel-parser/pom.xml @@ -24,7 +24,7 @@ org.drools drools-model - 8.46.0-SNAPSHOT + 9.46.0-SNAPSHOT Drools :: MVEL Parser diff --git a/drools-model/drools-mvel-parser/src/main/java/org/drools/mvel/parser/MvelParser.java b/drools-model/drools-mvel-parser/src/main/java/org/drools/mvel/parser/MvelParser.java index 00edf488ce4..e641bda95ba 100644 --- a/drools-model/drools-mvel-parser/src/main/java/org/drools/mvel/parser/MvelParser.java +++ b/drools-model/drools-mvel-parser/src/main/java/org/drools/mvel/parser/MvelParser.java @@ -80,7 +80,7 @@ public MvelParser(ParserConfiguration configuration) { public MvelParser(ParserConfiguration configuration, boolean optionalSemicolon) { this.configuration = configuration; - configuration.getPostProcessors().clear(); + configuration.getProcessors().clear(); this.optionalSemicolon = optionalSemicolon; } @@ -140,8 +140,8 @@ public ParseResult parse(ParseStart start, Provider provi N resultNode = start.parse(parser); ParseResult result = new ParseResult<>(resultNode, parser.problems, parser.getCommentsCollection()); - configuration.getPostProcessors().forEach(postProcessor -> - postProcessor.process(result, configuration)); + configuration.getProcessors().forEach(processor -> + processor.get().postProcess(result, configuration)); result.getProblems().sort(PROBLEM_BY_BEGIN_POSITION); diff --git a/drools-model/drools-mvel-parser/src/main/javacc/mvel.jj b/drools-model/drools-mvel-parser/src/main/javacc/mvel.jj index 615512de3f8..d4752e980d5 100644 --- a/drools-model/drools-mvel-parser/src/main/javacc/mvel.jj +++ b/drools-model/drools-mvel-parser/src/main/javacc/mvel.jj @@ -1370,13 +1370,14 @@ ModifierHolder Modifiers(): * Also note that JavaParser handles the hierarchy/specialisations of classes, interfaces, and enums differently to the JLS. *
    *
  • This {@code ClassOrInterfaceDeclaration} refers to the {@code NormalClassDeclaration} and {@code NormalInterfaceDeclaration},
    • - *
  • while {@code AnnotationTypeDeclaration} and {@code EnumDeclaration} are handled separately within this grammar.
    • + *
  • while {@code AnnotationTypeDeclaration}, {@code EnumDeclaration}, and {@code RecordDeclaration} are handled separately within this grammar.
    • *
- * https://docs.oracle.com/javase/specs/jls/se15/html/jls-8.html#jls-8.1 + * https://docs.oracle.com/javase/specs/jls/se17/html/jls-8.html#jls-8.1 * 
{@code
  *     ClassDeclaration:
  *         NormalClassDeclaration
  *         EnumDeclaration
+ *         RecordDeclaration
  *     NormalClassDeclaration:
  *         {ClassModifier} class TypeIdentifier [TypeParameters] [Superclass] [Superinterfaces] ClassBody
  * }
@@ -1396,6 +1397,7 @@ ClassOrInterfaceDeclaration ClassOrInterfaceDeclaration(ModifierHolder modifier) RangedList typePar = new RangedList(emptyNodeList()); NodeList extList = emptyNodeList(); NodeList impList = emptyNodeList(); + NodeList permittedTypes = emptyNodeList(); NodeList> members = emptyNodeList(); JavaToken begin = modifier.begin; } @@ -1413,15 +1415,15 @@ ClassOrInterfaceDeclaration ClassOrInterfaceDeclaration(ModifierHolder modifier) members = ClassOrInterfaceBody() - { return new ClassOrInterfaceDeclaration(range(begin, token()), modifier.modifiers, modifier.annotations, isInterface, name, typePar.list, extList, impList, members); } + { return new ClassOrInterfaceDeclaration(range(begin, token()), modifier.modifiers, modifier.annotations, isInterface, name, typePar.list, extList, impList, permittedTypes, members); } } /** - * https://openjdk.java.net/jeps/395#Java-grammar + * https://docs.oracle.com/javase/specs/jls/se17/html/jls-8.html#jls-8.10 * 
{@code
  *     RecordDeclaration:
  *        {ClassModifier} `record` TypeIdentifier [TypeParameters]
- *          RecordHeader [SuperInterfaces] RecordBody
+ *          RecordHeader [ClassImplements] RecordBody
  *
  *      RecordHeader:
  *       `(` [RecordComponentList] `)`
@@ -1430,11 +1432,15 @@ ClassOrInterfaceDeclaration ClassOrInterfaceDeclaration(ModifierHolder modifier)
  *       RecordComponent { `,` RecordComponent}
  *
  *      RecordComponent:
- *       {Annotation} UnannType Identifier
+ *       {RecordComponentModifier} UnannType Identifier
  *       VariableArityRecordComponent
  *
  *      VariableArityRecordComponent:
  *       {Annotation} UnannType {Annotation} `...` Identifier
+ *       {RecordComponentModifier} UnannType {Annotation} `...` Identifier
+ *
+ *      RecordComponentModifier:
+ *       Annotation
  *
  *      RecordBody:
  *        `{` {RecordBodyDeclaration} `}`
@@ -1859,6 +1865,9 @@ BodyDeclaration RecordBodyDeclaration():
          |
             LOOKAHEAD("enum")
             ret = EnumDeclaration(modifiers)
+         |
+            LOOKAHEAD("record")
+            ret = RecordDeclaration(modifiers)
          |
             LOOKAHEAD("@" "interface")
             ret = AnnotationTypeDeclaration(modifiers)
@@ -3365,13 +3374,15 @@ Expression EqualityExpression():
  */
 PatternExpr PatternExpression():
 {
+    ModifierHolder modifier;
     ReferenceType type;
     SimpleName name;
 }
 {
-    type = AnnotatedReferenceType()
+    modifier = Modifiers()
+    type = ReferenceType(modifier.annotations)
     name = SimpleName()
-    { return new PatternExpr(range(type, token()), type, name); }
+    { return new PatternExpr(range(type, token()), modifier.modifiers, type, name); }
 }
 
 
@@ -4527,6 +4538,11 @@ Statement BlockStatement():
             LOOKAHEAD( Modifiers() "record" SimpleName() [ TypeParameters() ] Parameters() )
             modifier = Modifiers()
             recordDeclaration = RecordDeclaration(modifier) { ret = new LocalRecordDeclarationStmt(range(recordDeclaration, token()), recordDeclaration); }
+         |
+            // try yield statement separate from more general Statement() because yield is not a keyword but
+            // just a restricted identifier and a yield statement can be confused with VariableDeclarationExpression sometimes
+            LOOKAHEAD( YieldStatement() )
+            ret = YieldStatement()
          |
             LOOKAHEAD( VariableDeclarationExpression() )
             expr = VariableDeclarationExpression()
diff --git a/drools-model/pom.xml b/drools-model/pom.xml
index 8697a510f7e..7e77f0d9f3e 100644
--- a/drools-model/pom.xml
+++ b/drools-model/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-mvel/pom.xml b/drools-mvel/pom.xml
index 7372effd888..8a6eb92eeba 100644
--- a/drools-mvel/pom.xml
+++ b/drools-mvel/pom.xml
@@ -26,7 +26,7 @@
     
         org.kie
         drools-build-parent
-        8.46.0-SNAPSHOT
+        9.46.0-SNAPSHOT
         ../build-parent/pom.xml
     
 
@@ -89,11 +89,6 @@
             jaxb-core
             provided
         
-        
-            com.sun.xml.bind
-            jaxb-impl
-            provided
-        
         
             jakarta.xml.bind
             jakarta.xml.bind-api
diff --git a/drools-mvel/src/test/java/org/drools/mvel/compiler/Person.java b/drools-mvel/src/test/java/org/drools/mvel/compiler/Person.java
index 13641acfe0b..a1b4bda3fb8 100644
--- a/drools-mvel/src/test/java/org/drools/mvel/compiler/Person.java
+++ b/drools-mvel/src/test/java/org/drools/mvel/compiler/Person.java
@@ -20,8 +20,8 @@
 
 import org.drools.base.factmodel.traits.Traitable;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/drools-persistence/drools-persistence-api/pom.xml b/drools-persistence/drools-persistence-api/pom.xml
index bf7d3d2b9bd..a00b6f44a67 100644
--- a/drools-persistence/drools-persistence-api/pom.xml
+++ b/drools-persistence/drools-persistence-api/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-persistence
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
   drools-persistence-api
@@ -60,11 +60,6 @@
       org.drools
       drools-commands
     
-    
-      com.sun.xml.bind
-      jaxb-impl
-      provided
-    
     
       com.sun.xml.bind
       jaxb-xjc
diff --git a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/PersistenceContextManager.java b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/PersistenceContextManager.java
index 1037ab3c35d..5a20fa88f64 100644
--- a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/PersistenceContextManager.java
+++ b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/PersistenceContextManager.java
@@ -22,7 +22,7 @@
 import org.kie.api.command.Command;
 import org.kie.api.runtime.KieSession;
 
-import javax.transaction.Synchronization;
+import jakarta.transaction.Synchronization;
 
 public interface PersistenceContextManager {
     
diff --git a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/TransactionSynchronizationRegistryHelper.java b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/TransactionSynchronizationRegistryHelper.java
index 647c178f2b2..74654794cf9 100644
--- a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/TransactionSynchronizationRegistryHelper.java
+++ b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/TransactionSynchronizationRegistryHelper.java
@@ -18,7 +18,7 @@
  */
 package org.drools.persistence.api;
 
-import javax.transaction.TransactionSynchronizationRegistry;
+import jakarta.transaction.TransactionSynchronizationRegistry;
 
 import org.drools.persistence.jta.JtaTransactionSynchronizationAdapter;
 import org.slf4j.Logger;
diff --git a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionManager.java b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionManager.java
index 967365339f9..7b7869f2ade 100644
--- a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionManager.java
+++ b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionManager.java
@@ -23,10 +23,10 @@
 import java.util.Map;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.TransactionSynchronizationRegistry;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.Status;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.TransactionSynchronizationRegistry;
+import jakarta.transaction.UserTransaction;
 
 import org.drools.persistence.api.TransactionManager;
 import org.drools.persistence.api.TransactionSynchronization;
@@ -50,7 +50,7 @@ public class JtaTransactionManager
      */
     public static final String           DEFAULT_TRANSACTION_SYNCHRONIZATION_REGISTRY_NAME = "java:comp/TransactionSynchronizationRegistry";
 
-    private static final String          TRANSACTION_SYNCHRONIZATION_REGISTRY_CLASS_NAME   = "javax.transaction.TransactionSynchronizationRegistry";
+    private static final String          TRANSACTION_SYNCHRONIZATION_REGISTRY_CLASS_NAME   = "jakarta.transaction.TransactionSynchronizationRegistry";
 
     private static Class< ? >            transactionSynchronizationRegistryClass;
 
@@ -72,7 +72,7 @@ protected Map initialValue() {
 
     UserTransaction                      ut;
     Object                               tsr;
-    javax.transaction.TransactionManager tm;
+    jakarta.transaction.TransactionManager tm;
     
     public JtaTransactionManager(Object ut,
                                  Object tsr,
@@ -83,20 +83,20 @@ public JtaTransactionManager(Object ut,
             this.ut = ( UserTransaction ) ( (ut != null) ? ut : findUserTransaction() );
         }
         
-        if ( tm instanceof javax.transaction.TransactionManager ) {
-            this.tm = ( javax.transaction.TransactionManager ) tm;
+        if ( tm instanceof jakarta.transaction.TransactionManager ) {
+            this.tm = ( jakarta.transaction.TransactionManager ) tm;
         } else {
-            this.tm = ( javax.transaction.TransactionManager ) ( (tm != null) ? tm : findTransactionManager( this.ut ) );
+            this.tm = ( jakarta.transaction.TransactionManager ) ( (tm != null) ? tm : findTransactionManager( this.ut ) );
         }
         this.tsr = (tsr != null) ? tsr : findTransactionSynchronizationRegistry( this.ut,
                                                                                  this.tm );
     }
 
-    protected javax.transaction.TransactionManager findTransactionManager(UserTransaction ut) {
-        if ( ut instanceof javax.transaction.TransactionManager ) {
+    protected jakarta.transaction.TransactionManager findTransactionManager(UserTransaction ut) {
+        if ( ut instanceof jakarta.transaction.TransactionManager ) {
             logger.debug( "JTA UserTransaction object [{}] implements TransactionManager",
                           ut );
-            return (javax.transaction.TransactionManager) ut;
+            return (jakarta.transaction.TransactionManager) ut;
         }
 
         InitialContext context;
@@ -115,7 +115,7 @@ protected javax.transaction.TransactionManager findTransactionManager(UserTransa
                 continue;
             }
             try {
-                javax.transaction.TransactionManager tm = (javax.transaction.TransactionManager) context.lookup( jndiName );
+                jakarta.transaction.TransactionManager tm = (jakarta.transaction.TransactionManager) context.lookup( jndiName );
                 logger.debug( "JTA TransactionManager found at fallback JNDI location [{}]",
                               jndiName );
                 return tm;
@@ -149,7 +149,7 @@ protected UserTransaction findUserTransaction() {
     }
 
     protected Object findTransactionSynchronizationRegistry(UserTransaction ut,
-                                                            javax.transaction.TransactionManager tm) {
+                                                            jakarta.transaction.TransactionManager tm) {
 
         if ( transactionSynchronizationRegistryClass == null ) {
             // JTA 1.1 API not present - skip.
@@ -219,7 +219,7 @@ public boolean begin() {
                 return true;
             } catch ( Exception e ) {
                 // special WAS handling for cached UserTrnsactions
-                if (e.getClass().getName().equals("javax.ejb.EJBException")) {
+                if (e.getClass().getName().equals("jakarta.ejb.EJBException")) {
                     // reinitialize all fields
                     this.ut = findUserTransaction();
                     this.tm = findTransactionManager(this.ut);
diff --git a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionManagerFactory.java b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionManagerFactory.java
index e7c3b5eb52f..e99fe58afd7 100644
--- a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionManagerFactory.java
+++ b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionManagerFactory.java
@@ -36,8 +36,8 @@ public TransactionManager newTransactionManager() {
     }
 
     /**
-     * Creates a {@link JtaTransactionManager} instance using any of the {@link javax.transaction.UserTransaction},
-     * {@link javax.transaction.TransactionSynchronizationRegistry}, and {@link javax.transaction.TransactionManager}
+     * Creates a {@link JtaTransactionManager} instance using any of the {@link jakarta.transaction.UserTransaction},
+     * {@link jakarta.transaction.TransactionSynchronizationRegistry}, and {@link jakarta.transaction.TransactionManager}
      * present in {@code env}.
      * 
      * @param env
diff --git a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionSynchronizationAdapter.java b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionSynchronizationAdapter.java
index fa387cd3a4d..79247df16e3 100644
--- a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionSynchronizationAdapter.java
+++ b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionSynchronizationAdapter.java
@@ -18,8 +18,8 @@
  */
 package org.drools.persistence.jta;
 
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
+import jakarta.transaction.Status;
+import jakarta.transaction.Synchronization;
 
 import org.drools.persistence.api.TransactionManager;
 import org.drools.persistence.api.TransactionSynchronization;
diff --git a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/TransactionLockInterceptor.java b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/TransactionLockInterceptor.java
index 7673604692a..e1dc0b573f0 100644
--- a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/TransactionLockInterceptor.java
+++ b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/TransactionLockInterceptor.java
@@ -21,7 +21,7 @@
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.locks.ReentrantLock;
-import javax.transaction.Status;
+import jakarta.transaction.Status;
 
 import org.drools.commands.impl.AbstractInterceptor;
 import org.drools.persistence.api.OrderedTransactionSynchronization;
diff --git a/drools-persistence/drools-persistence-jpa/pom.xml b/drools-persistence/drools-persistence-jpa/pom.xml
index 7a3ec66da13..d86ded1a391 100644
--- a/drools-persistence/drools-persistence-jpa/pom.xml
+++ b/drools-persistence/drools-persistence-jpa/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-persistence
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
   drools-persistence-jpa
@@ -122,11 +122,6 @@
       org.drools
       drools-mvel
     
-    
-      com.sun.xml.bind
-      jaxb-impl
-      provided
-    
     
       com.sun.xml.bind
       jaxb-xjc
@@ -167,13 +162,8 @@
     
 
     
-    
-      org.hibernate
-      hibernate-entitymanager
-      test
-    
-    
-      org.hibernate
+    
+      org.hibernate.orm
       hibernate-core
       test
       
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/TriggerUpdateTransactionSynchronization.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/TriggerUpdateTransactionSynchronization.java
index 82114ee5644..71bc7749ffe 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/TriggerUpdateTransactionSynchronization.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/TriggerUpdateTransactionSynchronization.java
@@ -19,7 +19,7 @@
 package org.drools.persistence;
 
 import java.util.Set;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import org.drools.persistence.api.TransactionManager;
 import org.drools.persistence.api.TransactionManagerHelper;
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/SessionInfo.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/SessionInfo.java
index ec5069ad65a..54fd6cc38ad 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/SessionInfo.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/SessionInfo.java
@@ -20,15 +20,15 @@
 
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Transient;
-import javax.persistence.Version;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Lob;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Transient;
+import jakarta.persistence.Version;
 
 import org.drools.persistence.api.PersistentSession;
 import org.drools.persistence.SessionMarshallingHelper;
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/WorkItemInfo.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/WorkItemInfo.java
index 3db72569d34..ce26c9d2f87 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/WorkItemInfo.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/WorkItemInfo.java
@@ -23,15 +23,15 @@
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Transient;
-import javax.persistence.Version;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Lob;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Transient;
+import jakarta.persistence.Version;
 
 import org.drools.core.marshalling.MarshallerReaderContext;
 import org.drools.core.marshalling.MarshallerWriteContext;
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/AbstractPersistenceContextManager.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/AbstractPersistenceContextManager.java
index 0e2bf94fd71..415ce0724c6 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/AbstractPersistenceContextManager.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/AbstractPersistenceContextManager.java
@@ -18,8 +18,8 @@
  */
  package org.drools.persistence.jpa;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
 
 import org.drools.persistence.api.TransactionManager;
 import org.kie.api.runtime.Environment;
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContext.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContext.java
index 08c24f246f3..4ae16e7ed56 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContext.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContext.java
@@ -20,8 +20,8 @@
 
 import java.lang.reflect.Field;
 
-import javax.persistence.EntityManager;
-import javax.persistence.LockModeType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.LockModeType;
 
 import org.drools.persistence.api.PersistenceContext;
 import org.drools.persistence.api.PersistentSession;
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContextManager.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContextManager.java
index 2663169c075..7dc6f58be9b 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContextManager.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContextManager.java
@@ -18,7 +18,7 @@
  */
  package org.drools.persistence.jpa;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import org.drools.persistence.api.PersistenceContext;
 import org.drools.persistence.api.PersistenceContextManager;
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/OptimisticLockRetryInterceptor.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/OptimisticLockRetryInterceptor.java
index ec5e1d68a5b..91485667576 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/OptimisticLockRetryInterceptor.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/OptimisticLockRetryInterceptor.java
@@ -24,7 +24,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.persistence.OptimisticLockException;
+import jakarta.persistence.OptimisticLockException;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/EntityPersister.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/EntityPersister.java
index 31c97addfb7..80544087bdf 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/EntityPersister.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/EntityPersister.java
@@ -21,7 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 public class EntityPersister {
 
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/JPAPlaceholderResolverStrategy.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/JPAPlaceholderResolverStrategy.java
index 9e4b4469f6b..98c9a5b745c 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/JPAPlaceholderResolverStrategy.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/JPAPlaceholderResolverStrategy.java
@@ -27,11 +27,11 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.Metamodel;
 import org.drools.base.common.DroolsObjectInputStream;
 import org.drools.persistence.api.TransactionAware;
 import org.drools.persistence.api.TransactionManager;
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/MappedVariable.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/MappedVariable.java
index 5448b4c2ebb..7f9072b9fcb 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/MappedVariable.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/MappedVariable.java
@@ -19,13 +19,13 @@
 package org.drools.persistence.jpa.marshaller;
 
 import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Version;
 
 @Entity
 @SequenceGenerator(name="mappedVarIdSeq", sequenceName="MAPPED_VAR_ID_SEQ")
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/VariableEntity.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/VariableEntity.java
index 1cbe51e3229..abc061e965a 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/VariableEntity.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/VariableEntity.java
@@ -21,11 +21,11 @@
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.JoinColumn;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.OneToMany;
-import javax.persistence.FetchType;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.FetchType;
 
 @MappedSuperclass
 public abstract class VariableEntity implements Serializable {
diff --git a/drools-persistence/drools-persistence-jpa/src/test/filtered-resources/META-INF/persistence.xml b/drools-persistence/drools-persistence-jpa/src/test/filtered-resources/META-INF/persistence.xml
index 36800ba01f5..845fcc9f72a 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/filtered-resources/META-INF/persistence.xml
+++ b/drools-persistence/drools-persistence-jpa/src/test/filtered-resources/META-INF/persistence.xml
@@ -19,10 +19,10 @@
     under the License.
 
 -->
-
+             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
 
     
       org.hibernate.jpa.HibernatePersistenceProvider
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerFactoryTest.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerFactoryTest.java
index 137814bbcf2..d8d57b2d3c5 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerFactoryTest.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerFactoryTest.java
@@ -20,13 +20,13 @@
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.HeuristicMixedException;
+import jakarta.transaction.HeuristicRollbackException;
+import jakarta.transaction.NotSupportedException;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.TransactionManager;
+import jakarta.transaction.UserTransaction;
 import org.drools.core.impl.EnvironmentFactory;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerTest.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerTest.java
index 399a7437300..449fc7759ae 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerTest.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerTest.java
@@ -23,10 +23,10 @@
 import java.util.Map;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.transaction.RollbackException;
-import javax.transaction.UserTransaction;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.UserTransaction;
 
 import org.drools.commands.impl.CommandBasedStatefulKnowledgeSessionImpl;
 import org.drools.kiesession.rulebase.InternalKnowledgeBase;
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestCommand.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestCommand.java
index 973d928459a..42df2e5504d 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestCommand.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestCommand.java
@@ -19,8 +19,8 @@
 package org.drools.persistence.jta;
 
 import java.util.HashMap;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
 
 import com.arjuna.ats.jta.TransactionManager;
 import org.drools.core.base.MapGlobalResolver;
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestObject.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestObject.java
index b06c96053c2..c9930291c87 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestObject.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestObject.java
@@ -20,13 +20,13 @@
 
 import java.io.Serializable;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.SequenceGenerator;
 
 /**
  * This class is used to test transactions. 
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/kie/persistence/session/JpaPersistentStatefulSessionTest.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/kie/persistence/session/JpaPersistentStatefulSessionTest.java
index 0f5b11a2b2e..0863d2fdfae 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/kie/persistence/session/JpaPersistentStatefulSessionTest.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/kie/persistence/session/JpaPersistentStatefulSessionTest.java
@@ -29,7 +29,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.naming.InitialContext;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.UserTransaction;
 
 import org.drools.core.FlowSessionConfiguration;
 import org.drools.core.SessionConfiguration;
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/map/impl/JpaBasedPersistenceTest.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/map/impl/JpaBasedPersistenceTest.java
index 6a001acc5c1..730575a1a4d 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/map/impl/JpaBasedPersistenceTest.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/map/impl/JpaBasedPersistenceTest.java
@@ -34,7 +34,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/JpaPersistentStatefulSessionTest.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/JpaPersistentStatefulSessionTest.java
index d7e3a61ae4e..f61559f90b1 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/JpaPersistentStatefulSessionTest.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/JpaPersistentStatefulSessionTest.java
@@ -29,7 +29,7 @@
 import java.util.stream.IntStream;
 
 import javax.naming.InitialContext;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.UserTransaction;
 
 import org.drools.commands.ChainableRunner;
 import org.drools.commands.impl.CommandBasedStatefulKnowledgeSessionImpl;
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/ReloadSessionTest.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/ReloadSessionTest.java
index 67d4e42d621..b49aff78383 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/ReloadSessionTest.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/ReloadSessionTest.java
@@ -23,8 +23,8 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.Random;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 
 import org.drools.core.common.DefaultFactHandle;
 import org.drools.kiesession.rulebase.InternalKnowledgeBase;
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/util/DroolsPersistenceUtil.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/util/DroolsPersistenceUtil.java
index 563b210269f..a61ec15cbe6 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/util/DroolsPersistenceUtil.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/util/DroolsPersistenceUtil.java
@@ -22,7 +22,7 @@
 import static org.kie.api.runtime.EnvironmentName.TRANSACTION;
 
 import java.util.Map;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.UserTransaction;
 import org.drools.core.base.MapGlobalResolver;
 import org.drools.core.impl.EnvironmentFactory;
 import org.kie.api.runtime.Environment;
diff --git a/drools-persistence/pom.xml b/drools-persistence/pom.xml
index 2f262cf6665..b17eb405989 100644
--- a/drools-persistence/pom.xml
+++ b/drools-persistence/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-quarkus-extension/drools-quarkus-deployment/pom.xml b/drools-quarkus-extension/drools-quarkus-deployment/pom.xml
index 86e7cf5b157..996771b4e74 100644
--- a/drools-quarkus-extension/drools-quarkus-deployment/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-deployment/pom.xml
@@ -24,9 +24,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     4.0.0
     
-        org.drools
+      org.drools
       drools-quarkus-extension
-      8.46.0-SNAPSHOT
+      9.46.0-SNAPSHOT
     
 
   Drools :: Quarkus Extension :: Deployment
@@ -89,12 +89,22 @@
             quarkus-vertx-http-deployment-spi
         
 
-        
-        
-            io.quarkus
-            quarkus-junit5-internal
-            test
-        
+    
+    
+      io.quarkus
+      quarkus-junit5-internal
+      test
+      
+        
+          org.codehaus.plexus
+          plexus-xml
+        
+        
+          org.apache.maven
+          maven-xml-impl
+        
+      
+    
     
       io.rest-assured
       rest-assured
diff --git a/drools-quarkus-extension/drools-quarkus-deployment/src/main/java/org/drools/quarkus/deployment/DroolsAssetsProcessor.java b/drools-quarkus-extension/drools-quarkus-deployment/src/main/java/org/drools/quarkus/deployment/DroolsAssetsProcessor.java
index 1ac349f63e5..51aa2e792bb 100644
--- a/drools-quarkus-extension/drools-quarkus-deployment/src/main/java/org/drools/quarkus/deployment/DroolsAssetsProcessor.java
+++ b/drools-quarkus-extension/drools-quarkus-deployment/src/main/java/org/drools/quarkus/deployment/DroolsAssetsProcessor.java
@@ -44,7 +44,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.Collection;
 import java.util.Set;
 import java.util.stream.Collectors;
diff --git a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml
index 7775183a6fe..0da79019017 100644
--- a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-quarkus-examples
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
   Drools :: Quarkus Extension :: Examples :: Reactive
@@ -57,6 +57,16 @@
       io.quarkus
       quarkus-junit5
       test
+      
+        
+          org.codehaus.plexus
+          plexus-xml
+        
+        
+          org.apache.maven
+          maven-xml-impl
+        
+      
     
 
     
-    
-      org.hibernate
+    
+      org.hibernate.orm
       hibernate-core
       test
       
@@ -178,11 +178,6 @@
       jandex
       test
     
-    
-      org.hibernate
-      hibernate-entitymanager
-      test
-    
 
     
       com.sun.xml.bind
diff --git a/drools-traits/src/test/filtered-resources/META-INF/persistence.xml b/drools-traits/src/test/filtered-resources/META-INF/persistence.xml
index 36800ba01f5..845fcc9f72a 100644
--- a/drools-traits/src/test/filtered-resources/META-INF/persistence.xml
+++ b/drools-traits/src/test/filtered-resources/META-INF/persistence.xml
@@ -19,10 +19,10 @@
     under the License.
 
 -->
-
+             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
 
     
       org.hibernate.jpa.HibernatePersistenceProvider
diff --git a/drools-traits/src/test/java/org/drools/traits/persistence/DroolsPersistenceUtil.java b/drools-traits/src/test/java/org/drools/traits/persistence/DroolsPersistenceUtil.java
index 2adf906eee4..126aa6a7bf3 100644
--- a/drools-traits/src/test/java/org/drools/traits/persistence/DroolsPersistenceUtil.java
+++ b/drools-traits/src/test/java/org/drools/traits/persistence/DroolsPersistenceUtil.java
@@ -20,7 +20,7 @@
 
 import java.util.Map;
 
-import javax.transaction.UserTransaction;
+import jakarta.transaction.UserTransaction;
 
 import org.drools.core.base.MapGlobalResolver;
 import org.drools.core.impl.EnvironmentFactory;
diff --git a/drools-util/pom.xml b/drools-util/pom.xml
index ae537454a0c..fea264ed260 100644
--- a/drools-util/pom.xml
+++ b/drools-util/pom.xml
@@ -27,7 +27,7 @@
     
         org.kie
         drools-build-parent
-        8.46.0-SNAPSHOT
+        9.46.0-SNAPSHOT
         ../build-parent/pom.xml
     
 
diff --git a/drools-verifier/drools-verifier-api/pom.xml b/drools-verifier/drools-verifier-api/pom.xml
index d1e724eb50c..c7a012b7c68 100644
--- a/drools-verifier/drools-verifier-api/pom.xml
+++ b/drools-verifier/drools-verifier-api/pom.xml
@@ -26,7 +26,7 @@
     
         org.drools
         drools-verifier
-        8.46.0-SNAPSHOT
+        9.46.0-SNAPSHOT
     
     4.0.0
 
diff --git a/drools-verifier/drools-verifier-core/pom.xml b/drools-verifier/drools-verifier-core/pom.xml
index aa0b05f6efb..7c4208ea61f 100644
--- a/drools-verifier/drools-verifier-core/pom.xml
+++ b/drools-verifier/drools-verifier-core/pom.xml
@@ -25,7 +25,7 @@
     
         drools-verifier
         org.drools
-        8.46.0-SNAPSHOT
+        9.46.0-SNAPSHOT
     
     4.0.0
 
diff --git a/drools-verifier/drools-verifier-drl/pom.xml b/drools-verifier/drools-verifier-drl/pom.xml
index 9b6b501518d..39b2a490c3f 100644
--- a/drools-verifier/drools-verifier-drl/pom.xml
+++ b/drools-verifier/drools-verifier-drl/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-verifier
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
   drools-verifier-drl
diff --git a/drools-verifier/pom.xml b/drools-verifier/pom.xml
index bdbd2c6afd1..58e711cdd25 100644
--- a/drools-verifier/pom.xml
+++ b/drools-verifier/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-wiring/drools-wiring-api/pom.xml b/drools-wiring/drools-wiring-api/pom.xml
index 59bde229b16..56738b61172 100755
--- a/drools-wiring/drools-wiring-api/pom.xml
+++ b/drools-wiring/drools-wiring-api/pom.xml
@@ -26,7 +26,7 @@
     
         org.drools
         drools-wiring
-        8.46.0-SNAPSHOT
+        9.46.0-SNAPSHOT
     
 
     org.drools
diff --git a/drools-wiring/drools-wiring-dynamic/pom.xml b/drools-wiring/drools-wiring-dynamic/pom.xml
index f03da3d19ee..a55951ff43f 100755
--- a/drools-wiring/drools-wiring-dynamic/pom.xml
+++ b/drools-wiring/drools-wiring-dynamic/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-wiring
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
   org.drools
@@ -53,11 +53,6 @@
       jaxb-core
       provided
     
-    
-      com.sun.xml.bind
-      jaxb-impl
-      provided
-    
     
       jakarta.xml.bind
       jakarta.xml.bind-api
diff --git a/drools-wiring/drools-wiring-static/pom.xml b/drools-wiring/drools-wiring-static/pom.xml
index 8a559cc87be..d3eb30c4982 100755
--- a/drools-wiring/drools-wiring-static/pom.xml
+++ b/drools-wiring/drools-wiring-static/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-wiring
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
   org.drools
diff --git a/drools-wiring/pom.xml b/drools-wiring/pom.xml
index b4a11cc99fe..d6a958ce688 100644
--- a/drools-wiring/pom.xml
+++ b/drools-wiring/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-xml-support/pom.xml b/drools-xml-support/pom.xml
index 8a617cc402e..ca212a2c4b6 100644
--- a/drools-xml-support/pom.xml
+++ b/drools-xml-support/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-xml-support/src/test/java/org/drools/xml/support/CommandSerializationTest.java b/drools-xml-support/src/test/java/org/drools/xml/support/CommandSerializationTest.java
index 8f867a445df..eb2f89ed199 100644
--- a/drools-xml-support/src/test/java/org/drools/xml/support/CommandSerializationTest.java
+++ b/drools-xml-support/src/test/java/org/drools/xml/support/CommandSerializationTest.java
@@ -34,9 +34,9 @@
 import java.util.UUID;
 import java.util.regex.Pattern;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElements;
 
 import org.drools.core.ClassObjectFilter;
 import org.drools.core.ClassObjectSerializationFilter;
diff --git a/efesto/efesto-common-utils/pom.xml b/efesto/efesto-common-utils/pom.xml
index c5d9bdfb802..faff12a313a 100644
--- a/efesto/efesto-common-utils/pom.xml
+++ b/efesto/efesto-common-utils/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
   efesto-common-utils
diff --git a/efesto/efesto-core/efesto-common-api/pom.xml b/efesto/efesto-core/efesto-common-api/pom.xml
index 091dbf1ab58..e083232c2a4 100644
--- a/efesto/efesto-core/efesto-common-api/pom.xml
+++ b/efesto/efesto-core/efesto-common-api/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto-core
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
   efesto-common-api
diff --git a/efesto/efesto-core/efesto-common-core/pom.xml b/efesto/efesto-core/efesto-common-core/pom.xml
index 71eaba144c9..4488d7dc72c 100644
--- a/efesto/efesto-core/efesto-common-core/pom.xml
+++ b/efesto/efesto-core/efesto-common-core/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto-core
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
   efesto-common-core
diff --git a/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-api/pom.xml b/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-api/pom.xml
index 31fec980e81..cf10dbf0c45 100644
--- a/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-api/pom.xml
+++ b/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-api/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto-compilation-manager
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
   efesto-compilation-manager-api
diff --git a/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-core/pom.xml b/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-core/pom.xml
index d2f8105cd43..aa9e9108a39 100644
--- a/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-core/pom.xml
+++ b/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-core/pom.xml
@@ -39,7 +39,7 @@
   
     org.kie
     efesto-compilation-manager
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
   efesto-compilation-manager-core
diff --git a/efesto/efesto-core/efesto-compilation-manager/pom.xml b/efesto/efesto-core/efesto-compilation-manager/pom.xml
index 6ab2912c753..bed0864d9aa 100644
--- a/efesto/efesto-core/efesto-compilation-manager/pom.xml
+++ b/efesto/efesto-core/efesto-compilation-manager/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto-core
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   pom
 
diff --git a/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-api/pom.xml b/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-api/pom.xml
index f8e7ff014cb..d6cdc38cfc2 100644
--- a/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-api/pom.xml
+++ b/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-api/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto-runtime-manager
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
  efesto-runtime-manager-api
diff --git a/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/pom.xml b/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/pom.xml
index 9d49428f86d..6327eceeba9 100644
--- a/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/pom.xml
+++ b/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto-runtime-manager
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
   efesto-runtime-manager-core
diff --git a/efesto/efesto-core/efesto-runtime-manager/pom.xml b/efesto/efesto-core/efesto-runtime-manager/pom.xml
index b89f22d3c91..933b674841f 100644
--- a/efesto/efesto-core/efesto-runtime-manager/pom.xml
+++ b/efesto/efesto-core/efesto-runtime-manager/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto-core
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   pom
 
diff --git a/efesto/efesto-core/pom.xml b/efesto/efesto-core/pom.xml
index bdb5b5991d8..b4fbf23e982 100644
--- a/efesto/efesto-core/pom.xml
+++ b/efesto/efesto-core/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   pom
 
diff --git a/efesto/efesto-dependencies/pom.xml b/efesto/efesto-dependencies/pom.xml
index d4c9ef7817f..b5dac1332ca 100644
--- a/efesto/efesto-dependencies/pom.xml
+++ b/efesto/efesto-dependencies/pom.xml
@@ -25,7 +25,7 @@
   
     efesto
     org.kie
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/efesto/pom.xml b/efesto/pom.xml
index 4dd86f47e9c..8864c32572c 100644
--- a/efesto/pom.xml
+++ b/efesto/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     drools-build-parent
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/jpmml-migration-recipe/pom.xml b/jpmml-migration-recipe/pom.xml
index 81a0719f44a..af0a2fd98f3 100644
--- a/jpmml-migration-recipe/pom.xml
+++ b/jpmml-migration-recipe/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-api/pom.xml b/kie-api/pom.xml
index 183162d7f17..c39c6a0c4a1 100644
--- a/kie-api/pom.xml
+++ b/kie-api/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-api/src/main/java/org/kie/api/builder/model/KieBaseModel.java b/kie-api/src/main/java/org/kie/api/builder/model/KieBaseModel.java
index 2f451e17516..6898c2fc6c0 100644
--- a/kie-api/src/main/java/org/kie/api/builder/model/KieBaseModel.java
+++ b/kie-api/src/main/java/org/kie/api/builder/model/KieBaseModel.java
@@ -183,7 +183,7 @@ public interface KieBaseModel {
 
     /**
      * Returns the CDI scope of this KieBaseModel
-     * Default is javax.enterprise.context.ApplicationScoped
+     * Default is jakarta.enterprise.context.ApplicationScoped
      */
     String getScope();
 
diff --git a/kie-api/src/main/java/org/kie/api/builder/model/KieSessionModel.java b/kie-api/src/main/java/org/kie/api/builder/model/KieSessionModel.java
index ea96087e077..ef7f4b33fc1 100644
--- a/kie-api/src/main/java/org/kie/api/builder/model/KieSessionModel.java
+++ b/kie-api/src/main/java/org/kie/api/builder/model/KieSessionModel.java
@@ -100,7 +100,7 @@ public interface KieSessionModel {
     
     /**
      * Sets the CDI scope for this KieSessionModel
-     * Default is javax.enterprise.context.ApplicationScoped
+     * Default is jakarta.enterprise.context.ApplicationScoped
      */
     KieSessionModel setScope(String scope);
 
diff --git a/kie-api/src/main/java/org/kie/api/internal/utils/KieServiceLoader.java b/kie-api/src/main/java/org/kie/api/internal/utils/KieServiceLoader.java
index eba502dc9a2..82ae6d55a94 100644
--- a/kie-api/src/main/java/org/kie/api/internal/utils/KieServiceLoader.java
+++ b/kie-api/src/main/java/org/kie/api/internal/utils/KieServiceLoader.java
@@ -47,7 +47,7 @@  T lookup(Class serviceClass, String tag) {
     }
 
      T load(Class serviceClass, String tag) {
-        ServiceLoader loader = ServiceLoader.load(serviceClass, serviceClass.getClassLoader());
+        ServiceLoader loader = ServiceLoader.load(serviceClass);
         T service = null;
         for (T impl : loader) {
             if ( tag.equals(impl.serviceTag()) ) { // accept only services with the specified tag
diff --git a/kie-api/src/main/java/org/kie/api/pmml/AbstractOutput.java b/kie-api/src/main/java/org/kie/api/pmml/AbstractOutput.java
index 9c727454aca..6c41a29dfb5 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/AbstractOutput.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/AbstractOutput.java
@@ -18,11 +18,11 @@
  */
 package org.kie.api.pmml;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name="pmmlOutput")
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/kie-api/src/main/java/org/kie/api/pmml/DoubleFieldOutput.java b/kie-api/src/main/java/org/kie/api/pmml/DoubleFieldOutput.java
index 54fbc053050..73a2b9ce6e4 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/DoubleFieldOutput.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/DoubleFieldOutput.java
@@ -18,9 +18,9 @@
  */
 package org.kie.api.pmml;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name="value")
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/kie-api/src/main/java/org/kie/api/pmml/IntegerFieldOutput.java b/kie-api/src/main/java/org/kie/api/pmml/IntegerFieldOutput.java
index eebb975416d..82d2a1fb5c1 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/IntegerFieldOutput.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/IntegerFieldOutput.java
@@ -18,9 +18,9 @@
  */
 package org.kie.api.pmml;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name="value")
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/kie-api/src/main/java/org/kie/api/pmml/PMML4DataField.java b/kie-api/src/main/java/org/kie/api/pmml/PMML4DataField.java
index 63515db55ad..ebe972d8616 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/PMML4DataField.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/PMML4DataField.java
@@ -18,10 +18,10 @@
  */
 package org.kie.api.pmml;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import org.kie.api.definition.type.Role;
 import org.kie.api.definition.type.Role.Type;
diff --git a/kie-api/src/main/java/org/kie/api/pmml/PMML4OutputField.java b/kie-api/src/main/java/org/kie/api/pmml/PMML4OutputField.java
index cf5a1191036..8424cea547f 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/PMML4OutputField.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/PMML4OutputField.java
@@ -18,11 +18,11 @@
  */
 package org.kie.api.pmml;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import org.kie.api.definition.type.Role;
 import org.kie.api.definition.type.Role.Type;
diff --git a/kie-api/src/main/java/org/kie/api/pmml/PMML4Result.java b/kie-api/src/main/java/org/kie/api/pmml/PMML4Result.java
index d3421b3bff6..530096a9fe9 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/PMML4Result.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/PMML4Result.java
@@ -24,13 +24,13 @@
 import java.util.Map;
 import java.util.Optional;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.kie.api.definition.type.PropertyReactive;
 import org.slf4j.Logger;
diff --git a/kie-api/src/main/java/org/kie/api/pmml/PMMLRequestData.java b/kie-api/src/main/java/org/kie/api/pmml/PMMLRequestData.java
index 235999635f0..88cef278062 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/PMMLRequestData.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/PMMLRequestData.java
@@ -25,12 +25,12 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * This class provides a vanilla mechanism for sending data to
diff --git a/kie-api/src/main/java/org/kie/api/pmml/ParameterInfo.java b/kie-api/src/main/java/org/kie/api/pmml/ParameterInfo.java
index 2f83078daab..9bea0c17b27 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/ParameterInfo.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/ParameterInfo.java
@@ -18,12 +18,12 @@
  */
 package org.kie.api.pmml;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlType(name="ParameterInfo")
 @XmlAccessorType(XmlAccessType.NONE)
diff --git a/kie-api/src/main/java/org/kie/api/pmml/StringFieldOutput.java b/kie-api/src/main/java/org/kie/api/pmml/StringFieldOutput.java
index f21eb8951ad..d52c9a9e3f5 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/StringFieldOutput.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/StringFieldOutput.java
@@ -18,9 +18,9 @@
  */
 package org.kie.api.pmml;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name="value")
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/kie-api/src/main/java/org/kie/api/runtime/query/QueryContext.java b/kie-api/src/main/java/org/kie/api/runtime/query/QueryContext.java
index 024a9187638..77968f77a3a 100644
--- a/kie-api/src/main/java/org/kie/api/runtime/query/QueryContext.java
+++ b/kie-api/src/main/java/org/kie/api/runtime/query/QueryContext.java
@@ -20,11 +20,11 @@
 
 import java.io.Serializable;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlType(name="kieQueryContext")
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/kie-api/src/main/java/org/kie/api/task/model/Status.java b/kie-api/src/main/java/org/kie/api/task/model/Status.java
index 57a6b11146c..7dc485aa7d5 100644
--- a/kie-api/src/main/java/org/kie/api/task/model/Status.java
+++ b/kie-api/src/main/java/org/kie/api/task/model/Status.java
@@ -18,7 +18,7 @@
  */
 package org.kie.api.task.model;
 
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 @XmlType
diff --git a/kie-api/src/test/resources/org/kie/api/kmod1.xml b/kie-api/src/test/resources/org/kie/api/kmod1.xml
index 714fcc93ead..0db133f6f72 100644
--- a/kie-api/src/test/resources/org/kie/api/kmod1.xml
+++ b/kie-api/src/test/resources/org/kie/api/kmod1.xml
@@ -29,7 +29,7 @@
     
 
 
-    
+    
         
     
 
@@ -47,7 +47,7 @@
     
 
     
-        
+        
             
         
 
@@ -105,5 +105,3 @@
         
     
 
-
-
diff --git a/kie-archetypes/kie-drools-dmn-archetype/pom.xml b/kie-archetypes/kie-drools-dmn-archetype/pom.xml
index 6a8b8d044f5..031120f023e 100644
--- a/kie-archetypes/kie-drools-dmn-archetype/pom.xml
+++ b/kie-archetypes/kie-drools-dmn-archetype/pom.xml
@@ -24,7 +24,7 @@
   
     org.kie
     kie-archetypes
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
   kie-drools-dmn-archetype
diff --git a/kie-archetypes/kie-drools-exec-model-archetype/pom.xml b/kie-archetypes/kie-drools-exec-model-archetype/pom.xml
index 4a760e940b1..11492e34857 100644
--- a/kie-archetypes/kie-drools-exec-model-archetype/pom.xml
+++ b/kie-archetypes/kie-drools-exec-model-archetype/pom.xml
@@ -24,7 +24,7 @@
   
     org.kie
     kie-archetypes
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
   kie-drools-exec-model-archetype
diff --git a/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/pom.xml b/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/pom.xml
index e3819d8fc45..760bc16e05e 100644
--- a/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/pom.xml
+++ b/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/pom.xml
@@ -24,7 +24,7 @@
   
     org.kie
     kie-archetypes
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
   kie-drools-exec-model-ruleunit-archetype
diff --git a/kie-archetypes/kie-drools-yaml-archetype/pom.xml b/kie-archetypes/kie-drools-yaml-archetype/pom.xml
index 1a7b7c63880..e28761f13c2 100644
--- a/kie-archetypes/kie-drools-yaml-archetype/pom.xml
+++ b/kie-archetypes/kie-drools-yaml-archetype/pom.xml
@@ -24,7 +24,7 @@
   
     org.kie
     kie-archetypes
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
   kie-drools-yaml-archetype
diff --git a/kie-archetypes/pom.xml b/kie-archetypes/pom.xml
index cb5ef4806ce..db39906da60 100644
--- a/kie-archetypes/pom.xml
+++ b/kie-archetypes/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-ci/pom.xml b/kie-ci/pom.xml
index 8f5a8f84f77..3463106ca1a 100644
--- a/kie-ci/pom.xml
+++ b/kie-ci/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-dmn/kie-dmn-api/pom.xml b/kie-dmn/kie-dmn-api/pom.xml
index f0f678c47d2..29dc0ce3f5f 100644
--- a/kie-dmn/kie-dmn-api/pom.xml
+++ b/kie-dmn/kie-dmn-api/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     kie-dmn
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
   kie-dmn-api
diff --git a/kie-dmn/kie-dmn-backend/pom.xml b/kie-dmn/kie-dmn-backend/pom.xml
index 0eabb95f9f9..46414eb9160 100644
--- a/kie-dmn/kie-dmn-backend/pom.xml
+++ b/kie-dmn/kie-dmn-backend/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     kie-dmn
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
   kie-dmn-backend
diff --git a/kie-dmn/kie-dmn-core-jsr223-jq/pom.xml b/kie-dmn/kie-dmn-core-jsr223-jq/pom.xml
index 661b87db6da..903328c2a2c 100644
--- a/kie-dmn/kie-dmn-core-jsr223-jq/pom.xml
+++ b/kie-dmn/kie-dmn-core-jsr223-jq/pom.xml
@@ -23,7 +23,7 @@
     
         org.kie
         kie-dmn
-        8.46.0-SNAPSHOT
+        9.46.0-SNAPSHOT
     
     kie-dmn-core-jsr223-jq
     KIE :: Decision Model Notation :: JSR-223 JQ ScriptEngine
diff --git a/kie-dmn/kie-dmn-core-jsr223/pom.xml b/kie-dmn/kie-dmn-core-jsr223/pom.xml
index 9bdd20601f7..1e5d21c5206 100644
--- a/kie-dmn/kie-dmn-core-jsr223/pom.xml
+++ b/kie-dmn/kie-dmn-core-jsr223/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   kie-dmn-core-jsr223
   KIE :: Decision Model Notation :: Core JSR-223
diff --git a/kie-dmn/kie-dmn-core/pom.xml b/kie-dmn/kie-dmn-core/pom.xml
index 2add1f66756..7eae5d4dedd 100644
--- a/kie-dmn/kie-dmn-core/pom.xml
+++ b/kie-dmn/kie-dmn-core/pom.xml
@@ -27,7 +27,7 @@
   
     kie-dmn
     org.kie
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
   kie-dmn-core
diff --git a/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/DMNImportPMMLInfo.java b/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/DMNImportPMMLInfo.java
index cf32659cdcc..bf47f624c0c 100644
--- a/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/DMNImportPMMLInfo.java
+++ b/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/DMNImportPMMLInfo.java
@@ -64,7 +64,7 @@ public static Either from(InputStream is, DMNCompi
             final PMML pmml = org.jpmml.model.PMMLUtil.unmarshal(is);
             PMMLHeaderInfo h = PMMLInfo.pmmlToHeaderInfo(pmml, pmml.getHeader());
             for (DataField df : pmml.getDataDictionary().getDataFields()) {
-                String dfName = df.getName().getValue();
+                String dfName =df.getName();
                 BuiltInType ft = getBuiltInTypeByDataType(df.getDataType());
                 List helperFEELProfiles = cc.getFeelProfiles();
                 DMNFEELHelper feel = new DMNFEELHelper(cc.getRootClassLoader(), helperFEELProfiles);
@@ -120,7 +120,7 @@ private static void registerOutputFieldType(Model pmmlModel, DMNModelImpl dmnMod
                 // register ., being a composite type of the different model outputs fields
                 Map typeMap = new HashMap<>();
                 outputFields.stream().forEach(field -> {
-                    String fieldName = field.getName().getValue();
+                    String fieldName =field.getName();
                     BuiltInType ft = getBuiltInTypeByDataType(field.getDataType());
                     DMNType type = new SimpleTypeImpl(i.getNamespace(), fieldName, null, false, null, dmnModel.getTypeRegistry().resolveType(dmnModel.getDefinitions().getURIFEEL(), ft.getName()), ft);
                     typeMap.put(fieldName, type);
diff --git a/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/PMMLInfo.java b/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/PMMLInfo.java
index e51f9a16ce8..179cbf1d2ab 100644
--- a/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/PMMLInfo.java
+++ b/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/PMMLInfo.java
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 
 import org.dmg.pmml.Extension;
 import org.dmg.pmml.Header;
@@ -75,15 +75,15 @@ public static PMMLModelInfo pmmlToModelInfo(Model pm) {
         miningSchema.getMiningFields()
                     .stream()
                     .filter(mf -> mf.getUsageType() == UsageType.ACTIVE)
-                    .forEach(fn -> inputFields.add(fn.getName().getValue()));
+                    .forEach(fn -> inputFields.add(fn.getName()));
         Collection targetFields = new ArrayList<>();
         miningSchema.getMiningFields()
                     .stream()
                     .filter(mf -> mf.getUsageType() == UsageType.PREDICTED)
-                    .forEach(fn -> targetFields.add(fn.getName().getValue()));
+                    .forEach(fn -> targetFields.add(fn.getName()));
         Collection outputFields = new ArrayList<>();
         if (pm.getOutput() != null && pm.getOutput().getOutputFields() != null) {
-            pm.getOutput().getOutputFields().forEach(of -> outputFields.add(of.getName().getValue()));
+            pm.getOutput().getOutputFields().forEach(of -> outputFields.add(of.getName()));
         }
         return new PMMLModelInfo(pm.getModelName(), pm.getClass().getSimpleName(), inputFields, targetFields, outputFields);
     }
diff --git a/kie-dmn/kie-dmn-feel/pom.xml b/kie-dmn/kie-dmn-feel/pom.xml
index 4c38b6a7336..25cd680ffcf 100644
--- a/kie-dmn/kie-dmn-feel/pom.xml
+++ b/kie-dmn/kie-dmn-feel/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     kie-dmn
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
   kie-dmn-feel
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/util/Generated.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/util/Generated.java
index d81ed31e148..0d81acb15a5 100644
--- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/util/Generated.java
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/util/Generated.java
@@ -34,7 +34,7 @@
 /**
  * For internal use for the scope of https://github.com/jacoco/jacoco/issues/731
  * and coverage analysis.
- * Similar to {@link javax.annotation.Generated}, but with RetentionPolicy.CLASS
+ * Similar to {@link jakarta.annotation.Generated}, but with RetentionPolicy.CLASS
  */
 @Retention(RetentionPolicy.CLASS)
 @Target({PACKAGE, TYPE, ANNOTATION_TYPE, METHOD, CONSTRUCTOR, FIELD,
diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/jandex/AbstractJandexTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/jandex/AbstractJandexTest.java
index d5bc785f513..046555611e9 100644
--- a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/jandex/AbstractJandexTest.java
+++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/jandex/AbstractJandexTest.java
@@ -31,9 +31,9 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
-import javax.json.bind.JsonbConfig;
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+import jakarta.json.bind.JsonbConfig;
 
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
diff --git a/kie-dmn/kie-dmn-legacy-tests/pom.xml b/kie-dmn/kie-dmn-legacy-tests/pom.xml
index a47b9a64400..16a31d57fd1 100644
--- a/kie-dmn/kie-dmn-legacy-tests/pom.xml
+++ b/kie-dmn/kie-dmn-legacy-tests/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   kie-dmn-legacy-tests
   
@@ -123,11 +123,6 @@
       jaxb-core
       provided
     
-    
-      com.sun.xml.bind
-      jaxb-impl
-      provided
-    
     
       jakarta.xml.bind
       jakarta.xml.bind-api
diff --git a/kie-dmn/kie-dmn-model/pom.xml b/kie-dmn/kie-dmn-model/pom.xml
index 2cafe5c03ad..4b9e1ee9f9f 100644
--- a/kie-dmn/kie-dmn-model/pom.xml
+++ b/kie-dmn/kie-dmn-model/pom.xml
@@ -27,7 +27,7 @@
   
     kie-dmn
     org.kie
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
   kie-dmn-model
diff --git a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DMNDiagram.java b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DMNDiagram.java
index 73c6e9a0dcc..5afed613ea2 100644
--- a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DMNDiagram.java
+++ b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DMNDiagram.java
@@ -21,7 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 
 public class DMNDiagram extends Diagram implements org.kie.dmn.model.api.dmndi.DMNDiagram {
 
diff --git a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DiagramElement.java b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DiagramElement.java
index 6c7d93324b3..7d0166c1cfd 100644
--- a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DiagramElement.java
+++ b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DiagramElement.java
@@ -21,7 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 
 import org.kie.dmn.model.v1_2.KieDMNModelInstrumentedBase;
 
diff --git a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DMNDiagram.java b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DMNDiagram.java
index 07d10ee3b74..56c12fed1f6 100644
--- a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DMNDiagram.java
+++ b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DMNDiagram.java
@@ -21,7 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 
 public class DMNDiagram extends Diagram implements org.kie.dmn.model.api.dmndi.DMNDiagram {
 
diff --git a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DiagramElement.java b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DiagramElement.java
index 3a1d68e30e3..a05148e753c 100644
--- a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DiagramElement.java
+++ b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DiagramElement.java
@@ -21,7 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 
 import org.kie.dmn.model.v1_3.KieDMNModelInstrumentedBase;
 
diff --git a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/jandex/KieDMNModelJandexTest.java b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/jandex/KieDMNModelJandexTest.java
index fec094247e7..44999d32c37 100644
--- a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/jandex/KieDMNModelJandexTest.java
+++ b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/jandex/KieDMNModelJandexTest.java
@@ -31,9 +31,9 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
-import javax.json.bind.JsonbConfig;
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+import jakarta.json.bind.JsonbConfig;
 
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
diff --git a/kie-dmn/kie-dmn-openapi/pom.xml b/kie-dmn/kie-dmn-openapi/pom.xml
index 27a7588cf67..b63ab9f81f3 100644
--- a/kie-dmn/kie-dmn-openapi/pom.xml
+++ b/kie-dmn/kie-dmn-openapi/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   kie-dmn-openapi
   
@@ -81,11 +81,6 @@
       jaxb-core
       provided
     
-    
-      com.sun.xml.bind
-      jaxb-impl
-      provided
-    
     
       jakarta.xml.bind
       jakarta.xml.bind-api
diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests-trusty/pom.xml b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests-trusty/pom.xml
index 36e719f5fed..64dacbfe40f 100644
--- a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests-trusty/pom.xml
+++ b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests-trusty/pom.xml
@@ -25,7 +25,7 @@
   
     kie-dmn-pmml-tests-parent
     org.kie
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/pom.xml b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/pom.xml
index a00be0eb217..9da9e7d335e 100644
--- a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/pom.xml
+++ b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/pom.xml
@@ -25,7 +25,7 @@
   
     kie-dmn-pmml-tests-parent
     org.kie
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
@@ -85,11 +85,6 @@
       jaxb-core
       provided
     
-    
-      com.sun.xml.bind
-      jaxb-impl
-      provided
-    
     
       jakarta.xml.bind
       jakarta.xml.bind-api
diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/pom.xml b/kie-dmn/kie-dmn-pmml-tests-parent/pom.xml
index 08a405f28fe..db909667c2b 100644
--- a/kie-dmn/kie-dmn-pmml-tests-parent/pom.xml
+++ b/kie-dmn/kie-dmn-pmml-tests-parent/pom.xml
@@ -25,7 +25,7 @@
   
     kie-dmn
     org.kie
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
   pom
diff --git a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn-cli/pom.xml b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn-cli/pom.xml
index 468c7ea1b5e..290e81ebff8 100644
--- a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn-cli/pom.xml
+++ b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn-cli/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn-ruleset2dmn-parent
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   kie-dmn-ruleset2dmn-cli
   
diff --git a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/pom.xml b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/pom.xml
index 29d70f61394..a49b93b00fb 100644
--- a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/pom.xml
+++ b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn-ruleset2dmn-parent
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   kie-dmn-ruleset2dmn
 
diff --git a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/Converter.java b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/Converter.java
index fcfde77a26e..06dd73a2396 100644
--- a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/Converter.java
+++ b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/Converter.java
@@ -38,7 +38,6 @@
 import org.dmg.pmml.DataDictionary;
 import org.dmg.pmml.DataField;
 import org.dmg.pmml.DataType;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.Model;
 import org.dmg.pmml.PMML;
 import org.dmg.pmml.SimplePredicate;
@@ -145,7 +144,7 @@ public static String parse(String dmnModelName, InputStream is) throws Exception
             for (String input : usedPredictors) {
                 List predicatesForInput = r.map.get(input);
                 if (predicatesForInput != null && !predicatesForInput.isEmpty())  {
-                    FieldName fnLookup = FieldName.create(input);
+                     String fnLookup =input;
                     Optional df = pmml.getDataDictionary().getDataFields().stream().filter(x-> x.getName().equals(fnLookup)).findFirst();
                     UnaryTests ut = processSimplePredicateUnaryOrBinary(predicatesForInput, df);
                     if (ut.getText().startsWith("\"") && ut.getText().endsWith("\"")) {
@@ -197,9 +196,9 @@ public static String parse(String dmnModelName, InputStream is) throws Exception
         }
 
         for (DataField df : pmml.getDataDictionary().getDataFields()) {
-            if (df.getDataType() == DataType.STRING && predictorsLoVs.containsKey(df.getName().getValue())) {
+            if (df.getDataType() == DataType.STRING && predictorsLoVs.containsKey(df.getName())) {
                 for (Value value : df.getValues()) {
-                    predictorsLoVs.get(df.getName().getValue()).add("\""+value.getValue().toString()+"\"");
+                    predictorsLoVs.get(df.getName()).add("\""+value.getValue().toString()+"\"");
                 }
             }
         }
@@ -478,7 +477,7 @@ private static void appendInputData(Definitions definitions, PMML pmml, Set opt = dd.getDataFields().stream().filter(df -> df.getName().equals(lookup)).findFirst();
         if (opt.isEmpty()) {
             return "Any";
diff --git a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/SimpleRuleRow.java b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/SimpleRuleRow.java
index b5fd23ed65b..9d789df4a46 100644
--- a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/SimpleRuleRow.java
+++ b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/SimpleRuleRow.java
@@ -39,7 +39,7 @@ public SimpleRuleRow(SimpleRule r) {
         Predicate rootPredicate = r.getPredicate();
         if (rootPredicate instanceof SimplePredicate) {
             SimplePredicate sp = (SimplePredicate) rootPredicate;
-            map.computeIfAbsent(sp.getField().getValue(), k -> new ArrayList()).add(sp);
+            map.computeIfAbsent(sp.getField(), k -> new ArrayList()).add(sp);
         } else {
             if (!(rootPredicate instanceof CompoundPredicate)) {
                 throw new UnsupportedOperationException("Was expecting a CompoundPredicate, found: "+rootPredicate.getClass());
@@ -50,7 +50,7 @@ public SimpleRuleRow(SimpleRule r) {
             }
             for (Predicate c : cPredicate.getPredicates()) {
                 SimplePredicate sp = (SimplePredicate) c;
-                map.computeIfAbsent(sp.getField().getValue(), k -> new ArrayList()).add(sp);
+                map.computeIfAbsent(sp.getField(), k -> new ArrayList()).add(sp);
             }
         }
     }
diff --git a/kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml b/kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml
index 6b02aa7a2b2..597b84a0e64 100644
--- a/kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml
+++ b/kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   kie-dmn-ruleset2dmn-parent
   pom
diff --git a/kie-dmn/kie-dmn-signavio/pom.xml b/kie-dmn/kie-dmn-signavio/pom.xml
index b6754c2f392..c4f4a9efbb3 100644
--- a/kie-dmn/kie-dmn-signavio/pom.xml
+++ b/kie-dmn/kie-dmn-signavio/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   kie-dmn-signavio
   
diff --git a/kie-dmn/kie-dmn-tck/pom.xml b/kie-dmn/kie-dmn-tck/pom.xml
index 81121a0c9b8..dbe80e03504 100644
--- a/kie-dmn/kie-dmn-tck/pom.xml
+++ b/kie-dmn/kie-dmn-tck/pom.xml
@@ -26,7 +26,7 @@
   
     kie-dmn
     org.kie
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
   pom
diff --git a/kie-dmn/kie-dmn-trisotech/pom.xml b/kie-dmn/kie-dmn-trisotech/pom.xml
index fde1d5226cd..6ec92140996 100644
--- a/kie-dmn/kie-dmn-trisotech/pom.xml
+++ b/kie-dmn/kie-dmn-trisotech/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-dmn
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   kie-dmn-trisotech
 
diff --git a/kie-dmn/kie-dmn-validation-bootstrap/pom.xml b/kie-dmn/kie-dmn-validation-bootstrap/pom.xml
index 5e8ee5f2f9d..3d78022cbbd 100644
--- a/kie-dmn/kie-dmn-validation-bootstrap/pom.xml
+++ b/kie-dmn/kie-dmn-validation-bootstrap/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-dmn
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   kie-dmn-validation-bootstrap
 
diff --git a/kie-dmn/kie-dmn-validation/pom.xml b/kie-dmn/kie-dmn-validation/pom.xml
index 727f8aa7a68..5ab7798b378 100644
--- a/kie-dmn/kie-dmn-validation/pom.xml
+++ b/kie-dmn/kie-dmn-validation/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   kie-dmn-validation
     jar
diff --git a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/MCDC2TCKGenerator.java b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/MCDC2TCKGenerator.java
index c9ef7d523df..a33228f2c20 100644
--- a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/MCDC2TCKGenerator.java
+++ b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/MCDC2TCKGenerator.java
@@ -23,10 +23,10 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
 
 import org.kie.dmn.model.api.DecisionTable;
 import org.kie.dmn.validation.dtanalysis.mcdc.MCDCAnalyser.PosNegBlock;
diff --git a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ObjectFactory.java b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ObjectFactory.java
index 2bf017df45a..096c084b795 100644
--- a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ObjectFactory.java
+++ b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ObjectFactory.java
@@ -20,9 +20,9 @@
 package org.kie.dmn.validation.dtanalysis.mcdc.dmntck;
 
 import org.kie.dmn.feel.util.Generated;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 
 
diff --git a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCaseType.java b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCaseType.java
index cbed707d7f4..8d47bb97734 100644
--- a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCaseType.java
+++ b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCaseType.java
@@ -20,9 +20,9 @@
 package org.kie.dmn.validation.dtanalysis.mcdc.dmntck;
 
 import org.kie.dmn.feel.util.Generated;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCases.java b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCases.java
index bad57fe70d5..963513552ee 100644
--- a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCases.java
+++ b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCases.java
@@ -25,16 +25,16 @@
 import java.util.Map;
 
 import org.kie.dmn.feel.util.Generated;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyAttribute;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
 
 import org.w3c.dom.Element;
diff --git a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ValueType.java b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ValueType.java
index 4d9b58d9a1a..e06798a5f03 100644
--- a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ValueType.java
+++ b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ValueType.java
@@ -25,17 +25,17 @@
 import java.util.Map;
 
 import org.kie.dmn.feel.util.Generated;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyAttribute;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
 
 import org.w3c.dom.Element;
diff --git a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/package-info.java b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/package-info.java
index feed0d61962..9d09b429e7c 100644
--- a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/package-info.java
+++ b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/package-info.java
@@ -17,9 +17,9 @@
  * under the License.
  */
 // Copied under Apache License from https://github.com/dmn-tck/tck/blob/8c23dc13caa508a33d11b47cca318d7c3a3ca2fc/LICENSE-ASL-2.0.txt
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.omg.org/spec/DMN/20160719/testcase",
-                                     elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED,
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.omg.org/spec/DMN/20160719/testcase",
+                                     elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED,
                                      xmlns = {@XmlNs(prefix = "tc", namespaceURI = "http://www.omg.org/spec/DMN/20160719/testcase")})
 package org.kie.dmn.validation.dtanalysis.mcdc.dmntck;
 
-import javax.xml.bind.annotation.XmlNs;
+import jakarta.xml.bind.annotation.XmlNs;
diff --git a/kie-dmn/kie-dmn-xls2dmn-cli/pom.xml b/kie-dmn/kie-dmn-xls2dmn-cli/pom.xml
index 354a8bb822f..3f742cf8eb8 100644
--- a/kie-dmn/kie-dmn-xls2dmn-cli/pom.xml
+++ b/kie-dmn/kie-dmn-xls2dmn-cli/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   kie-dmn-xls2dmn-cli
   jar
diff --git a/kie-dmn/pom.xml b/kie-dmn/pom.xml
index f0010781fca..47e3bdf220e 100644
--- a/kie-dmn/pom.xml
+++ b/kie-dmn/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-drl/kie-drl-api/pom.xml b/kie-drl/kie-drl-api/pom.xml
index c7e7b9fffd9..3dca87da619 100644
--- a/kie-drl/kie-drl-api/pom.xml
+++ b/kie-drl/kie-drl-api/pom.xml
@@ -25,7 +25,7 @@
   
     kie-drl
     org.kie
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-drl/kie-drl-compilation-common/pom.xml b/kie-drl/kie-drl-compilation-common/pom.xml
index 407d7325931..ca1074f6faa 100644
--- a/kie-drl/kie-drl-compilation-common/pom.xml
+++ b/kie-drl/kie-drl-compilation-common/pom.xml
@@ -25,7 +25,7 @@
   
     kie-drl
     org.kie
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/kie-drl-kiesession-local-runtime/pom.xml b/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/kie-drl-kiesession-local-runtime/pom.xml
index 894441b5266..0141af12e4d 100644
--- a/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/kie-drl-kiesession-local-runtime/pom.xml
+++ b/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/kie-drl-kiesession-local-runtime/pom.xml
@@ -25,7 +25,7 @@
   
     kie-drl-kiesession-local
     org.kie
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/pom.xml b/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/pom.xml
index 5bfe225af2d..474b22726ed 100644
--- a/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/pom.xml
+++ b/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/pom.xml
@@ -25,7 +25,7 @@
     
         kie-drl-implementations
         org.kie
-        8.46.0-SNAPSHOT
+        9.46.0-SNAPSHOT
     
     4.0.0
     pom
diff --git a/kie-drl/kie-drl-implementations/kie-drl-map-input/kie-drl-map-input-runtime/pom.xml b/kie-drl/kie-drl-implementations/kie-drl-map-input/kie-drl-map-input-runtime/pom.xml
index a50217799a9..ea2da4e4577 100644
--- a/kie-drl/kie-drl-implementations/kie-drl-map-input/kie-drl-map-input-runtime/pom.xml
+++ b/kie-drl/kie-drl-implementations/kie-drl-map-input/kie-drl-map-input-runtime/pom.xml
@@ -26,7 +26,7 @@
   
     kie-drl-map-input
     org.kie
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
 
   kie-drl-map-input-runtime
diff --git a/kie-drl/kie-drl-implementations/kie-drl-map-input/pom.xml b/kie-drl/kie-drl-implementations/kie-drl-map-input/pom.xml
index 9189bcb0518..5f793fb0208 100644
--- a/kie-drl/kie-drl-implementations/kie-drl-map-input/pom.xml
+++ b/kie-drl/kie-drl-implementations/kie-drl-map-input/pom.xml
@@ -25,7 +25,7 @@
     
         kie-drl-implementations
         org.kie
-        8.46.0-SNAPSHOT
+        9.46.0-SNAPSHOT
     
     4.0.0
     pom
diff --git a/kie-drl/kie-drl-implementations/pom.xml b/kie-drl/kie-drl-implementations/pom.xml
index 6530d40440e..a6555a95a83 100644
--- a/kie-drl/kie-drl-implementations/pom.xml
+++ b/kie-drl/kie-drl-implementations/pom.xml
@@ -27,7 +27,7 @@
     
         kie-drl
         org.kie
-        8.46.0-SNAPSHOT
+        9.46.0-SNAPSHOT
     
 
     KIE :: DRL :: Implementations
diff --git a/kie-drl/kie-drl-runtime-common/pom.xml b/kie-drl/kie-drl-runtime-common/pom.xml
index 6d6d19759fb..0099f5638c9 100644
--- a/kie-drl/kie-drl-runtime-common/pom.xml
+++ b/kie-drl/kie-drl-runtime-common/pom.xml
@@ -25,7 +25,7 @@
   
     kie-drl
     org.kie
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-drl/kie-drl-tests-without-index-file/pom.xml b/kie-drl/kie-drl-tests-without-index-file/pom.xml
index f257190ff59..fe73310120e 100644
--- a/kie-drl/kie-drl-tests-without-index-file/pom.xml
+++ b/kie-drl/kie-drl-tests-without-index-file/pom.xml
@@ -25,7 +25,7 @@
   
     kie-drl
     org.kie
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-drl/kie-drl-tests/pom.xml b/kie-drl/kie-drl-tests/pom.xml
index 00d65fe85d4..3c535f5a81f 100644
--- a/kie-drl/kie-drl-tests/pom.xml
+++ b/kie-drl/kie-drl-tests/pom.xml
@@ -25,7 +25,7 @@
   
     kie-drl
     org.kie
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-drl/pom.xml b/kie-drl/pom.xml
index 3ce72ba34a7..3631ff868e5 100644
--- a/kie-drl/pom.xml
+++ b/kie-drl/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     drools-build-parent
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-internal/pom.xml b/kie-internal/pom.xml
index 85f776de10f..64da37681cc 100644
--- a/kie-internal/pom.xml
+++ b/kie-internal/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
@@ -90,16 +90,6 @@
       jaxb-xjc
       provided
     
-    
-      com.sun.xml.bind
-      jaxb-core
-       provided
-    
-    
-      com.sun.xml.bind
-      jaxb-impl
-      provided
-    
 
     
       jakarta.xml.bind
@@ -113,6 +103,13 @@
       provided
     
 
+    
+    
+      org.glassfish.jaxb
+      jaxb-runtime
+      provided
+    
+
     
       ch.qos.logback
       logback-classic
diff --git a/kie-internal/src/main/java/org/kie/internal/builder/help/DroolsJaxbHelperProvider.java b/kie-internal/src/main/java/org/kie/internal/builder/help/DroolsJaxbHelperProvider.java
index 5a70bf3a038..63f6154f20c 100644
--- a/kie-internal/src/main/java/org/kie/internal/builder/help/DroolsJaxbHelperProvider.java
+++ b/kie-internal/src/main/java/org/kie/internal/builder/help/DroolsJaxbHelperProvider.java
@@ -21,8 +21,8 @@
 import java.io.IOException;
 import java.util.Map;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 
 import com.sun.tools.xjc.Options;
 import org.kie.api.KieBase;
diff --git a/kie-internal/src/main/java/org/kie/internal/builder/help/KnowledgeBuilderHelper.java b/kie-internal/src/main/java/org/kie/internal/builder/help/KnowledgeBuilderHelper.java
index d60aa2bcccc..77728250818 100644
--- a/kie-internal/src/main/java/org/kie/internal/builder/help/KnowledgeBuilderHelper.java
+++ b/kie-internal/src/main/java/org/kie/internal/builder/help/KnowledgeBuilderHelper.java
@@ -22,8 +22,8 @@
 import java.util.Collections;
 import java.util.Map;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 
 import com.sun.tools.xjc.Options;
 import org.kie.api.KieBase;
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/CorrelationKeyXmlAdapter.java b/kie-internal/src/main/java/org/kie/internal/jaxb/CorrelationKeyXmlAdapter.java
index a66ab3e1559..c859e47bf83 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/CorrelationKeyXmlAdapter.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/CorrelationKeyXmlAdapter.java
@@ -24,7 +24,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 import org.kie.internal.KieInternalServices;
 import org.kie.internal.process.CorrelationKey;
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateTimeXmlAdapter.java b/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateTimeXmlAdapter.java
index b74e99d2f50..880169eef4b 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateTimeXmlAdapter.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateTimeXmlAdapter.java
@@ -24,7 +24,7 @@
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.temporal.ChronoField;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 public class LocalDateTimeXmlAdapter extends XmlAdapter {
 
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateXmlAdapter.java b/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateXmlAdapter.java
index fb733055ac1..4ae10ef641a 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateXmlAdapter.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateXmlAdapter.java
@@ -21,7 +21,7 @@
 import java.time.DateTimeException;
 import java.time.LocalDate;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 public class LocalDateXmlAdapter extends XmlAdapter {
 
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/LocalTimeXmlAdapter.java b/kie-internal/src/main/java/org/kie/internal/jaxb/LocalTimeXmlAdapter.java
index 9c9f66d6184..b269f3fd6ca 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/LocalTimeXmlAdapter.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/LocalTimeXmlAdapter.java
@@ -24,7 +24,7 @@
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.temporal.ChronoField;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 public class LocalTimeXmlAdapter extends XmlAdapter {
 
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/OffsetDateTimeXmlAdapter.java b/kie-internal/src/main/java/org/kie/internal/jaxb/OffsetDateTimeXmlAdapter.java
index 705641b07c9..52e5d2933ca 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/OffsetDateTimeXmlAdapter.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/OffsetDateTimeXmlAdapter.java
@@ -24,7 +24,7 @@
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.temporal.ChronoField;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 public class OffsetDateTimeXmlAdapter extends XmlAdapter {
 
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueEntry.java b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueEntry.java
index f74cfffc611..967d0070a44 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueEntry.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueEntry.java
@@ -20,12 +20,12 @@
 
 import java.util.Map.Entry;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlValue;
 
 
 @XmlType
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMap.java b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMap.java
index df560c3a853..6436952334c 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMap.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMap.java
@@ -26,10 +26,10 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import static org.kie.internal.jaxb.StringKeyObjectValueMapXmlAdapter.createJaxbStringObjectMapEntry;
 import static org.kie.internal.jaxb.StringKeyObjectValueMapXmlAdapter.deserializeObject;
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMapXmlAdapter.java b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMapXmlAdapter.java
index bb2aa1f32af..34807c6d2a6 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMapXmlAdapter.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMapXmlAdapter.java
@@ -28,7 +28,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueEntry.java b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueEntry.java
index 88c9abcd742..6a3bc0a122b 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueEntry.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueEntry.java
@@ -18,10 +18,10 @@
  */
 package org.kie.internal.jaxb;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 @XmlType
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMap.java b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMap.java
index 8561a4f2666..cac273d1262 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMap.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMap.java
@@ -26,10 +26,10 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * This implements {@link Map} in order to fool JSON..
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMapXmlAdapter.java b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMapXmlAdapter.java
index e996b22b08e..ec05798634b 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMapXmlAdapter.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMapXmlAdapter.java
@@ -22,7 +22,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 /**
  * This is a {@link XmlAdapter} for mapping Map<String, String> instances
diff --git a/kie-internal/src/main/java/org/kie/internal/query/QueryContext.java b/kie-internal/src/main/java/org/kie/internal/query/QueryContext.java
index de305a5d934..125af0455ab 100644
--- a/kie-internal/src/main/java/org/kie/internal/query/QueryContext.java
+++ b/kie-internal/src/main/java/org/kie/internal/query/QueryContext.java
@@ -18,9 +18,9 @@
  */
 package org.kie.internal.query;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlType
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/kie-internal/src/main/java/org/kie/internal/query/QueryFilter.java b/kie-internal/src/main/java/org/kie/internal/query/QueryFilter.java
index 2e514b2534c..5967f783934 100644
--- a/kie-internal/src/main/java/org/kie/internal/query/QueryFilter.java
+++ b/kie-internal/src/main/java/org/kie/internal/query/QueryFilter.java
@@ -22,9 +22,9 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.kie.internal.jaxb.StringKeyObjectValueMapXmlAdapter;
 
diff --git a/kie-internal/src/main/java/org/kie/internal/query/data/QueryData.java b/kie-internal/src/main/java/org/kie/internal/query/data/QueryData.java
index 3196813c535..6460e835435 100644
--- a/kie-internal/src/main/java/org/kie/internal/query/data/QueryData.java
+++ b/kie-internal/src/main/java/org/kie/internal/query/data/QueryData.java
@@ -18,10 +18,10 @@
  */
 package org.kie.internal.query.data;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.kie.internal.query.QueryContext;
 
diff --git a/kie-internal/src/main/java/org/kie/internal/query/data/QueryParameters.java b/kie-internal/src/main/java/org/kie/internal/query/data/QueryParameters.java
index c68575a7846..b6d2272d679 100644
--- a/kie-internal/src/main/java/org/kie/internal/query/data/QueryParameters.java
+++ b/kie-internal/src/main/java/org/kie/internal/query/data/QueryParameters.java
@@ -24,12 +24,12 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.kie.internal.jaxb.StringKeyObjectValueMapXmlAdapter;
 
diff --git a/kie-internal/src/main/java/org/kie/internal/runtime/conf/DeploymentDescriptor.java b/kie-internal/src/main/java/org/kie/internal/runtime/conf/DeploymentDescriptor.java
index 65a87112256..1a893de3365 100644
--- a/kie-internal/src/main/java/org/kie/internal/runtime/conf/DeploymentDescriptor.java
+++ b/kie-internal/src/main/java/org/kie/internal/runtime/conf/DeploymentDescriptor.java
@@ -20,8 +20,8 @@
 
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.kie.api.remote.Remotable;
 
diff --git a/kie-internal/src/main/java/org/kie/internal/runtime/conf/MergeMode.java b/kie-internal/src/main/java/org/kie/internal/runtime/conf/MergeMode.java
index 1ac2d744d3d..97c512830da 100644
--- a/kie-internal/src/main/java/org/kie/internal/runtime/conf/MergeMode.java
+++ b/kie-internal/src/main/java/org/kie/internal/runtime/conf/MergeMode.java
@@ -18,7 +18,7 @@
  */
 package org.kie.internal.runtime.conf;
 
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * Defines merging strategy of two descriptors
diff --git a/kie-internal/src/main/java/org/kie/internal/runtime/conf/NamedObjectModel.java b/kie-internal/src/main/java/org/kie/internal/runtime/conf/NamedObjectModel.java
index 8421eeda8ee..6e7d6ebfb34 100644
--- a/kie-internal/src/main/java/org/kie/internal/runtime/conf/NamedObjectModel.java
+++ b/kie-internal/src/main/java/org/kie/internal/runtime/conf/NamedObjectModel.java
@@ -18,11 +18,11 @@
  */
 package org.kie.internal.runtime.conf;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
 
 /**
  * Extension of ObjectModel that provides unique name for the object model
diff --git a/kie-internal/src/main/java/org/kie/internal/runtime/conf/ObjectModel.java b/kie-internal/src/main/java/org/kie/internal/runtime/conf/ObjectModel.java
index 71306f0345c..6268d19d31f 100644
--- a/kie-internal/src/main/java/org/kie/internal/runtime/conf/ObjectModel.java
+++ b/kie-internal/src/main/java/org/kie/internal/runtime/conf/ObjectModel.java
@@ -23,12 +23,12 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
 /**
  * Object model that defines how and of what type the object instance should be created.

  * The how is actually delegated to resolved implementation ObjectModelResolver
diff --git a/kie-internal/src/main/java/org/kie/internal/runtime/conf/RuntimeStrategy.java b/kie-internal/src/main/java/org/kie/internal/runtime/conf/RuntimeStrategy.java
index 7356288e5e9..3389c78f73d 100644
--- a/kie-internal/src/main/java/org/kie/internal/runtime/conf/RuntimeStrategy.java
+++ b/kie-internal/src/main/java/org/kie/internal/runtime/conf/RuntimeStrategy.java
@@ -18,7 +18,7 @@
  */
 package org.kie.internal.runtime.conf;
 
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlType
 public enum RuntimeStrategy {
diff --git a/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/DeploymentDescriptorIO.java b/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/DeploymentDescriptorIO.java
index 87ff5dd215e..d9917b3d1b4 100644
--- a/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/DeploymentDescriptorIO.java
+++ b/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/DeploymentDescriptorIO.java
@@ -23,10 +23,10 @@
 import java.net.URL;
 
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 
diff --git a/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/DeploymentDescriptorImpl.java b/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/DeploymentDescriptorImpl.java
index a93615ec76b..d5281d43e93 100644
--- a/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/DeploymentDescriptorImpl.java
+++ b/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/DeploymentDescriptorImpl.java
@@ -29,13 +29,13 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlTransient;
 
 import org.kie.internal.runtime.conf.AuditMode;
 import org.kie.internal.runtime.conf.BuilderHandler;
diff --git a/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/TransientObjectModel.java b/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/TransientObjectModel.java
index 572cc4412ae..9026d35f5dd 100644
--- a/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/TransientObjectModel.java
+++ b/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/TransientObjectModel.java
@@ -18,7 +18,7 @@
  */
 package org.kie.internal.runtime.manager.deploy;
 
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlTransient;
 
 import org.kie.internal.runtime.conf.ObjectModel;
 
diff --git a/kie-internal/src/main/java/org/kie/internal/task/api/model/AccessType.java b/kie-internal/src/main/java/org/kie/internal/task/api/model/AccessType.java
index 406ddf4e705..3caaedb1650 100644
--- a/kie-internal/src/main/java/org/kie/internal/task/api/model/AccessType.java
+++ b/kie-internal/src/main/java/org/kie/internal/task/api/model/AccessType.java
@@ -21,7 +21,7 @@
  */
 package org.kie.internal.task.api.model;
 
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlType
 public enum AccessType {
diff --git a/kie-internal/src/main/java/org/kie/internal/task/api/model/SubTasksStrategy.java b/kie-internal/src/main/java/org/kie/internal/task/api/model/SubTasksStrategy.java
index b79d5bc55c7..209a283f4f1 100644
--- a/kie-internal/src/main/java/org/kie/internal/task/api/model/SubTasksStrategy.java
+++ b/kie-internal/src/main/java/org/kie/internal/task/api/model/SubTasksStrategy.java
@@ -18,7 +18,7 @@
  */
 package org.kie.internal.task.api.model;
 
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlType
 public enum SubTasksStrategy{
diff --git a/kie-internal/src/test/java/org/kie/internal/runtime/manager/deploy/JaxbMarshalingTest.java b/kie-internal/src/test/java/org/kie/internal/runtime/manager/deploy/JaxbMarshalingTest.java
index 4cbd3f31924..5038a1806fa 100644
--- a/kie-internal/src/test/java/org/kie/internal/runtime/manager/deploy/JaxbMarshalingTest.java
+++ b/kie-internal/src/test/java/org/kie/internal/runtime/manager/deploy/JaxbMarshalingTest.java
@@ -20,9 +20,9 @@
 
 import java.io.StringWriter;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
 
 import org.junit.Test;
 import org.kie.internal.runtime.conf.DeploymentDescriptor;
diff --git a/kie-maven-plugin/pom.xml b/kie-maven-plugin/pom.xml
index 16fa86657ae..1a1f0170e2b 100644
--- a/kie-maven-plugin/pom.xml
+++ b/kie-maven-plugin/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     drools-build-parent
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-memory-compiler/pom.xml b/kie-memory-compiler/pom.xml
index 7982be9f8f2..bc681e6a1b6 100644
--- a/kie-memory-compiler/pom.xml
+++ b/kie-memory-compiler/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-pmml-trusty/kie-pmml-api/pom.xml b/kie-pmml-trusty/kie-pmml-api/pom.xml
index 938b5affaa0..ecfe6df4d1d 100644
--- a/kie-pmml-trusty/kie-pmml-api/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-api/pom.xml
@@ -25,7 +25,7 @@
   
     kie-pmml-trusty
     org.kie
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-api/src/main/java/org/kie/pmml/api/PMMLRuntimeFactory.java b/kie-pmml-trusty/kie-pmml-api/src/main/java/org/kie/pmml/api/PMMLRuntimeFactory.java
index d5394fdcee6..d24bd5c3b1e 100644
--- a/kie-pmml-trusty/kie-pmml-api/src/main/java/org/kie/pmml/api/PMMLRuntimeFactory.java
+++ b/kie-pmml-trusty/kie-pmml-api/src/main/java/org/kie/pmml/api/PMMLRuntimeFactory.java
@@ -26,7 +26,7 @@ public interface PMMLRuntimeFactory {
 
     /**
      * Retrieve a PMMLRuntime bound to the given 
-     * with an on-the-fly compilation.
+     * with an on-the-fly compilation.
      * @param pmmlFile
      * @return
      */
diff --git a/kie-pmml-trusty/kie-pmml-commons/pom.xml b/kie-pmml-trusty/kie-pmml-commons/pom.xml
index d9d231d6b3f..3460285aaba 100644
--- a/kie-pmml-trusty/kie-pmml-commons/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-commons/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-trusty
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/pom.xml b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/pom.xml
index dec1881eb3f..5f411cc8268 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-compiler
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/main/java/org/kie/pmml/compiler/api/dto/CommonCompilationDTO.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/main/java/org/kie/pmml/compiler/api/dto/CommonCompilationDTO.java
index b4d12b531be..505d54d07a9 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/main/java/org/kie/pmml/compiler/api/dto/CommonCompilationDTO.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/main/java/org/kie/pmml/compiler/api/dto/CommonCompilationDTO.java
@@ -119,7 +119,7 @@ private CommonCompilationDTO(final PMML pmml,
             targetDataField = this.fields.stream()
                     .filter(DataField.class::isInstance)
                     .map(DataField.class::cast)
-                    .filter(field -> Objects.equals(getTargetFieldName(), field.getName().getValue()))
+                    .filter(field -> Objects.equals(getTargetFieldName(),field.getName()))
                     .findFirst().orElse(null);
         } else {
             targetDataField = null;
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/main/java/org/kie/pmml/compiler/api/utils/ModelUtils.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/main/java/org/kie/pmml/compiler/api/utils/ModelUtils.java
index 45015d4b374..6a404100e93 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/main/java/org/kie/pmml/compiler/api/utils/ModelUtils.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/main/java/org/kie/pmml/compiler/api/utils/ModelUtils.java
@@ -51,8 +51,8 @@
 import org.dmg.pmml.Targets;
 import org.dmg.pmml.TransformationDictionary;
 import org.dmg.pmml.Value;
-import org.jpmml.model.inlinetable.InputCell;
-import org.jpmml.model.inlinetable.OutputCell;
+import org.jpmml.model.cells.InputCell;
+import org.jpmml.model.cells.OutputCell;
 import org.kie.pmml.api.enums.CAST_INTEGER;
 import org.kie.pmml.api.enums.DATA_TYPE;
 import org.kie.pmml.api.enums.FIELD_USAGE_TYPE;
@@ -123,8 +123,8 @@ public static List getTargetFields(final List> field
         if (model.getMiningSchema() != null && model.getMiningSchema().getMiningFields() != null) {
             for (MiningField miningField : model.getMiningSchema().getMiningFields()) {
                 if (MiningField.UsageType.TARGET.equals(miningField.getUsageType()) || MiningField.UsageType.PREDICTED.equals(miningField.getUsageType())) {
-                    OP_TYPE opType = getOpType(fields, model, miningField.getName().getValue());
-                    toReturn.add(new KiePMMLNameOpType(miningField.getName().getValue(), opType));
+                    OP_TYPE opType = getOpType(fields, model,miningField.getName());
+                    toReturn.add(new KiePMMLNameOpType(miningField.getName(), opType));
                 }
             }
         }
@@ -145,8 +145,7 @@ public static Map getTargetFieldsTypeMap(final List>
         if (model.getMiningSchema() != null && model.getMiningSchema().getMiningFields() != null) {
             for (MiningField miningField : model.getMiningSchema().getMiningFields()) {
                 if (MiningField.UsageType.TARGET.equals(miningField.getUsageType()) || MiningField.UsageType.PREDICTED.equals(miningField.getUsageType())) {
-                    toReturn.put(miningField.getName().getValue(), getDATA_TYPE(fields,
-                                                                                miningField.getName().getValue()));
+                    toReturn.put(miningField.getName(), getDATA_TYPE(fields,miningField.getName()));
                 }
             }
         }
@@ -182,7 +181,7 @@ public static Optional getOpTypeFromFields(final List> fields,
                                                         final String fieldName) {
         return fields == null ? Optional.empty() :
                 fields.stream()
-                        .filter(dataField -> Objects.equals(fieldName, dataField.getName().getValue()) && dataField.getOpType() != null)
+                        .filter(dataField -> Objects.equals(fieldName,dataField.getName()) && dataField.getOpType() != null)
                         .map(dataField -> OP_TYPE.byName(dataField.getOpType().value()))
                         .findFirst();
     }
@@ -196,7 +195,7 @@ public static Optional getOpTypeFromFields(final List> fields,
     public static Optional getOpTypeFromMiningFields(MiningSchema miningSchema, String fieldName) {
         if (miningSchema != null && miningSchema.getMiningFields() != null) {
             return miningSchema.getMiningFields().stream()
-                    .filter(miningField -> Objects.equals(fieldName, miningField.getName().getValue()) && miningField.getOpType() != null)
+                    .filter(miningField -> Objects.equals(fieldName,miningField.getName()) && miningField.getOpType() != null)
                     .findFirst()
                     .map(dataField -> OP_TYPE.byName(dataField.getOpType().value()));
         } else {
@@ -213,7 +212,7 @@ public static Optional getOpTypeFromMiningFields(MiningSchema miningSch
     public static Optional getOpTypeFromTargets(Targets targets, String fieldName) {
         if (targets != null && targets.getTargets() != null) {
             return targets.getTargets().stream()
-                    .filter(target -> Objects.equals(fieldName, target.getField().getValue()) && target.getOpType() != null)
+                    .filter(target -> Objects.equals(fieldName,target.getField()) && target.getOpType() != null)
                     .findFirst()
                     .map(dataField -> OP_TYPE.byName(dataField.getOpType().value()));
         } else {
@@ -231,7 +230,7 @@ public static Optional getOpTypeFromTargets(Targets targets, String fie
     public static DataType getDataType(final List> fields,
                                        final String fieldName) {
         return fields.stream()
-                .filter(fld -> Objects.equals(fieldName, fld.getName().getValue()))
+                .filter(fld -> Objects.equals(fieldName,fld.getName()))
                 .map(Field::getDataType)
                 .findFirst()
                 .orElseThrow(() -> new KiePMMLInternalException(String.format("Failed to find DataType for " +
@@ -247,7 +246,7 @@ public static DataType getDataType(final List> fields,
      */
     public static DATA_TYPE getDATA_TYPE(final List> fields, String fieldName) {
         Optional toReturn = fields.stream()
-                .filter(fld -> Objects.equals(fieldName, fld.getName().getValue()))
+                .filter(fld -> Objects.equals(fieldName,fld.getName()))
                 .findFirst()
                 .map(dataField -> DATA_TYPE.byName(dataField.getDataType().value()));
         return toReturn.orElseThrow(() -> new KiePMMLInternalException(String.format("Failed to find DATA_TYPE for " +
@@ -331,7 +330,7 @@ public static List convertToKieMiningFieldL
      */
     public static org.kie.pmml.api.models.MiningField convertToKieMiningField(final MiningField toConvert,
                                                                               final Field field) {
-        final String name = toConvert.getName() != null ? toConvert.getName().getValue() : null;
+        final String name = toConvert.getName() != null ?toConvert.getName() : null;
         final FIELD_USAGE_TYPE fieldUsageType = toConvert.getUsageType() != null ?
                 FIELD_USAGE_TYPE.byName(toConvert.getUsageType().value()) : null;
         final OP_TYPE opType = toConvert.getOpType() != null ? OP_TYPE.byName(toConvert.getOpType().value()) : null;
@@ -408,13 +407,13 @@ public static List convertToKieOutputFieldL
      */
     public static org.kie.pmml.api.models.OutputField convertToKieOutputField(final OutputField toConvert,
                                                                               final Field field) {
-        final String name = toConvert.getName() != null ? toConvert.getName().getValue() : null;
+        final String name = toConvert.getName() != null ?toConvert.getName() : null;
         final OP_TYPE opType = toConvert.getOpType() != null ? OP_TYPE.byName(toConvert.getOpType().value()) : null;
         final DATA_TYPE dataFieldDataType = field != null ? DATA_TYPE.byName(field.getDataType().value()) :
                 null;
         final DATA_TYPE dataType = toConvert.getDataType() != null ?
                 DATA_TYPE.byName(toConvert.getDataType().value()) : dataFieldDataType;
-        final String targetField = toConvert.getTargetField() != null ? toConvert.getTargetField().getValue() : null;
+        final String targetField = toConvert.getTargetField() != null ?toConvert.getTargetField() : null;
         final RESULT_FEATURE resultFeature = toConvert.getResultFeature() != null ?
                 RESULT_FEATURE.byName(toConvert.getResultFeature().value()) : null;
         final List allowedValues = field instanceof DataField ?
@@ -459,8 +458,7 @@ public static TargetField convertToKieTargetField(final Target toConvert) {
                 toConvert.getRescaleConstant().doubleValue() : null;
         final Double rescaleFactor = toConvert.getRescaleFactor() != null ? toConvert.getRescaleFactor().doubleValue() : null;
         return new TargetField(targetValues,
-                               opType,
-                               toConvert.getField().getValue(),
+                               opType,toConvert.getField(),
                                castInteger,
                                min,
                                max,
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/mocks/TestModel.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/mocks/TestModel.java
index 32c3b862caf..aab45ac8523 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/mocks/TestModel.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/mocks/TestModel.java
@@ -125,4 +125,14 @@ public TestModel setLocalTransformations(LocalTransformations localTransformatio
     public VisitorAction accept(Visitor visitor) {
         return null;
     }
+
+    @Override
+    public MiningFunction requireMiningFunction() {
+        return null;
+    }
+
+    @Override
+    public MiningSchema requireMiningSchema() {
+        return null;
+    }
 }
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/testutils/PMMLModelTestUtils.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/testutils/PMMLModelTestUtils.java
index c668e1a6ff0..8f919c3e929 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/testutils/PMMLModelTestUtils.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/testutils/PMMLModelTestUtils.java
@@ -31,6 +31,7 @@
 import org.dmg.pmml.Array;
 import org.dmg.pmml.CompareFunction;
 import org.dmg.pmml.ComparisonMeasure;
+import org.dmg.pmml.ComplexScoreDistribution;
 import org.dmg.pmml.CompoundPredicate;
 import org.dmg.pmml.Constant;
 import org.dmg.pmml.DataDictionary;
@@ -43,7 +44,6 @@
 import org.dmg.pmml.Euclidean;
 import org.dmg.pmml.Field;
 import org.dmg.pmml.FieldColumnPair;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.FieldRef;
 import org.dmg.pmml.InlineTable;
 import org.dmg.pmml.Interval;
@@ -89,8 +89,8 @@
 import org.dmg.pmml.regression.PredictorTerm;
 import org.dmg.pmml.regression.RegressionModel;
 import org.dmg.pmml.regression.RegressionTable;
-import org.jpmml.model.inlinetable.InputCell;
-import org.jpmml.model.inlinetable.OutputCell;
+import org.jpmml.model.cells.InputCell;
+import org.jpmml.model.cells.OutputCell;
 import org.kie.pmml.api.enums.DATA_TYPE;
 import org.kie.pmml.api.enums.Named;
 import org.kie.pmml.api.enums.RESULT_FEATURE;
@@ -194,7 +194,7 @@ public static TestModel getRandomTestModel(DataDictionary dataDictionary) {
         miningSchema.addMiningFields(predictedMiningField);
         Output output = new Output();
         OutputField outputField = new OutputField();
-        outputField.setName(FieldName.create("OUTPUT_" + lastDataField.getName().getValue()));
+        outputField.setName("OUTPUT_" +lastDataField.getName());
         outputField.setDataType(lastDataField.getDataType());
         outputField.setOpType(getRandomOpType());
         toReturn.setModelName(RandomStringUtils.random(6, true, false));
@@ -222,7 +222,7 @@ public static MiningModel getRandomMiningModel(DataDictionary dataDictionary) {
         miningSchema.addMiningFields(predictedMiningField);
         Output output = new Output();
         OutputField outputField = new OutputField();
-        outputField.setName(FieldName.create("OUTPUT_" + lastDataField.getName().getValue()));
+        outputField.setName("OUTPUT_" +lastDataField.getName());
         outputField.setDataType(lastDataField.getDataType());
         outputField.setOpType(getRandomOpType());
         toReturn.setModelName(RandomStringUtils.random(6, true, false));
@@ -282,7 +282,7 @@ public static RegressionTable getRegressionTable(List cate
 
     public static CategoricalPredictor getCategoricalPredictor(String name, double value, double coefficient) {
         CategoricalPredictor toReturn = new CategoricalPredictor();
-        toReturn.setField(FieldName.create(name));
+        toReturn.setField(name);
         toReturn.setValue(value);
         toReturn.setCoefficient(coefficient);
         return toReturn;
@@ -290,7 +290,7 @@ public static CategoricalPredictor getCategoricalPredictor(String name, double v
 
     public static NumericPredictor getNumericPredictor(String name, int exponent, double coefficient) {
         NumericPredictor toReturn = new NumericPredictor();
-        toReturn.setField(FieldName.create(name));
+        toReturn.setField(name);
         toReturn.setExponent(exponent);
         toReturn.setCoefficient(coefficient);
         return toReturn;
@@ -298,7 +298,7 @@ public static NumericPredictor getNumericPredictor(String name, int exponent, do
 
     public static PredictorTerm getPredictorTerm(String name, double coefficient, List fieldRefNames) {
         PredictorTerm toReturn = new PredictorTerm();
-        toReturn.setName(FieldName.create(name));
+        toReturn.setName(name);
         toReturn.setCoefficient(coefficient);
         toReturn.addFieldRefs(fieldRefNames.stream().map(PMMLModelTestUtils::getFieldRef).toArray(FieldRef[]::new));
         return toReturn;
@@ -323,7 +323,7 @@ public static ClusteringModel getClusteringModel(String modelName, MiningFunctio
 
     public static DataField getDataField(String fieldName, OpType opType) {
         DataField toReturn = new DataField();
-        toReturn.setName(FieldName.create(fieldName));
+        toReturn.setName(fieldName);
         toReturn.setOpType(opType);
         return toReturn;
     }
@@ -336,14 +336,14 @@ public static DataField getDataField(String fieldName, OpType opType, DataType d
 
     public static MiningField getMiningField(String fieldName, MiningField.UsageType usageType) {
         MiningField toReturn = getRandomMiningField();
-        toReturn.setName(FieldName.create(fieldName));
+        toReturn.setName(fieldName);
         toReturn.setUsageType(usageType);
         return toReturn;
     }
 
     public static Target getTarget(String fieldTarget, OpType opType) {
         Target toReturn = new Target();
-        toReturn.setField(FieldName.create(fieldTarget));
+        toReturn.setField(fieldTarget);
         toReturn.setOpType(opType);
         return toReturn;
     }
@@ -362,7 +362,7 @@ public static DefineFunction getDefineFunction(String functionName) {
 
     public static DerivedField getDerivedField(String fieldName) {
         DerivedField toReturn = new DerivedField();
-        toReturn.setName(FieldName.create(fieldName));
+        toReturn.setName(fieldName);
         toReturn.setDataType(getRandomDataType());
         toReturn.setOpType(getRandomOpType());
         Constant expression = new Constant(5);
@@ -386,7 +386,7 @@ public static Measure getRandomMeasure() {
 
     public static DataField getRandomDataField() {
         DataField toReturn = new DataField();
-        toReturn.setName(FieldName.create(RandomStringUtils.random(6, true, false)));
+        toReturn.setName(RandomStringUtils.random(6, true, false));
         toReturn.setDataType(getRandomDataType());
         toReturn.setOpType(getRandomOpType());
         IntStream.range(0, 3).forEach(i -> {
@@ -413,7 +413,7 @@ public static MiningField getRandomMiningField(DataField dataField) {
 
     public static MiningField getRandomMiningField() {
         Random random = new Random();
-        MiningField toReturn = new MiningField(FieldName.create(RandomStringUtils.random(6, true, false)));
+        MiningField toReturn = new MiningField(RandomStringUtils.random(6, true, false));
         toReturn.setInvalidValueTreatment(getRandomInvalidValueTreatmentMethod());
         toReturn.setMissingValueTreatment(getRandomMissingValueTreatmentMethod());
         toReturn.setOutlierTreatment(getRandomOutlierTreatmentMethod());
@@ -436,13 +436,13 @@ public static OutputField getRandomOutputField(DataField dataField) {
     }
 
     public static OutputField getRandomOutputField() {
-        FieldName fieldName = FieldName.create(RandomStringUtils.random(6, true, false));
+         String fieldName =RandomStringUtils.random(6, true, false);
         OutputField toReturn = new OutputField();
         toReturn.setName(fieldName);
         toReturn.setOpType(getRandomOpType());
         toReturn.setDataType(getRandomDataType());
         toReturn.setValue(getRandomValue(toReturn.getDataType()));
-        fieldName = FieldName.create(RandomStringUtils.random(6, true, false));
+        fieldName =RandomStringUtils.random(6, true, false);
         toReturn.setTargetField(fieldName);
         toReturn.setResultFeature(getRandomResultFeature());
         toReturn.setExpression(getRandomConstant());
@@ -452,7 +452,7 @@ public static OutputField getRandomOutputField() {
     public static Target getRandomTarget() {
         Random random = new Random();
         Target toReturn = new Target();
-        toReturn.setField(FieldName.create(RandomStringUtils.random(6, true, false)));
+        toReturn.setField(RandomStringUtils.random(6, true, false));
         toReturn.setOpType(getRandomOpType());
         toReturn.setMax(random.nextInt(234));
         toReturn.setMin(random.nextInt(23));
@@ -476,7 +476,7 @@ public static TargetValue getRandomTargetValue() {
 
     public static FieldColumnPair getRandomFieldColumnPair() {
         FieldColumnPair toReturn = new FieldColumnPair();
-        toReturn.setField(FieldName.create(RandomStringUtils.random(6, true, false)));
+        toReturn.setField(RandomStringUtils.random(6, true, false));
         toReturn.setColumn(RandomStringUtils.random(6, true, false));
         return toReturn;
     }
@@ -493,7 +493,7 @@ public static ClusteringField getRandomClusteringField() {
         Random random = new Random();
         ClusteringField toReturn = new ClusteringField();
         toReturn.setCenterField(getRandomClusteringFieldCenterField());
-        toReturn.setField(FieldName.create(RandomStringUtils.random(6, true, false)));
+        toReturn.setField(RandomStringUtils.random(6, true, false));
         toReturn.setCompareFunction(getRandomCompareFunction());
         toReturn.setFieldWeight(random.nextDouble());
         toReturn.setComparisons(getRandomComparisons());
@@ -531,7 +531,7 @@ public static Discretize getRandomDiscretize() {
         Discretize toReturn = new Discretize();
         toReturn.setDataType(getRandomDataType());
         toReturn.setDefaultValue(RandomStringUtils.random(6, true, false));
-        toReturn.setField(FieldName.create(RandomStringUtils.random(6, true, false)));
+        toReturn.setField(RandomStringUtils.random(6, true, false));
         toReturn.setMapMissingTo(RandomStringUtils.random(6, true, false));
         IntStream.range(0, 3).forEach(i -> toReturn.addDiscretizeBins(getRandomDiscretizeBin()));
         return toReturn;
@@ -539,7 +539,7 @@ public static Discretize getRandomDiscretize() {
 
     public static FieldRef getRandomFieldRef() {
         FieldRef toReturn = new FieldRef();
-        toReturn.setField(FieldName.create(RandomStringUtils.random(6, true, false)));
+        toReturn.setField(RandomStringUtils.random(6, true, false));
         toReturn.setMapMissingTo(RandomStringUtils.random(6, true, false));
         return toReturn;
     }
@@ -565,7 +565,7 @@ public static NormContinuous getRandomNormContinuous() {
         double mapMissingTo = random.nextInt(100) / 10;
         NormContinuous toReturn = new NormContinuous();
         IntStream.range(0, 3).forEach(i -> toReturn.addLinearNorms(getRandomLinearNorm()));
-        toReturn.setField(FieldName.create(RandomStringUtils.random(6, true, false)));
+        toReturn.setField(RandomStringUtils.random(6, true, false));
         toReturn.setOutliers(getRandomOutlierTreatmentMethod());
         toReturn.setMapMissingTo(mapMissingTo);
         return toReturn;
@@ -573,7 +573,7 @@ public static NormContinuous getRandomNormContinuous() {
 
     public static NormDiscrete getRandomNormDiscrete() {
         NormDiscrete toReturn = new NormDiscrete();
-        toReturn.setField(FieldName.create(RandomStringUtils.random(6, true, false)));
+        toReturn.setField(RandomStringUtils.random(6, true, false));
         toReturn.setValue(getRandomObject(DataType.INTEGER));
         toReturn.setMapMissingTo((Number) getRandomObject(DataType.INTEGER));
         toReturn.setMethod(getRandomMethod());
@@ -583,14 +583,14 @@ public static NormDiscrete getRandomNormDiscrete() {
     public static TextIndex getRandomTextIndex() {
         Random random = new Random();
         TextIndex toReturn = new TextIndex();
-        toReturn.setField(FieldName.create(RandomStringUtils.random(6, true, false)));
+        toReturn.setField(RandomStringUtils.random(6, true, false));
         toReturn.setExpression(getRandomFieldRef());
         toReturn.setLocalTermWeights(getRandomLocalTermWeights());
         toReturn.setWordSeparatorCharacterRE(RandomStringUtils.random(1, true, false));
         toReturn.setTokenize(true);
         toReturn.setCaseSensitive(false);
         toReturn.setMaxLevenshteinDistance(random.nextInt(10));
-        toReturn.setTextField(FieldName.create(RandomStringUtils.random(6, true, false)));
+        toReturn.setTextField(RandomStringUtils.random(6, true, false));
         IntStream.range(0, 3).forEach(i -> toReturn.addTextIndexNormalizations(getRandomTextIndexNormalization()));
         return toReturn;
     }
@@ -603,7 +603,7 @@ public static LinearNorm getRandomLinearNorm() {
     }
 
     public static ParameterField getParameterField(String fieldName) {
-        ParameterField toReturn = new ParameterField(FieldName.create(fieldName));
+        ParameterField toReturn = new ParameterField(fieldName);
         toReturn.setDataType(getRandomDataType());
         toReturn.setOpType(getRandomOpType());
         toReturn.setDisplayName("Display-" + fieldName);
@@ -611,7 +611,7 @@ public static ParameterField getParameterField(String fieldName) {
     }
 
     public static ParameterField getParameterField(String fieldName, DataType dataType) {
-        ParameterField toReturn = new ParameterField(FieldName.create(fieldName));
+        ParameterField toReturn = new ParameterField(fieldName);
         toReturn.setDataType(dataType);
         return toReturn;
     }
@@ -638,7 +638,7 @@ public static List getResultFeature() {
     public static SimplePredicate getSimplePredicate(final String predicateName,
                                                      final Object value,
                                                      final SimplePredicate.Operator operator) {
-        FieldName fieldName = FieldName.create(predicateName);
+         String fieldName =predicateName;
         SimplePredicate toReturn = new SimplePredicate();
         toReturn.setField(fieldName);
         toReturn.setOperator(operator);
@@ -657,7 +657,7 @@ public static SimpleSetPredicate getSimpleSetPredicate(final String predicateNam
                                                            final Array.Type arrayType,
                                                            final List values,
                                                            final SimpleSetPredicate.BooleanOperator booleanOperator) {
-        FieldName fieldName = FieldName.create(predicateName);
+         String fieldName =predicateName;
         SimpleSetPredicate toReturn = new SimpleSetPredicate();
         toReturn.setField(fieldName);
         toReturn.setBooleanOperator(booleanOperator);
@@ -674,7 +674,7 @@ public static Array getArray(Array.Type arrayType, final List values) {
     }
 
     public static FieldRef getFieldRef(final String fieldName) {
-        return new FieldRef(FieldName.create(fieldName));
+        return new FieldRef(fieldName);
     }
 
     public static Object getRandomObject(DataType dataType) {
@@ -876,7 +876,7 @@ public static List getRandomPMMLScoreDistributions(boolean wi
 
     public static ScoreDistribution getRandomPMMLScoreDistribution(Double probability) {
         Random random = new Random();
-        ScoreDistribution toReturn = new ScoreDistribution();
+        ScoreDistribution toReturn = new ComplexScoreDistribution();
         toReturn.setValue(RandomStringUtils.random(6, true, false));
         toReturn.setRecordCount(random.nextInt(100));
         toReturn.setConfidence((double) random.nextInt(1) / 100);
@@ -928,7 +928,7 @@ public static SimplePredicate getRandomSimplePredicate(DataField dataField) {
     }
 
     public static SimplePredicate getRandomSimplePredicate() {
-        FieldName fieldName = FieldName.create(RandomStringUtils.random(6, true, false));
+         String fieldName =RandomStringUtils.random(6, true, false);
         SimplePredicate toReturn = new SimplePredicate();
         toReturn.setField(fieldName);
         toReturn.setOperator(getRandomSimplePredicateOperator());
@@ -948,7 +948,7 @@ public static SimpleSetPredicate getRandomSimpleSetPredicate(DataField dataField
     }
 
     public static SimpleSetPredicate getRandomSimpleSetPredicate() {
-        FieldName fieldName = FieldName.create(RandomStringUtils.random(6, true, false));
+         String fieldName =RandomStringUtils.random(6, true, false);
         SimpleSetPredicate toReturn = new SimpleSetPredicate();
         toReturn.setField(fieldName);
         toReturn.setBooleanOperator(getRandomSimpleSetPredicateOperator());
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/utils/ModelUtilsTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/utils/ModelUtilsTest.java
index cbf3518face..a5ee7e78687 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/utils/ModelUtilsTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/utils/ModelUtilsTest.java
@@ -36,7 +36,6 @@
 import org.dmg.pmml.DataType;
 import org.dmg.pmml.DerivedField;
 import org.dmg.pmml.Field;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.MiningField;
 import org.dmg.pmml.MiningSchema;
 import org.dmg.pmml.Model;
@@ -47,8 +46,8 @@
 import org.dmg.pmml.Target;
 import org.dmg.pmml.Targets;
 import org.dmg.pmml.regression.RegressionModel;
-import org.jpmml.model.inlinetable.InputCell;
-import org.jpmml.model.inlinetable.OutputCell;
+import org.jpmml.model.cells.InputCell;
+import org.jpmml.model.cells.OutputCell;
 import org.junit.jupiter.api.Test;
 import org.kie.pmml.api.enums.DATA_TYPE;
 import org.kie.pmml.api.enums.FIELD_USAGE_TYPE;
@@ -198,10 +197,10 @@ void getTargetFieldsWithTargetFieldsWithoutOptType() {
         retrieved.forEach(kiePMMLNameOpType -> {
             assertThat(miningSchema.getMiningFields()
                                .stream()
-                               .anyMatch(fld -> kiePMMLNameOpType.getName().equals(fld.getName().getValue()))).isTrue();
+                               .anyMatch(fld -> kiePMMLNameOpType.getName().equals(fld.getName()))).isTrue();
             Optional optionalDataField = dataDictionary.getDataFields()
                     .stream()
-                    .filter(fld -> kiePMMLNameOpType.getName().equals(fld.getName().getValue()))
+                    .filter(fld -> kiePMMLNameOpType.getName().equals(fld.getName()))
                     .findFirst();
             assertThat(optionalDataField).isPresent();
             DataField dataField = optionalDataField.get();
@@ -230,7 +229,7 @@ void getTargetFieldsWithTargetFieldsWithOptType() {
         retrieved.forEach(kiePMMLNameOpType -> {
             Optional optionalMiningField = miningSchema.getMiningFields()
                     .stream()
-                    .filter(fld -> kiePMMLNameOpType.getName().equals(fld.getName().getValue()))
+                    .filter(fld -> kiePMMLNameOpType.getName().equals(fld.getName()))
                     .findFirst();
             assertThat(optionalMiningField).isPresent();
             MiningField miningField = optionalMiningField.get();
@@ -263,7 +262,7 @@ void getTargetFieldsWithTargetFieldsWithTargetsWithoutOptType() {
         retrieved.forEach(kiePMMLNameOpType -> {
             Optional optionalMiningField = miningSchema.getMiningFields()
                     .stream()
-                    .filter(fld -> kiePMMLNameOpType.getName().equals(fld.getName().getValue()))
+                    .filter(fld -> kiePMMLNameOpType.getName().equals(fld.getName()))
                     .findFirst();
             assertThat(optionalMiningField).isPresent();
             MiningField miningField = optionalMiningField.get();
@@ -296,7 +295,7 @@ void getTargetFieldsWithTargetFieldsWithTargetsWithOptType() {
         retrieved.forEach(kiePMMLNameOpType -> {
             Optional optionalTarget = targets.getTargets()
                     .stream()
-                    .filter(fld -> kiePMMLNameOpType.getName().equals(fld.getField().getValue()))
+                    .filter(fld -> kiePMMLNameOpType.getName().equals(fld.getField()))
                     .findFirst();
             assertThat(optionalTarget).isPresent();
             Target target = optionalTarget.get();
@@ -313,7 +312,7 @@ void getTargetFieldsTypeMapWithTargetFieldsWithoutTargets() {
         IntStream.range(0, 3).forEach(i -> {
             final DataField dataField = getRandomDataField();
             dataDictionary.addDataFields(dataField);
-            final MiningField miningField = getMiningField(dataField.getName().getValue(),
+            final MiningField miningField = getMiningField(dataField.getName(),
                                                            MiningField.UsageType.PREDICTED);
             miningSchema.addMiningFields(miningField);
         });
@@ -343,7 +342,7 @@ void getTargetFieldsTypeMapWithoutTargetFieldsWithoutTargets() {
         IntStream.range(0, 3).forEach(i -> {
             final DataField dataField = getRandomDataField();
             dataDictionary.addDataFields(dataField);
-            final MiningField miningField = getMiningField(dataField.getName().getValue(),
+            final MiningField miningField = getMiningField(dataField.getName(),
                                                            MiningField.UsageType.ACTIVE);
             miningSchema.addMiningFields(miningField);
         });
@@ -362,10 +361,10 @@ void getTargetFieldsWithoutTargetFieldsWithTargets() {
         IntStream.range(0, 3).forEach(i -> {
             final DataField dataField = getRandomDataField();
             dataDictionary.addDataFields(dataField);
-            final MiningField miningField = getMiningField(dataField.getName().getValue(),
+            final MiningField miningField = getMiningField(dataField.getName(),
                                                            MiningField.UsageType.ACTIVE);
             miningSchema.addMiningFields(miningField);
-            final Target targetField = getTarget(dataField.getName().getValue(), null);
+            final Target targetField = getTarget(dataField.getName(), null);
             targets.addTargets(targetField);
         });
         model.setMiningSchema(miningSchema);
@@ -388,8 +387,7 @@ void getOpTypeByDataFields() {
         dataDictionary.getDataFields().forEach(dataField -> {
             OP_TYPE retrieved =
                     org.kie.pmml.compiler.api.utils.ModelUtils.getOpType(getFieldsFromDataDictionary(dataDictionary),
-                                                                         model,
-                                                                                     dataField.getName().getValue());
+                                                                         model,dataField.getName());
             assertThat(retrieved).isNotNull();
             OP_TYPE expected = OP_TYPE.byName(dataField.getOpType().value());
             assertThat(retrieved).isEqualTo(expected);
@@ -404,7 +402,7 @@ void getOpTypeByDataFieldsNotFound() {
             IntStream.range(0, 3).forEach(i -> {
                 String fieldName = "field" + i;
                 final DataField dataField = getRandomDataField();
-                dataField.setName(FieldName.create(fieldName));
+                dataField.setName(fieldName);
                 dataDictionary.addDataFields(dataField);
             });
             org.kie.pmml.compiler.api.utils.ModelUtils.getOpType(getFieldsFromDataDictionary(dataDictionary), model,
@@ -428,8 +426,7 @@ void getOpTypeByMiningFields() {
         miningSchema.getMiningFields().forEach(miningField -> {
             OP_TYPE retrieved =
                     org.kie.pmml.compiler.api.utils.ModelUtils.getOpType(getFieldsFromDataDictionary(dataDictionary),
-                                                                         model,
-                                                                                     miningField.getName().getValue());
+                                                                         model,miningField.getName());
             assertThat(retrieved).isNotNull();
             OP_TYPE expected = OP_TYPE.byName(miningField.getOpType().value());
             assertThat(retrieved).isEqualTo(expected);
@@ -445,7 +442,7 @@ void getOpTypeByMiningFieldsNotFound() {
             IntStream.range(0, 3).forEach(i -> {
                 String fieldName = "field" + i;
                 final DataField dataField = getRandomDataField();
-                dataField.setName(FieldName.create(fieldName));
+                dataField.setName(fieldName);
                 dataDictionary.addDataFields(dataField);
                 final MiningField miningField = getRandomMiningField();
                 miningField.setName(dataField.getName());
@@ -479,8 +476,7 @@ void getOpTypeByTargets() {
         targets.getTargets().forEach(target -> {
             OP_TYPE retrieved =
                     org.kie.pmml.compiler.api.utils.ModelUtils.getOpType(getFieldsFromDataDictionary(dataDictionary),
-                                                                         model,
-                                                                                     target.getField().getValue());
+                                                                         model,target.getField());
             assertThat(retrieved).isNotNull();
             OP_TYPE expected = OP_TYPE.byName(target.getOpType().value());
             assertThat(retrieved).isEqualTo(expected);
@@ -497,7 +493,7 @@ void getOpTypeByTargetsNotFound() {
             IntStream.range(0, 3).forEach(i -> {
                 String fieldName = "field" + i;
                 final DataField dataField = getRandomDataField();
-                dataField.setName(FieldName.create(fieldName));
+                dataField.setName(fieldName);
                 dataDictionary.addDataFields(dataField);
                 final MiningField miningField = getRandomMiningField();
                 miningField.setName(dataField.getName());
@@ -530,8 +526,7 @@ void getOpTypeFromFields() {
         fields.clear();
         fields.addAll(getFieldsFromDataDictionary(dataDictionary));
         dataDictionary.getDataFields().forEach(dataField -> {
-            Optional retrieved = org.kie.pmml.compiler.api.utils.ModelUtils.getOpTypeFromFields(fields,
-                                                                                                         dataField.getName().getValue());
+            Optional retrieved = org.kie.pmml.compiler.api.utils.ModelUtils.getOpTypeFromFields(fields,dataField.getName());
             assertThat(retrieved).isNotNull();
             assertThat(retrieved).isPresent();
             OP_TYPE expected = OP_TYPE.byName(dataField.getOpType().value());
@@ -554,8 +549,7 @@ void getOpTypeFromMiningFields() {
         });
         miningSchema.getMiningFields().forEach(miningField -> {
             Optional retrieved =
-                    org.kie.pmml.compiler.api.utils.ModelUtils.getOpTypeFromMiningFields(miningSchema,
-                                                                                         miningField.getName().getValue());
+                    org.kie.pmml.compiler.api.utils.ModelUtils.getOpTypeFromMiningFields(miningSchema,miningField.getName());
             assertThat(retrieved).isNotNull();
             assertThat(retrieved).isPresent();
             OP_TYPE expected = OP_TYPE.byName(miningField.getOpType().value());
@@ -577,8 +571,7 @@ void getOpTypeFromTargets() {
             targets.addTargets(target);
         });
         targets.getTargets().forEach(target -> {
-            Optional retrieved = org.kie.pmml.compiler.api.utils.ModelUtils.getOpTypeFromTargets(targets,
-                                                                                                          target.getField().getValue());
+            Optional retrieved = org.kie.pmml.compiler.api.utils.ModelUtils.getOpTypeFromTargets(targets,target.getField());
             assertThat(retrieved).isNotNull();
             assertThat(retrieved).isPresent();
             OP_TYPE expected = OP_TYPE.byName(target.getOpType().value());
@@ -597,7 +590,7 @@ void getDataTypeFromDerivedFieldsAndDataDictionary() {
                 .stream()
                 .map(dataField -> {
                     DerivedField toReturn = new DerivedField();
-                    toReturn.setName(FieldName.create("DER_" + dataField.getName().getValue()));
+                    toReturn.setName("DER_" +dataField.getName());
                     DataType dataType = getRandomDataType();
                     while (dataType.equals(dataField.getDataType())) {
                         dataType = getRandomDataType();
@@ -614,14 +607,14 @@ void getDataTypeFromDerivedFieldsAndDataDictionary() {
                 .map(Field.class::cast)
                 .forEach(fields::add);
         dataDictionary.getDataFields().forEach(dataField -> {
-            String fieldName = dataField.getName().getValue();
+            String fieldName =dataField.getName();
             DataType retrieved = org.kie.pmml.compiler.api.utils.ModelUtils.getDataType(fields, fieldName);
             assertThat(retrieved).isNotNull();
             DataType expected = dataField.getDataType();
             assertThat(retrieved).isEqualTo(expected);
         });
         derivedFields.forEach(derivedField -> {
-            String fieldName = derivedField.getName().getValue();
+            String fieldName =derivedField.getName();
             DataType retrieved = org.kie.pmml.compiler.api.utils.ModelUtils.getDataType(fields, fieldName);
             assertThat(retrieved).isNotNull();
             DataType expected = derivedField.getDataType();
@@ -638,7 +631,7 @@ void getDataTypeFromDataDictionary() {
         });
         dataDictionary.getDataFields().forEach(dataField -> {
             DATA_TYPE retrieved =
-                    org.kie.pmml.compiler.api.utils.ModelUtils.getDATA_TYPE(getFieldsFromDataDictionary(dataDictionary), dataField.getName().getValue());
+                    org.kie.pmml.compiler.api.utils.ModelUtils.getDATA_TYPE(getFieldsFromDataDictionary(dataDictionary),dataField.getName());
             assertThat(retrieved).isNotNull();
             DATA_TYPE expected = DATA_TYPE.byName(dataField.getDataType().value());
             assertThat(retrieved).isEqualTo(expected);
@@ -652,7 +645,7 @@ void getDataTypeNotFound() {
             IntStream.range(0, 3).forEach(i -> {
                 String fieldName = "field" + i;
                 final DataField dataField = getRandomDataField();
-                dataField.setName(FieldName.create(fieldName));
+                dataField.setName(fieldName);
                 dataDictionary.addDataFields(dataField);
             });
             org.kie.pmml.compiler.api.utils.ModelUtils.getDATA_TYPE(getFieldsFromDataDictionary(dataDictionary),
@@ -718,12 +711,12 @@ void convertToKieOutputField() {
         org.kie.pmml.api.models.OutputField retrieved =
                 org.kie.pmml.compiler.api.utils.ModelUtils.convertToKieOutputField(toConvert, null);
         assertThat(retrieved).isNotNull();
-        assertThat(retrieved.getName()).isEqualTo(toConvert.getName().getValue());
+        assertThat(retrieved.getName()).isEqualTo(toConvert.getName());
         OP_TYPE expectedOpType = OP_TYPE.byName(toConvert.getOpType().value());
         assertThat(retrieved.getOpType()).isEqualTo(expectedOpType);
         DATA_TYPE expectedDataType = DATA_TYPE.byName(toConvert.getDataType().value());
         assertThat(retrieved.getDataType()).isEqualTo(expectedDataType);
-        assertThat(retrieved.getTargetField()).isEqualTo(toConvert.getTargetField().getValue());
+        assertThat(retrieved.getTargetField()).isEqualTo(toConvert.getTargetField());
         RESULT_FEATURE expectedResultFeature = RESULT_FEATURE.byName(toConvert.getResultFeature().value());
         assertThat(retrieved.getResultFeature()).isEqualTo(expectedResultFeature);
         toConvert.setOpType(null);
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/pom.xml b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/pom.xml
index 9fdb3f70aa9..395ecbd498e 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-compiler
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDerivedFieldFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDerivedFieldFactory.java
index 0267b4f905f..4cc3591f282 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDerivedFieldFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDerivedFieldFactory.java
@@ -84,7 +84,7 @@ static BlockStmt getDerivedFieldVariableDeclaration(final String variableName, f
         final MethodCallExpr builder = getChainedMethodCallExprFrom("builder", initializer);
         final Expression dataTypeExpression = getExpressionForDataType(derivedField.getDataType());
         final Expression opTypeExpression = getExpressionForOpType(derivedField.getOpType());
-        builder.setArgument(0, new StringLiteralExpr(derivedField.getName().getValue()));
+        builder.setArgument(0, new StringLiteralExpr(derivedField.getName()));
         builder.setArgument(2, dataTypeExpression);
         builder.setArgument(3, opTypeExpression);
         builder.setArgument(4, new NameExpr(nestedVariableName));
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDiscretizeFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDiscretizeFactory.java
index 302047678fc..0a3e7e371f2 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDiscretizeFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDiscretizeFactory.java
@@ -88,7 +88,7 @@ static BlockStmt getDiscretizeVariableDeclaration(final String variableName, fin
                 .orElseThrow(() -> new KiePMMLException(String.format(MISSING_VARIABLE_INITIALIZER_TEMPLATE,
                                                                       DISCRETIZE, toReturn)))
                 .asObjectCreationExpr();
-        final Expression nameExpr = new StringLiteralExpr(discretize.getField().getValue());
+        final Expression nameExpr = new StringLiteralExpr(discretize.getField());
         final Expression mapMissingToExpr = getExpressionForObject(discretize.getMapMissingTo());
         final Expression defaultValueExpr = getExpressionForObject(discretize.getDefaultValue());
 
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLFieldColumnPairFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLFieldColumnPairFactory.java
index 727090cd0b5..d948a4bc93b 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLFieldColumnPairFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLFieldColumnPairFactory.java
@@ -70,7 +70,7 @@ static BlockStmt getFieldColumnPairVariableDeclaration(final String variableName
         final ObjectCreationExpr objectCreationExpr = variableDeclarator.getInitializer()
                 .orElseThrow(() -> new KiePMMLException(String.format(MISSING_VARIABLE_INITIALIZER_TEMPLATE, FIELDCOLUMNPAIR, toReturn)))
         .asObjectCreationExpr();
-        objectCreationExpr.getArguments().set(0, new StringLiteralExpr(fieldColumnPair.getField().getValue()));
+        objectCreationExpr.getArguments().set(0, new StringLiteralExpr(fieldColumnPair.getField()));
         objectCreationExpr.getArguments().set(2, new StringLiteralExpr(fieldColumnPair.getColumn()));
         return toReturn;
     }
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLFieldRefFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLFieldRefFactory.java
index 33b40939dc1..11276c4ce68 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLFieldRefFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLFieldRefFactory.java
@@ -73,7 +73,7 @@ static BlockStmt getFieldRefVariableDeclaration(final String variableName, final
                                                                       FIELD_REF, toReturn)))
                 .asObjectCreationExpr();
 
-        final StringLiteralExpr nameExpr = new StringLiteralExpr(fieldRef.getField().getValue());
+        final StringLiteralExpr nameExpr = new StringLiteralExpr(fieldRef.getField());
         final Expression mapMissingToExpr = getExpressionForObject(fieldRef.getMapMissingTo());
         objectCreationExpr.getArguments().set(0, nameExpr);
         objectCreationExpr.getArguments().set(2, mapMissingToExpr);
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLMiningFieldFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLMiningFieldFactory.java
index 9f68eeeba66..7e9865ed1d0 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLMiningFieldFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLMiningFieldFactory.java
@@ -88,7 +88,7 @@ static BlockStmt getMiningFieldVariableDeclaration(final String variableName, fi
                                                                       MININGFIELD, toReturn)))
                 .asMethodCallExpr();
         final MethodCallExpr builder = getChainedMethodCallExprFrom("builder", initializer);
-        final StringLiteralExpr nameExpr = new StringLiteralExpr(miningField.getName().getValue());
+        final StringLiteralExpr nameExpr = new StringLiteralExpr(miningField.getName());
         Expression fieldUsageTypeExpr;
         if (miningField.getUsageType() != null) {
             final FIELD_USAGE_TYPE fieldUsageType = FIELD_USAGE_TYPE.byName(miningField.getUsageType().value());
@@ -103,8 +103,8 @@ static BlockStmt getMiningFieldVariableDeclaration(final String variableName, fi
         } else {
             opTypeExpr = new NullLiteralExpr();
         }
-        final List> mappedFields = getMappedFields(fields, miningField.getName().getValue());
-        final DataType dataType = getDataType(mappedFields, miningField.getName().getValue());
+        final List> mappedFields = getMappedFields(fields,miningField.getName());
+        final DataType dataType = getDataType(mappedFields,miningField.getName());
         final DATA_TYPE data_TYPE = DATA_TYPE.byName(dataType.value());
         Expression dataTypeExpr = new NameExpr(DATA_TYPE.class.getName() + "." + data_TYPE.name());
         Expression missingValueTreatmentMethodExpr;
@@ -172,7 +172,7 @@ static BlockStmt getMiningFieldVariableDeclaration(final String variableName, fi
     private static List> getMappedFields(final List> fields,
                                                   final String fieldName) {
         return fields.stream()
-                .filter(fld -> Objects.equals(fieldName, fld.getName().getValue()))
+                .filter(fld -> Objects.equals(fieldName,fld.getName()))
                 .collect(Collectors.toList());
     }
 
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLModelFactoryUtils.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLModelFactoryUtils.java
index 32b0378c4da..ae7296e3608 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLModelFactoryUtils.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLModelFactoryUtils.java
@@ -614,7 +614,7 @@ static void commonPopulateGetCreatedKiePMMLMiningFieldsMethod(final MethodDeclar
         BlockStmt body = new BlockStmt();
         NodeList arguments = new NodeList<>();
         for (org.dmg.pmml.MiningField miningField : miningFields) {
-            String miningFieldVariableName = getSanitizedVariableName(miningField.getName().getValue()).toLowerCase();
+            String miningFieldVariableName = getSanitizedVariableName(miningField.getName()).toLowerCase();
             BlockStmt toAdd = getMiningFieldVariableDeclaration(miningFieldVariableName, miningField, fields);
             toAdd.getStatements().forEach(body::addStatement);
             arguments.add(new NameExpr(miningFieldVariableName));
@@ -634,7 +634,7 @@ static void commonPopulateGetCreatedKiePMMLOutputFieldsMethod(final MethodDeclar
         BlockStmt body = new BlockStmt();
         NodeList arguments = new NodeList<>();
         for (org.dmg.pmml.OutputField outputField : outputFields) {
-            String outputFieldVariableName = getSanitizedVariableName(outputField.getName().getValue()).toLowerCase();
+            String outputFieldVariableName = getSanitizedVariableName(outputField.getName()).toLowerCase();
             BlockStmt toAdd = getOutputFieldVariableDeclaration(outputFieldVariableName, outputField);
             toAdd.getStatements().forEach(body::addStatement);
             arguments.add(new NameExpr(outputFieldVariableName));
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLNormContinuousFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLNormContinuousFactory.java
index c060b2b8343..5dbee1419c2 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLNormContinuousFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLNormContinuousFactory.java
@@ -80,7 +80,7 @@ static BlockStmt getNormContinuousVariableDeclaration(final String variableName,
                                                                       NORM_CONTINUOUS, toReturn)))
                 .asObjectCreationExpr();
 
-        final StringLiteralExpr nameExpr = new StringLiteralExpr(normContinuous.getField().getValue());
+        final StringLiteralExpr nameExpr = new StringLiteralExpr(normContinuous.getField());
         final OUTLIER_TREATMENT_METHOD outlierTreatmentMethod =
                 OUTLIER_TREATMENT_METHOD.byName(normContinuous.getOutliers().value());
         final NameExpr outlierTreatmentMethodExpr =
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLNormDiscreteFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLNormDiscreteFactory.java
index 4db24f7ac22..c3aa7ee0cb0 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLNormDiscreteFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLNormDiscreteFactory.java
@@ -74,7 +74,7 @@ static BlockStmt getNormDiscreteVariableDeclaration(final String variableName,
                                                                       NORM_DISCRETE, toReturn)))
                 .asObjectCreationExpr();
 
-        final StringLiteralExpr nameExpr = new StringLiteralExpr(normDiscrete.getField().getValue());
+        final StringLiteralExpr nameExpr = new StringLiteralExpr(normDiscrete.getField());
 
         final Expression mapMissingToExpr = getExpressionForObject(normDiscrete.getMapMissingTo());
         objectCreationExpr.getArguments().set(0, nameExpr);
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLOutputFieldFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLOutputFieldFactory.java
index 3f375480d11..e14ccbce9b0 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLOutputFieldFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLOutputFieldFactory.java
@@ -81,10 +81,10 @@ static BlockStmt getOutputFieldVariableDeclaration(final String variableName, fi
                 .orElseThrow(() -> new KiePMMLException(String.format(MISSING_VARIABLE_INITIALIZER_TEMPLATE, OUTPUTFIELD, toReturn)))
                 .asMethodCallExpr();
         final MethodCallExpr builder = getChainedMethodCallExprFrom("builder", initializer);
-        final StringLiteralExpr nameExpr = new StringLiteralExpr(outputField.getName().getValue());
+        final StringLiteralExpr nameExpr = new StringLiteralExpr(outputField.getName());
         final RESULT_FEATURE resultFeature = RESULT_FEATURE.byName(outputField.getResultFeature().value());
         final NameExpr resultFeatureExpr = new NameExpr(RESULT_FEATURE.class.getName() + "." + resultFeature.name());
-        final Expression targetFieldExpr = outputField.getTargetField() != null ? getExpressionForObject(outputField.getTargetField().getValue()) : new NullLiteralExpr();
+        final Expression targetFieldExpr = outputField.getTargetField() != null ? getExpressionForObject(outputField.getTargetField()) : new NullLiteralExpr();
         final Expression valueExpr = outputField.getValue() != null ? getExpressionForObject(outputField.getValue()) : new NullLiteralExpr();
         final Expression dataTypeExpression = getExpressionForDataType(outputField.getDataType());
         final Expression rankExpr = outputField.getRank() != null ? getExpressionForObject(outputField.getRank()) : new NullLiteralExpr();
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLParameterFieldFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLParameterFieldFactory.java
index c7d22413fa1..b99982cd7bb 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLParameterFieldFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLParameterFieldFactory.java
@@ -73,7 +73,7 @@ static BlockStmt getParameterFieldVariableDeclaration(final String variableName,
                 .orElseThrow(() -> new KiePMMLException(String.format(MISSING_VARIABLE_INITIALIZER_TEMPLATE, PARAMETER_FIELD, toReturn)))
                 .asMethodCallExpr();
         final MethodCallExpr builder = getChainedMethodCallExprFrom("builder", initializer);
-        builder.setArgument(0, new StringLiteralExpr(parameterField.getName().getValue()));
+        builder.setArgument(0, new StringLiteralExpr(parameterField.getName()));
         final Expression dataTypeExpression = getExpressionForDataType(parameterField.getDataType());
         final Expression opTypeExpression = getExpressionForOpType(parameterField.getOpType());
         getChainedMethodCallExprFrom("withDataType", initializer).setArgument(0, dataTypeExpression);
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLSimplePredicateFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLSimplePredicateFactory.java
index 544619f337c..1c45d74aa25 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLSimplePredicateFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLSimplePredicateFactory.java
@@ -85,9 +85,9 @@ static BlockStmt getSimplePredicateVariableDeclaration(final String variableName
                 .orElseThrow(() -> new KiePMMLException(String.format(MISSING_VARIABLE_INITIALIZER_TEMPLATE, SIMPLE_PREDICATE, simplePredicateBody)))
                 .asMethodCallExpr();
         final MethodCallExpr builder = getChainedMethodCallExprFrom("builder", initializer);
-        builder.setArgument(0, new StringLiteralExpr(simplePredicate.getField().getValue()));
+        builder.setArgument(0, new StringLiteralExpr(simplePredicate.getField()));
         builder.setArgument(2, operatorExpr);
-        DataType dataType = getDataType(fields, simplePredicate.getField().getValue());
+        DataType dataType = getDataType(fields,simplePredicate.getField());
         Object actualValue = DATA_TYPE.byName(dataType.value()).getActualValue(simplePredicate.getValue());
         getChainedMethodCallExprFrom("withValue", initializer).setArgument(0, getExpressionForObject(actualValue));
         simplePredicateBody.getStatements().forEach(toReturn::addStatement);
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLSimpleSetPredicateFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLSimpleSetPredicateFactory.java
index d8e41815bdd..b70c5d89e36 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLSimpleSetPredicateFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLSimpleSetPredicateFactory.java
@@ -90,7 +90,7 @@ static BlockStmt getSimpleSetPredicateVariableDeclaration(final String variableN
                 .orElseThrow(() -> new KiePMMLException(String.format(MISSING_VARIABLE_INITIALIZER_TEMPLATE, SIMPLESET_PREDICATE, simpleSetPredicateBody)))
                 .asMethodCallExpr();
         final MethodCallExpr builder = getChainedMethodCallExprFrom("builder", initializer);
-        builder.setArgument(0, new StringLiteralExpr(simpleSetPredicate.getField().getValue()));
+        builder.setArgument(0, new StringLiteralExpr(simpleSetPredicate.getField()));
         builder.setArgument(2, arrayTypeExpr);
         builder.setArgument(3, inNotInExpr);
         getChainedMethodCallExprFrom("asList", initializer).setArguments(arguments);
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLTextIndexFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLTextIndexFactory.java
index 45d387b36f0..a9121d02fee 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLTextIndexFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLTextIndexFactory.java
@@ -101,7 +101,7 @@ static BlockStmt getTextIndexVariableDeclaration(final String variableName, fina
                 TEXTINDEX, toReturn)))
                 .asMethodCallExpr();
         final MethodCallExpr builder = getChainedMethodCallExprFrom("builder", initializer);
-        final StringLiteralExpr nameExpr = new StringLiteralExpr(textIndex.getTextField().getValue());
+        final StringLiteralExpr nameExpr = new StringLiteralExpr(textIndex.getTextField());
         final NameExpr expressionExpr = new NameExpr(expressionVariableName);
         builder.setArgument(0, nameExpr);
         builder.setArgument(2, expressionExpr);
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLDerivedFieldInstanceFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLDerivedFieldInstanceFactory.java
index 836c1022040..a25397bd89a 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLDerivedFieldInstanceFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLDerivedFieldInstanceFactory.java
@@ -52,10 +52,9 @@ static List getKiePMMLDerivedFields(final List> fields) {
-        DataType dataType = derivedField.getDataType() != null ? derivedField.getDataType() : getDataType(fields,
-                                                                                                          derivedField.getName().getValue());
+        DataType dataType = derivedField.getDataType() != null ? derivedField.getDataType() : getDataType(fields,derivedField.getName());
         OP_TYPE opType = derivedField.getOpType() != null ? OP_TYPE.byName(derivedField.getOpType().value()) : null;
-        return KiePMMLDerivedField.builder(derivedField.getName().getValue(),
+        return KiePMMLDerivedField.builder(derivedField.getName(),
                                            getKiePMMLExtensions(derivedField.getExtensions()),
                                            DATA_TYPE.byName(dataType.value()),
                                            opType,
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLDiscretizeInstanceFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLDiscretizeInstanceFactory.java
index 43cbb224b87..2f862a685d3 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLDiscretizeInstanceFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLDiscretizeInstanceFactory.java
@@ -46,7 +46,7 @@ static KiePMMLDiscretize getKiePMMLDiscretize(final Discretize discretize) {
         String defaultValue = discretize.getDefaultValue() != null ? discretize.getDefaultValue().toString() : null;
         DATA_TYPE dataType = discretize.getDataType() != null ? DATA_TYPE.byName(discretize.getDataType().value()) :
                 null;
-        return new KiePMMLDiscretize(discretize.getField().getValue(),
+        return new KiePMMLDiscretize(discretize.getField(),
                                      getKiePMMLExtensions(discretize.getExtensions()),
                                      discretizeBins,
                                      mapMissingTo,
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLFieldColumnPairInstanceFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLFieldColumnPairInstanceFactory.java
index 5ba7d7924d9..d70badd5610 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLFieldColumnPairInstanceFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLFieldColumnPairInstanceFactory.java
@@ -41,7 +41,7 @@ static List getKiePMMLFieldColumnPairs(List field) {
-        String name = toConvert.getName() != null ? toConvert.getName().getValue() : "" + toConvert.hashCode();
+        String name = toConvert.getName() != null ?toConvert.getName() : "" + toConvert.hashCode();
         final FIELD_USAGE_TYPE fieldUsageType = toConvert.getUsageType() != null ?
                 FIELD_USAGE_TYPE.byName(toConvert.getUsageType().value()) : null;
         final OP_TYPE opType = toConvert.getOpType() != null ? OP_TYPE.byName(toConvert.getOpType().value()) : null;
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLNormContinuousInstanceFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLNormContinuousInstanceFactory.java
index d659f76aae7..1fd3cb11cd0 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLNormContinuousInstanceFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLNormContinuousInstanceFactory.java
@@ -43,7 +43,7 @@ static KiePMMLNormContinuous getKiePMMLNormContinuous(final NormContinuous normC
         final List linearNorms = normContinuous.hasLinearNorms() ?
                 getKiePMMLLinearNorms(normContinuous.getLinearNorms()) : Collections.emptyList();
         final OUTLIER_TREATMENT_METHOD outlierTreatmentMethod = normContinuous.getOutliers() != null ? OUTLIER_TREATMENT_METHOD.byName(normContinuous.getOutliers().value()) : null;
-        return new KiePMMLNormContinuous(normContinuous.getField().getValue(), getKiePMMLExtensions(normContinuous.getExtensions()), linearNorms, outlierTreatmentMethod, normContinuous.getMapMissingTo());
+        return new KiePMMLNormContinuous(normContinuous.getField(), getKiePMMLExtensions(normContinuous.getExtensions()), linearNorms, outlierTreatmentMethod, normContinuous.getMapMissingTo());
     }
 
 }
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLNormDiscreteInstanceFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLNormDiscreteInstanceFactory.java
index f887761703f..2c63c82f3f1 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLNormDiscreteInstanceFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLNormDiscreteInstanceFactory.java
@@ -38,7 +38,7 @@ private KiePMMLNormDiscreteInstanceFactory() {
 
     static KiePMMLNormDiscrete getKiePMMLNormDiscrete(final NormDiscrete normDiscrete) {
         List extensions = getKiePMMLExtensions(normDiscrete.getExtensions());
-        return new KiePMMLNormDiscrete(normDiscrete.getField().getValue(),
+        return new KiePMMLNormDiscrete(normDiscrete.getField(),
                                        extensions,
                                        normDiscrete.getValue().toString(),
                                        normDiscrete.getMapMissingTo());
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLOutputFieldInstanceFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLOutputFieldInstanceFactory.java
index 91804ffa9e7..21f7080d229 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLOutputFieldInstanceFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLOutputFieldInstanceFactory.java
@@ -38,8 +38,8 @@ private KiePMMLOutputFieldInstanceFactory() {
     }
 
     public static KiePMMLOutputField getKiePMMLOutputField(final OutputField outputField) {
-        String name = outputField.getName() != null ? outputField.getName().getValue() : "" + outputField.hashCode();
-        final String targetField = outputField.getTargetField() != null ? outputField.getTargetField().getValue() :
+        String name = outputField.getName() != null ?outputField.getName() : "" + outputField.hashCode();
+        final String targetField = outputField.getTargetField() != null ?outputField.getTargetField() :
                 null;
         final RESULT_FEATURE resultFeature = outputField.getResultFeature() != null ?
                 RESULT_FEATURE.byName(outputField.getResultFeature().value()) : null;
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLParameterFieldInstanceFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLParameterFieldInstanceFactory.java
index 5b946d1d616..a2abeb73061 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLParameterFieldInstanceFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLParameterFieldInstanceFactory.java
@@ -47,7 +47,7 @@ static KiePMMLParameterField getKiePMMLParameterField(final ParameterField param
         DATA_TYPE dataType = parameterField.getDataType() != null ?
                 DATA_TYPE.byName(parameterField.getDataType().value()) : null;
         OP_TYPE opType = parameterField.getOpType() != null ? OP_TYPE.byName(parameterField.getOpType().value()) : null;
-        return KiePMMLParameterField.builder(parameterField.getName().getValue(),
+        return KiePMMLParameterField.builder(parameterField.getName(),
                                              Collections.emptyList())
                 .withDataType(dataType)
                 .withOpType(opType)
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLSimplePredicateInstanceFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLSimplePredicateInstanceFactory.java
index 922bbbc043d..8ce616753d5 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLSimplePredicateInstanceFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLSimplePredicateInstanceFactory.java
@@ -44,9 +44,9 @@ private KiePMMLSimplePredicateInstanceFactory() {
     static KiePMMLSimplePredicate getKiePMMLSimplePredicate(final SimplePredicate simplePredicate,
                                                             final List> fields) {
         final List kiePMMLExtensions = getKiePMMLExtensions(simplePredicate.getExtensions());
-        DataType dataType = getDataType(fields, simplePredicate.getField().getValue());
+        DataType dataType = getDataType(fields,simplePredicate.getField());
         Object value = DATA_TYPE.byName(dataType.value()).getActualValue(simplePredicate.getValue());
-        return KiePMMLSimplePredicate.builder(simplePredicate.getField().getValue(),
+        return KiePMMLSimplePredicate.builder(simplePredicate.getField(),
                                               kiePMMLExtensions,
                                               OPERATOR.byName(simplePredicate.getOperator().value()))
                 .withValue(value)
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLSimpleSetPredicateInstanceFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLSimpleSetPredicateInstanceFactory.java
index b5bec302aa7..9d23fb0b55b 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLSimpleSetPredicateInstanceFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLSimpleSetPredicateInstanceFactory.java
@@ -37,7 +37,7 @@ private KiePMMLSimpleSetPredicateInstanceFactory() {
     }
 
     static KiePMMLSimpleSetPredicate getKiePMMLSimpleSetPredicate(final SimpleSetPredicate simpleSetPredicate) {
-        return KiePMMLSimpleSetPredicate.builder(simpleSetPredicate.getField().getValue(),
+        return KiePMMLSimpleSetPredicate.builder(simpleSetPredicate.getField(),
                                                  getKiePMMLExtensions(simpleSetPredicate.getExtensions()),
                                                  ARRAY_TYPE.byName(simpleSetPredicate.getArray().getType().value()),
                                                  IN_NOTIN.byName(simpleSetPredicate.getBooleanOperator().value()))
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLTargetInstanceFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLTargetInstanceFactory.java
index 5aa4483c38f..fae20d1f3cd 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLTargetInstanceFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLTargetInstanceFactory.java
@@ -45,7 +45,7 @@ public static KiePMMLTarget getKiePMMLTarget(final Target target) {
                 .map(KiePMMLTargetInstanceFactory::getKieTargetValue)
                 .collect(Collectors.toList()) : Collections.emptyList();
         final OP_TYPE opType = target.getOpType() != null ? OP_TYPE.byName(target.getOpType().value()) : null;
-        final String field = target.getField() != null ? target.getField().getValue() : null;
+        final String field = target.getField() != null ?target.getField() : null;
         final CAST_INTEGER castInteger = target.getCastInteger() != null ?
                 CAST_INTEGER.byName(target.getCastInteger().value()) : null;
         TargetField targetField = new TargetField(targetValues,
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLTextIndexInstanceFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLTextIndexInstanceFactory.java
index e946b3b40ae..3a814d52091 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLTextIndexInstanceFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLTextIndexInstanceFactory.java
@@ -45,7 +45,7 @@ static KiePMMLTextIndex getKiePMMLTextIndex(final TextIndex textIndex) {
                 COUNT_HITS.byName(textIndex.getCountHits().value()) : null;
         final String wordSeparatorCharacterRE = textIndex.getWordSeparatorCharacterRE() != null ?
                 StringEscapeUtils.escapeJava(textIndex.getWordSeparatorCharacterRE()) : null;
-        return KiePMMLTextIndex.builder(textIndex.getTextField().getValue(),
+        return KiePMMLTextIndex.builder(textIndex.getTextField(),
                                         getKiePMMLExtensions(textIndex.getExtensions()),
                                         getKiePMMLExpression(textIndex.getExpression()))
                 .withTextIndexNormalizations(getKiePMMLTextIndexNormalizations(textIndex.getTextIndexNormalizations()))
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/utils/KiePMMLUtil.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/utils/KiePMMLUtil.java
index ee967bc5c36..62bc2580d71 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/utils/KiePMMLUtil.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/utils/KiePMMLUtil.java
@@ -24,11 +24,10 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 
 import org.dmg.pmml.DataField;
 import org.dmg.pmml.DataType;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.MathContext;
 import org.dmg.pmml.MiningField;
 import org.dmg.pmml.MiningFunction;
@@ -169,7 +168,7 @@ static Optional getTargetDataField(final Model model) {
         String cleanedName = model.getModelName().replaceAll("[^A-Za-z0-9]", "");
         String fieldName = String.format(TARGETFIELD_TEMPLATE, cleanedName);
         DataField toReturn = new DataField();
-        toReturn.setName(FieldName.create(fieldName));
+        toReturn.setName(fieldName);
         toReturn.setOpType(targetOpType);
         toReturn.setDataType(targetDataType);
         return Optional.of(toReturn);
@@ -341,7 +340,7 @@ static void populateMissingOutputFieldDataType(List toPopulate, Lis
                                 .filter(targetField -> outputField.getTargetField().equals(targetField.getName()))
                                 .findFirst()
                                 .orElseThrow(() -> new KiePMMLException("Failed to find a target field for OutputField "
-                                                                                + outputField.getName().getValue()));
+                                                                                +outputField.getName()));
                     }
                     if (referencedField == null && (outputField.getResultFeature() == null || outputField.getResultFeature().equals(ResultFeature.PREDICTED_VALUE))) { // default predictedValue
                         referencedField = targetFields.stream()
@@ -354,7 +353,7 @@ static void populateMissingOutputFieldDataType(List toPopulate, Lis
                         return;
                     }
                     if (referencedField != null) {
-                        FieldName targetFieldName = referencedField.getName();
+                         String targetFieldName = referencedField.getName();
                         DataField dataField = dataFields.stream()
                                 .filter(df -> df.getName().equals(targetFieldName))
                                 .findFirst()
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLApplyFactoryTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLApplyFactoryTest.java
index 6ff7acc2c15..d9c225cee18 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLApplyFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLApplyFactoryTest.java
@@ -27,7 +27,6 @@
 import com.github.javaparser.ast.stmt.Statement;
 import org.dmg.pmml.Apply;
 import org.dmg.pmml.Constant;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.FieldRef;
 import org.dmg.pmml.InvalidValueTreatmentMethod;
 import org.junit.jupiter.api.Test;
@@ -91,9 +90,9 @@ void getApplyVariableDeclarationWithFieldRefs() throws IOException {
         InvalidValueTreatmentMethod invalidValueTreatmentMethod = InvalidValueTreatmentMethod.AS_MISSING;
         apply.setInvalidValueTreatment(invalidValueTreatmentMethod);
         FieldRef fieldRef1 = new FieldRef();
-        fieldRef1.setField(FieldName.create(PARAM_1));
+        fieldRef1.setField(PARAM_1);
         FieldRef fieldRef2 = new FieldRef();
-        fieldRef2.setField(FieldName.create(PARAM_2));
+        fieldRef2.setField(PARAM_2);
         apply.addExpressions(fieldRef1, fieldRef2);
         BlockStmt retrieved =
                 org.kie.pmml.compiler.commons.codegenfactories.KiePMMLApplyFactory.getApplyVariableDeclaration(variableName, apply);
@@ -119,9 +118,9 @@ void getApplyVariableDeclarationWithApply() throws IOException {
         InvalidValueTreatmentMethod nestedInvalidValueTreatmentMethod = InvalidValueTreatmentMethod.AS_MISSING;
         nestedApply.setInvalidValueTreatment(nestedInvalidValueTreatmentMethod);
         FieldRef fieldRef1 = new FieldRef();
-        fieldRef1.setField(FieldName.create(PARAM_1));
+        fieldRef1.setField(PARAM_1);
         FieldRef fieldRef2 = new FieldRef();
-        fieldRef2.setField(FieldName.create(PARAM_2));
+        fieldRef2.setField(PARAM_2);
         nestedApply.addExpressions(fieldRef1, fieldRef2);
         Apply apply = new Apply();
         apply.setFunction(function);
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDefineFunctionFactoryTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDefineFunctionFactoryTest.java
index d136aa7b631..b54f075e5ca 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDefineFunctionFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDefineFunctionFactoryTest.java
@@ -29,7 +29,6 @@
 import org.dmg.pmml.Constant;
 import org.dmg.pmml.DataType;
 import org.dmg.pmml.DefineFunction;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.FieldRef;
 import org.dmg.pmml.OpType;
 import org.dmg.pmml.ParameterField;
@@ -57,18 +56,18 @@ public class KiePMMLDefineFunctionFactoryTest {
 
     @Test
     void getDefineFunctionVariableDeclaration() throws IOException {
-        ParameterField parameterField1 = new ParameterField(FieldName.create(PARAM_1));
+        ParameterField parameterField1 = new ParameterField(PARAM_1);
         parameterField1.setDataType(DataType.DOUBLE);
         parameterField1.setOpType(OpType.CONTINUOUS);
         parameterField1.setDisplayName("displayName1");
-        ParameterField parameterField2 = new ParameterField(FieldName.create(PARAM_2));
+        ParameterField parameterField2 = new ParameterField(PARAM_2);
         parameterField2.setDataType(DataType.DOUBLE);
         parameterField2.setOpType(OpType.CONTINUOUS);
         parameterField2.setDisplayName("displayName2");
         Constant constant = new Constant();
         constant.setValue(value1);
         FieldRef fieldRef = new FieldRef();
-        fieldRef.setField(FieldName.create("FIELD_REF"));
+        fieldRef.setField("FIELD_REF");
         Apply apply = new Apply();
         apply.setFunction("/");
         apply.addExpressions(constant, fieldRef);
@@ -87,17 +86,14 @@ void getDefineFunctionVariableDeclaration() throws IOException {
         BlockStmt retrieved = KiePMMLDefineFunctionFactory.getDefineFunctionVariableDeclaration(defineFunction);
         String text = getFileContent(TEST_01_SOURCE);
         Statement expected = JavaParserUtils
-                .parseBlock(String.format(text,
-                                          parameterField1.getName().getValue(),
+                .parseBlock(String.format(text,parameterField1.getName(),
                                           dataType1,
                                           opType1,
-                                          parameterField1.getDisplayName(),
-                                          parameterField2.getName().getValue(),
+                                          parameterField1.getDisplayName(),parameterField2.getName(),
                                           dataType2,
                                           opType2,
                                           parameterField2.getDisplayName(),
-                                          constant.getValue(),
-                                          fieldRef.getField().getValue(),
+                                          constant.getValue(),fieldRef.getField(),
                                           apply.getFunction(),
                                           apply.getInvalidValueTreatment().value(),
                                           dataType3,
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDerivedFieldFactoryTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDerivedFieldFactoryTest.java
index 83cf1f84aa6..4bd5621a833 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDerivedFieldFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDerivedFieldFactoryTest.java
@@ -29,7 +29,6 @@
 import org.dmg.pmml.Constant;
 import org.dmg.pmml.DataType;
 import org.dmg.pmml.DerivedField;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.FieldRef;
 import org.dmg.pmml.OpType;
 import org.junit.jupiter.api.Test;
@@ -61,7 +60,7 @@ void getDerivedFieldVariableDeclarationWithConstant() throws IOException {
         Constant constant = new Constant();
         constant.setValue(value1);
         DerivedField derivedField = new DerivedField();
-        derivedField.setName(FieldName.create(PARAM_1));
+        derivedField.setName(PARAM_1);
         derivedField.setDataType(DataType.DOUBLE);
         derivedField.setOpType(OpType.CONTINUOUS);
         derivedField.setExpression(constant);
@@ -72,8 +71,7 @@ void getDerivedFieldVariableDeclarationWithConstant() throws IOException {
         String text = getFileContent(TEST_01_SOURCE);
         Statement expected = JavaParserUtils
                 .parseBlock(String.format(text, constant.getValue(),
-                                          variableName,
-                                          derivedField.getName().getValue(),
+                                          variableName,derivedField.getName(),
                                           dataType,
                                           opType));
         assertThat(JavaParserUtils.equalsNode(expected, retrieved)).isTrue();
@@ -87,9 +85,9 @@ void getDerivedFieldVariableDeclarationWithConstant() throws IOException {
     void getDerivedFieldVariableDeclarationWithFieldRef() throws IOException {
         final String variableName = "variableName";
         FieldRef fieldRef = new FieldRef();
-        fieldRef.setField(FieldName.create("FIELD_REF"));
+        fieldRef.setField("FIELD_REF");
         DerivedField derivedField = new DerivedField();
-        derivedField.setName(FieldName.create(PARAM_1));
+        derivedField.setName(PARAM_1);
         derivedField.setDataType(DataType.DOUBLE);
         derivedField.setOpType(OpType.CONTINUOUS);
         derivedField.setExpression(fieldRef);
@@ -99,9 +97,8 @@ void getDerivedFieldVariableDeclarationWithFieldRef() throws IOException {
                 org.kie.pmml.compiler.commons.codegenfactories.KiePMMLDerivedFieldFactory.getDerivedFieldVariableDeclaration(variableName, derivedField);
         String text = getFileContent(TEST_02_SOURCE);
         Statement expected = JavaParserUtils
-                .parseBlock(String.format(text, fieldRef.getField().getValue(),
-                                          variableName,
-                                          derivedField.getName().getValue(),
+                .parseBlock(String.format(text,fieldRef.getField(),
+                                          variableName,derivedField.getName(),
                                           dataType,
                                           opType));
         assertThat(JavaParserUtils.equalsNode(expected, retrieved)).isTrue();
@@ -117,12 +114,12 @@ void getDerivedFieldVariableDeclarationWithApply() throws IOException {
         Constant constant = new Constant();
         constant.setValue(value1);
         FieldRef fieldRef = new FieldRef();
-        fieldRef.setField(FieldName.create("FIELD_REF"));
+        fieldRef.setField("FIELD_REF");
         Apply apply = new Apply();
         apply.setFunction("/");
         apply.addExpressions(constant, fieldRef);
         DerivedField derivedField = new DerivedField();
-        derivedField.setName(FieldName.create(PARAM_1));
+        derivedField.setName(PARAM_1);
         derivedField.setDataType(DataType.DOUBLE);
         derivedField.setOpType(OpType.CONTINUOUS);
         derivedField.setExpression(apply);
@@ -132,12 +129,10 @@ void getDerivedFieldVariableDeclarationWithApply() throws IOException {
         String text = getFileContent(TEST_03_SOURCE);
         Statement expected = JavaParserUtils
                 .parseBlock(String.format(text,
-                                          constant.getValue(),
-                                          fieldRef.getField().getValue(),
+                                          constant.getValue(),fieldRef.getField(),
                                           apply.getFunction(),
                                           apply.getInvalidValueTreatment().value(),
-                                          variableName,
-                                          derivedField.getName().getValue(),
+                                          variableName,derivedField.getName(),
                                           dataType,
                                           opType));
         assertThat(JavaParserUtils.equalsNode(expected, retrieved)).isTrue();
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDiscretizeFactoryTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDiscretizeFactoryTest.java
index 3bb53dc323d..414ae4fc3e8 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDiscretizeFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDiscretizeFactoryTest.java
@@ -28,7 +28,6 @@
 import org.dmg.pmml.DataType;
 import org.dmg.pmml.Discretize;
 import org.dmg.pmml.DiscretizeBin;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.Interval;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -66,7 +65,7 @@ public static void setup() {
     void getDiscretizeVariableDeclaration() throws IOException {
         String variableName = "variableName";
         Discretize discretize = new Discretize();
-        discretize.setField(FieldName.create(NAME));
+        discretize.setField(NAME);
         discretize.setDataType(dataType);
         discretize.setMapMissingTo(MAP_MISSING_TO);
         discretize.setDefaultValue(DEFAULTVALUE);
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLFieldColumnPairFactoryTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLFieldColumnPairFactoryTest.java
index f3615838188..7e5c892ebe5 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLFieldColumnPairFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLFieldColumnPairFactoryTest.java
@@ -26,7 +26,6 @@
 import com.github.javaparser.ast.stmt.BlockStmt;
 import com.github.javaparser.ast.stmt.Statement;
 import org.dmg.pmml.FieldColumnPair;
-import org.dmg.pmml.FieldName;
 import org.junit.jupiter.api.Test;
 import org.kie.pmml.commons.model.expressions.KiePMMLFieldColumnPair;
 import org.kie.pmml.compiler.commons.utils.JavaParserUtils;
@@ -45,7 +44,7 @@ void getRowVariableDeclaration() throws IOException {
         String fieldName = "fieldName";
         String column = "column";
         FieldColumnPair fieldColumnPair = new FieldColumnPair();
-        fieldColumnPair.setField(FieldName.create(fieldName));
+        fieldColumnPair.setField(fieldName);
         fieldColumnPair.setColumn(column);
 
         BlockStmt retrieved = KiePMMLFieldColumnPairFactory.getFieldColumnPairVariableDeclaration(variableName,
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLFieldRefFactoryTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLFieldRefFactoryTest.java
index d7231b57808..359e3e36dfe 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLFieldRefFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLFieldRefFactoryTest.java
@@ -25,7 +25,6 @@
 
 import com.github.javaparser.ast.stmt.BlockStmt;
 import com.github.javaparser.ast.stmt.Statement;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.FieldRef;
 import org.junit.jupiter.api.Test;
 import org.kie.pmml.commons.model.expressions.KiePMMLFieldRef;
@@ -45,7 +44,7 @@ void getFieldRefVariableDeclaration() throws IOException {
         String fieldName = "fieldName";
         String mapMissingTo = "mapMissingTo";
         FieldRef fieldRef = new FieldRef();
-        fieldRef.setField(FieldName.create(fieldName));
+        fieldRef.setField(fieldName);
         fieldRef.setMapMissingTo(mapMissingTo);
         BlockStmt retrieved = KiePMMLFieldRefFactory.getFieldRefVariableDeclaration(variableName, fieldRef);
         String text = getFileContent(TEST_01_SOURCE);
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLInlineTableFactoryTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLInlineTableFactoryTest.java
index 4fb84d0b438..a86e50c013e 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLInlineTableFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLInlineTableFactoryTest.java
@@ -57,7 +57,7 @@ public static void setup() throws Exception {
         DerivedField mapValued = pmmlModel.getTransformationDictionary()
                 .getDerivedFields()
                 .stream()
-                .filter(derivedField -> MAPVALUED.equals(derivedField.getName().getValue()))
+                .filter(derivedField -> MAPVALUED.equals(derivedField.getName()))
                 .findFirst()
                 .orElseThrow(() -> new RuntimeException("Missing derived field " + MAPVALUED));
         INLINETABLE = ((MapValues) mapValued.getExpression()).getInlineTable();
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLLocalTransformationsFactoryTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLLocalTransformationsFactoryTest.java
index 12bf81ccb81..2660518d6b0 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLLocalTransformationsFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLLocalTransformationsFactoryTest.java
@@ -29,7 +29,6 @@
 import org.dmg.pmml.Constant;
 import org.dmg.pmml.DataType;
 import org.dmg.pmml.DerivedField;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.LocalTransformations;
 import org.dmg.pmml.OpType;
 import org.junit.jupiter.api.Test;
@@ -80,7 +79,7 @@ private DerivedField getDerivedField(int counter) {
         Constant constant = new Constant();
         constant.setValue(value1);
         DerivedField toReturn = new DerivedField();
-        toReturn.setName(FieldName.create(PARAM_2 + counter));
+        toReturn.setName(PARAM_2 + counter);
         toReturn.setDataType(DataType.DOUBLE);
         toReturn.setOpType(OpType.CONTINUOUS);
         toReturn.setExpression(constant);
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLMapValuesFactoryTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLMapValuesFactoryTest.java
index b01a9b7a97c..c3221ab11d8 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLMapValuesFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLMapValuesFactoryTest.java
@@ -58,7 +58,7 @@ public static void setup() throws Exception {
         DerivedField mapValued = pmmlModel.getTransformationDictionary()
                 .getDerivedFields()
                 .stream()
-                .filter(derivedField -> MAPVALUED.equals(derivedField.getName().getValue()))
+                .filter(derivedField -> MAPVALUED.equals(derivedField.getName()))
                 .findFirst()
                 .orElseThrow(() -> new RuntimeException("Missing derived field " + MAPVALUED));
         MAPVALUES = ((MapValues) mapValued.getExpression());
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLMiningFieldFactoryTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLMiningFieldFactoryTest.java
index e3d14fc03b0..141a7a2240b 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLMiningFieldFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLMiningFieldFactoryTest.java
@@ -59,8 +59,7 @@ void getMiningFieldVariableDeclarationNoAllowedValuesNoIntervals() throws IOExce
         String dataTypeString =
                 DATA_TYPE.class.getName() + "." + DATA_TYPE.byName(dataField.getDataType().value()).name();
         String text = getFileContent(TEST_01_SOURCE);
-        Statement expected = JavaParserUtils.parseBlock(String.format(text, VARIABLE_NAME,
-                                                                      miningField.getName().getValue(),
+        Statement expected = JavaParserUtils.parseBlock(String.format(text, VARIABLE_NAME,miningField.getName(),
                                                                       dataTypeString));
         assertThat(JavaParserUtils.equalsNode(expected, retrieved)).isTrue();
         List> imports = Arrays.asList(Arrays.class, Collections.class, KiePMMLInterval.class,
@@ -81,8 +80,7 @@ void getMiningFieldVariableDeclarationWithAllowedValuesNoIntervals() throws IOEx
         String dataTypeString =
                 DATA_TYPE.class.getName() + "." + DATA_TYPE.byName(dataField.getDataType().value()).name();
         String text = getFileContent(TEST_02_SOURCE);
-        Statement expected = JavaParserUtils.parseBlock(String.format(text, VARIABLE_NAME,
-                                                                      miningField.getName().getValue(),
+        Statement expected = JavaParserUtils.parseBlock(String.format(text, VARIABLE_NAME,miningField.getName(),
                                                                       dataTypeString,
                                                                       dataField.getValues().get(0).getValue(),
                                                                       dataField.getValues().get(1).getValue(),
@@ -104,8 +102,7 @@ void getMiningFieldVariableDeclarationWithAllowedValuesAndIntervals() throws IOE
         String dataTypeString =
                 DATA_TYPE.class.getName() + "." + DATA_TYPE.byName(dataField.getDataType().value()).name();
         String text = getFileContent(TEST_03_SOURCE);
-        Statement expected = JavaParserUtils.parseBlock(String.format(text, VARIABLE_NAME,
-                                                                      miningField.getName().getValue(),
+        Statement expected = JavaParserUtils.parseBlock(String.format(text, VARIABLE_NAME,miningField.getName(),
                                                                       dataTypeString,
                                                                       dataField.getValues().get(0).getValue(),
                                                                       dataField.getValues().get(1).getValue(),
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLNormContinuousFactoryTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLNormContinuousFactoryTest.java
index 3c0d1aa1420..56f78bdd176 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLNormContinuousFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLNormContinuousFactoryTest.java
@@ -57,8 +57,7 @@ void getNormContinuousVariableDeclaration() throws IOException {
         String outlierString =
                 OUTLIER_TREATMENT_METHOD.class.getName() + "." + OUTLIER_TREATMENT_METHOD.byName(normContinuous.getOutliers().value()).name();
         String text = getFileContent(TEST_01_SOURCE);
-        Statement expected = JavaParserUtils.parseBlock(String.format(text, variableName,
-                                                                      normContinuous.getField().getValue(),
+        Statement expected = JavaParserUtils.parseBlock(String.format(text, variableName,normContinuous.getField(),
                                                                       linearNorms.get(0).getOrig(),
                                                                       linearNorms.get(0).getNorm(),
                                                                       linearNorms.get(1).getOrig(),
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLNormDiscreteFactoryTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLNormDiscreteFactoryTest.java
index fc0fe288b85..25be272ac8e 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLNormDiscreteFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLNormDiscreteFactoryTest.java
@@ -25,7 +25,6 @@
 
 import com.github.javaparser.ast.stmt.BlockStmt;
 import com.github.javaparser.ast.stmt.Statement;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.NormDiscrete;
 import org.junit.jupiter.api.Test;
 import org.kie.pmml.commons.model.expressions.KiePMMLNormDiscrete;
@@ -47,7 +46,7 @@ void getNormDiscreteVariableDeclaration() throws IOException {
         double mapMissingTo = 45.32;
 
         NormDiscrete normDiscrete = new NormDiscrete();
-        normDiscrete.setField(FieldName.create(fieldName));
+        normDiscrete.setField(fieldName);
         normDiscrete.setValue(fieldValue);
         normDiscrete.setMapMissingTo(mapMissingTo);
 
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLParameterFieldFactoryTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLParameterFieldFactoryTest.java
index 62d6b453926..05831bc0688 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLParameterFieldFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLParameterFieldFactoryTest.java
@@ -26,7 +26,6 @@
 import com.github.javaparser.ast.stmt.BlockStmt;
 import com.github.javaparser.ast.stmt.Statement;
 import org.dmg.pmml.DataType;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.OpType;
 import org.dmg.pmml.ParameterField;
 import org.junit.jupiter.api.Test;
@@ -46,7 +45,7 @@ public class KiePMMLParameterFieldFactoryTest {
     @Test
     void getParameterFieldVariableDeclaration() throws IOException {
         String variableName = "variableName";
-        ParameterField parameterField = new ParameterField(FieldName.create(variableName));
+        ParameterField parameterField = new ParameterField(variableName);
         parameterField.setDataType(DataType.DOUBLE);
         parameterField.setOpType(OpType.CONTINUOUS);
         parameterField.setDisplayName("displayName");
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLRowFactoryTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLRowFactoryTest.java
index 4315879f7bc..d999c4c36bd 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLRowFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLRowFactoryTest.java
@@ -58,14 +58,14 @@ public static void setup() throws Exception {
         DerivedField mapValued = pmmlModel.getTransformationDictionary()
                 .getDerivedFields()
                 .stream()
-                .filter(derivedField -> MAPVALUED.equals(derivedField.getName().getValue()))
+                .filter(derivedField -> MAPVALUED.equals(derivedField.getName()))
                 .findFirst()
                 .orElseThrow(() -> new RuntimeException("Missing derived field " + MAPVALUED));
         MAPVALUED_ROW = ((MapValues) mapValued.getExpression()).getInlineTable().getRows().get(0);
         DerivedField dataEncoded = pmmlModel.getTransformationDictionary()
                 .getDerivedFields()
                 .stream()
-                .filter(derivedField -> DATAENCODED.equals(derivedField.getName().getValue()))
+                .filter(derivedField -> DATAENCODED.equals(derivedField.getName()))
                 .findFirst()
                 .orElseThrow(() -> new RuntimeException("Missing derived field " + MAPVALUED));
         DATAENCODED_ROW = ((MapValues) dataEncoded.getExpression()).getInlineTable().getRows().get(0);
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLSimplePredicateFactoryTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLSimplePredicateFactoryTest.java
index ef278cbe938..23d5d30c4a7 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLSimplePredicateFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLSimplePredicateFactoryTest.java
@@ -28,7 +28,6 @@
 import org.dmg.pmml.DataDictionary;
 import org.dmg.pmml.DataField;
 import org.dmg.pmml.DataType;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.SimplePredicate;
 import org.junit.jupiter.api.Test;
 import org.kie.pmml.api.enums.OPERATOR;
@@ -48,7 +47,7 @@ public class KiePMMLSimplePredicateFactoryTest {
     void getSimplePredicateVariableDeclaration() throws IOException {
         String variableName = "variableName";
         final SimplePredicate simplePredicate = new SimplePredicate();
-        simplePredicate.setField(FieldName.create("CUSTOM_FIELD"));
+        simplePredicate.setField("CUSTOM_FIELD");
         simplePredicate.setValue("235.435");
         simplePredicate.setOperator(SimplePredicate.Operator.EQUAL);
         String operatorString = OPERATOR.class.getName() + "." + OPERATOR.byName(simplePredicate.getOperator().value());
@@ -60,8 +59,7 @@ void getSimplePredicateVariableDeclaration() throws IOException {
 
         BlockStmt retrieved = KiePMMLSimplePredicateFactory.getSimplePredicateVariableDeclaration(variableName, simplePredicate, getFieldsFromDataDictionary(dataDictionary));
         String text = getFileContent(TEST_01_SOURCE);
-        Statement expected = JavaParserUtils.parseBlock(String.format(text, variableName,
-                                                                      simplePredicate.getField().getValue(),
+        Statement expected = JavaParserUtils.parseBlock(String.format(text, variableName,simplePredicate.getField(),
                                                                       operatorString,
                                                                       simplePredicate.getValue()));
         assertThat(JavaParserUtils.equalsNode(expected, retrieved)).isTrue();
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLSimpleSetPredicateFactoryTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLSimpleSetPredicateFactoryTest.java
index ed4c46efff5..3ee849e0e55 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLSimpleSetPredicateFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLSimpleSetPredicateFactoryTest.java
@@ -30,7 +30,6 @@
 import org.dmg.pmml.DataDictionary;
 import org.dmg.pmml.DataField;
 import org.dmg.pmml.DataType;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.SimpleSetPredicate;
 import org.junit.jupiter.api.Test;
 import org.kie.pmml.api.enums.ARRAY_TYPE;
@@ -73,8 +72,7 @@ void getSimpleSetPredicateVariableDeclaration() throws IOException {
         BlockStmt retrieved = KiePMMLSimpleSetPredicateFactory.getSimpleSetPredicateVariableDeclaration(variableName,
                                                                                                         simpleSetPredicate);
         String text = getFileContent(TEST_01_SOURCE);
-        Statement expected = JavaParserUtils.parseBlock(String.format(text, variableName,
-                                                                      simpleSetPredicate.getField().getValue(),
+        Statement expected = JavaParserUtils.parseBlock(String.format(text, variableName,simpleSetPredicate.getField(),
                                                                       arrayTypeString,
                                                                       booleanOperatorString,
                                                                       valuesString));
@@ -87,7 +85,7 @@ public static SimpleSetPredicate getSimpleSetPredicate(List values, fina
                                                            final SimpleSetPredicate.BooleanOperator inNotIn) {
         Array array = getArray(arrayType, values);
         SimpleSetPredicate toReturn = new SimpleSetPredicate();
-        toReturn.setField(FieldName.create(SIMPLE_SET_PREDICATE_NAME));
+        toReturn.setField(SIMPLE_SET_PREDICATE_NAME);
         toReturn.setBooleanOperator(inNotIn);
         toReturn.setArray(array);
         return toReturn;
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLTextIndexFactoryTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLTextIndexFactoryTest.java
index e9874f34d6f..938a29d9c82 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLTextIndexFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLTextIndexFactoryTest.java
@@ -71,8 +71,7 @@ void getTextIndexVariableDeclaration() throws IOException {
         BlockStmt retrieved = KiePMMLTextIndexFactory.getTextIndexVariableDeclaration(variableName,
                                                                                       TEXTINDEX);
         String text = getFileContent(TEST_01_SOURCE);
-        Statement expected = JavaParserUtils.parseBlock(String.format(text, variableName,
-                                                                      TEXTINDEX.getTextField().getValue()));
+        Statement expected = JavaParserUtils.parseBlock(String.format(text, variableName,TEXTINDEX.getTextField()));
         assertThat(JavaParserUtils.equalsNode(expected, retrieved)).isTrue();
         List> imports = Arrays.asList(Arrays.class, Collections.class, Collectors.class,
                                                KiePMMLFieldRef.class, KiePMMLInlineTable.class,
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLTransformationDictionaryFactoryTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLTransformationDictionaryFactoryTest.java
index bd4374a478a..d78a9ced335 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLTransformationDictionaryFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLTransformationDictionaryFactoryTest.java
@@ -31,7 +31,6 @@
 import org.dmg.pmml.DataType;
 import org.dmg.pmml.DefineFunction;
 import org.dmg.pmml.DerivedField;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.FieldRef;
 import org.dmg.pmml.OpType;
 import org.dmg.pmml.ParameterField;
@@ -88,18 +87,18 @@ private DefineFunction[] getDefineFunctions() {
     }
 
     private DefineFunction getDefineFunction(int counter) {
-        ParameterField parameterField1 = new ParameterField(FieldName.create(PARAM_1 + counter));
+        ParameterField parameterField1 = new ParameterField(PARAM_1 + counter);
         parameterField1.setDataType(DataType.DOUBLE);
         parameterField1.setOpType(OpType.CONTINUOUS);
         parameterField1.setDisplayName("displayName1" + counter);
-        ParameterField parameterField2 = new ParameterField(FieldName.create(PARAM_2 + counter));
+        ParameterField parameterField2 = new ParameterField(PARAM_2 + counter);
         parameterField2.setDataType(DataType.DOUBLE);
         parameterField2.setOpType(OpType.CONTINUOUS);
         parameterField2.setDisplayName("displayName2" + counter);
         Constant constant = new Constant();
         constant.setValue(value1);
         FieldRef fieldRef = new FieldRef();
-        fieldRef.setField(FieldName.create("FIELD_REF" + counter));
+        fieldRef.setField("FIELD_REF" + counter);
         Apply apply = new Apply();
         apply.setFunction("/");
         apply.addExpressions(constant, fieldRef);
@@ -122,7 +121,7 @@ private DerivedField getDerivedField(int counter) {
         Constant constant = new Constant();
         constant.setValue(value1);
         DerivedField toReturn = new DerivedField();
-        toReturn.setName(FieldName.create(PARAM_2 + counter));
+        toReturn.setName(PARAM_2 + counter);
         toReturn.setDataType(DataType.DOUBLE);
         toReturn.setOpType(OpType.CONTINUOUS);
         toReturn.setExpression(constant);
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/factories/InstanceFactoriesTestCommon.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/factories/InstanceFactoriesTestCommon.java
index 23927ed5e49..cb339230e0c 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/factories/InstanceFactoriesTestCommon.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/factories/InstanceFactoriesTestCommon.java
@@ -112,7 +112,7 @@ static void commonVerifyKiePMMLDefineFunction(KiePMMLDefineFunction toVerify,
         assertThat(toVerifyList).hasSameSizeAs(sourcesParameterFields);
         sourcesParameterFields.forEach(paramSource -> {
             Optional parameterToVerify =
-                    toVerifyList.stream().filter(param -> param.getName().equals(paramSource.getName().getValue()))
+                    toVerifyList.stream().filter(param -> param.getName().equals(paramSource.getName()))
                             .findFirst();
             assertThat(parameterToVerify).isPresent();
             commonVerifyKiePMMLParameterField(parameterToVerify.get(), paramSource);
@@ -122,24 +122,24 @@ static void commonVerifyKiePMMLDefineFunction(KiePMMLDefineFunction toVerify,
     static void commonVerifyKiePMMLDerivedField(KiePMMLDerivedField toVerify,
                                                 DerivedField source) {
         assertThat(toVerify).isNotNull();
-        assertThat(toVerify.getName()).isEqualTo(source.getName().getValue());
+        assertThat(toVerify.getName()).isEqualTo(source.getName());
         DATA_TYPE expectedDataType = DATA_TYPE.byName(source.getDataType().value());
         assertThat(toVerify.getDataType()).isEqualTo(expectedDataType);
         OP_TYPE expectedOpType = OP_TYPE.byName(source.getOpType().value());
         assertThat(toVerify.getOpType()).isEqualTo(expectedOpType);
-        String expectedDisplayName = "Display-" + source.getName().getValue();
+        String expectedDisplayName = "Display-" +source.getName();
         assertThat(toVerify.getDisplayName()).isEqualTo(expectedDisplayName);
         commonVerifyKiePMMLExpression(toVerify.getKiePMMLExpression(), source.getExpression());
     }
 
     static void commonVerifyKiePMMLParameterField(KiePMMLParameterField toVerify, ParameterField source) {
         assertThat(toVerify).isNotNull();
-        assertThat(toVerify.getName()).isEqualTo(source.getName().getValue());
+        assertThat(toVerify.getName()).isEqualTo(source.getName());
         DATA_TYPE expectedDataType = DATA_TYPE.byName(source.getDataType().value());
         assertThat(toVerify.getDataType()).isEqualTo(expectedDataType);
         OP_TYPE expectedOpType = OP_TYPE.byName(source.getOpType().value());
         assertThat(toVerify.getOpType()).isEqualTo(expectedOpType);
-        String expectedDisplayName = "Display-" + source.getName().getValue();
+        String expectedDisplayName = "Display-" +source.getName();
         assertThat(toVerify.getDisplayName()).isEqualTo(expectedDisplayName);
     }
 
@@ -184,20 +184,20 @@ static void commonVerifyKiePMMLSimplePredicate(KiePMMLSimplePredicate toVerify,
                                                    DataField dataField) {
         assertThat(toVerify).isNotNull();
         Object value = DATA_TYPE.byName(dataField.getDataType().value()).getActualValue(source.getValue());
-        assertThat(toVerify.getName()).isEqualTo(source.getField().getValue());
+        assertThat(toVerify.getName()).isEqualTo(source.getField());
         assertThat(toVerify.getValue()).isEqualTo(value);
         assertThat(toVerify.getOperator().getName()).isEqualTo(source.getOperator().value());
     }
 
     static void commonVerifyKiePMMLSimplePredicate(KiePMMLSimplePredicate toVerify, SimplePredicate source) {
         assertThat(toVerify).isNotNull();
-        assertThat(toVerify.getName()).isEqualTo(source.getField().getValue());
+        assertThat(toVerify.getName()).isEqualTo(source.getField());
         assertThat(toVerify.getOperator().getName()).isEqualTo(source.getOperator().value());
     }
 
     static void commonVerifyKiePMMLSimpleSetPredicate(KiePMMLSimpleSetPredicate toVerify, SimpleSetPredicate source) {
         assertThat(toVerify).isNotNull();
-        assertThat(toVerify.getName()).isEqualTo(source.getField().getValue());
+        assertThat(toVerify.getName()).isEqualTo(source.getField());
         Array array = source.getArray();
         assertThat(toVerify.getArrayType().getName()).isEqualTo(array.getType().value());
         assertThat(toVerify.getInNotIn().getName()).isEqualTo(source.getBooleanOperator().value());
@@ -276,7 +276,7 @@ static void commonVerifyKiePMMLConstant(KiePMMLConstant toVerify, Constant sourc
 
     static void commonVerifyKiePMMLDiscretize(KiePMMLDiscretize toVerify, Discretize source) {
         assertThat(toVerify).isNotNull();
-        assertThat(toVerify.getName()).isEqualTo(source.getField().getValue());
+        assertThat(toVerify.getName()).isEqualTo(source.getField());
         assertThat(toVerify.getMapMissingTo()).isEqualTo(source.getMapMissingTo());
         assertThat(toVerify.getDefaultValue()).isEqualTo(source.getDefaultValue());
         assertThat(toVerify.getDataType().getName()).isEqualTo(source.getDataType().value());
@@ -286,7 +286,7 @@ static void commonVerifyKiePMMLDiscretize(KiePMMLDiscretize toVerify, Discretize
 
     static void commonVerifyKiePMMLFieldRef(KiePMMLFieldRef toVerify, FieldRef source) {
         assertThat(toVerify).isNotNull();
-        assertThat(toVerify.getName()).isEqualTo(source.getField().getValue());
+        assertThat(toVerify.getName()).isEqualTo(source.getField());
         assertThat(toVerify.getMapMissingTo()).isEqualTo(source.getMapMissingTo());
     }
 
@@ -314,7 +314,7 @@ static void commonVerifyKiePMMLNormContinuous(KiePMMLNormContinuous toVerify, No
 
     static void commonVerifyKiePMMLNormDiscrete(KiePMMLNormDiscrete toVerify, NormDiscrete source) {
         assertThat(toVerify).isNotNull();
-        assertThat(toVerify.getName()).isEqualTo(source.getField().getValue());
+        assertThat(toVerify.getName()).isEqualTo(source.getField());
         assertThat(toVerify.getMapMissingTo()).isEqualTo(source.getMapMissingTo());
         assertThat(toVerify.getValue()).isEqualTo(source.getValue().toString());
     }
@@ -350,7 +350,7 @@ static void commonVerifyKiePMMLDiscretizeBin(KiePMMLDiscretizeBin toVerify, Disc
 
     static void commonVerifyKiePMMLFieldColumnPair(KiePMMLFieldColumnPair toVerify, FieldColumnPair source) {
         assertThat(toVerify).isNotNull();
-        assertThat(toVerify.getName()).isEqualTo(source.getField().getValue());
+        assertThat(toVerify.getName()).isEqualTo(source.getField());
         assertThat(toVerify.getColumn()).isEqualTo(source.getColumn());
     }
 
@@ -369,7 +369,7 @@ static void commonVerifyKiePMMLInterval(KiePMMLInterval toVerify, Interval sourc
 
     static void commonVerifyKiePMMLMiningField(KiePMMLMiningField toVerify, MiningField source, DataField dataField) {
         assertThat(toVerify).isNotNull();
-        assertThat(toVerify.getName()).isEqualTo(source.getName().getValue());
+        assertThat(toVerify.getName()).isEqualTo(source.getName());
         assertThat(toVerify.getOpType().getName()).isEqualTo(source.getOpType().value());
         assertThat(toVerify.getFieldUsageType().getName()).isEqualTo(source.getUsageType().value());
         assertThat(toVerify.getInvalidValueTreatmentMethod().getName()).isEqualTo(source.getInvalidValueTreatment().value());
@@ -383,10 +383,10 @@ static void commonVerifyKiePMMLMiningField(KiePMMLMiningField toVerify, MiningFi
 
     static void commonVerifyKiePMMLOutputField(KiePMMLOutputField toVerify, OutputField source) {
         assertThat(toVerify).isNotNull();
-        assertThat(toVerify.getName()).isEqualTo(source.getName().getValue());
+        assertThat(toVerify.getName()).isEqualTo(source.getName());
         assertThat(toVerify.getValue()).isEqualTo(source.getValue());
         assertThat(toVerify.getDataType().getName()).isEqualTo(source.getDataType().value());
-        assertThat(toVerify.getTargetField().get()).isEqualTo(source.getTargetField().getValue());
+        assertThat(toVerify.getTargetField().get()).isEqualTo(source.getTargetField());
         assertThat(toVerify.getResultFeature().getName()).isEqualTo(source.getResultFeature().value());
         assertThat(toVerify.getRank()).isEqualTo(source.getRank());
         assertThat(toVerify.getValue()).isEqualTo(source.getValue());
@@ -398,7 +398,7 @@ static void commonVerifyKiePMMLTarget(KiePMMLTarget toVerify, Target source) {
         assertThat(source.getTargetValues()).hasSameSizeAs(toVerify.getTargetValues());
         OP_TYPE expectedOpType = OP_TYPE.byName(source.getOpType().value());
         assertThat(toVerify.getOpType()).isEqualTo(expectedOpType);
-        assertThat(toVerify.getField()).isEqualTo(source.getField().getValue());
+        assertThat(toVerify.getField()).isEqualTo(source.getField());
         CAST_INTEGER expectedCastInteger = CAST_INTEGER.byName(source.getCastInteger().value());
         assertThat(toVerify.getCastInteger()).isEqualTo(expectedCastInteger);
         assertThat(toVerify.getMin()).isCloseTo(source.getMin().doubleValue(), Offset.offset(0.0));
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/factories/KiePMMLLocalTransformationsInstanceFactoryTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/factories/KiePMMLLocalTransformationsInstanceFactoryTest.java
index 1d55b0229e7..4f1b09f22fe 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/factories/KiePMMLLocalTransformationsInstanceFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/factories/KiePMMLLocalTransformationsInstanceFactoryTest.java
@@ -47,7 +47,7 @@ void getKiePMMLLocalTransformations() {
         assertThat(derivedFieldsToVerify).hasSameSizeAs(derivedFields);
         derivedFields.forEach(derivedFieldSource -> {
             Optional derivedFieldToVerify =
-                    derivedFieldsToVerify.stream().filter(param -> param.getName().equals(derivedFieldSource.getName().getValue()))
+                    derivedFieldsToVerify.stream().filter(param -> param.getName().equals(derivedFieldSource.getName()))
                             .findFirst();
             assertThat(derivedFieldToVerify).isPresent();
             commonVerifyKiePMMLDerivedField(derivedFieldToVerify.get(), derivedFieldSource);
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/factories/KiePMMLTransformationDictionaryInstanceFactoryTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/factories/KiePMMLTransformationDictionaryInstanceFactoryTest.java
index ed87c68309f..df58cc39f94 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/factories/KiePMMLTransformationDictionaryInstanceFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/factories/KiePMMLTransformationDictionaryInstanceFactoryTest.java
@@ -50,7 +50,7 @@ void getKiePMMLTransformationDictionary() {
         assertThat(derivedFieldsToVerify).hasSameSizeAs(derivedFields);
         derivedFields.forEach(derivedFieldSource -> {
             Optional derivedFieldToVerify =
-                    derivedFieldsToVerify.stream().filter(param -> param.getName().equals(derivedFieldSource.getName().getValue()))
+                    derivedFieldsToVerify.stream().filter(param -> param.getName().equals(derivedFieldSource.getName()))
                             .findFirst();
             assertThat(derivedFieldToVerify).isPresent();
             commonVerifyKiePMMLDerivedField(derivedFieldToVerify.get(), derivedFieldSource);
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/utils/JavaParserUtilsTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/utils/JavaParserUtilsTest.java
index ba3d9f20653..3c222171f60 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/utils/JavaParserUtilsTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/utils/JavaParserUtilsTest.java
@@ -24,6 +24,7 @@
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
 import com.github.javaparser.ast.expr.Name;
 import org.junit.jupiter.api.Test;
+import org.kie.pmml.api.exceptions.ExternalException;
 import org.kie.pmml.api.exceptions.KiePMMLInternalException;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -51,7 +52,7 @@ void getFromFileNameNotParsable() {
 
     @Test
     void getFromFileNameNotExisting() {
-        assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> {
+        assertThatExceptionOfType(ExternalException.class).isThrownBy(() -> {
             JavaParserUtils.getFromFileName("not_existing");
         });
     }
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/utils/KiePMMLUtilTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/utils/KiePMMLUtilTest.java
index 46ce5d7bee0..df844bcf3ad 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/utils/KiePMMLUtilTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/java/org/kie/pmml/compiler/commons/utils/KiePMMLUtilTest.java
@@ -32,12 +32,11 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.dmg.pmml.DataField;
 import org.dmg.pmml.DataType;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.MathContext;
 import org.dmg.pmml.MiningField;
 import org.dmg.pmml.MiningFunction;
@@ -142,7 +141,7 @@ void getTargetDataField() throws Exception {
         assertThat(optionalDataField).isPresent();
         DataField retrieved = optionalDataField.get();
         String expected = String.format(TARGETFIELD_TEMPLATE, "golfing");
-        assertThat(retrieved.getName().getValue()).isEqualTo(expected);
+        assertThat(retrieved.getName()).isEqualTo(expected);
     }
 
     @Test
@@ -190,23 +189,23 @@ void getTargetOpType()  {
     @Test
     void getTargetMiningField() {
         final DataField dataField = new DataField();
-        dataField.setName(FieldName.create("FIELD_NAME"));
+        dataField.setName("FIELD_NAME");
         final MiningField retrieved = KiePMMLUtil.getTargetMiningField(dataField);
-        assertThat(retrieved.getName().getValue()).isEqualTo(dataField.getName().getValue());
+        assertThat(retrieved.getName()).isEqualTo(dataField.getName());
         assertThat(retrieved.getUsageType()).isEqualTo(MiningField.UsageType.TARGET);
     }
 
     @Test
     void correctTargetFields() {
-        final MiningField miningField = new MiningField(FieldName.create("FIELD_NAME"));
+        final MiningField miningField = new MiningField("FIELD_NAME");
         final Targets targets = new Targets();
         final Target namedTarget = new Target();
         String targetName = "TARGET_NAME";
-        namedTarget.setField(FieldName.create(targetName));
+        namedTarget.setField(targetName);
         final Target unnamedTarget = new Target();
         targets.addTargets(namedTarget, unnamedTarget);
         KiePMMLUtil.correctTargetFields(miningField, targets);
-        assertThat(namedTarget.getField().getValue()).isEqualTo(targetName);
+        assertThat(namedTarget.getField()).isEqualTo(targetName);
         assertThat(unnamedTarget.getField()).isEqualTo(miningField.getName());
     }
 
@@ -292,7 +291,7 @@ void populateMissingOutputFieldDataType() {
         List dataFields = fieldNames.stream()
                 .map(fieldName -> {
                     DataField toReturn = new DataField();
-                    toReturn.setName(FieldName.create(fieldName));
+                    toReturn.setName(fieldName);
                     DataType dataType = DataType.values()[random.nextInt(DataType.values().length)];
                     toReturn.setDataType(dataType);
                     return toReturn;
@@ -302,40 +301,40 @@ void populateMissingOutputFieldDataType() {
                 .mapToObj(dataFields::get)
                 .map(dataField -> {
                     MiningField toReturn = new MiningField();
-                    toReturn.setName(FieldName.create(dataField.getName().getValue()));
+                    toReturn.setName(dataField.getName());
                     toReturn.setUsageType(MiningField.UsageType.ACTIVE);
                     return toReturn;
                 })
                 .collect(Collectors.toList());
         DataField lastDataField = dataFields.get(dataFields.size() - 1);
         MiningField targetMiningField = new MiningField();
-        targetMiningField.setName(FieldName.create(lastDataField.getName().getValue()));
+        targetMiningField.setName(lastDataField.getName());
         targetMiningField.setUsageType(MiningField.UsageType.TARGET);
         miningFields.add(targetMiningField);
         // Following OutputFields should be populated based on "ResultFeature.PROBABILITY"
         List outputFields = IntStream.range(0, 3)
                 .mapToObj(i -> {
                     OutputField toReturn = new OutputField();
-                    toReturn.setName(FieldName.create(RandomStringUtils.random(6, true, false)));
+                    toReturn.setName(RandomStringUtils.random(6, true, false));
                     toReturn.setResultFeature(ResultFeature.PROBABILITY);
                     return toReturn;
                 })
                 .collect(Collectors.toList());
         // Following OutputField should be populated based on "ResultFeature.PREDICTED_VALUE"
         OutputField targetOutputField = new OutputField();
-        targetOutputField.setName(FieldName.create(RandomStringUtils.random(6, true, false)));
+        targetOutputField.setName(RandomStringUtils.random(6, true, false));
         targetOutputField.setResultFeature(ResultFeature.PREDICTED_VALUE);
         outputFields.add(targetOutputField);
         // Following OutputField should be populated based on "TargetField" property
         OutputField targetingOutputField = new OutputField();
-        targetingOutputField.setName(FieldName.create(RandomStringUtils.random(6, true, false)));
-        targetingOutputField.setTargetField(FieldName.create(targetMiningField.getName().getValue()));
+        targetingOutputField.setName(RandomStringUtils.random(6, true, false));
+        targetingOutputField.setTargetField(targetMiningField.getName());
         outputFields.add(targetingOutputField);
         outputFields.forEach(outputField -> assertThat(outputField.getDataType()).isNull());
         IntStream.range(0, 2)
                 .forEach(i -> {
                     OutputField toAdd = new OutputField();
-                    toAdd.setName(FieldName.create(RandomStringUtils.random(6, true, false)));
+                    toAdd.setName(RandomStringUtils.random(6, true, false));
                     DataType dataType = DataType.values()[random.nextInt(DataType.values().length)];
                     toAdd.setDataType(dataType);
                     outputFields.add(toAdd);
@@ -370,7 +369,7 @@ void getMiningTargetFieldsFromMiningSchema() throws Exception {
         assertThat(retrieved).isNotNull();
         assertThat(retrieved).hasSize(1);
         MiningField targetField = retrieved.get(0);
-        assertThat(targetField.getName().getValue()).isEqualTo("car_location");
+        assertThat(targetField.getName()).isEqualTo("car_location");
         assertThat(targetField.getUsageType().value()).isEqualTo("target");
     }
 
@@ -383,7 +382,7 @@ void getMiningTargetFieldsFromMiningFields() throws Exception {
         assertThat(retrieved).isNotNull();
         assertThat(retrieved).hasSize(1);
         MiningField targetField = retrieved.get(0);
-        assertThat(targetField.getName().getValue()).isEqualTo("car_location");
+        assertThat(targetField.getName()).isEqualTo("car_location");
         assertThat(targetField.getUsageType().value()).isEqualTo("target");
     }
 
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-core/pom.xml b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-core/pom.xml
index c36d086282d..c67aba7c643 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-core/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-core/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-compiler
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-core/src/test/java/org/kie/pmml/compiler/testingutils/TestingModel.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-core/src/test/java/org/kie/pmml/compiler/testingutils/TestingModel.java
index feb38f91b9a..4d7c7c58347 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-core/src/test/java/org/kie/pmml/compiler/testingutils/TestingModel.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-core/src/test/java/org/kie/pmml/compiler/testingutils/TestingModel.java
@@ -107,5 +107,15 @@ public String getModelName() {
         return modelName;
     }
 
+    @Override
+    public MiningFunction requireMiningFunction() {
+        return null;
+    }
+
+    @Override
+    public MiningSchema requireMiningSchema() {
+        return null;
+    }
+
 
 }
diff --git a/kie-pmml-trusty/kie-pmml-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-compiler/pom.xml
index cdf2de1396a..b18db33d519 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-compiler/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-trusty
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-dependencies/pom.xml b/kie-pmml-trusty/kie-pmml-dependencies/pom.xml
index 10f15f4f843..fe129f23cae 100644
--- a/kie-pmml-trusty/kie-pmml-dependencies/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-dependencies/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-trusty
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-api/pom.xml b/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-api/pom.xml
index caa05f09213..f77a7609ca0 100644
--- a/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-api/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-api/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-evaluator
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-core/pom.xml b/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-core/pom.xml
index 47ff9f4e3d0..2f5f1338557 100644
--- a/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-core/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-core/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-evaluator
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-utils/pom.xml b/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-utils/pom.xml
index 42707cf8484..394cd5be907 100644
--- a/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-utils/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-utils/pom.xml
@@ -25,7 +25,7 @@
   
     kie-pmml-evaluator
     org.kie
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-evaluator/pom.xml
index 6fd1be5de84..617f9625156 100644
--- a/kie-pmml-trusty/kie-pmml-evaluator/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-evaluator/pom.xml
@@ -24,7 +24,7 @@
   
     org.kie
     kie-pmml-trusty
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
   pom
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-compiler/pom.xml
index 28e50828878..6794413ce5e 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-compiler/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-compiler/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-clustering
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-compiler/src/main/java/org/kie/pmml/models/clustering/compiler/factories/KiePMMLClusteringModelFactory.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-compiler/src/main/java/org/kie/pmml/models/clustering/compiler/factories/KiePMMLClusteringModelFactory.java
index 5570464de9f..fd2bfeaab6d 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-compiler/src/main/java/org/kie/pmml/models/clustering/compiler/factories/KiePMMLClusteringModelFactory.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-compiler/src/main/java/org/kie/pmml/models/clustering/compiler/factories/KiePMMLClusteringModelFactory.java
@@ -173,7 +173,7 @@ static KiePMMLClusteringField getKiePMMLClusteringField(ClusteringField clusteri
         boolean isCenterField =
                 clusteringField.getCenterField() == null || clusteringField.getCenterField() == ClusteringField.CenterField.TRUE;
         KiePMMLCompareFunction kiePMMLCompareFunction = clusteringField.getCompareFunction() != null ? compareFunctionFrom(clusteringField.getCompareFunction()) : null;
-        return new KiePMMLClusteringField(clusteringField.getField().getValue(), fieldWeight, isCenterField,
+        return new KiePMMLClusteringField(clusteringField.getField(), fieldWeight, isCenterField,
                                           kiePMMLCompareFunction, null);
     }
 
@@ -253,7 +253,7 @@ private static ObjectCreationExpr clusteringFieldCreationExprFrom(ClusteringFiel
                 clusteringField.getCenterField() == null || clusteringField.getCenterField() == ClusteringField.CenterField.TRUE;
 
         NodeList arguments = new NodeList<>();
-        arguments.add(literalExprFrom(clusteringField.getField().getValue()));
+        arguments.add(literalExprFrom(clusteringField.getField()));
         arguments.add(new DoubleLiteralExpr(fieldWeight));
         arguments.add(new BooleanLiteralExpr(isCenterField));
         arguments.add(clusteringField.getCompareFunction() == null ? new NullLiteralExpr() :
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-compiler/src/test/java/org/kie/pmml/models/clustering/compiler/factories/KiePMMLClusteringModelFactoryTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-compiler/src/test/java/org/kie/pmml/models/clustering/compiler/factories/KiePMMLClusteringModelFactoryTest.java
index a8b06c8f091..23f30fe19f1 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-compiler/src/test/java/org/kie/pmml/models/clustering/compiler/factories/KiePMMLClusteringModelFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-compiler/src/test/java/org/kie/pmml/models/clustering/compiler/factories/KiePMMLClusteringModelFactoryTest.java
@@ -38,7 +38,6 @@
 import org.dmg.pmml.DataField;
 import org.dmg.pmml.DataType;
 import org.dmg.pmml.Euclidean;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.MiningField;
 import org.dmg.pmml.MiningFunction;
 import org.dmg.pmml.MiningSchema;
@@ -108,7 +107,7 @@ public static void setup() {
         IntStream.range(0, 3).forEach(i -> {
             ClusteringField clusteringField = getRandomClusteringField();
             clusteringFields.add(clusteringField);
-            fieldNames.add(clusteringField.getField().getValue());
+            fieldNames.add(clusteringField.getField());
             clusters.add(getRandomCluster());
         });
 
@@ -193,7 +192,7 @@ void getKiePMMLCluster() {
     void getKiePMMLClusteringField() {
         ClusteringField clusteringField = new ClusteringField();
         final Random random = new Random();
-        clusteringField.setField(FieldName.create("TEXT"));
+        clusteringField.setField("TEXT");
         clusteringField.setFieldWeight(random.nextDouble());
         clusteringField.setCenterField(getRandomEnum(ClusteringField.CenterField.values()));
         clusteringField.setCompareFunction(getRandomEnum(CompareFunction.values()));
@@ -256,7 +255,7 @@ void setStaticGetter() throws IOException {
 
         String expectedCompareFunction =
                 KiePMMLCompareFunction.class.getCanonicalName() + "." + comparisonMeasure.getCompareFunction().name();
-        String expectedTargetField = targetMiningField.getName().getValue();
+        String expectedTargetField =targetMiningField.getName();
 
         KiePMMLClusteringModelFactory.setStaticGetter(compilationDTO,
                 modelTemplate);
@@ -285,7 +284,7 @@ private void commonEvaluateKiePMMLClusteringField(KiePMMLClusteringField retriev
                                                       ClusteringField clusteringField) {
         assertThat(retrieved).isNotNull();
         boolean isCenterField = clusteringField.getCenterField() == ClusteringField.CenterField.TRUE;
-        assertThat(retrieved.getField()).isEqualTo(clusteringField.getField().getValue());
+        assertThat(retrieved.getField()).isEqualTo(clusteringField.getField());
         assertThat(retrieved.getFieldWeight()).isEqualTo(clusteringField.getFieldWeight());
         assertThat(retrieved.getCenterField()).isEqualTo(isCenterField);
         assertThat(retrieved.getCompareFunction()).isPresent();
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-evaluator/pom.xml
index ff25ead6ce7..88986a284f0 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-evaluator/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-evaluator/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-clustering
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-model/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-model/pom.xml
index 9bcd6d28e43..32e93735ade 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-model/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-model/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-clustering
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/pom.xml
index 28ebf9d493a..f76924675ce 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-clustering
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/pom.xml
index 27c37b9878e..efd7d14747d 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
   pom
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/pom.xml
index 3cee5846362..1d65fa5ac0e 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-models-drools
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDataDictionaryASTFactory.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDataDictionaryASTFactory.java
index a748a0e59c4..9e27e0e0f2e 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDataDictionaryASTFactory.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDataDictionaryASTFactory.java
@@ -66,8 +66,8 @@ public List declareTypes(final List> fields) {
      * @param field
      */
     public KiePMMLDroolsType declareType(Field field) {
-        String generatedType = getGeneratedClassName(field.getName().getValue());
-        String fieldName = field.getName().getValue();
+        String generatedType = getGeneratedClassName(field.getName());
+        String fieldName =field.getName();
         String fieldType = field.getDataType().value();
         fieldTypeMap.put(fieldName, new KiePMMLOriginalTypeGeneratedType(fieldType, generatedType));
         return new KiePMMLDroolsType(generatedType, DATA_TYPE.byName(fieldType).getMappedClass().getSimpleName());
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDerivedFieldASTFactory.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDerivedFieldASTFactory.java
index 84de887edeb..492dfe0f897 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDerivedFieldASTFactory.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDerivedFieldASTFactory.java
@@ -63,8 +63,8 @@ public List declareTypes(final List derivedFiel
      * @param derivedField
      */
     public KiePMMLDroolsType declareType(DerivedField derivedField) {
-        String generatedType = getSanitizedClassName(derivedField.getName().getValue().toUpperCase());
-        String fieldName = derivedField.getName().getValue();
+        String generatedType = getSanitizedClassName(derivedField.getName().toUpperCase());
+        String fieldName =derivedField.getName();
         String fieldType = derivedField.getDataType().value();
         fieldTypeMap.put(fieldName, new KiePMMLOriginalTypeGeneratedType(fieldType, generatedType));
         return new KiePMMLDroolsType(generatedType, DATA_TYPE.byName(fieldType).getMappedClass().getSimpleName());
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLSimplePredicateASTFactory.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLSimplePredicateASTFactory.java
index 83d01f66f09..48eb2adbb01 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLSimplePredicateASTFactory.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLSimplePredicateASTFactory.java
@@ -58,7 +58,7 @@ public void declareRuleFromSimplePredicateSurrogate(
             final KiePMMLReasonCodeAndValue reasonCodeAndValue,
             final boolean isLastCharacteristic) {
         logger.trace("declareRuleFromSimplePredicateSurrogate {} {} {} {}", agendaActivationGroup, toAccumulate, statusToSet, isLastCharacteristic);
-        String fieldName = predicateASTFactoryData.getFieldTypeMap().get(((SimplePredicate) predicateASTFactoryData.getPredicate()).getField().getValue()).getGeneratedType();
+        String fieldName = predicateASTFactoryData.getFieldTypeMap().get(((SimplePredicate) predicateASTFactoryData.getPredicate()).getField()).getGeneratedType();
         String surrogateCurrentRule = String.format(KiePMMLAbstractModelASTFactory.SURROGATE_RULENAME_PATTERN, predicateASTFactoryData.getCurrentRule(), fieldName);
         final List constraints = Collections.singletonList(KiePMMLASTFactoryUtils.getConstraintEntryFromSimplePredicates(fieldName, BOOLEAN_OPERATOR.SURROGATE, Collections.singletonList((SimplePredicate) predicateASTFactoryData.getPredicate()), predicateASTFactoryData.getFieldTypeMap()));
         // Create "TRUE" matcher
@@ -82,7 +82,7 @@ public void declareRuleFromSimplePredicateSurrogate(
             final Object result,
             boolean isFinalLeaf) {
         logger.trace("declareRuleFromSimplePredicateSurrogate {} {} {}", agendaActivationGroup, result, isFinalLeaf);
-        String fieldName = predicateASTFactoryData.getFieldTypeMap().get(((SimplePredicate) predicateASTFactoryData.getPredicate()).getField().getValue()).getGeneratedType();
+        String fieldName = predicateASTFactoryData.getFieldTypeMap().get(((SimplePredicate) predicateASTFactoryData.getPredicate()).getField()).getGeneratedType();
         String surrogateCurrentRule = String.format(KiePMMLAbstractModelASTFactory.SURROGATE_RULENAME_PATTERN, predicateASTFactoryData.getCurrentRule(), fieldName);
         final List constraints = Collections.singletonList(KiePMMLASTFactoryUtils.getConstraintEntryFromSimplePredicates(fieldName, BOOLEAN_OPERATOR.SURROGATE, Collections.singletonList((SimplePredicate) predicateASTFactoryData.getPredicate()), predicateASTFactoryData.getFieldTypeMap()));
         String statusToSet = isFinalLeaf ? DONE : predicateASTFactoryData.getCurrentRule();
@@ -218,7 +218,7 @@ private KiePMMLDroolsRule.Builder getBuilderForSimplePredicateSurrogateFalseMatc
     protected KiePMMLDroolsRule.Builder getBuilderForSimplePredicate(final String statusToSet) {
         logger.trace("getBuilderForSimplePredicate {}", statusToSet);
         String statusConstraint = StringUtils.isEmpty(predicateASTFactoryData.getParentPath()) ? KiePMMLAbstractModelASTFactory.STATUS_NULL : String.format(STATUS_PATTERN, predicateASTFactoryData.getParentPath());
-        String key = predicateASTFactoryData.getFieldTypeMap().get(((SimplePredicate) predicateASTFactoryData.getPredicate()).getField().getValue()).getGeneratedType();
+        String key = predicateASTFactoryData.getFieldTypeMap().get(((SimplePredicate) predicateASTFactoryData.getPredicate()).getField()).getGeneratedType();
         OPERATOR operator = OPERATOR.byName(((SimplePredicate) predicateASTFactoryData.getPredicate()).getOperator().value());
         Object value = KiePMMLASTFactoryUtils.getCorrectlyFormattedObject(((SimplePredicate) predicateASTFactoryData.getPredicate()), predicateASTFactoryData.getFieldTypeMap());
         List andConstraints = Collections.singletonList(new KiePMMLFieldOperatorValue(key, BOOLEAN_OPERATOR.AND, Collections.singletonList(new KiePMMLOperatorValue(operator, value)), null));
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLSimpleSetPredicateASTFactory.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLSimpleSetPredicateASTFactory.java
index 10656ad316d..0e9a561efb6 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLSimpleSetPredicateASTFactory.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLSimpleSetPredicateASTFactory.java
@@ -75,11 +75,11 @@ private KiePMMLDroolsRule.Builder getBuilderForSimpleSetPredicate(final String s
         logger.trace("declareRuleFromSimpleSetPredicate {}", statusToSet);
         String statusConstraint = StringUtils.isEmpty(predicateASTFactoryData.getParentPath()) ? STATUS_NULL : String.format(STATUS_PATTERN, predicateASTFactoryData.getParentPath());
         SimpleSetPredicate simpleSetPredicate = (SimpleSetPredicate) predicateASTFactoryData.getPredicate();
-        String key = predicateASTFactoryData.getFieldTypeMap().get(simpleSetPredicate.getField().getValue()).getGeneratedType();
+        String key = predicateASTFactoryData.getFieldTypeMap().get(simpleSetPredicate.getField()).getGeneratedType();
         String stringValue = (String) simpleSetPredicate.getArray().getValue();
         String[] valuesArray = stringValue.split(" ");
         List value = Arrays.stream(valuesArray).map(rawValue -> {
-            String originalType = predicateASTFactoryData.getFieldTypeMap().get(simpleSetPredicate.getField().getValue()).getOriginalType();
+            String originalType = predicateASTFactoryData.getFieldTypeMap().get(simpleSetPredicate.getField()).getOriginalType();
             switch (originalType) {
                 case "string":
                     return "\"" + rawValue + "\"";
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/utils/KiePMMLASTFactoryUtils.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/utils/KiePMMLASTFactoryUtils.java
index b8b150adced..b36131729b9 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/utils/KiePMMLASTFactoryUtils.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/utils/KiePMMLASTFactoryUtils.java
@@ -58,7 +58,7 @@ public static List getConstraintEntriesFromAndOrCompo
         }
         final Map> predicatesByField = simplePredicates.stream()
                 .map(child -> (SimplePredicate) child)
-                .collect(groupingBy(child -> fieldTypeMap.get(child.getField().getValue()).getGeneratedType()));
+                .collect(groupingBy(child -> fieldTypeMap.get(child.getField()).getGeneratedType()));
         final List toReturn = new LinkedList<>();
         populateKiePMMLFieldOperatorValueListWithSimplePredicates(toReturn, compoundPredicate.getBooleanOperator(), predicatesByField, fieldTypeMap);
         final List compoundPredicates = compoundPredicate.getPredicates().stream()
@@ -116,7 +116,7 @@ public static List getXORConstraintEntryFromSimplePre
                 .filter(predicate -> predicate instanceof SimplePredicate)
                 .map(predicate -> {
                     SimplePredicate simplePredicate = (SimplePredicate) predicate;
-                    String fieldName = fieldTypeMap.get(simplePredicate.getField().getValue()).getGeneratedType();
+                    String fieldName = fieldTypeMap.get(simplePredicate.getField()).getGeneratedType();
                     OPERATOR operator = OPERATOR.byName(simplePredicate.getOperator().value());
                     Object value = getCorrectlyFormattedObject(simplePredicate, fieldTypeMap);
                     return new KiePMMLFieldOperatorValue(fieldName, null, Collections.singletonList(new KiePMMLOperatorValue(operator, value)), null);
@@ -124,7 +124,7 @@ public static List getXORConstraintEntryFromSimplePre
     }
 
     public static Object getCorrectlyFormattedObject(final SimplePredicate simplePredicate, final Map fieldTypeMap) {
-        DATA_TYPE dataType = DATA_TYPE.byName(fieldTypeMap.get(simplePredicate.getField().getValue()).getOriginalType());
+        DATA_TYPE dataType = DATA_TYPE.byName(fieldTypeMap.get(simplePredicate.getField()).getOriginalType());
         return getCorrectlyFormattedResult(simplePredicate.getValue(), dataType);
     }
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/ast/factories/KiePMMLCompoundPredicateASTFactoryTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/ast/factories/KiePMMLCompoundPredicateASTFactoryTest.java
index 22ffee44d51..0fed2e969f8 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/ast/factories/KiePMMLCompoundPredicateASTFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/ast/factories/KiePMMLCompoundPredicateASTFactoryTest.java
@@ -172,7 +172,7 @@ void declareRuleFromCompoundPredicateSurrogateFinalLeaf() {
                         .findFirst();
                 if (fieldName.isPresent()) {
                     SimplePredicate mappedPredicate = predicates.stream()
-                            .filter(pred -> fieldName.get().equals(pred.getField().getValue()))
+                            .filter(pred -> fieldName.get().equals(pred.getField()))
                             .findFirst()
                             .orElse(null);
                     assertThat(mappedPredicate).isNotNull();
@@ -237,7 +237,7 @@ void declareRuleFromCompoundPredicateSurrogateNotFinalLeaf() {
                         .findFirst();
                 if (fieldName.isPresent()) {
                     SimplePredicate mappedPredicate = predicates.stream()
-                            .filter(pred -> fieldName.get().equals(pred.getField().getValue())).findFirst().orElse(null);
+                            .filter(pred -> fieldName.get().equals(pred.getField())).findFirst().orElse(null);
                     assertThat(mappedPredicate).isNotNull();
                     assertThat(retrieved.getStatusConstraint()).isNull();
                     assertThat(retrieved.getActivationGroup()).isEqualTo(agendaActivationGroup);
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDataDictionaryASTFactoryTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDataDictionaryASTFactoryTest.java
index 5b3642abbc9..3d222c3bf2a 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDataDictionaryASTFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDataDictionaryASTFactoryTest.java
@@ -42,7 +42,7 @@ public class KiePMMLDataDictionaryASTFactoryTest {
     @Test
     void declareTypes() {
         List dataFields = Arrays.asList(getTypeDataField(), getDottedTypeDataField(), getTypeDataField(), getDottedTypeDataField());
-        DataDictionary dataDictionary = new DataDictionary(dataFields);
+        DataDictionary dataDictionary = new DataDictionary().addDataFields(dataFields.toArray(new org.dmg.pmml.DataField[0]));
         final Map fieldTypeMap = new HashMap<>();
         List retrieved = KiePMMLDataDictionaryASTFactory.factory(fieldTypeMap).declareTypes(getFieldsFromDataDictionary(dataDictionary));
         assertThat(retrieved).isNotNull();
@@ -60,12 +60,12 @@ void declareType() {
     }
 
     private void commonVerifyTypeDeclarationDescr(DataField dataField, Map fieldTypeMap, final KiePMMLDroolsType kiePMMLDroolsType) {
-        String expectedGeneratedType = getSanitizedClassName(dataField.getName().getValue());
+        String expectedGeneratedType = getSanitizedClassName(dataField.getName());
         String expectedMappedOriginalType = DATA_TYPE.byName(dataField.getDataType().value()).getMappedClass().getSimpleName();
         assertThat(kiePMMLDroolsType.getName()).startsWith(expectedGeneratedType);
         assertThat(kiePMMLDroolsType.getType()).isEqualTo(expectedMappedOriginalType);
-        assertThat(fieldTypeMap).containsKey(dataField.getName().getValue());
-        KiePMMLOriginalTypeGeneratedType kiePMMLOriginalTypeGeneratedType = fieldTypeMap.get(dataField.getName().getValue());
+        assertThat(fieldTypeMap).containsKey(dataField.getName());
+        KiePMMLOriginalTypeGeneratedType kiePMMLOriginalTypeGeneratedType = fieldTypeMap.get(dataField.getName());
         assertThat(kiePMMLOriginalTypeGeneratedType.getOriginalType()).isEqualTo(dataField.getDataType().value());
         assertThat(kiePMMLOriginalTypeGeneratedType.getGeneratedType()).startsWith(expectedGeneratedType);
     }
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDerivedFieldASTFactoryTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDerivedFieldASTFactoryTest.java
index 4f7b725f82a..f83d4f22dd9 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDerivedFieldASTFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDerivedFieldASTFactoryTest.java
@@ -27,7 +27,6 @@
 
 import org.dmg.pmml.DataType;
 import org.dmg.pmml.DerivedField;
-import org.dmg.pmml.FieldName;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.kie.pmml.api.enums.DATA_TYPE;
@@ -69,7 +68,7 @@ void declareType() {
     }
 
     private void commonValidateKiePMMLDroolsType(KiePMMLDroolsType toValidate, DerivedField derivedField) {
-        String derivedFieldName = derivedField.getName().getValue();
+        String derivedFieldName =derivedField.getName();
         String expectedName = getSanitizedClassName(derivedFieldName.toUpperCase());
         assertThat(toValidate.getName()).isEqualTo(expectedName);
         String expectedType = DATA_TYPE.byName(derivedField.getDataType().value()).getMappedClass().getSimpleName();
@@ -82,7 +81,7 @@ private void commonValidateKiePMMLDroolsType(KiePMMLDroolsType toValidate, Deriv
 
     private DerivedField getDerivedField(String fieldName) {
         DerivedField toReturn = new DerivedField();
-        toReturn.setName(FieldName.create(fieldName));
+        toReturn.setName(fieldName);
         final DATA_TYPE[] values = DATA_TYPE.values();
         int rndInt = new Random().nextInt(values.length - 1);
         DATA_TYPE dataType = values[rndInt];
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/ast/factories/KiePMMLSimplePredicateASTFactoryTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/ast/factories/KiePMMLSimplePredicateASTFactoryTest.java
index ebc557fb9ba..0ec409c52d5 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/ast/factories/KiePMMLSimplePredicateASTFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/ast/factories/KiePMMLSimplePredicateASTFactoryTest.java
@@ -67,7 +67,7 @@ void declareRuleFromSimplePredicateSurrogateFinalLeaf() {
         assertThat(retrieved).isNotNull();
         String baseExpectedRule = String.format(KiePMMLAbstractModelASTFactory.SURROGATE_RULENAME_PATTERN,
                 currentRule,
-                fieldTypeMap.get(simplePredicate.getField().getValue()).getGeneratedType());
+                fieldTypeMap.get(simplePredicate.getField()).getGeneratedType());
         String expectedRule = baseExpectedRule + "_TRUE";
         assertThat(retrieved.getName()).isEqualTo(expectedRule);
         assertThat(retrieved.getStatusToSet()).isEqualTo(DONE);
@@ -135,7 +135,7 @@ void declareRuleFromSimplePredicateSurrogateNotFinalLeaf() {
         assertThat(retrieved).isNotNull();
         String baseExpectedRule = String.format(KiePMMLAbstractModelASTFactory.SURROGATE_RULENAME_PATTERN,
                 currentRule,
-                fieldTypeMap.get(simplePredicate.getField().getValue()).getGeneratedType());
+                fieldTypeMap.get(simplePredicate.getField()).getGeneratedType());
         String expectedRule = baseExpectedRule + "_TRUE";
         assertThat(retrieved.getName()).isEqualTo(expectedRule);
         assertThat(retrieved.getStatusToSet()).isEqualTo(currentRule);
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/commons/factories/KiePMMLDescrRhsFactoryTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/commons/factories/KiePMMLDescrRhsFactoryTest.java
index 013f6edf63d..86261e81537 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/commons/factories/KiePMMLDescrRhsFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/commons/factories/KiePMMLDescrRhsFactoryTest.java
@@ -22,7 +22,6 @@
 import java.util.List;
 import java.util.StringJoiner;
 
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.OutputField;
 import org.dmg.pmml.ResultFeature;
 import org.drools.drl.ast.dsl.DescrFactory;
@@ -166,7 +165,7 @@ void commonDeclareThen() {
         String outputFieldName = "OUTPUTFIELDNAME";
         Object result = "RESULT";
         OutputField outputField = new OutputField();
-        outputField.setName(FieldName.create(outputFieldName));
+        outputField.setName(outputFieldName);
         outputField.setResultFeature(ResultFeature.PREDICTED_VALUE);
         List outputFields = Collections.singletonList(outputField);
         KiePMMLDroolsRule.Builder builder = KiePMMLDroolsRule.builder(ruleName, statusToSet, outputFields);
@@ -211,7 +210,7 @@ void commonDeclareOutputFields() {
         String outputFieldName = "OUTPUTFIELDNAME";
         Object result = "RESULT";
         OutputField outputField = new OutputField();
-        outputField.setName(FieldName.create(outputFieldName));
+        outputField.setName(outputFieldName);
         outputField.setResultFeature(ResultFeature.PREDICTED_VALUE);
         List outputFields = Collections.singletonList(outputField);
         StringJoiner joiner = new StringJoiner("");
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/provider/DroolsModelProviderTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/provider/DroolsModelProviderTest.java
index 666154816d4..232e38f76b1 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/provider/DroolsModelProviderTest.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/provider/DroolsModelProviderTest.java
@@ -183,7 +183,7 @@ private void commonVerifyTypesList(final List toVerify, List<
     private void commonVerifyTypesList(Field toVerify, final List types) {
         assertThat(types.stream()
                            .anyMatch(type -> {
-                               String expectedName = getSanitizedClassName(toVerify.getName().getValue());
+                               String expectedName = getSanitizedClassName(toVerify.getName());
                                if (!type.getName().startsWith(expectedName)) {
                                    return false;
                                }
@@ -208,13 +208,13 @@ private void commonVerifyFieldTypeMap(Field toVerify,
                                           final Map fieldTypeMap) {
         assertThat(fieldTypeMap.entrySet().stream()
                            .anyMatch(entry -> {
-                               if (!entry.getKey().equals(toVerify.getName().getValue())) {
+                               if (!entry.getKey().equals(toVerify.getName())) {
                                    return false;
                                }
                                KiePMMLOriginalTypeGeneratedType value = entry.getValue();
                                assertThat(value.getOriginalType()).isEqualTo(toVerify.getDataType().value());
                                String expectedGeneratedType =
-                                       getSanitizedClassName(toVerify.getName().getValue());
+                                       getSanitizedClassName(toVerify.getName());
                                assertThat(value.getGeneratedType()).startsWith(expectedGeneratedType);
                                return true;
                            })).isTrue();
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/utils/KiePMMLASTFactoryUtilsTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/utils/KiePMMLASTFactoryUtilsTest.java
index 7fd20b7b30d..5dd81dc8781 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/utils/KiePMMLASTFactoryUtilsTest.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/utils/KiePMMLASTFactoryUtilsTest.java
@@ -197,7 +197,7 @@ public void accept(KiePMMLFieldOperatorValue kiePMMLFieldOperatorValue) {
                             kiePMMLFieldOperatorValue.getKiePMMLOperatorValues().get(0);
                     SimplePredicate simplePredicate = nestedPredicates.stream()
                             .map(predicate -> (SimplePredicate) predicate)
-                            .filter(predicate -> predicate.getField().getValue().equals(getOriginalPredicateName(kiePMMLFieldOperatorValue.getName())))
+                            .filter(predicate -> predicate.getField().equals(getOriginalPredicateName(kiePMMLFieldOperatorValue.getName())))
                             .findFirst()
                             .orElseThrow(() -> new RuntimeException("Failed to find SimplePredicate for " + kiePMMLFieldOperatorValue.getName()));
                     commonVerifyKiePMMLOperatorValue(kiePMMLOperatorValue, simplePredicate);
@@ -210,7 +210,7 @@ public void accept(KiePMMLFieldOperatorValue kiePMMLFieldOperatorValue) {
 
     private void commonPopulateKiePMMLFieldOperatorValueListWithSimplePredicates(CompoundPredicate.BooleanOperator compoundBooleanOperator, BOOLEAN_OPERATOR booleanOperator) {
         final Map> predicatesByField = simplePredicates.stream()
-                .collect(groupingBy(child -> fieldTypeMap.get(child.getField().getValue()).getGeneratedType()));
+                .collect(groupingBy(child -> fieldTypeMap.get(child.getField()).getGeneratedType()));
         final List toPopulate = new ArrayList<>();
         KiePMMLASTFactoryUtils.populateKiePMMLFieldOperatorValueListWithSimplePredicates(toPopulate,
                                                                                          compoundBooleanOperator,
@@ -260,7 +260,7 @@ private void commonVerifyKiePMMLOperatorValue(final KiePMMLOperatorValue toVerif
     private SimplePredicate getSimplePredicate(String generatedType) {
         String predicateName = getOriginalPredicateName(generatedType);
         return simplePredicates.stream()
-                .filter(simplePredicate -> simplePredicate.getField().getValue().equals(predicateName))
+                .filter(simplePredicate -> simplePredicate.getField().equals(predicateName))
                 .findFirst()
                 .orElseThrow(() -> new RuntimeException("Failed to find SimplePredicate for " + predicateName));
     }
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/utils/KiePMMLASTTestUtils.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/utils/KiePMMLASTTestUtils.java
index b5ec2ce14d4..e18a9313514 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/utils/KiePMMLASTTestUtils.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/utils/KiePMMLASTTestUtils.java
@@ -25,7 +25,6 @@
 import org.dmg.pmml.DataDictionary;
 import org.dmg.pmml.DataField;
 import org.dmg.pmml.DataType;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.LocalTransformations;
 import org.dmg.pmml.OpType;
 import org.dmg.pmml.OutputField;
@@ -70,7 +69,7 @@ public static DataField getTypeDataField() {
         DataField toReturn = new DataField();
         toReturn.setOpType(OpType.CONTINUOUS);
         toReturn.setDataType(DataType.DATE);
-        toReturn.setName(FieldName.create("dataField"));
+        toReturn.setName("dataField");
         return toReturn;
     }
 
@@ -78,7 +77,7 @@ public static DataField getDottedTypeDataField() {
         DataField toReturn = new DataField();
         toReturn.setOpType(OpType.CONTINUOUS);
         toReturn.setDataType(DataType.BOOLEAN);
-        toReturn.setName(FieldName.create("dotted.field"));
+        toReturn.setName("dotted.field");
         return toReturn;
     }
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/utils/KiePMMLDroolsModelFactoryUtilsTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/utils/KiePMMLDroolsModelFactoryUtilsTest.java
index 18d6ac33f73..d74bd8f7a51 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/utils/KiePMMLDroolsModelFactoryUtilsTest.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/test/java/org/kie/pmml/models/drools/utils/KiePMMLDroolsModelFactoryUtilsTest.java
@@ -44,7 +44,6 @@
 import org.dmg.pmml.DataDictionary;
 import org.dmg.pmml.DataField;
 import org.dmg.pmml.DataType;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.MiningField;
 import org.dmg.pmml.MiningFunction;
 import org.dmg.pmml.MiningSchema;
@@ -86,7 +85,7 @@ public static void setup() {
     void getKiePMMLModelCompilationUnit() {
         DataDictionary dataDictionary = new DataDictionary();
         String targetFieldString = "target.field";
-        FieldName targetFieldName = FieldName.create(targetFieldString);
+         String targetFieldName =targetFieldString;
         dataDictionary.addDataFields(new DataField(targetFieldName, OpType.CONTINUOUS, DataType.DOUBLE));
         String modelName = "ModelName";
         TreeModel model = new TreeModel();
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-compiler/pom.xml
index 3f647355e0d..4e30b327c01 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-compiler/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-compiler/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-drools-scorecard
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-compiler/src/test/java/org/kie/pmml/models/drools/scorecard/compiler/factories/KiePMMLScorecardModelCharacteristicASTFactoryTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-compiler/src/test/java/org/kie/pmml/models/drools/scorecard/compiler/factories/KiePMMLScorecardModelCharacteristicASTFactoryTest.java
index 486f873b803..0823492a5bb 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-compiler/src/test/java/org/kie/pmml/models/drools/scorecard/compiler/factories/KiePMMLScorecardModelCharacteristicASTFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-compiler/src/test/java/org/kie/pmml/models/drools/scorecard/compiler/factories/KiePMMLScorecardModelCharacteristicASTFactoryTest.java
@@ -370,7 +370,7 @@ private Object getExpectedValue(SimplePredicate simplePredicate) throws RuntimeE
         DATA_TYPE dataType = dataDictionary.getDataFields().stream().filter(dataField -> dataField.getName().equals(simplePredicate.getField()))
                 .map(dataField -> DATA_TYPE.byName(dataField.getDataType().value()))
                 .findFirst()
-                .orElseThrow(() -> new RuntimeException("Failed to find DataField for " + simplePredicate.getField().getValue()));
+                .orElseThrow(() -> new RuntimeException("Failed to find DataField for " +simplePredicate.getField()));
         return getCorrectlyFormattedResult(simplePredicate.getValue(), dataType);
     }
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-evaluator/pom.xml
index 84d4a6ebe9d..2cfaf27ab71 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-evaluator/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-evaluator/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-drools-scorecard
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-model/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-model/pom.xml
index 170a54e348f..d1aee553c67 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-model/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-model/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-drools-scorecard
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/pom.xml
index 8cd77cc9a89..55cf47a4ec2 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-drools-scorecard
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/pom.xml
index 1969461504c..34bb547e759 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-drools
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
   pom
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-compiler/pom.xml
index 716d80b3aa7..ffe4443996b 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-compiler/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-compiler/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-drools-tree
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-compiler/src/test/java/org/kie/pmml/models/drools/tree/compiler/factories/KiePMMLTreeModelFactoryTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-compiler/src/test/java/org/kie/pmml/models/drools/tree/compiler/factories/KiePMMLTreeModelFactoryTest.java
index e5e1a37343e..6f9f7f833ca 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-compiler/src/test/java/org/kie/pmml/models/drools/tree/compiler/factories/KiePMMLTreeModelFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-compiler/src/test/java/org/kie/pmml/models/drools/tree/compiler/factories/KiePMMLTreeModelFactoryTest.java
@@ -100,7 +100,7 @@ void getKiePMMLDroolsAST() {
         assertThat(retrieved).isNotNull();
         List dataFields = dataDictionary.getDataFields();
         assertThat(fieldTypeMap).hasSameSizeAs(dataFields);
-        dataFields.forEach(dataField -> assertThat(fieldTypeMap).containsKey(dataField.getName().getValue()));
+        dataFields.forEach(dataField -> assertThat(fieldTypeMap).containsKey(dataField.getName()));
     }
 
     @Test
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-evaluator/pom.xml
index f0544d62f6f..7d15de1a63c 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-evaluator/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-evaluator/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-drools-tree
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-model/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-model/pom.xml
index 549766273ca..7d3354e510b 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-model/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-model/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-drools-tree
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/pom.xml
index 81fb2c280e9..5fd2f3dde5b 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-drools-tree
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/pom.xml
index 81ddeaa5a6f..7c3b9aa4cbf 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-drools
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
   pom
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/pom.xml
index 13249fc9df1..380b8da09e8 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/pom.xml
index c0c7433580c..7dd6ccb1c8c 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-mining
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/src/test/java/org/kie/pmml/models/mining/compiler/factories/AbstractKiePMMLFactoryTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/src/test/java/org/kie/pmml/models/mining/compiler/factories/AbstractKiePMMLFactoryTest.java
index 2bbd9df0847..d6cadfc321b 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/src/test/java/org/kie/pmml/models/mining/compiler/factories/AbstractKiePMMLFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/src/test/java/org/kie/pmml/models/mining/compiler/factories/AbstractKiePMMLFactoryTest.java
@@ -22,7 +22,7 @@
 import java.io.IOException;
 import java.util.List;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 
 import org.dmg.pmml.DataDictionary;
 import org.dmg.pmml.DerivedField;
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/src/test/java/org/kie/pmml/models/mining/compiler/factories/KiePMMLMiningModelFactoryTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/src/test/java/org/kie/pmml/models/mining/compiler/factories/KiePMMLMiningModelFactoryTest.java
index 16c99b6297a..935a576397a 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/src/test/java/org/kie/pmml/models/mining/compiler/factories/KiePMMLMiningModelFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/src/test/java/org/kie/pmml/models/mining/compiler/factories/KiePMMLMiningModelFactoryTest.java
@@ -24,7 +24,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/src/test/java/org/kie/pmml/models/mining/compiler/factories/KiePMMLSegmentFactoryTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/src/test/java/org/kie/pmml/models/mining/compiler/factories/KiePMMLSegmentFactoryTest.java
index df6b84623ae..0ff476d12fc 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/src/test/java/org/kie/pmml/models/mining/compiler/factories/KiePMMLSegmentFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/src/test/java/org/kie/pmml/models/mining/compiler/factories/KiePMMLSegmentFactoryTest.java
@@ -24,7 +24,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/src/test/java/org/kie/pmml/models/mining/compiler/factories/KiePMMLSegmentationFactoryTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/src/test/java/org/kie/pmml/models/mining/compiler/factories/KiePMMLSegmentationFactoryTest.java
index 413c7bfec9a..05b1117e15c 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/src/test/java/org/kie/pmml/models/mining/compiler/factories/KiePMMLSegmentationFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/src/test/java/org/kie/pmml/models/mining/compiler/factories/KiePMMLSegmentationFactoryTest.java
@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 
 import org.dmg.pmml.mining.MiningModel;
 import org.junit.jupiter.api.BeforeAll;
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-evaluator/pom.xml
index 41d203533c7..0484ef442e2 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-evaluator/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-evaluator/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-mining
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-model/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-model/pom.xml
index d7d8c20b86f..e9804e3467a 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-model/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-model/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-mining
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/pom.xml
index 64c0bccc196..9ba58c4c888 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-mining
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/pom.xml
index a64f8262e70..e77ebf1e0af 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
   pom
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/pom.xml
index 93b1e933ed0..0824beb29d6 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-models-regression
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/main/java/org/kie/pmml/models/regression/compiler/executor/RegressionModelImplementationProvider.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/main/java/org/kie/pmml/models/regression/compiler/executor/RegressionModelImplementationProvider.java
index a74071da45a..3630b255e15 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/main/java/org/kie/pmml/models/regression/compiler/executor/RegressionModelImplementationProvider.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/main/java/org/kie/pmml/models/regression/compiler/executor/RegressionModelImplementationProvider.java
@@ -194,7 +194,7 @@ private void validateRegressionTargetField(final List targetF
         if (targetFields.size() != 1) {
             throw new KiePMMLException("Expected one target field, retrieved " + targetFields.size());
         }
-        if (toValidate.getTargetField() != null && !(Objects.equals(toValidate.getTargetField().getValue(),
+        if (toValidate.getTargetField() != null && !(Objects.equals(toValidate.getTargetField(),
                                                                     targetFields.get(0).getName()))) {
             throw new KiePMMLException(String.format("Not-matching target fields: %s %s", toValidate.getTargetField()
                     , targetFields.get(0).getName()));
@@ -209,7 +209,7 @@ private boolean isBinary(final List> fields, final String categoricalFi
         return fields.stream()
                 .filter(DataField.class::isInstance)
                 .map(DataField.class::cast)
-                .filter(dataField -> Objects.equals(dataField.getName().getValue(), categoricalFieldName)).mapToDouble(dataField -> dataField.getValues().size())
+                .filter(dataField -> Objects.equals(dataField.getName(), categoricalFieldName)).mapToDouble(dataField -> dataField.getValues().size())
                 .findFirst().orElse(0) == 2;
     }
 
@@ -217,7 +217,7 @@ private String getCategoricalTargetName(final List> fields, final Regre
         List targetFields = getTargetFields(fields, toValidate);
         final List categoricalFields = fields.stream()
                 .filter(dataField -> OpType.CATEGORICAL.equals(dataField.getOpType()))
-                .map(dataField -> dataField.getName().getValue())
+                .map(dataField ->dataField.getName())
                 .collect(Collectors.toList());
         final List categoricalNameTypes =
                 targetFields.stream().filter(targetField -> categoricalFields.contains(targetField.getName())).collect(Collectors.toList());
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/main/java/org/kie/pmml/models/regression/compiler/factories/KiePMMLRegressionTableFactory.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/main/java/org/kie/pmml/models/regression/compiler/factories/KiePMMLRegressionTableFactory.java
index 131e786ce6b..c24e4bf06a0 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/main/java/org/kie/pmml/models/regression/compiler/factories/KiePMMLRegressionTableFactory.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/main/java/org/kie/pmml/models/regression/compiler/factories/KiePMMLRegressionTableFactory.java
@@ -206,7 +206,7 @@ public static Map.Entry getRegressionTableBuilder(final Regressi
      */
     static Map> getNumericPredictorsMap(final List numericPredictors) {
         return numericPredictors.stream()
-                .collect(Collectors.toMap(numericPredictor -> numericPredictor.getName().getValue(),
+                .collect(Collectors.toMap(numericPredictor ->numericPredictor.getField(),
                                           KiePMMLRegressionTableFactory::getNumericPredictorEntry));
     }
 
@@ -235,7 +235,7 @@ static SerializableFunction getNumericPredictorEntry(final Numer
      */
     static Map> getCategoricalPredictorsMap(final List categoricalPredictors) {
         final Map> groupedCollectors = categoricalPredictors.stream()
-                .collect(groupingBy(categoricalPredictor -> categoricalPredictor.getField().getValue()));
+                .collect(groupingBy(categoricalPredictor ->categoricalPredictor.getField()));
         return groupedCollectors.entrySet().stream()
                 .map(entry -> {
                     Map groupedCategoricalPredictorMap =
@@ -276,7 +276,7 @@ static Map, Double>> getPredict
         return predictorTerms.stream()
                 .map(predictorTerm -> {
                     int arity = predictorsArity.addAndGet(1);
-                    String variableName = predictorTerm.getName() != null ? predictorTerm.getName().getValue() :
+                    String variableName = predictorTerm.getName() != null ?predictorTerm.getName() :
                             "predictorTermFunction" + arity;
                     return new AbstractMap.SimpleEntry<>(variableName,
                                                          getPredictorTermSerializableFunction(predictorTerm));
@@ -295,7 +295,7 @@ static SerializableFunction, Double> getPredictorTermSeriali
         return resultMap -> {
             final AtomicReference result = new AtomicReference<>(1.0);
             final List fieldRefs = predictorTerm.getFieldRefs().stream()
-                    .map(fieldRef -> fieldRef.getField().getValue())
+                    .map(fieldRef ->fieldRef.getField())
                     .collect(Collectors.toList());
             for (Map.Entry entry : resultMap.entrySet()) {
                 if (fieldRefs.contains(entry.getKey())) {
@@ -443,7 +443,7 @@ static MethodReferenceExpr getResultUpdaterSupportedExpression(final RegressionM
      */
     static Map getNumericPredictorsExpressions(final List numericPredictors) {
         return numericPredictors.stream()
-                .collect(Collectors.toMap(numericPredictor -> numericPredictor.getName().getValue(),
+                .collect(Collectors.toMap(numericPredictor ->numericPredictor.getField(),
                                           KiePMMLRegressionTableFactory::getNumericPredictorExpression));
     }
 
@@ -492,7 +492,7 @@ static CastExpr getNumericPredictorExpression(final NumericPredictor numericPred
      */
     static Map getCategoricalPredictorsExpressions(final List categoricalPredictors, final BlockStmt body, final String variableName) {
         final Map> groupedCollectors = categoricalPredictors.stream()
-                .collect(groupingBy(categoricalPredictor -> categoricalPredictor.getField().getValue()));
+                .collect(groupingBy(categoricalPredictor ->categoricalPredictor.getField()));
         final String categoricalPredictorMapNameBase = getSanitizedVariableName(String.format("%sMap", variableName));
         final AtomicInteger counter = new AtomicInteger();
         return groupedCollectors.entrySet().stream()
@@ -581,7 +581,7 @@ static Map getPredictorTermFunctions(final List {
                     int arity = predictorsArity.addAndGet(1);
-                    String variableName = predictorTerm.getName() != null ? predictorTerm.getName().getValue() :
+                    String variableName = predictorTerm.getName() != null ?predictorTerm.getName() :
                             "predictorTermFunction" + arity;
                     return new AbstractMap.SimpleEntry<>(variableName,
                                                          getPredictorTermFunction(predictorTerm));
@@ -630,7 +630,7 @@ static BlockStmt getPredictorTermBody(final PredictorTerm predictorTerm) {
                     .orElseThrow(() -> new KiePMMLInternalException(String.format(MISSING_VARIABLE_IN_BODY,
                                                                                   "fieldRefs", body)));
             final List nodeList = predictorTerm.getFieldRefs().stream()
-                    .map(fieldRef -> new StringLiteralExpr(fieldRef.getField().getValue()))
+                    .map(fieldRef -> new StringLiteralExpr(fieldRef.getField()))
                     .collect(Collectors.toList());
             NodeList expressions = NodeList.nodeList(nodeList);
             MethodCallExpr methodCallExpr = new MethodCallExpr(new NameExpr("Arrays"), "asList", expressions);
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/java/org/kie/pmml/models/regression/compiler/factories/AbstractKiePMMLRegressionTableRegressionFactoryTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/java/org/kie/pmml/models/regression/compiler/factories/AbstractKiePMMLRegressionTableRegressionFactoryTest.java
index a2d17ca5d04..2d3983495d1 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/java/org/kie/pmml/models/regression/compiler/factories/AbstractKiePMMLRegressionTableRegressionFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/java/org/kie/pmml/models/regression/compiler/factories/AbstractKiePMMLRegressionTableRegressionFactoryTest.java
@@ -66,8 +66,7 @@ protected RegressionTable getRegressionTable(double intercept, Object targetCate
             IntStream.range(0, 2).forEach(j -> categoricalPredictors.add(getCategoricalPredictor("CatPred-" + i, 27.12, 3.46)));
             numericPredictors.add(getNumericPredictor("NumPred-" + i, 2, 13.11));
             predictorTerms.add(getPredictorTerm("PredTerm-" + i, 32.29,
-                                                Arrays.asList(categoricalPredictors.get(0).getName().getValue(),
-                                                              numericPredictors.get(0).getName().getValue())));
+                                                Arrays.asList(categoricalPredictors.get(0).getField(),numericPredictors.get(0).getField())));
         });
         return PMMLModelTestUtils.getRegressionTable(categoricalPredictors, numericPredictors, predictorTerms, intercept, targetCategory);
     }
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/java/org/kie/pmml/models/regression/compiler/factories/KiePMMLClassificationTableFactoryTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/java/org/kie/pmml/models/regression/compiler/factories/KiePMMLClassificationTableFactoryTest.java
index 9d9d2172f75..950c91cb917 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/java/org/kie/pmml/models/regression/compiler/factories/KiePMMLClassificationTableFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/java/org/kie/pmml/models/regression/compiler/factories/KiePMMLClassificationTableFactoryTest.java
@@ -30,7 +30,6 @@
 import com.github.javaparser.ast.expr.MethodReferenceExpr;
 import org.dmg.pmml.DataDictionary;
 import org.dmg.pmml.DataField;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.MiningField;
 import org.dmg.pmml.MiningSchema;
 import org.dmg.pmml.OpType;
@@ -90,7 +89,7 @@ void getClassificationTable() {
 
         String targetField = "targetField";
         DataField dataField = new DataField();
-        dataField.setName(FieldName.create(targetField));
+        dataField.setName(targetField);
         dataField.setOpType(OpType.CATEGORICAL);
         DataDictionary dataDictionary = new DataDictionary();
         dataDictionary.addDataFields(dataField);
@@ -131,7 +130,7 @@ void getClassificationTable() {
         boolean isBinary = regressionModel.getRegressionTables().size() == 2;
         assertThat(retrieved.isBinary()).isEqualTo(isBinary);
         assertThat(retrieved.isBinary()).isEqualTo(isBinary);
-        assertThat(retrieved.getTargetField()).isEqualTo(targetMiningField.getName().getValue());
+        assertThat(retrieved.getTargetField()).isEqualTo(targetMiningField.getName());
     }
 
     @Test
@@ -144,7 +143,7 @@ void getClassificationTableBuilders() {
 
         String targetField = "targetField";
         DataField dataField = new DataField();
-        dataField.setName(FieldName.create(targetField));
+        dataField.setName(targetField);
         dataField.setOpType(OpType.CATEGORICAL);
         DataDictionary dataDictionary = new DataDictionary();
         dataDictionary.addDataFields(dataField);
@@ -195,7 +194,7 @@ void getClassificationTableBuilder() {
 
         String targetField = "targetField";
         DataField dataField = new DataField();
-        dataField.setName(FieldName.create(targetField));
+        dataField.setName(targetField);
         dataField.setOpType(OpType.CATEGORICAL);
         DataDictionary dataDictionary = new DataDictionary();
         dataDictionary.addDataFields(dataField);
@@ -281,7 +280,7 @@ void setStaticGetter() throws IOException {
 
         String targetField = "targetField";
         DataField dataField = new DataField();
-        dataField.setName(FieldName.create(targetField));
+        dataField.setName(targetField);
         dataField.setOpType(OpType.CATEGORICAL);
         DataDictionary dataDictionary = new DataDictionary();
         dataDictionary.addDataFields(dataField);
@@ -373,10 +372,10 @@ void getProbabilityMapFunctionSupportedExpression() throws IOException {
 
     private OutputField getOutputField(String name, ResultFeature resultFeature, String targetField) {
         OutputField toReturn = new OutputField();
-        toReturn.setName(FieldName.create(name));
+        toReturn.setName(name);
         toReturn.setResultFeature(resultFeature);
         if (targetField != null) {
-            toReturn.setTargetField(FieldName.create(targetField));
+            toReturn.setTargetField(targetField);
         }
         return toReturn;
     }
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/java/org/kie/pmml/models/regression/compiler/factories/KiePMMLRegressionModelFactoryTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/java/org/kie/pmml/models/regression/compiler/factories/KiePMMLRegressionModelFactoryTest.java
index fa15492acac..aa7ed597e7a 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/java/org/kie/pmml/models/regression/compiler/factories/KiePMMLRegressionModelFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/java/org/kie/pmml/models/regression/compiler/factories/KiePMMLRegressionModelFactoryTest.java
@@ -166,7 +166,7 @@ void getKiePMMLRegressionModelClasses() throws IOException, IllegalAccessExcepti
         assertThat(retrieved).isNotNull();
         assertThat(retrieved.getName()).isEqualTo(regressionModel.getModelName());
         assertThat(retrieved.getMiningFunction()).isEqualTo(MINING_FUNCTION.byName(regressionModel.getMiningFunction().value()));
-        assertThat(retrieved.getTargetField()).isEqualTo(miningFields.get(0).getName().getValue());
+        assertThat(retrieved.getTargetField()).isEqualTo(miningFields.get(0).getName());
         final AbstractKiePMMLTable regressionTable = retrieved.getRegressionTable();
         assertThat(regressionTable).isNotNull();
         assertThat(regressionTable).isInstanceOf(KiePMMLClassificationTable.class);
@@ -227,7 +227,7 @@ void setStaticGetter() throws IOException {
         Map superInvocationExpressionsMap = new HashMap<>();
         superInvocationExpressionsMap.put(0, new NameExpr(String.format("\"%s\"", regressionModel.getModelName())));
         Map assignExpressionMap = new HashMap<>();
-        assignExpressionMap.put("targetField", new StringLiteralExpr(targetMiningField.getName().getValue()));
+        assignExpressionMap.put("targetField", new StringLiteralExpr(targetMiningField.getName()));
         assignExpressionMap.put("miningFunction",
                 new NameExpr(miningFunction.getClass().getName() + "." + miningFunction.name()));
         assignExpressionMap.put("pmmlMODEL",
@@ -260,17 +260,17 @@ private void evaluateRegressionTable(KiePMMLRegressionTable regressionTable,
         final Map> numericFunctionMap =
                 regressionTable.getNumericFunctionMap();
         for (NumericPredictor numericPredictor : originalRegressionTable.getNumericPredictors()) {
-            assertThat(numericFunctionMap).containsKey(numericPredictor.getName().getValue());
+            assertThat(numericFunctionMap).containsKey(numericPredictor.getField());
         }
         final Map> categoricalFunctionMap =
                 regressionTable.getCategoricalFunctionMap();
         for (CategoricalPredictor categoricalPredictor : originalRegressionTable.getCategoricalPredictors()) {
-        	assertThat(categoricalFunctionMap).containsKey(categoricalPredictor.getName().getValue());
+		assertThat(categoricalFunctionMap).containsKey(categoricalPredictor.getField());
         }
         final Map, Double>> predictorTermsFunctionMap =
                 regressionTable.getPredictorTermsFunctionMap();
         for (PredictorTerm predictorTerm : originalRegressionTable.getPredictorTerms()) {
-        	assertThat(predictorTermsFunctionMap).containsKey(predictorTerm.getName().getValue());
+		assertThat(predictorTermsFunctionMap).containsKey(predictorTerm.getName());
         }
     }
 }
\ No newline at end of file
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/java/org/kie/pmml/models/regression/compiler/factories/KiePMMLRegressionTableFactoryTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/java/org/kie/pmml/models/regression/compiler/factories/KiePMMLRegressionTableFactoryTest.java
index a8565080425..def6548dc56 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/java/org/kie/pmml/models/regression/compiler/factories/KiePMMLRegressionTableFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/java/org/kie/pmml/models/regression/compiler/factories/KiePMMLRegressionTableFactoryTest.java
@@ -43,7 +43,6 @@
 import org.assertj.core.data.Offset;
 import org.dmg.pmml.DataDictionary;
 import org.dmg.pmml.DataField;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.MiningField;
 import org.dmg.pmml.MiningSchema;
 import org.dmg.pmml.OpType;
@@ -113,7 +112,7 @@ void getRegressionTables() {
         regressionModel.setModelName(getGeneratedClassName("RegressionModel"));
         String targetField = "targetField";
         DataField dataField = new DataField();
-        dataField.setName(FieldName.create(targetField));
+        dataField.setName(targetField);
         dataField.setOpType(OpType.CATEGORICAL);
         DataDictionary dataDictionary = new DataDictionary();
         dataDictionary.addDataFields(dataField);
@@ -156,7 +155,7 @@ void getRegressionTable() {
         regressionModel.setModelName(getGeneratedClassName("RegressionModel"));
         String targetField = "targetField";
         DataField dataField = new DataField();
-        dataField.setName(FieldName.create(targetField));
+        dataField.setName(targetField);
         dataField.setOpType(OpType.CATEGORICAL);
         DataDictionary dataDictionary = new DataDictionary();
         dataDictionary.addDataFields(dataField);
@@ -194,7 +193,7 @@ void getRegressionTableBuilders() {
         regressionModel.setModelName(getGeneratedClassName("RegressionModel"));
         String targetField = "targetField";
         DataField dataField = new DataField();
-        dataField.setName(FieldName.create(targetField));
+        dataField.setName(targetField);
         dataField.setOpType(OpType.CATEGORICAL);
         DataDictionary dataDictionary = new DataDictionary();
         dataDictionary.addDataFields(dataField);
@@ -233,7 +232,7 @@ void getRegressionTableBuilder() {
         regressionModel.setModelName(getGeneratedClassName("RegressionModel"));
         String targetField = "targetField";
         DataField dataField = new DataField();
-        dataField.setName(FieldName.create(targetField));
+        dataField.setName(targetField);
         dataField.setOpType(OpType.CATEGORICAL);
         DataDictionary dataDictionary = new DataDictionary();
         dataDictionary.addDataFields(dataField);
@@ -318,7 +317,7 @@ void getCategoricalPredictorsMap() {
         Map> retrieved =
                 KiePMMLRegressionTableFactory.getCategoricalPredictorsMap(categoricalPredictors);
         final Map> groupedCollectors = categoricalPredictors.stream()
-                .collect(groupingBy(categoricalPredictor -> categoricalPredictor.getField().getValue()));
+                .collect(groupingBy(categoricalPredictor ->categoricalPredictor.getField()));
         assertThat(retrieved).hasSameSizeAs(groupedCollectors);
         groupedCollectors.keySet().forEach(predictName -> assertThat(retrieved).containsKey(predictName));
     }
@@ -357,7 +356,7 @@ void getPredictorTermsMap() {
         assertThat(retrieved).hasSameSizeAs(predictorTerms);
         IntStream.range(0, predictorTerms.size()).forEach(index -> {
             PredictorTerm predictorTerm = predictorTerms.get(index);
-            assertThat(retrieved).containsKey(predictorTerm.getName().getValue());
+            assertThat(retrieved).containsKey(predictorTerm.getName());
         });
     }
 
@@ -394,7 +393,7 @@ void setStaticGetter() throws IOException {
         regressionModel.setModelName(getGeneratedClassName("RegressionModel"));
         String targetField = "targetField";
         DataField dataField = new DataField();
-        dataField.setName(FieldName.create(targetField));
+        dataField.setName(targetField);
         dataField.setOpType(OpType.CATEGORICAL);
         DataDictionary dataDictionary = new DataDictionary();
         dataDictionary.addDataFields(dataField);
@@ -533,7 +532,7 @@ void getCategoricalPredictorsExpressions() {
                         "variableName");
         assertThat(retrieved).hasSize(3);
         final Map> groupedCollectors = categoricalPredictors.stream()
-                .collect(groupingBy(categoricalPredictor -> categoricalPredictor.getField().getValue()));
+                .collect(groupingBy(categoricalPredictor ->categoricalPredictor.getField()));
 
         groupedCollectors.values().forEach(categoricalPredictors12 -> commonEvaluateCategoryPredictors(body,
                 categoricalPredictors12, "variableName"));
@@ -588,7 +587,7 @@ void getPredictorTermFunctions() {
         assertThat(retrieved).hasSameSizeAs(predictorTerms);
         IntStream.range(0, predictorTerms.size()).forEach(index -> {
             PredictorTerm predictorTerm = predictorTerms.get(index);
-            assertThat(retrieved).containsKey(predictorTerm.getName().getValue());
+            assertThat(retrieved).containsKey(predictorTerm.getName());
         });
     }
 
@@ -609,17 +608,17 @@ void getPredictorTermFunction() throws IOException {
     private void commonEvaluateRegressionTable(KiePMMLRegressionTable retrieved, RegressionTable source) {
         Map> numericFunctionMap = retrieved.getNumericFunctionMap();
         assertThat(numericFunctionMap).hasSameSizeAs(source.getNumericPredictors());
-        source.getNumericPredictors().forEach(numericPredictor -> assertThat(numericFunctionMap).containsKey(numericPredictor.getName().getValue()));
+        source.getNumericPredictors().forEach(numericPredictor -> assertThat(numericFunctionMap).containsKey(numericPredictor.getField()));
         Map> categoricalFunctionMap =
                 retrieved.getCategoricalFunctionMap();
         Map> groupedCollectors = categoricalPredictors.stream()
-                .collect(groupingBy(categoricalPredictor -> categoricalPredictor.getField().getValue()));
+                .collect(groupingBy(categoricalPredictor ->categoricalPredictor.getField()));
         assertThat(categoricalFunctionMap).hasSameSizeAs(groupedCollectors);
         groupedCollectors.keySet().forEach(categorical -> assertThat(categoricalFunctionMap).containsKey(categorical));
         Map, Double>> predictorTermsFunctionMap =
                 retrieved.getPredictorTermsFunctionMap();
         assertThat(predictorTermsFunctionMap).hasSameSizeAs(source.getPredictorTerms());
-        source.getPredictorTerms().forEach(predictorTerm -> assertThat(predictorTermsFunctionMap).containsKey(predictorTerm.getName().getValue()));
+        source.getPredictorTerms().forEach(predictorTerm -> assertThat(predictorTermsFunctionMap).containsKey(predictorTerm.getName()));
     }
 
     private void commonEvaluateCategoryPredictors(final BlockStmt toVerify,
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-evaluator/pom.xml
index eb80cde5849..9b9e96a1283 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-evaluator/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-evaluator/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-models-regression
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-model/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-model/pom.xml
index a7ba740c909..4c899d44f81 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-model/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-model/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-models-regression
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/pom.xml
index adefd80d1bd..ffe3eabdd50 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-models-regression
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/pom.xml
index 11993c1c928..f79efe3dbd5 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-models
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
   pom
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-compiler/pom.xml
index 6bdcb38cd3c..6691dcba55f 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-compiler/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-compiler/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-scorecard
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-compiler/src/test/java/org/kie/pmml/models/scorecard/compiler/factories/KiePMMLComplexPartialScoreFactoryTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-compiler/src/test/java/org/kie/pmml/models/scorecard/compiler/factories/KiePMMLComplexPartialScoreFactoryTest.java
index 5ca0f0c5c48..7e162bec99f 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-compiler/src/test/java/org/kie/pmml/models/scorecard/compiler/factories/KiePMMLComplexPartialScoreFactoryTest.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-compiler/src/test/java/org/kie/pmml/models/scorecard/compiler/factories/KiePMMLComplexPartialScoreFactoryTest.java
@@ -27,7 +27,6 @@
 import com.github.javaparser.ast.stmt.Statement;
 import org.dmg.pmml.Apply;
 import org.dmg.pmml.Constant;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.FieldRef;
 import org.dmg.pmml.scorecard.ComplexPartialScore;
 import org.junit.jupiter.api.Test;
@@ -72,14 +71,14 @@ void getComplexPartialScoreVariableDeclaration() throws IOException {
     void getComplexPartialScoreVariableDeclarationWithFieldRef() throws IOException {
         final String variableName = "variableName";
         FieldRef fieldRef = new FieldRef();
-        fieldRef.setField(FieldName.create("FIELD_REF"));
+        fieldRef.setField("FIELD_REF");
         ComplexPartialScore complexPartialScore = new ComplexPartialScore();
         complexPartialScore.setExpression(fieldRef);
         BlockStmt retrieved =
                 KiePMMLComplexPartialScoreFactory.getComplexPartialScoreVariableDeclaration(variableName,
                         complexPartialScore);
         String text = getFileContent(TEST_02_SOURCE);
-        Statement expected = JavaParserUtils.parseBlock(String.format(text, fieldRef.getField().getValue(),
+        Statement expected = JavaParserUtils.parseBlock(String.format(text,fieldRef.getField(),
                 variableName));
         assertThat(retrieved).isEqualTo(expected);
         List> imports = Arrays.asList(KiePMMLFieldRef.class,
@@ -94,7 +93,7 @@ void getComplexPartialScoreVariableDeclarationWithApply() throws IOException {
         Constant constant = new Constant();
         constant.setValue(value1);
         FieldRef fieldRef = new FieldRef();
-        fieldRef.setField(FieldName.create("FIELD_REF"));
+        fieldRef.setField("FIELD_REF");
         Apply apply = new Apply();
         apply.setFunction("/");
         apply.addExpressions(constant, fieldRef);
@@ -105,8 +104,7 @@ void getComplexPartialScoreVariableDeclarationWithApply() throws IOException {
                         complexPartialScore);
         String text = getFileContent(TEST_03_SOURCE);
         Statement expected = JavaParserUtils.parseBlock(String.format(text,
-                constant.getValue(),
-                fieldRef.getField().getValue(),
+                constant.getValue(),fieldRef.getField(),
                 apply.getFunction(),
                 apply.getInvalidValueTreatment().value(),
                 variableName));
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-evaluator/pom.xml
index 530bd6d048c..bb2a9c7feb4 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-evaluator/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-evaluator/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-scorecard
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-model/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-model/pom.xml
index 0b093e4a802..2e486228746 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-model/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-model/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-scorecard
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/pom.xml
index b4a0fc9dc4d..47563db9f81 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-scorecard
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/pom.xml
index 038a9a1cdd2..f0e12bbaee5 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
   pom
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tests/pom.xml
index c3cbcf31561..809e3ff83b5 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tests/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tests/pom.xml
@@ -25,7 +25,7 @@
   
     kie-pmml-models
     org.kie
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-compiler/pom.xml
index ab9b3c7fda8..6b9863250ff 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-compiler/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-compiler/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-tree
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-evaluator/pom.xml
index b69e91a357f..2bce2fc53a6 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-evaluator/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-evaluator/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-tree
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-model/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-model/pom.xml
index 508cb042203..6ef246de31d 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-model/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-model/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-tree
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/pom.xml
index 17417332349..0319cfac314 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-tree
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/pom.xml
index cadfd56cea2..a61ae82749a 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
   pom
diff --git a/kie-pmml-trusty/kie-pmml-models/pom.xml b/kie-pmml-trusty/kie-pmml-models/pom.xml
index 8c8eee7842b..b69006f4e40 100644
--- a/kie-pmml-trusty/kie-pmml-models/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-trusty
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/pom.xml b/kie-pmml-trusty/pom.xml
index d42732b386c..c98a83b264e 100644
--- a/kie-pmml-trusty/pom.xml
+++ b/kie-pmml-trusty/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-test-util/pom.xml b/kie-test-util/pom.xml
index 693809b2105..e73862dcd0d 100644
--- a/kie-test-util/pom.xml
+++ b/kie-test-util/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     drools-build-parent
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-test-util/src/main/java/org/kie/test/util/db/PersistenceUtil.java b/kie-test-util/src/main/java/org/kie/test/util/db/PersistenceUtil.java
index 121d08ea24c..dd775957017 100644
--- a/kie-test-util/src/main/java/org/kie/test/util/db/PersistenceUtil.java
+++ b/kie-test-util/src/main/java/org/kie/test/util/db/PersistenceUtil.java
@@ -25,8 +25,8 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 
 import org.h2.tools.DeleteDbFiles;
 import org.h2.tools.Server;
diff --git a/kie-test-util/src/main/java/org/kie/test/util/db/internal/PoolingDataSourceFactory.java b/kie-test-util/src/main/java/org/kie/test/util/db/internal/PoolingDataSourceFactory.java
index 8e9f686db35..1db19a25e71 100644
--- a/kie-test-util/src/main/java/org/kie/test/util/db/internal/PoolingDataSourceFactory.java
+++ b/kie-test-util/src/main/java/org/kie/test/util/db/internal/PoolingDataSourceFactory.java
@@ -28,8 +28,8 @@
 import javax.sql.DataSource;
 import javax.sql.XAConnection;
 import javax.sql.XADataSource;
-import javax.transaction.TransactionManager;
-import javax.transaction.TransactionSynchronizationRegistry;
+import jakarta.transaction.TransactionManager;
+import jakarta.transaction.TransactionSynchronizationRegistry;
 import javax.transaction.xa.XAResource;
 
 import com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule;
diff --git a/kie-test-util/src/main/java/org/kie/test/util/db/internal/PoolingDataSourceWrapperImpl.java b/kie-test-util/src/main/java/org/kie/test/util/db/internal/PoolingDataSourceWrapperImpl.java
index 71d6cf6b9e8..1e194adeaad 100755
--- a/kie-test-util/src/main/java/org/kie/test/util/db/internal/PoolingDataSourceWrapperImpl.java
+++ b/kie-test-util/src/main/java/org/kie/test/util/db/internal/PoolingDataSourceWrapperImpl.java
@@ -29,8 +29,8 @@
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.sql.XADataSource;
-import javax.transaction.TransactionManager;
-import javax.transaction.TransactionSynchronizationRegistry;
+import jakarta.transaction.TransactionManager;
+import jakarta.transaction.TransactionSynchronizationRegistry;
 
 import com.arjuna.ats.jta.common.jtaPropertyManager;
 import org.apache.tomcat.dbcp.dbcp2.managed.BasicManagedDataSource;
diff --git a/kie-util/kie-util-maven-integration/pom.xml b/kie-util/kie-util-maven-integration/pom.xml
index dd1556e250f..2c29553a1c0 100644
--- a/kie-util/kie-util-maven-integration/pom.xml
+++ b/kie-util/kie-util-maven-integration/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-util
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-util/kie-util-maven-support/pom.xml b/kie-util/kie-util-maven-support/pom.xml
index 5051bd50930..b8dcb26f95f 100644
--- a/kie-util/kie-util-maven-support/pom.xml
+++ b/kie-util/kie-util-maven-support/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-util
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-util/kie-util-xml/pom.xml b/kie-util/kie-util-xml/pom.xml
index ed9651688ec..5515801457b 100644
--- a/kie-util/kie-util-xml/pom.xml
+++ b/kie-util/kie-util-xml/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-util
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-util/pom.xml b/kie-util/pom.xml
index 2f04814da3f..e933f733ce5 100644
--- a/kie-util/pom.xml
+++ b/kie-util/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.46.0-SNAPSHOT
+    9.46.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/pom.xml b/pom.xml
index 2e2dfadedc7..a110248bd5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
   org.kie
   drools-parent
   pom
-  8.46.0-SNAPSHOT
+  9.46.0-SNAPSHOT
 
   Drools :: Parent
   

From dfc4bfb5d03846a565622a328de845e2beffaad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tibor=20Zim=C3=A1nyi?= 
Date: Fri, 15 Dec 2023 15:05:17 +0100
Subject: [PATCH 05/29] [kie-issues#745] Handle lists and maps in method calls
 and constructors in drools-mvel-compiler (#5617)

---
 .../mvelcompiler/MethodCallExprVisitor.java   |  92 ++----
 .../org/drools/mvelcompiler/RHSPhase.java     | 116 ++++---
 .../drools/mvelcompiler/ast/ListExprT.java    |  47 +++
 .../org/drools/mvelcompiler/ast/MapExprT.java |  53 +++
 .../mvelcompiler/ast/MethodCallExprT.java     |   2 +-
 .../util/MethodResolutionUtils.java           | 224 +++++++++++++
 .../mvelcompiler/util/VisitorContext.java     |  24 ++
 .../src/test/java/org/drools/Person.java      |  21 ++
 .../util/MethodResolutionUtilsTest.java       | 303 ++++++++++++++++++
 .../parser/ast/visitor/DrlGenericVisitor.java |   8 +-
 .../MVELEmptyCollectionsTest.java             | 167 ++++++++++
 .../mvel/integrationtests/MVELTest.java       |   2 +
 .../integrationtests/facts/FactWithList.java  |   4 +
 .../integrationtests/facts/FactWithMap.java   |  45 +++
 .../facts/FactWithObject.java                 |  36 +++
 15 files changed, 1030 insertions(+), 114 deletions(-)
 create mode 100644 drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/ast/ListExprT.java
 create mode 100644 drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/ast/MapExprT.java
 create mode 100644 drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/util/MethodResolutionUtils.java
 create mode 100644 drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/util/VisitorContext.java
 create mode 100644 drools-model/drools-mvel-compiler/src/test/java/org/drools/mvelcompiler/util/MethodResolutionUtilsTest.java
 create mode 100644 drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/MVELEmptyCollectionsTest.java
 create mode 100644 drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/facts/FactWithMap.java
 create mode 100644 drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/facts/FactWithObject.java

diff --git a/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/MethodCallExprVisitor.java b/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/MethodCallExprVisitor.java
index 4d0b38ed080..ab007da9411 100644
--- a/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/MethodCallExprVisitor.java
+++ b/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/MethodCallExprVisitor.java
@@ -18,28 +18,32 @@
  */
 package org.drools.mvelcompiler;
 
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.expr.Expression;
 import com.github.javaparser.ast.expr.MethodCallExpr;
-import org.drools.util.MethodUtils;
+import com.github.javaparser.utils.Pair;
+import org.drools.mvel.parser.ast.expr.ListCreationLiteralExpression;
+import org.drools.mvel.parser.ast.expr.MapCreationLiteralExpression;
 import org.drools.mvel.parser.ast.visitor.DrlGenericVisitor;
 import org.drools.mvelcompiler.ast.MethodCallExprT;
 import org.drools.mvelcompiler.ast.TypedExpression;
 import org.drools.mvelcompiler.context.DeclaredFunction;
 import org.drools.mvelcompiler.context.MvelCompilerContext;
-import org.drools.util.ClassUtils;
+import org.drools.mvelcompiler.util.MethodResolutionUtils;
+import org.drools.mvelcompiler.util.VisitorContext;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 import static org.drools.util.StreamUtils.optionalToStream;
 
-public class MethodCallExprVisitor implements DrlGenericVisitor {
+public class MethodCallExprVisitor implements DrlGenericVisitor {
 
     final RHSPhase parentVisitor;
     final MvelCompilerContext mvelCompilerContext;
@@ -50,24 +54,18 @@ public MethodCallExprVisitor(RHSPhase parentVisitor, MvelCompilerContext mvelCom
     }
 
     @Override
-    public TypedExpression defaultMethod(Node n, RHSPhase.Context context) {
+    public TypedExpression defaultMethod(Node n, VisitorContext context) {
         return n.accept(parentVisitor, context);
     }
 
     @Override
-    public TypedExpression visit(MethodCallExpr n, RHSPhase.Context arg) {
-        Optional scope = n.getScope().map(s -> s.accept(this, arg));
-        TypedExpression name = n.getName().accept(this, new RHSPhase.Context(scope.orElse(null)));
-        final List arguments = new ArrayList<>(n.getArguments().size());
-        for (Expression child : n.getArguments()) {
-            TypedExpression a = child.accept(this, arg);
-            arguments.add(a);
-        }
-
-        Class[] argumentsTypes = parametersType(arguments);
-
-        return parseMethodFromDeclaredFunction(n, arguments)
-                .orElseGet(() -> parseMethod(n, scope, name, arguments, argumentsTypes));
+    public TypedExpression visit(final MethodCallExpr n, final VisitorContext arg) {
+        final Optional scope = n.getScope().map(s -> s.accept(this, arg));
+        final TypedExpression name = n.getName().accept(this, new VisitorContext(scope.orElse(null)));
+        final Pair, List> typedArgumentsResult =
+                MethodResolutionUtils.getTypedArgumentsWithEmptyCollectionArgumentDetection(n.getArguments(), this, arg);
+        return parseMethodFromDeclaredFunction(n, typedArgumentsResult.a)
+                .orElseGet(() -> parseMethod(n, scope, name, typedArgumentsResult.a, typedArgumentsResult.b));
     }
 
     private Optional parseMethodFromDeclaredFunction(MethodCallExpr n, List arguments) {
@@ -89,43 +87,21 @@ private MethodCallExprT parseMethod(MethodCallExpr n,
                                         Optional scope,
                                         TypedExpression name,
                                         List arguments,
-                                        Class[] argumentsType) {
-        Optional method = scope.flatMap(TypedExpression::getType)
-                .>map(ClassUtils::classFromType)
-                .map(scopeClazz -> MethodUtils.findMethod(scopeClazz, n.getNameAsString(), argumentsType));
-
-        if (method.isEmpty()) {
-            method = mvelCompilerContext.getRootPattern()
-                    .map(scopeClazz -> MethodUtils.findMethod(scopeClazz, n.getNameAsString(), argumentsType));
-            if(method.isPresent()) {
-                scope = mvelCompilerContext.createRootTypePrefix();
-            }
+                                        List emptyCollectionArgumentIndexes) {
+        Pair, Optional> resolveMethodResult =
+                MethodResolutionUtils.resolveMethod(n, mvelCompilerContext, scope, arguments);
+        // This is a workaround for mvel empty list and map ambiguity, please see the description in getTypedArguments() method.
+        if (resolveMethodResult.a.isEmpty() && !emptyCollectionArgumentIndexes.isEmpty()) {
+            resolveMethodResult = MethodResolutionUtils.resolveMethodWithEmptyCollectionArguments(n, mvelCompilerContext, resolveMethodResult.b, arguments, emptyCollectionArgumentIndexes);
         }
-
-        if (method.isEmpty()) {
-            method = mvelCompilerContext.findStaticMethod(n.getNameAsString());
-        }
-
-        Optional finalMethod = method;
-        Optional methodReturnType =
-                name.getType()
-                        .map(Optional::of)
-                        .orElseGet(() -> finalMethod.map(Method::getReturnType));
-
-        List> actualArgumentType = optionalToStream(method)
+        final Optional finalMethod = resolveMethodResult.a;
+        final Optional finalScope = resolveMethodResult.b;
+        final Optional methodReturnType = name.getType().or(() -> finalMethod.map(Method::getReturnType));
+        final List> actualArgumentType = optionalToStream(finalMethod)
                 .flatMap((Method m) -> Arrays.stream(m.getParameterTypes()))
                 .collect(Collectors.toList());
 
-        return new MethodCallExprT(n.getName().asString(), scope, arguments,
+        return new MethodCallExprT(n.getName().asString(), finalScope, arguments,
                                    actualArgumentType, methodReturnType);
     }
-
-    private Class[] parametersType(List arguments) {
-        return arguments.stream()
-                .map(TypedExpression::getType)
-                .filter(Optional::isPresent)
-                .map(Optional::get)
-                .map(ClassUtils::classFromType)
-                .toArray(Class[]::new);
-    }
 }
diff --git a/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/RHSPhase.java b/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/RHSPhase.java
index d85917abc3a..533fab5680a 100644
--- a/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/RHSPhase.java
+++ b/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/RHSPhase.java
@@ -52,9 +52,13 @@
 import com.github.javaparser.ast.expr.VariableDeclarationExpr;
 import com.github.javaparser.ast.stmt.ExpressionStmt;
 import com.github.javaparser.ast.stmt.YieldStmt;
+import com.github.javaparser.utils.Pair;
 import org.drools.mvel.parser.ast.expr.BigDecimalLiteralExpr;
 import org.drools.mvel.parser.ast.expr.BigIntegerLiteralExpr;
 import org.drools.mvel.parser.ast.expr.DrlNameExpr;
+import org.drools.mvel.parser.ast.expr.ListCreationLiteralExpression;
+import org.drools.mvel.parser.ast.expr.ListCreationLiteralExpressionElement;
+import org.drools.mvel.parser.ast.expr.MapCreationLiteralExpression;
 import org.drools.mvel.parser.ast.visitor.DrlGenericVisitor;
 import org.drools.mvelcompiler.ast.BigDecimalArithmeticExprT;
 import org.drools.mvelcompiler.ast.BigDecimalConvertedExprT;
@@ -69,7 +73,9 @@
 import org.drools.mvelcompiler.ast.FieldToAccessorTExpr;
 import org.drools.mvelcompiler.ast.IntegerLiteralExpressionT;
 import org.drools.mvelcompiler.ast.ListAccessExprT;
+import org.drools.mvelcompiler.ast.ListExprT;
 import org.drools.mvelcompiler.ast.LongLiteralExpressionT;
+import org.drools.mvelcompiler.ast.MapExprT;
 import org.drools.mvelcompiler.ast.ObjectCreationExpressionT;
 import org.drools.mvelcompiler.ast.SimpleNameTExpr;
 import org.drools.mvelcompiler.ast.StringLiteralExpressionT;
@@ -77,6 +83,8 @@
 import org.drools.mvelcompiler.ast.UnalteredTypedExpression;
 import org.drools.mvelcompiler.context.Declaration;
 import org.drools.mvelcompiler.context.MvelCompilerContext;
+import org.drools.mvelcompiler.util.MethodResolutionUtils;
+import org.drools.mvelcompiler.util.VisitorContext;
 import org.drools.util.ClassUtils;
 import org.drools.util.MethodUtils.NullType;
 
@@ -100,7 +108,7 @@
  * might need to create new variables accordingly.
  *
  */
-public class RHSPhase implements DrlGenericVisitor {
+public class RHSPhase implements DrlGenericVisitor {
 
     private static final Set arithmeticOperators = Set.of(
             BinaryExpr.Operator.PLUS,
@@ -121,18 +129,6 @@ public class RHSPhase implements DrlGenericVisitor scope;
-
-        Context(TypedExpression scope) {
-            this.scope = ofNullable(scope);
-        }
-
-        Optional getScopeType() {
-            return scope.flatMap(TypedExpression::getType);
-        }
-    }
-
     private final MvelCompilerContext mvelCompilerContext;
 
     RHSPhase(MvelCompilerContext mvelCompilerContext) {
@@ -141,19 +137,19 @@ Optional getScopeType() {
     }
 
     public TypedExpression invoke(Node statement) {
-        Context ctx = new Context(null);
+        VisitorContext ctx = new VisitorContext(null);
 
         return statement.accept(this, ctx);
     }
 
     @Override
-    public TypedExpression visit(DrlNameExpr n, Context arg) {
+    public TypedExpression visit(DrlNameExpr n, VisitorContext arg) {
         return n.getName().accept(this, arg);
     }
 
     @Override
-    public TypedExpression visit(SimpleName n, Context arg) {
-        if (arg.scope.isEmpty()) { // first node
+    public TypedExpression visit(SimpleName n, VisitorContext arg) {
+        if (arg.getScope().isEmpty()) { // first node
             return simpleNameAsFirstNode(n);
         } else {
             return simpleNameAsField(n, arg);
@@ -161,17 +157,17 @@ public TypedExpression visit(SimpleName n, Context arg) {
     }
 
     @Override
-    public TypedExpression visit(YieldStmt n, Context arg) {
+    public TypedExpression visit(YieldStmt n, VisitorContext arg) {
         return null;
     }
 
     @Override
-    public TypedExpression visit(TextBlockLiteralExpr n, Context arg) {
+    public TypedExpression visit(TextBlockLiteralExpr n, VisitorContext arg) {
         return new UnalteredTypedExpression(n, String.class);
     }
 
     @Override
-    public TypedExpression visit(PatternExpr n, Context arg) {
+    public TypedExpression visit(PatternExpr n, VisitorContext arg) {
         return null;
     }
 
@@ -184,15 +180,15 @@ private TypedExpression simpleNameAsFirstNode(SimpleName n) {
                 .orElseGet(() -> new UnalteredTypedExpression(n));
     }
 
-    private TypedExpression simpleNameAsField(SimpleName n, Context arg) {
+    private TypedExpression simpleNameAsField(SimpleName n, VisitorContext arg) {
         return asPropertyAccessor(n, arg)
                 .map(Optional::of)
                 .orElseGet(() -> asFieldAccessTExpr(n, arg))
                 .orElseGet(() -> new UnalteredTypedExpression(n));
     }
 
-    private Optional asFieldAccessTExpr(SimpleName n, Context arg) {
-        Optional lastTypedExpression = arg.scope;
+    private Optional asFieldAccessTExpr(SimpleName n, VisitorContext arg) {
+        Optional lastTypedExpression = arg.getScope();
         Optional scopeType = arg.getScopeType();
 
         Optional fieldType = scopeType.flatMap(te -> {
@@ -217,8 +213,8 @@ private Optional asEnum(SimpleName n) {
         return enumType.map(clazz -> new SimpleNameTExpr(n.asString(), clazz));
     }
 
-    private Optional asPropertyAccessor(SimpleName n, Context arg) {
-        Optional lastTypedExpression = arg.scope;
+    private Optional asPropertyAccessor(SimpleName n, VisitorContext arg) {
+        Optional lastTypedExpression = arg.getScope();
 
         Optional scopeType = lastTypedExpression.filter(ListAccessExprT.class::isInstance)
                                                       .map(ListAccessExprT.class::cast)
@@ -238,18 +234,18 @@ private Optional asPropertyAccessorOfRootPattern(SimpleName n)
     }
 
     @Override
-    public TypedExpression visit(FieldAccessExpr n, Context arg) {
+    public TypedExpression visit(FieldAccessExpr n, VisitorContext arg) {
         TypedExpression scope = n.getScope().accept(this, arg);
-        return n.getName().accept(this, new Context(scope));
+        return n.getName().accept(this, new VisitorContext(scope));
     }
 
     @Override
-    public TypedExpression visit(MethodCallExpr n, Context arg) {
+    public TypedExpression visit(MethodCallExpr n, VisitorContext arg) {
         return n.accept(methodCallExprVisitor, arg);
     }
 
     @Override
-    public TypedExpression visit(BinaryExpr n, Context arg) {
+    public TypedExpression visit(BinaryExpr n, VisitorContext arg) {
         TypedExpression left = n.getLeft().accept(this, arg);
         TypedExpression right = n.getRight().accept(this, arg);
         return withPossiblyBigDecimalConversion(left, right, n.getOperator());
@@ -303,78 +299,82 @@ private TypedExpression convertToBigDecimalRelationalExprTIfNeeded(TypedExpressi
     }
 
     @Override
-    public TypedExpression visit(ExpressionStmt n, Context arg) {
+    public TypedExpression visit(ExpressionStmt n, VisitorContext arg) {
         return n.getExpression().accept(this, arg);
     }
 
     @Override
-    public TypedExpression visit(VariableDeclarationExpr n, Context arg) {
+    public TypedExpression visit(VariableDeclarationExpr n, VisitorContext arg) {
         return n.getVariables().iterator().next().accept(this, arg);
     }
 
     @Override
-    public TypedExpression visit(VariableDeclarator n, Context arg) {
+    public TypedExpression visit(VariableDeclarator n, VisitorContext arg) {
         Optional initExpression = n.getInitializer().map(i -> i.accept(this, arg));
         return initExpression.orElse(null);
     }
 
     @Override
-    public TypedExpression visit(AssignExpr n, Context arg) {
+    public TypedExpression visit(AssignExpr n, VisitorContext arg) {
         return n.getValue().accept(this, arg);
     }
 
     @Override
-    public TypedExpression visit(StringLiteralExpr n, Context arg) {
+    public TypedExpression visit(StringLiteralExpr n, VisitorContext arg) {
         return new StringLiteralExpressionT(n);
     }
 
     @Override
-    public TypedExpression visit(IntegerLiteralExpr n, Context arg) {
+    public TypedExpression visit(IntegerLiteralExpr n, VisitorContext arg) {
         return new IntegerLiteralExpressionT(n);
     }
 
     @Override
-    public TypedExpression visit(DoubleLiteralExpr n, Context arg) {
+    public TypedExpression visit(DoubleLiteralExpr n, VisitorContext arg) {
         return new DoubleLiteralExpressionT(n);
     }
 
     @Override
-    public TypedExpression visit(CharLiteralExpr n, Context arg) {
+    public TypedExpression visit(CharLiteralExpr n, VisitorContext arg) {
         return new CharacterLiteralExpressionT(n);
     }
 
     @Override
-    public TypedExpression visit(LongLiteralExpr n, Context arg) {
+    public TypedExpression visit(LongLiteralExpr n, VisitorContext arg) {
         return new LongLiteralExpressionT(n);
     }
 
     @Override
-    public TypedExpression visit(BooleanLiteralExpr n, Context arg) {
+    public TypedExpression visit(BooleanLiteralExpr n, VisitorContext arg) {
         return new BooleanLiteralExpressionT(n);
     }
 
     @Override
-    public TypedExpression defaultMethod(Node n, Context context) {
+    public TypedExpression defaultMethod(Node n, VisitorContext context) {
         return new UnalteredTypedExpression(n);
     }
 
     @Override
-    public TypedExpression visit(ObjectCreationExpr n, Context arg) {
-        List constructorArguments = new ArrayList<>();
-        for(Expression e : n.getArguments()) {
-            TypedExpression compiledArgument = e.accept(this, arg);
-            constructorArguments.add(compiledArgument);
+    public TypedExpression visit(ObjectCreationExpr n, VisitorContext arg) {
+        final Class type = resolveType(n.getType());
+        final Pair, List> typedArgumentsResult =
+                MethodResolutionUtils.getTypedArgumentsWithEmptyCollectionArgumentDetection(n.getArguments(), this, arg);
+        if (!typedArgumentsResult.b.isEmpty()) {
+            return new ObjectCreationExpressionT(
+                    MethodResolutionUtils.coerceCorrectConstructorArguments(type, typedArgumentsResult.a, typedArgumentsResult.b),
+                    type);
+        } else {
+            return new ObjectCreationExpressionT(typedArgumentsResult.a, type);
         }
-        return new ObjectCreationExpressionT(constructorArguments, resolveType(n.getType()));
     }
 
     @Override
-    public TypedExpression visit(NullLiteralExpr n, Context arg) {
+    public TypedExpression visit(NullLiteralExpr n, VisitorContext arg) {
         return new UnalteredTypedExpression(n, NullType.class);
     }
 
     @Override
-    public TypedExpression visit(ArrayAccessExpr n, Context arg) {
+    public TypedExpression visit(ArrayAccessExpr n, VisitorContext arg) {
         TypedExpression name = n.getName().accept(this, arg);
 
         Optional type = name.getType();
@@ -385,28 +385,28 @@ public TypedExpression visit(ArrayAccessExpr n, Context arg) {
     }
 
     @Override
-    public TypedExpression visit(EnclosedExpr n, Context arg) {
+    public TypedExpression visit(EnclosedExpr n, VisitorContext arg) {
         return n.getInner().accept(this, arg);
     }
 
     @Override
-    public TypedExpression visit(CastExpr n, Context arg) {
+    public TypedExpression visit(CastExpr n, VisitorContext arg) {
         TypedExpression innerExpr = n.getExpression().accept(this, arg);
         return new CastExprT(innerExpr, resolveType(n.getType()));
     }
 
     @Override
-    public TypedExpression visit(BigDecimalLiteralExpr n, Context arg) {
+    public TypedExpression visit(BigDecimalLiteralExpr n, VisitorContext arg) {
         return new BigDecimalConvertedExprT(new StringLiteralExpressionT(new StringLiteralExpr(n.getValue())));
     }
 
     @Override
-    public TypedExpression visit(BigIntegerLiteralExpr n, Context arg) {
+    public TypedExpression visit(BigIntegerLiteralExpr n, VisitorContext arg) {
         return new BigIntegerConvertedExprT(new StringLiteralExpressionT(new StringLiteralExpr(n.getValue())));
     }
 
     @Override
-    public TypedExpression visit(UnaryExpr n, Context arg) {
+    public TypedExpression visit(UnaryExpr n, VisitorContext arg) {
         Expression innerExpr = n.getExpression();
         UnaryExpr.Operator operator = n.getOperator();
         if (innerExpr instanceof BigDecimalLiteralExpr && operator == UnaryExpr.Operator.MINUS) {
@@ -418,6 +418,16 @@ public TypedExpression visit(UnaryExpr n, Context arg) {
         }
     }
 
+    @Override
+    public TypedExpression visit(ListCreationLiteralExpression n, VisitorContext arg) {
+        return new ListExprT(n);
+    }
+
+    @Override
+    public TypedExpression visit(MapCreationLiteralExpression n, VisitorContext arg) {
+        return new MapExprT(n);
+    }
+
     private Class resolveType(com.github.javaparser.ast.type.Type type) {
         return mvelCompilerContext.resolveType(type.asString());
     }
diff --git a/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/ast/ListExprT.java b/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/ast/ListExprT.java
new file mode 100644
index 00000000000..3b9d8a56f32
--- /dev/null
+++ b/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/ast/ListExprT.java
@@ -0,0 +1,47 @@
+package org.drools.mvelcompiler.ast;
+
+import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.NodeList;
+import com.github.javaparser.ast.expr.Expression;
+import com.github.javaparser.ast.expr.MethodCallExpr;
+import com.github.javaparser.ast.expr.NameExpr;
+import org.drools.mvel.parser.ast.expr.ListCreationLiteralExpression;
+import org.drools.mvel.parser.ast.expr.ListCreationLiteralExpressionElement;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import static com.github.javaparser.ast.NodeList.toNodeList;
+
+public class ListExprT implements TypedExpression {
+
+    private final ListCreationLiteralExpression listExpression;
+
+    public ListExprT(final ListCreationLiteralExpression listExpression) {
+        this.listExpression = listExpression;
+    }
+
+    @Override
+    public Optional getType() {
+        return Optional.of(List.class);
+    }
+
+    @Override
+    public Node toJavaExpression() {
+        if (listExpression.getExpressions() == null || listExpression.getExpressions().isEmpty()) {
+            return new MethodCallExpr(new NameExpr(Collections.class.getCanonicalName()), "emptyList");
+        } else {
+            return new MethodCallExpr(new NameExpr(List.class.getCanonicalName()), "of", getValueExpressionsFromListElements(listExpression.getExpressions()));
+        }
+    }
+
+    private NodeList getValueExpressionsFromListElements(final NodeList listItems) {
+        return listItems.stream()
+                .filter(listItem -> listItem instanceof ListCreationLiteralExpressionElement)
+                .map(listItem -> ((ListCreationLiteralExpressionElement) listItem).getValue())
+                .collect(toNodeList());
+    }
+}
diff --git a/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/ast/MapExprT.java b/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/ast/MapExprT.java
new file mode 100644
index 00000000000..8291905fab6
--- /dev/null
+++ b/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/ast/MapExprT.java
@@ -0,0 +1,53 @@
+package org.drools.mvelcompiler.ast;
+
+import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.NodeList;
+import com.github.javaparser.ast.expr.Expression;
+import com.github.javaparser.ast.expr.MethodCallExpr;
+import com.github.javaparser.ast.expr.NameExpr;
+import org.drools.mvel.parser.ast.expr.ListCreationLiteralExpressionElement;
+import org.drools.mvel.parser.ast.expr.MapCreationLiteralExpression;
+import org.drools.mvel.parser.ast.expr.MapCreationLiteralExpressionKeyValuePair;
+
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static com.github.javaparser.ast.NodeList.toNodeList;
+
+public class MapExprT implements TypedExpression {
+
+    private final MapCreationLiteralExpression mapExpression;
+
+    public MapExprT(final MapCreationLiteralExpression mapExpression) {
+        this.mapExpression = mapExpression;
+    }
+
+    @Override
+    public Optional getType() {
+        return Optional.of(Map.class);
+    }
+
+    @Override
+    public Node toJavaExpression() {
+        if (mapExpression.getExpressions() == null || mapExpression.getExpressions().isEmpty()) {
+            return new MethodCallExpr(new NameExpr(Collections.class.getCanonicalName()), "emptyMap");
+        } else {
+            return new MethodCallExpr(new NameExpr(Map.class.getCanonicalName()), "ofEntries", getMapEntryExpressions(mapExpression.getExpressions()));
+        }
+    }
+
+    private NodeList getMapEntryExpressions(final NodeList mapEntries) {
+        return mapEntries.stream()
+                .filter(mapEntry -> mapEntry instanceof MapCreationLiteralExpressionKeyValuePair)
+                .map(mapEntry ->
+                    new MethodCallExpr(
+                            new NameExpr(Map.class.getCanonicalName()),
+                            "entry",
+                            NodeList.nodeList(((MapCreationLiteralExpressionKeyValuePair) mapEntry).getKey(),
+                                    ((MapCreationLiteralExpressionKeyValuePair) mapEntry).getValue()))
+                ).collect(toNodeList());
+    }
+}
diff --git a/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/ast/MethodCallExprT.java b/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/ast/MethodCallExprT.java
index 688b0316211..5d3337edc50 100644
--- a/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/ast/MethodCallExprT.java
+++ b/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/ast/MethodCallExprT.java
@@ -63,7 +63,7 @@ public Node toJavaExpression() {
 
         List methodArguments;
         // MVEL forces a to string on each String value in map
-        if(PUT_CALL.equals(name) && arguments.size() == 2) {
+        if (PUT_CALL.equals(name) && arguments.size() == 2) {
             methodArguments = coercedMapArguments();
         } else {
             methodArguments = toJavaExpressionArgument();
diff --git a/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/util/MethodResolutionUtils.java b/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/util/MethodResolutionUtils.java
new file mode 100644
index 00000000000..7c648db28cb
--- /dev/null
+++ b/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/util/MethodResolutionUtils.java
@@ -0,0 +1,224 @@
+package org.drools.mvelcompiler.util;
+
+import com.github.javaparser.ast.NodeList;
+import com.github.javaparser.ast.expr.Expression;
+import com.github.javaparser.ast.expr.MethodCallExpr;
+import com.github.javaparser.utils.Pair;
+import org.drools.mvel.parser.ast.expr.ListCreationLiteralExpression;
+import org.drools.mvel.parser.ast.expr.MapCreationLiteralExpression;
+import org.drools.mvel.parser.ast.visitor.DrlGenericVisitor;
+import org.drools.mvelcompiler.ast.ListExprT;
+import org.drools.mvelcompiler.ast.MapExprT;
+import org.drools.mvelcompiler.ast.TypedExpression;
+import org.drools.mvelcompiler.context.MvelCompilerContext;
+import org.drools.util.ClassUtils;
+import org.drools.util.MethodUtils;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+public final class MethodResolutionUtils {
+
+    private MethodResolutionUtils() {
+        // It is forbidden to create instances of util classes.
+    }
+
+    /**
+     *  [] is ambiguous in mvel - it can represent an empty list or an empty map.
+     *    It cannot be distinguished on a language level, so this is a workaround:
+     *    - When there [] written in a rule, mvel parser parses it as an empty list.
+     *    - The only possible way with constructors, when there is such parameter, is try to guess the correct parameter type when trying to read the constructor from a class.
+     *    - This uses all indexes of empty lists or empty maps in the constructor parameters.
+     *    - When not possible to resolve the constructor with a list or map parameter, it will try to resolve a constructor with the other collection parameter.
+     *    - This happens for all empty list and map parameters resolved by the parser, until a proper constructor is found.
+     */
+    public static List coerceCorrectConstructorArguments(
+            final Class type,
+            List arguments,
+            List emptyCollectionArgumentsIndexes) {
+        Objects.requireNonNull(type, "Type parameter cannot be null as the method searches constructors from that class!");
+        Objects.requireNonNull(arguments, "Arguments parameter cannot be null! Use an empty list instance if needed instead.");
+        Objects.requireNonNull(emptyCollectionArgumentsIndexes, "EmptyListArgumentIndexes parameter cannot be null! Use an empty list instance if needed instead.");
+        if (emptyCollectionArgumentsIndexes.size() > arguments.size()) {
+            throw new IllegalArgumentException("There cannot be more empty collection arguments than all arguments! emptyCollectionArgumentsIndexes parameter has more items than arguments parameter. "
+                    + "(" + emptyCollectionArgumentsIndexes.size() + " > " + arguments.size() + ")");
+        }
+        // Rather work only with the argumentsType and when a method is resolved, flip the arguments list based on it.
+        final List coercedArgumentsTypesList = new ArrayList<>(arguments);
+        Constructor constructor = resolveConstructor(type, coercedArgumentsTypesList);
+        if (constructor != null) {
+            return coercedArgumentsTypesList;
+        } else {
+            // This needs to go through all possible combinations.
+            final int indexesListSize = emptyCollectionArgumentsIndexes.size();
+            for (int numberOfProcessedIndexes = 0; numberOfProcessedIndexes < indexesListSize; numberOfProcessedIndexes++) {
+                for (int indexOfEmptyListIndex = numberOfProcessedIndexes; indexOfEmptyListIndex < indexesListSize; indexOfEmptyListIndex++) {
+                    switchCollectionClassInArgumentsByIndex(coercedArgumentsTypesList, emptyCollectionArgumentsIndexes.get(indexOfEmptyListIndex));
+                    constructor = resolveConstructor(type, coercedArgumentsTypesList);
+                    if (constructor != null) {
+                        return coercedArgumentsTypesList;
+                    }
+                    switchCollectionClassInArgumentsByIndex(coercedArgumentsTypesList, emptyCollectionArgumentsIndexes.get(indexOfEmptyListIndex));
+                }
+                switchCollectionClassInArgumentsByIndex(coercedArgumentsTypesList, emptyCollectionArgumentsIndexes.get(numberOfProcessedIndexes));
+            }
+            // No constructor found, return the original arguments.
+            return arguments;
+        }
+    }
+
+    private static Constructor resolveConstructor(final Class type, List arguments) {
+        Constructor constructor;
+        try {
+            constructor = type.getConstructor(parametersType(arguments));
+        } catch (NoSuchMethodException ex) {
+            constructor = null;
+        }
+        return constructor;
+    }
+
+    /**
+     *  [] is ambiguous in mvel - it can represent an empty list or an empty map.
+     *    It cannot be distinguished on a language level, so this is a workaround:
+     *    - When there [] written in a rule, mvel parser parses it as an empty list.
+     *    - The only possible way with methods, when there is such parameter, is try to guess the correct parameter type when trying to read the method from a class.
+     *    - This uses all indexes of empty lists or empty maps in the method parameters.
+     *    - When not possible to resolve the method with a list or map parameter, it will try to resolve a method with the other collection parameter.
+     *    - This happens for all empty list and map parameters resolved by the parser, until a proper method is found.
+     */
+    public static Pair, Optional> resolveMethodWithEmptyCollectionArguments(
+            final MethodCallExpr methodExpression,
+            final MvelCompilerContext mvelCompilerContext,
+            final Optional scope,
+            List arguments,
+            List emptyCollectionArgumentsIndexes) {
+        Objects.requireNonNull(methodExpression, "MethodExpression parameter cannot be null as the method searches methods based on this expression!");
+        Objects.requireNonNull(mvelCompilerContext, "MvelCompilerContext parameter cannot be null!");
+        Objects.requireNonNull(arguments, "Arguments parameter cannot be null! Use an empty list instance if needed instead.");
+        Objects.requireNonNull(emptyCollectionArgumentsIndexes, "EmptyListArgumentIndexes parameter cannot be null! Use an empty list instance if needed instead.");
+        if (emptyCollectionArgumentsIndexes.size() > arguments.size()) {
+            throw new IllegalArgumentException("There cannot be more empty collection arguments than all arguments! emptyCollectionArgumentsIndexes parameter has more items than arguments parameter. "
+                    + "(" + emptyCollectionArgumentsIndexes.size() + " > " + arguments.size() + ")");
+        } else {
+            final List coercedArgumentsTypesList = new ArrayList<>(arguments);
+            Pair, Optional> resolveMethodResult =
+                    MethodResolutionUtils.resolveMethod(methodExpression, mvelCompilerContext, scope, coercedArgumentsTypesList);
+            if (resolveMethodResult.a.isPresent()) {
+                return resolveMethodResult;
+            } else {
+                // Rather work only with the argumentsType and when a method is resolved, flip the arguments list based on it.
+                // This needs to go through all possible combinations.
+                final int indexesListSize = emptyCollectionArgumentsIndexes.size();
+                for (int numberOfProcessedIndexes = 0; numberOfProcessedIndexes < indexesListSize; numberOfProcessedIndexes++) {
+                    for (int indexOfEmptyListIndex = numberOfProcessedIndexes; indexOfEmptyListIndex < indexesListSize; indexOfEmptyListIndex++) {
+                        switchCollectionClassInArgumentsByIndex(coercedArgumentsTypesList, emptyCollectionArgumentsIndexes.get(indexOfEmptyListIndex));
+                        resolveMethodResult =
+                                MethodResolutionUtils.resolveMethod(methodExpression, mvelCompilerContext, scope, coercedArgumentsTypesList);
+                        if (resolveMethodResult.a.isPresent()) {
+                            modifyArgumentsBasedOnCoercedCollectionArguments(arguments, coercedArgumentsTypesList);
+                            return resolveMethodResult;
+                        }
+                        switchCollectionClassInArgumentsByIndex(coercedArgumentsTypesList, emptyCollectionArgumentsIndexes.get(indexOfEmptyListIndex));
+                    }
+                    switchCollectionClassInArgumentsByIndex(coercedArgumentsTypesList, emptyCollectionArgumentsIndexes.get(numberOfProcessedIndexes));
+                }
+                // No method found, return empty.
+                return new Pair<>(Optional.empty(), scope);
+            }
+        }
+    }
+
+    public static Pair, Optional> resolveMethod(
+            final MethodCallExpr methodExpression,
+            final MvelCompilerContext mvelCompilerContext,
+            final Optional scope,
+            final List arguments) {
+        Objects.requireNonNull(methodExpression, "MethodExpression parameter cannot be null as the method searches methods based on this expression!");
+        Objects.requireNonNull(mvelCompilerContext, "MvelCompilerContext parameter cannot be null!");
+        Objects.requireNonNull(arguments, "Arguments parameter cannot be null! Use an empty list instance if needed instead.");
+        final Class[] argumentsTypesClasses = parametersType(arguments);
+        Optional finalScope = scope;
+        Optional resolvedMethod;
+        resolvedMethod = finalScope.flatMap(TypedExpression::getType)
+                .>map(ClassUtils::classFromType)
+                .map(scopeClazz -> MethodUtils.findMethod(scopeClazz, methodExpression.getNameAsString(), argumentsTypesClasses));
+
+        if (resolvedMethod.isEmpty()) {
+            resolvedMethod = mvelCompilerContext.getRootPattern()
+                    .map(scopeClazz -> MethodUtils.findMethod(scopeClazz, methodExpression.getNameAsString(), argumentsTypesClasses));
+            if (resolvedMethod.isPresent()) {
+                finalScope = mvelCompilerContext.createRootTypePrefix();
+            }
+        }
+
+        if (resolvedMethod.isEmpty()) {
+            resolvedMethod = mvelCompilerContext.findStaticMethod(methodExpression.getNameAsString());
+        }
+        return new Pair<>(resolvedMethod, finalScope);
+    }
+
+    public static Pair, List> getTypedArgumentsWithEmptyCollectionArgumentDetection(
+            final NodeList arguments,
+            final DrlGenericVisitor drlGenericVisitor,
+            final VisitorContext arg) {
+        final List typedArguments = new ArrayList<>();
+        final List emptyCollectionArgumentIndexes = new ArrayList<>();
+        int argumentIndex = 0;
+        for (Expression child : arguments) {
+            TypedExpression a = child.accept(drlGenericVisitor, arg);
+            typedArguments.add(a);
+            if (child instanceof ListCreationLiteralExpression
+                    && (((ListCreationLiteralExpression) child).getExpressions() == null
+                    || ((ListCreationLiteralExpression) child).getExpressions().isEmpty())) {
+                emptyCollectionArgumentIndexes.add(argumentIndex);
+            } else if (child instanceof MapCreationLiteralExpression
+                    && (((MapCreationLiteralExpression) child).getExpressions() == null
+                    || ((MapCreationLiteralExpression) child).getExpressions().isEmpty())) {
+                emptyCollectionArgumentIndexes.add(argumentIndex);
+            }
+            argumentIndex++;
+        }
+        return new Pair<>(typedArguments, emptyCollectionArgumentIndexes);
+    }
+
+    private static Class[] parametersType(List arguments) {
+        return arguments.stream()
+                .map(TypedExpression::getType)
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .map(ClassUtils::classFromType)
+                .toArray(Class[]::new);
+    }
+
+    private static void switchCollectionClassInArgumentsByIndex(final List argumentsTypesList, final int index) {
+        final Class argumentTypeClass = argumentsTypesList.get(index).getClass();
+        if (argumentTypeClass.equals(ListExprT.class) || argumentTypeClass.equals(MapExprT.class)) {
+            if (argumentTypeClass.equals(ListExprT.class)) {
+                argumentsTypesList.set(index, new MapExprT(new MapCreationLiteralExpression(null, NodeList.nodeList())));
+            } else {
+                argumentsTypesList.set(index, new ListExprT(new ListCreationLiteralExpression(null, NodeList.nodeList())));
+            }
+        } else {
+            throw new IllegalArgumentException("Argument at index " + index + " from the list of arguments (argumentsTypesList) is not a collection type, but " + argumentTypeClass.getCanonicalName() + " type!");
+        }
+    }
+
+    private static void modifyArgumentsBasedOnCoercedCollectionArguments(final List arguments, final List coercedCollectionArguments) {
+        int index = 0;
+        for (TypedExpression coercedArgument : coercedCollectionArguments) {
+            if (!coercedArgument.getClass().equals(arguments.get(index).getClass())) {
+                // Originally the resolved type was a List, so if it is different, it is a Map.
+                if (coercedArgument.getClass().equals(MapExprT.class)) {
+                    arguments.set(index, new MapExprT(new MapCreationLiteralExpression(null, NodeList.nodeList())));
+                } else {
+                    arguments.set(index, new ListExprT(new ListCreationLiteralExpression(null, NodeList.nodeList())));
+                }
+            }
+            index++;
+        }
+    }
+}
diff --git a/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/util/VisitorContext.java b/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/util/VisitorContext.java
new file mode 100644
index 00000000000..4945e669d1f
--- /dev/null
+++ b/drools-model/drools-mvel-compiler/src/main/java/org/drools/mvelcompiler/util/VisitorContext.java
@@ -0,0 +1,24 @@
+package org.drools.mvelcompiler.util;
+
+import org.drools.mvelcompiler.ast.TypedExpression;
+
+import java.lang.reflect.Type;
+import java.util.Optional;
+
+import static java.util.Optional.ofNullable;
+
+public class VisitorContext {
+    private final Optional scope;
+
+    public VisitorContext(final TypedExpression scope) {
+        this.scope = ofNullable(scope);
+    }
+
+    public Optional getScopeType() {
+        return scope.flatMap(TypedExpression::getType);
+    }
+
+    public Optional getScope() {
+        return scope;
+    }
+}
diff --git a/drools-model/drools-mvel-compiler/src/test/java/org/drools/Person.java b/drools-model/drools-mvel-compiler/src/test/java/org/drools/Person.java
index e99d6887c16..00b60f88775 100644
--- a/drools-model/drools-mvel-compiler/src/test/java/org/drools/Person.java
+++ b/drools-model/drools-mvel-compiler/src/test/java/org/drools/Person.java
@@ -53,6 +53,9 @@ public class Person {
 
     private Integer ageAsInteger;
 
+    public Person() {
+    }
+
     public Person(String name) {
         this(name, null);
     }
@@ -67,6 +70,19 @@ public Person(String name, Person parent, Gender gender) {
         this.gender = gender;
     }
 
+    public Person(List
 addresses) {
+        this.addresses = addresses;
+    }
+
+    public Person(Map items) {
+        this.items = items;
+    }
+
+    public Person(List
 addresses, Map items) {
+        this.addresses = addresses;
+        this.items = items;
+    }
+
     public String getName() {
         return name;
     }
@@ -204,4 +220,9 @@ public Float getFloatBoxed() {
     public void setFloatBoxed(Float floatBoxed) {
         this.floatBoxed = floatBoxed;
     }
+
+    public void setAddressesAndItems(List
 addresses, Map items) {
+        this.addresses = addresses;
+        this.items = items;
+    }
 }
diff --git a/drools-model/drools-mvel-compiler/src/test/java/org/drools/mvelcompiler/util/MethodResolutionUtilsTest.java b/drools-model/drools-mvel-compiler/src/test/java/org/drools/mvelcompiler/util/MethodResolutionUtilsTest.java
new file mode 100644
index 00000000000..c449cfe5c1e
--- /dev/null
+++ b/drools-model/drools-mvel-compiler/src/test/java/org/drools/mvelcompiler/util/MethodResolutionUtilsTest.java
@@ -0,0 +1,303 @@
+package org.drools.mvelcompiler.util;
+
+import com.github.javaparser.ast.NodeList;
+import com.github.javaparser.ast.expr.IntegerLiteralExpr;
+import com.github.javaparser.ast.expr.MethodCallExpr;
+import com.github.javaparser.ast.expr.StringLiteralExpr;
+import com.github.javaparser.utils.Pair;
+import org.assertj.core.api.Assertions;
+import org.drools.Person;
+import org.drools.mvel.parser.ast.expr.ListCreationLiteralExpression;
+import org.drools.mvel.parser.ast.expr.MapCreationLiteralExpression;
+import org.drools.mvelcompiler.ast.IntegerLiteralExpressionT;
+import org.drools.mvelcompiler.ast.ListExprT;
+import org.drools.mvelcompiler.ast.MapExprT;
+import org.drools.mvelcompiler.ast.ObjectCreationExpressionT;
+import org.drools.mvelcompiler.ast.StringLiteralExpressionT;
+import org.drools.mvelcompiler.ast.TypedExpression;
+import org.drools.mvelcompiler.context.MvelCompilerContext;
+import org.junit.Test;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+public class MethodResolutionUtilsTest {
+
+    @Test
+    public void coerceCorrectConstructorArgumentsTypeIsNull() {
+        Assertions.assertThatThrownBy(
+                        () -> MethodResolutionUtils.coerceCorrectConstructorArguments(
+                                null,
+                                null,
+                                null))
+                .isInstanceOf(NullPointerException.class);
+    }
+
+    @Test
+    public void coerceCorrectConstructorArgumentsArgumentsAreNull() {
+        Assertions.assertThatThrownBy(
+                        () -> MethodResolutionUtils.coerceCorrectConstructorArguments(
+                                Person.class,
+                                null,
+                                null))
+                .isInstanceOf(NullPointerException.class);
+    }
+
+    @Test
+    public void coerceCorrectConstructorArgumentsEmptyCollectionIndexesAreNull() {
+        Assertions.assertThatThrownBy(
+                        () -> MethodResolutionUtils.coerceCorrectConstructorArguments(
+                                Person.class,
+                                Collections.emptyList(),
+                                null))
+                .isInstanceOf(NullPointerException.class);
+    }
+
+    @Test
+    public void coerceCorrectConstructorArgumentsEmptyCollectionIndexesBiggerThanArguments() {
+        Assertions.assertThatThrownBy(
+                        () -> MethodResolutionUtils.coerceCorrectConstructorArguments(
+                                Person.class,
+                                Collections.emptyList(),
+                                List.of(1, 2, 4)))
+                .isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    public void coerceCorrectConstructorArgumentsNoCollectionArguments() {
+        final List arguments = List.of(new IntegerLiteralExpressionT(new IntegerLiteralExpr("12")));
+        final List coercedArguments = MethodResolutionUtils.coerceCorrectConstructorArguments(
+                Person.class, arguments, Collections.emptyList());
+        Assertions.assertThat(coercedArguments).containsExactlyElementsOf(arguments);
+    }
+
+    @Test
+    public void coerceCorrectConstructorArgumentsIsNotCollectionAtIndex() {
+        final List arguments = List.of(new IntegerLiteralExpressionT(new IntegerLiteralExpr("12")));
+        Assertions.assertThatThrownBy(
+                        () -> MethodResolutionUtils.coerceCorrectConstructorArguments(
+                                Person.class,
+                                arguments,
+                                List.of(0)))
+                .isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    public void coerceCorrectConstructorArgumentsList() {
+        final List arguments = List.of(new ListExprT(new ListCreationLiteralExpression(null, NodeList.nodeList())));
+        final List coercedArguments = MethodResolutionUtils.coerceCorrectConstructorArguments(
+                Person.class, arguments, List.of(0));
+        Assertions.assertThat(coercedArguments).containsExactlyElementsOf(arguments);
+    }
+
+    @Test
+    public void coerceCorrectConstructorArgumentsCoerceMap() {
+        final List arguments =
+                List.of(
+                        new ListExprT(new ListCreationLiteralExpression(null, NodeList.nodeList())),
+                        new ListExprT(new ListCreationLiteralExpression(null, NodeList.nodeList())));
+        final List> expectedArgumentClasses = List.of(ListExprT.class, MapExprT.class);
+        final List coercedArguments = MethodResolutionUtils.coerceCorrectConstructorArguments(
+                Person.class, arguments, List.of(1));
+        Assertions.assertThat(getTypedExpressionsClasses(coercedArguments))
+                .containsExactlyElementsOf(expectedArgumentClasses);
+    }
+
+    @Test
+    public void coerceCorrectConstructorArgumentsCoerceList() {
+        final List arguments =
+                List.of(
+                        new MapExprT(new MapCreationLiteralExpression(null, NodeList.nodeList())),
+                        new MapExprT(new MapCreationLiteralExpression(null, NodeList.nodeList())));
+        final List> expectedArgumentClasses = List.of(ListExprT.class, MapExprT.class);
+        final List coercedArguments = MethodResolutionUtils.coerceCorrectConstructorArguments(
+                Person.class, arguments, List.of(0));
+        Assertions.assertThat(getTypedExpressionsClasses(coercedArguments))
+                .containsExactlyElementsOf(expectedArgumentClasses);
+    }
+
+    @Test
+    public void coerceCorrectConstructorArgumentsCoerceListAndMap() {
+        final List arguments =
+                List.of(
+                        new MapExprT(new MapCreationLiteralExpression(null, NodeList.nodeList())),
+                        new ListExprT(new ListCreationLiteralExpression(null, NodeList.nodeList())));
+        final List> expectedArgumentClasses = List.of(ListExprT.class, MapExprT.class);
+        final List coercedArguments = MethodResolutionUtils.coerceCorrectConstructorArguments(
+                Person.class, arguments, List.of(0, 1));
+        Assertions.assertThat(getTypedExpressionsClasses(coercedArguments))
+                .containsExactlyElementsOf(expectedArgumentClasses);
+    }
+
+    @Test
+    public void resolveMethodWithEmptyCollectionArgumentsMethodExpressionIsNull() {
+        Assertions.assertThatThrownBy(
+                        () -> MethodResolutionUtils.resolveMethodWithEmptyCollectionArguments(
+                                null,
+                                null,
+                                Optional.empty(),
+                                null,
+                                null))
+                .isInstanceOf(NullPointerException.class);
+    }
+
+    @Test
+    public void resolveMethodWithEmptyCollectionArgumentsMvelCompilerContextIsNull() {
+        Assertions.assertThatThrownBy(
+                        () -> MethodResolutionUtils.resolveMethodWithEmptyCollectionArguments(
+                                new MethodCallExpr(),
+                                null,
+                                Optional.empty(),
+                                null,
+                                null))
+                .isInstanceOf(NullPointerException.class);
+    }
+
+    @Test
+    public void resolveMethodWithEmptyCollectionArgumentsArgumentsAreNull() {
+        Assertions.assertThatThrownBy(
+                        () -> MethodResolutionUtils.resolveMethodWithEmptyCollectionArguments(
+                                new MethodCallExpr(),
+                                new MvelCompilerContext(null),
+                                Optional.empty(),
+                                null,
+                                null))
+                .isInstanceOf(NullPointerException.class);
+    }
+
+    @Test
+    public void resolveMethodWithEmptyCollectionArgumentsEmptyCollectionIndexesAreNull() {
+        Assertions.assertThatThrownBy(
+                        () -> MethodResolutionUtils.resolveMethodWithEmptyCollectionArguments(
+                                new MethodCallExpr(),
+                                new MvelCompilerContext(null),
+                                Optional.empty(),
+                                Collections.emptyList(),
+                                null))
+                .isInstanceOf(NullPointerException.class);
+    }
+
+    @Test
+    public void resolveMethodWithEmptyCollectionArgumentsEmptyCollectionIndexesBiggerThanArguments() {
+        Assertions.assertThatThrownBy(
+                        () -> MethodResolutionUtils.resolveMethodWithEmptyCollectionArguments(
+                                new MethodCallExpr(),
+                                new MvelCompilerContext(null),
+                                Optional.empty(),
+                                Collections.emptyList(),
+                                List.of(1, 2, 4)))
+                .isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    public void resolveMethodWithEmptyCollectionArgumentsNoCollectionArguments() {
+        final MethodCallExpr methodExpression = new MethodCallExpr("setIntegerBoxed", new IntegerLiteralExpr("12"));
+        final List arguments = List.of(new IntegerLiteralExpressionT(new IntegerLiteralExpr("12")));
+        final List expectedArguments = new ArrayList<>(arguments);
+        final TypedExpression scope = new ObjectCreationExpressionT(arguments, Person.class);
+        final Pair, Optional> resolvedMethodResult =
+                MethodResolutionUtils.resolveMethodWithEmptyCollectionArguments(
+                        methodExpression,
+                        new MvelCompilerContext(null),
+                        Optional.of(scope),
+                        arguments,
+                        Collections.emptyList());
+        Assertions.assertThat(resolvedMethodResult.a).isPresent();
+        Assertions.assertThat(arguments).containsExactlyElementsOf(expectedArguments);
+    }
+
+    @Test
+    public void resolveMethodWithEmptyCollectionArgumentsIsNotCollectionAtIndex() {
+        final MethodCallExpr methodExpression = new MethodCallExpr("setIntegerBoxed", new IntegerLiteralExpr("12"));
+        final List arguments = List.of(new StringLiteralExpressionT(new StringLiteralExpr("12")));
+        final TypedExpression scope = new ObjectCreationExpressionT(arguments, Person.class);
+        Assertions.assertThatThrownBy(
+                        () -> MethodResolutionUtils.resolveMethodWithEmptyCollectionArguments(
+                                methodExpression,
+                                new MvelCompilerContext(null),
+                                Optional.of(scope),
+                                arguments,
+                                List.of(0)))
+                .isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    public void resolveMethodWithEmptyCollectionArguments() {
+        final MethodCallExpr methodExpression = new MethodCallExpr("setAddresses", new ListCreationLiteralExpression(null, NodeList.nodeList()));
+        final List arguments = List.of(new ListExprT(new ListCreationLiteralExpression(null, NodeList.nodeList())));
+        final TypedExpression scope = new ObjectCreationExpressionT(arguments, Person.class);
+        final Pair, Optional> resolvedMethodResult =
+                MethodResolutionUtils.resolveMethodWithEmptyCollectionArguments(
+                        methodExpression,
+                        new MvelCompilerContext(null),
+                        Optional.of(scope),
+                        arguments,
+                        List.of(0));
+        Assertions.assertThat(resolvedMethodResult.a).isPresent();
+        Assertions.assertThat(getTypedExpressionsClasses(arguments))
+                .containsExactlyElementsOf(List.of(ListExprT.class));
+    }
+
+    @Test
+    public void resolveMethodWithEmptyCollectionArgumentsCoerceMap() {
+        final MethodCallExpr methodExpression = new MethodCallExpr("setItems", new MapCreationLiteralExpression(null, NodeList.nodeList()));
+        final List arguments = new ArrayList<>();
+        arguments.add(new ListExprT(new ListCreationLiteralExpression(null, NodeList.nodeList())));
+        final TypedExpression scope = new ObjectCreationExpressionT(Collections.emptyList(), Person.class);
+        final Pair, Optional> resolvedMethodResult =
+                MethodResolutionUtils.resolveMethodWithEmptyCollectionArguments(
+                        methodExpression,
+                        new MvelCompilerContext(null),
+                        Optional.of(scope),
+                        arguments,
+                        List.of(0));
+        Assertions.assertThat(resolvedMethodResult.a).isPresent();
+        Assertions.assertThat(getTypedExpressionsClasses(arguments))
+                .containsExactlyElementsOf(List.of(MapExprT.class));
+    }
+
+    @Test
+    public void resolveMethodWithEmptyCollectionArgumentsCoerceList() {
+        final MethodCallExpr methodExpression = new MethodCallExpr("setAddresses", new MapCreationLiteralExpression(null, NodeList.nodeList()));
+        final List arguments = new ArrayList<>();
+        arguments.add(new MapExprT(new MapCreationLiteralExpression(null, NodeList.nodeList())));
+        final TypedExpression scope = new ObjectCreationExpressionT(Collections.emptyList(), Person.class);
+        final Pair, Optional> resolvedMethodResult =
+                MethodResolutionUtils.resolveMethodWithEmptyCollectionArguments(
+                        methodExpression,
+                        new MvelCompilerContext(null),
+                        Optional.of(scope),
+                        arguments,
+                        List.of(0));
+        Assertions.assertThat(resolvedMethodResult.a).isPresent();
+        Assertions.assertThat(getTypedExpressionsClasses(arguments))
+                .containsExactlyElementsOf(List.of(ListExprT.class));
+    }
+
+    @Test
+    public void resolveMethodWithEmptyCollectionArgumentsCoerceListAndMap() {
+        final MethodCallExpr methodExpression = new MethodCallExpr("setAddressesAndItems", new MapCreationLiteralExpression(null, NodeList.nodeList()));
+        final List arguments = new ArrayList<>();
+        arguments.add(new MapExprT(new MapCreationLiteralExpression(null, NodeList.nodeList())));
+        arguments.add(new ListExprT(new ListCreationLiteralExpression(null, NodeList.nodeList())));
+        final TypedExpression scope = new ObjectCreationExpressionT(Collections.emptyList(), Person.class);
+        final Pair, Optional> resolvedMethodResult =
+                MethodResolutionUtils.resolveMethodWithEmptyCollectionArguments(
+                        methodExpression,
+                        new MvelCompilerContext(null),
+                        Optional.of(scope),
+                        arguments,
+                        List.of(0, 1));
+        Assertions.assertThat(resolvedMethodResult.a).isPresent();
+        Assertions.assertThat(getTypedExpressionsClasses(arguments))
+                .containsExactlyElementsOf(List.of(ListExprT.class, MapExprT.class));
+    }
+
+    private List> getTypedExpressionsClasses(List typedExpressions) {
+        return typedExpressions.stream().map(TypedExpression::getClass).collect(Collectors.toList());
+    }
+}
\ No newline at end of file
diff --git a/drools-model/drools-mvel-parser/src/main/java/org/drools/mvel/parser/ast/visitor/DrlGenericVisitor.java b/drools-model/drools-mvel-parser/src/main/java/org/drools/mvel/parser/ast/visitor/DrlGenericVisitor.java
index 8bfa2fa91ee..e22961cf309 100644
--- a/drools-model/drools-mvel-parser/src/main/java/org/drools/mvel/parser/ast/visitor/DrlGenericVisitor.java
+++ b/drools-model/drools-mvel-parser/src/main/java/org/drools/mvel/parser/ast/visitor/DrlGenericVisitor.java
@@ -639,11 +639,15 @@ default R visit(SwitchExpr n, A arg) {
         return defaultMethod(n, arg);
     }
 
-    default R visit(MapCreationLiteralExpression n, A arg) { return null; }
+    default R visit(MapCreationLiteralExpression n, A arg) {
+        return defaultMethod(n, arg);
+    }
 
     default R visit(MapCreationLiteralExpressionKeyValuePair n, A arg) { return null; }
 
-    default R visit(ListCreationLiteralExpression n, A arg) { return null; }
+    default R visit(ListCreationLiteralExpression n, A arg) {
+        return defaultMethod(n, arg);
+    }
 
     default R visit(ListCreationLiteralExpressionElement n, A arg) { return null; }
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/MVELEmptyCollectionsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/MVELEmptyCollectionsTest.java
new file mode 100644
index 00000000000..aa884f989b4
--- /dev/null
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/MVELEmptyCollectionsTest.java
@@ -0,0 +1,167 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.drools.mvel.integrationtests;
+
+import org.drools.base.base.ClassObjectType;
+import org.drools.base.rule.constraint.AlphaNodeFieldConstraint;
+import org.drools.core.reteoo.AlphaNode;
+import org.drools.core.reteoo.ObjectTypeNode;
+import org.drools.kiesession.rulebase.InternalKnowledgeBase;
+import org.drools.mvel.MVELConstraint;
+import org.drools.mvel.accessors.ClassFieldReader;
+import org.drools.mvel.compiler.Address;
+import org.drools.mvel.compiler.Cheese;
+import org.drools.mvel.compiler.Cheesery;
+import org.drools.mvel.compiler.FactA;
+import org.drools.mvel.compiler.Person;
+import org.drools.mvel.compiler.TestEnum;
+import org.drools.mvel.expr.MVELDebugHandler;
+import org.drools.mvel.extractors.MVELObjectClassFieldReader;
+import org.drools.mvel.integrationtests.facts.FactWithList;
+import org.drools.mvel.integrationtests.facts.FactWithMap;
+import org.drools.mvel.integrationtests.facts.FactWithObject;
+import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
+import org.drools.testcoverage.common.util.KieBaseUtil;
+import org.drools.testcoverage.common.util.KieUtil;
+import org.drools.testcoverage.common.util.TestParametersUtil;
+import org.drools.util.DateUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.kie.api.KieBase;
+import org.kie.api.builder.KieBuilder;
+import org.kie.api.builder.Message;
+import org.kie.api.definition.type.FactType;
+import org.kie.api.runtime.KieSession;
+import org.kie.api.runtime.StatelessKieSession;
+import org.mvel2.MVEL;
+import org.mvel2.ParserContext;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.math.MathContext;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+
+@RunWith(Parameterized.class)
+public class MVELEmptyCollectionsTest {
+
+    private final KieBaseTestConfiguration kieBaseTestConfiguration;
+
+    public MVELEmptyCollectionsTest(final KieBaseTestConfiguration kieBaseTestConfiguration) {
+        this.kieBaseTestConfiguration = kieBaseTestConfiguration;
+    }
+
+    @Parameterized.Parameters(name = "KieBase type={0}")
+    public static Collection getParameters() {
+        // Some of these fail without executable model, so test only executable model.
+        return TestParametersUtil.getKieBaseCloudOnlyExecModelConfiguration();
+    }
+
+    @Test
+    public void testEmptyListAsMethodParameter() {
+        final String drl =
+                "import " + FactWithList.class.getCanonicalName() + "; \n" +
+                "rule \"test\"\n" +
+                "dialect \"mvel\" \n" +
+                "when\n" +
+                "    $p: FactWithList()\n" +
+                "then\n" +
+                "    $p.setItems([]); \n" +
+                "end";
+
+        KieBase kbase = KieBaseUtil.getKieBaseFromKieModuleFromDrl("test", kieBaseTestConfiguration, drl);
+        KieSession ksession = kbase.newKieSession();
+        final FactWithList f = new FactWithList("testString");
+        ksession.insert(f);
+        assertThat(ksession.fireAllRules()).isEqualTo(1);
+        assertThat(f.getItems()).hasSize(0);
+    }
+
+    @Test
+    public void testEmptyListAsConstructorParameter() {
+        final String drl =
+                "import " + FactWithList.class.getCanonicalName() + "; \n" +
+                        "import " + FactWithObject.class.getCanonicalName() + "; \n" +
+                        "rule \"test\"\n" +
+                        "dialect \"mvel\" \n" +
+                        "when\n" +
+                        "    $p: FactWithObject()\n" +
+                        "then\n" +
+                        "    $p.setObjectValue(new FactWithList([])); \n" +
+                        "end";
+
+        KieBase kbase = KieBaseUtil.getKieBaseFromKieModuleFromDrl("test", kieBaseTestConfiguration, drl);
+        KieSession ksession = kbase.newKieSession();
+        final FactWithObject f = new FactWithObject(null);
+        ksession.insert(f);
+        assertThat(ksession.fireAllRules()).isEqualTo(1);
+        assertThat(f.getObjectValue()).isInstanceOf(FactWithList.class);
+    }
+
+    @Test
+    public void testEmptyMapAsMethodParameter() {
+        final String drl =
+                "import " + FactWithMap.class.getCanonicalName() + "; \n" +
+                        "rule \"test\"\n" +
+                        "dialect \"mvel\" \n" +
+                        "when\n" +
+                        "    $p: FactWithMap()\n" +
+                        "then\n" +
+                        "    $p.setItemsMap([]); \n" +
+                        "end";
+
+        KieBase kbase = KieBaseUtil.getKieBaseFromKieModuleFromDrl("test", kieBaseTestConfiguration, drl);
+        KieSession ksession = kbase.newKieSession();
+        final FactWithMap f = new FactWithMap(1, "testString");
+        ksession.insert(f);
+        assertThat(ksession.fireAllRules()).isEqualTo(1);
+        assertThat(f.getItemsMap()).hasSize(0);
+    }
+
+    @Test
+    public void testEmptyMapAsConstructorParameter() {
+        final String drl =
+                "import " + FactWithMap.class.getCanonicalName() + "; \n" +
+                        "import " + FactWithObject.class.getCanonicalName() + "; \n" +
+                        "rule \"test\"\n" +
+                        "dialect \"mvel\" \n" +
+                        "when\n" +
+                        "    $p: FactWithObject()\n" +
+                        "then\n" +
+                        "    $p.setObjectValue(new FactWithMap([])); \n" +
+                        "end";
+
+        KieBase kbase = KieBaseUtil.getKieBaseFromKieModuleFromDrl("test", kieBaseTestConfiguration, drl);
+        KieSession ksession = kbase.newKieSession();
+        final FactWithObject f = new FactWithObject(null);
+        ksession.insert(f);
+        assertThat(ksession.fireAllRules()).isEqualTo(1);
+        assertThat(f.getObjectValue()).isNotNull().isInstanceOf(FactWithMap.class);
+    }
+}
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/MVELTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/MVELTest.java
index e878e4c65aa..a7c55659195 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/MVELTest.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/MVELTest.java
@@ -36,6 +36,8 @@
 import org.drools.core.reteoo.AlphaNode;
 import org.drools.core.reteoo.ObjectTypeNode;
 import org.drools.base.rule.constraint.AlphaNodeFieldConstraint;
+import org.drools.mvel.compiler.PersonHolder;
+import org.drools.mvel.integrationtests.facts.FactWithList;
 import org.drools.util.DateUtils;
 import org.drools.mvel.MVELConstraint;
 import org.drools.mvel.compiler.Address;
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/facts/FactWithList.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/facts/FactWithList.java
index a4ab4c647a9..eff913cc64c 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/facts/FactWithList.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/facts/FactWithList.java
@@ -31,6 +31,10 @@ public FactWithList(final String factString) {
         this.items.add(factString);
     }
 
+    public FactWithList(final List items) {
+        this.items = items;
+    }
+
     public List getItems() {
         return items;
     }
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/facts/FactWithMap.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/facts/FactWithMap.java
new file mode 100644
index 00000000000..e92423e8b2b
--- /dev/null
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/facts/FactWithMap.java
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.drools.mvel.integrationtests.facts;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class FactWithMap {
+
+    private Map itemsMap = new HashMap<>();
+
+    public FactWithMap() { }
+
+    public FactWithMap(final Integer key, final String value) {
+        this.itemsMap.put(key, value);
+    }
+
+    public FactWithMap(final Map itemsMap) {
+        this.itemsMap = itemsMap;
+    }
+
+    public Map getItemsMap() {
+        return itemsMap;
+    }
+
+    public void setItemsMap(Map itemsMap) {
+        this.itemsMap = itemsMap;
+    }
+}
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/facts/FactWithObject.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/facts/FactWithObject.java
new file mode 100644
index 00000000000..7a468e16621
--- /dev/null
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/facts/FactWithObject.java
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.drools.mvel.integrationtests.facts;
+
+public class FactWithObject {
+
+    private Object objectValue;
+
+    public FactWithObject(final Object objectValue) {
+        this.objectValue = objectValue;
+    }
+
+    public Object getObjectValue() {
+        return objectValue;
+    }
+
+    public void setObjectValue(final Object objectValue) {
+        this.objectValue = objectValue;
+    }
+}

From 76336e5eb2d8eb2f1a3defabb40a9e28e621bfbf Mon Sep 17 00:00:00 2001
From: Mario Fusco 
Date: Mon, 18 Dec 2023 14:33:21 +0100
Subject: [PATCH 06/29] bump version to 999-SNAPSHOT (#5629)

---
 bom/drools-bom/pom.xml                                          | 2 +-
 bom/kie-core-bom/pom.xml                                        | 2 +-
 bom/kie-dmn-bom/pom.xml                                         | 2 +-
 bom/kie-efesto-bom/pom.xml                                      | 2 +-
 bom/kie-pmml-bom/pom.xml                                        | 2 +-
 bom/pom.xml                                                     | 2 +-
 build-parent/pom.xml                                            | 2 +-
 drools-alphanetwork-compiler/pom.xml                            | 2 +-
 drools-base/pom.xml                                             | 2 +-
 drools-beliefs/pom.xml                                          | 2 +-
 drools-commands/pom.xml                                         | 2 +-
 drools-compiler/pom.xml                                         | 2 +-
 drools-core/pom.xml                                             | 2 +-
 drools-decisiontables/pom.xml                                   | 2 +-
 drools-distribution/pom.xml                                     | 2 +-
 drools-docs/pom.xml                                             | 2 +-
 drools-drl/drools-drl-ast/pom.xml                               | 2 +-
 drools-drl/drools-drl-extensions/pom.xml                        | 2 +-
 drools-drl/drools-drl-parser/pom.xml                            | 2 +-
 drools-drl/pom.xml                                              | 2 +-
 drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml      | 2 +-
 drools-drlonyaml-parent/drools-drlonyaml-cli/pom.xml            | 2 +-
 .../drools-drlonyaml-integration-tests/pom.xml                  | 2 +-
 drools-drlonyaml-parent/drools-drlonyaml-model/pom.xml          | 2 +-
 drools-drlonyaml-parent/drools-drlonyaml-schemagen/pom.xml      | 2 +-
 drools-drlonyaml-parent/drools-drlonyaml-todrl/pom.xml          | 2 +-
 drools-drlonyaml-parent/pom.xml                                 | 2 +-
 drools-ecj/pom.xml                                              | 2 +-
 drools-engine-classic/pom.xml                                   | 2 +-
 drools-engine/pom.xml                                           | 2 +-
 drools-examples-api/default-kiesession-from-file/pom.xml        | 2 +-
 drools-examples-api/default-kiesession/pom.xml                  | 2 +-
 drools-examples-api/kie-module-from-multiple-files/pom.xml      | 2 +-
 drools-examples-api/kiebase-inclusion/pom.xml                   | 2 +-
 drools-examples-api/kiecontainer-from-kierepo/pom.xml           | 2 +-
 drools-examples-api/kiefilesystem-example/pom.xml               | 2 +-
 drools-examples-api/kiemodulemodel-example/pom.xml              | 2 +-
 drools-examples-api/multiple-kbases/pom.xml                     | 2 +-
 drools-examples-api/named-kiesession-from-file/pom.xml          | 2 +-
 drools-examples-api/named-kiesession/pom.xml                    | 2 +-
 drools-examples-api/pom.xml                                     | 2 +-
 drools-examples-api/reactive-kiesession/pom.xml                 | 2 +-
 drools-examples/pom.xml                                         | 2 +-
 drools-fastutil/pom.xml                                         | 2 +-
 .../drools-impact-analysis-graph-common/pom.xml                 | 2 +-
 .../drools-impact-analysis-graph-graphviz/pom.xml               | 2 +-
 drools-impact-analysis/drools-impact-analysis-graph/pom.xml     | 2 +-
 drools-impact-analysis/drools-impact-analysis-itests/pom.xml    | 2 +-
 drools-impact-analysis/drools-impact-analysis-model/pom.xml     | 2 +-
 drools-impact-analysis/drools-impact-analysis-parser/pom.xml    | 2 +-
 drools-impact-analysis/pom.xml                                  | 2 +-
 drools-io/pom.xml                                               | 2 +-
 drools-kiesession/pom.xml                                       | 2 +-
 drools-legacy-test-util/pom.xml                                 | 2 +-
 drools-metric/pom.xml                                           | 2 +-
 drools-model/drools-canonical-model/pom.xml                     | 2 +-
 drools-model/drools-codegen-common/pom.xml                      | 2 +-
 drools-model/drools-model-codegen/pom.xml                       | 2 +-
 drools-model/drools-model-compiler/pom.xml                      | 2 +-
 drools-model/drools-mvel-compiler/pom.xml                       | 2 +-
 drools-model/drools-mvel-parser/pom.xml                         | 2 +-
 drools-model/pom.xml                                            | 2 +-
 drools-mvel/pom.xml                                             | 2 +-
 drools-persistence/drools-persistence-api/pom.xml               | 2 +-
 drools-persistence/drools-persistence-jpa/pom.xml               | 2 +-
 drools-persistence/pom.xml                                      | 2 +-
 drools-quarkus-extension/drools-quarkus-deployment/pom.xml      | 2 +-
 .../drools-quarkus-examples-multiunit/pom.xml                   | 2 +-
 .../drools-quarkus-examples-reactive/pom.xml                    | 2 +-
 drools-quarkus-extension/drools-quarkus-examples/pom.xml        | 2 +-
 .../drools-quarkus-integration-test-hotreload/pom.xml           | 2 +-
 .../drools-quarkus-integration-test/pom.xml                     | 2 +-
 drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml | 2 +-
 .../drools-quarkus-ruleunit-integration-test/pom.xml            | 2 +-
 drools-quarkus-extension/drools-quarkus-util-deployment/pom.xml | 2 +-
 drools-quarkus-extension/drools-quarkus/pom.xml                 | 2 +-
 drools-quarkus-extension/pom.xml                                | 2 +-
 drools-reliability/drools-reliability-core/pom.xml              | 2 +-
 drools-reliability/drools-reliability-h2mvstore/pom.xml         | 2 +-
 drools-reliability/drools-reliability-infinispan/pom.xml        | 2 +-
 drools-reliability/drools-reliability-tests/pom.xml             | 2 +-
 drools-reliability/pom.xml                                      | 2 +-
 drools-retediagram/pom.xml                                      | 2 +-
 drools-ruleunits/drools-ruleunits-api/pom.xml                   | 2 +-
 drools-ruleunits/drools-ruleunits-dsl/pom.xml                   | 2 +-
 drools-ruleunits/drools-ruleunits-engine/pom.xml                | 2 +-
 drools-ruleunits/drools-ruleunits-impl/pom.xml                  | 2 +-
 drools-ruleunits/pom.xml                                        | 2 +-
 .../drools-scenario-simulation-api/pom.xml                      | 2 +-
 .../drools-scenario-simulation-backend/pom.xml                  | 2 +-
 .../drools-scenario-simulation-integrationtest/pom.xml          | 2 +-
 drools-scenario-simulation/pom.xml                              | 2 +-
 drools-serialization-protobuf/pom.xml                           | 2 +-
 drools-templates/pom.xml                                        | 2 +-
 drools-test-coverage/pom.xml                                    | 2 +-
 drools-test-coverage/standalone/kie-ci-with-domain/pom.xml      | 2 +-
 .../standalone/kie-ci-with-domain/test-domain/pom.xml           | 2 +-
 .../standalone/kie-ci-with-domain/test-kjar/pom.xml             | 2 +-
 .../standalone/kie-ci-with-domain/tests/pom.xml                 | 2 +-
 drools-test-coverage/standalone/kie-ci-without-domain/pom.xml   | 2 +-
 .../standalone/kie-ci-without-domain/test-domain/pom.xml        | 2 +-
 .../standalone/kie-ci-without-domain/test-kjar/pom.xml          | 2 +-
 .../standalone/kie-ci-without-domain/tests/pom.xml              | 2 +-
 drools-test-coverage/standalone/pom.xml                         | 2 +-
 drools-test-coverage/test-compiler-integration/pom.xml          | 2 +-
 drools-test-coverage/test-integration-nomvel/pom.xml            | 2 +-
 drools-test-coverage/test-integration-notms/pom.xml             | 2 +-
 drools-test-coverage/test-integration-noxml/pom.xml             | 2 +-
 drools-test-coverage/test-integration-ruleunits/pom.xml         | 2 +-
 .../test-integration-ruleunits-jar/pom.xml                      | 2 +-
 .../test-integration-ruleunits-tests/pom.xml                    | 2 +-
 drools-test-coverage/test-suite/pom.xml                         | 2 +-
 drools-tms/pom.xml                                              | 2 +-
 drools-traits/pom.xml                                           | 2 +-
 drools-util/pom.xml                                             | 2 +-
 drools-verifier/drools-verifier-api/pom.xml                     | 2 +-
 drools-verifier/drools-verifier-core/pom.xml                    | 2 +-
 drools-verifier/drools-verifier-drl/pom.xml                     | 2 +-
 drools-verifier/pom.xml                                         | 2 +-
 drools-wiring/drools-wiring-api/pom.xml                         | 2 +-
 drools-wiring/drools-wiring-dynamic/pom.xml                     | 2 +-
 drools-wiring/drools-wiring-static/pom.xml                      | 2 +-
 drools-wiring/pom.xml                                           | 2 +-
 drools-xml-support/pom.xml                                      | 2 +-
 efesto/efesto-common-utils/pom.xml                              | 2 +-
 efesto/efesto-core/efesto-common-api/pom.xml                    | 2 +-
 efesto/efesto-core/efesto-common-core/pom.xml                   | 2 +-
 .../efesto-compilation-manager-api/pom.xml                      | 2 +-
 .../efesto-compilation-manager-core/pom.xml                     | 2 +-
 efesto/efesto-core/efesto-compilation-manager/pom.xml           | 2 +-
 .../efesto-runtime-manager/efesto-runtime-manager-api/pom.xml   | 2 +-
 .../efesto-runtime-manager/efesto-runtime-manager-core/pom.xml  | 2 +-
 efesto/efesto-core/efesto-runtime-manager/pom.xml               | 2 +-
 efesto/efesto-core/pom.xml                                      | 2 +-
 efesto/efesto-dependencies/pom.xml                              | 2 +-
 efesto/pom.xml                                                  | 2 +-
 jpmml-migration-recipe/pom.xml                                  | 2 +-
 kie-api/pom.xml                                                 | 2 +-
 kie-archetypes/kie-drools-dmn-archetype/pom.xml                 | 2 +-
 kie-archetypes/kie-drools-exec-model-archetype/pom.xml          | 2 +-
 kie-archetypes/kie-drools-exec-model-ruleunit-archetype/pom.xml | 2 +-
 kie-archetypes/kie-drools-yaml-archetype/pom.xml                | 2 +-
 kie-archetypes/pom.xml                                          | 2 +-
 kie-ci/pom.xml                                                  | 2 +-
 kie-dmn/kie-dmn-api/pom.xml                                     | 2 +-
 kie-dmn/kie-dmn-backend/pom.xml                                 | 2 +-
 kie-dmn/kie-dmn-core-jsr223-jq/pom.xml                          | 2 +-
 kie-dmn/kie-dmn-core-jsr223/pom.xml                             | 2 +-
 kie-dmn/kie-dmn-core/pom.xml                                    | 2 +-
 kie-dmn/kie-dmn-feel/pom.xml                                    | 2 +-
 kie-dmn/kie-dmn-legacy-tests/pom.xml                            | 2 +-
 kie-dmn/kie-dmn-model/pom.xml                                   | 2 +-
 kie-dmn/kie-dmn-openapi/pom.xml                                 | 2 +-
 .../kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests-trusty/pom.xml | 2 +-
 kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/pom.xml    | 2 +-
 kie-dmn/kie-dmn-pmml-tests-parent/pom.xml                       | 2 +-
 .../kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn-cli/pom.xml  | 2 +-
 kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/pom.xml  | 2 +-
 kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml                      | 2 +-
 kie-dmn/kie-dmn-signavio/pom.xml                                | 2 +-
 kie-dmn/kie-dmn-tck/pom.xml                                     | 2 +-
 kie-dmn/kie-dmn-trisotech/pom.xml                               | 2 +-
 kie-dmn/kie-dmn-validation-bootstrap/pom.xml                    | 2 +-
 kie-dmn/kie-dmn-validation/pom.xml                              | 2 +-
 kie-dmn/kie-dmn-xls2dmn-cli/pom.xml                             | 2 +-
 kie-dmn/pom.xml                                                 | 2 +-
 kie-drl/kie-drl-api/pom.xml                                     | 2 +-
 kie-drl/kie-drl-compilation-common/pom.xml                      | 2 +-
 .../kie-drl-kiesession-local-runtime/pom.xml                    | 2 +-
 .../kie-drl-implementations/kie-drl-kiesession-local/pom.xml    | 2 +-
 .../kie-drl-map-input/kie-drl-map-input-runtime/pom.xml         | 2 +-
 kie-drl/kie-drl-implementations/kie-drl-map-input/pom.xml       | 2 +-
 kie-drl/kie-drl-implementations/pom.xml                         | 2 +-
 kie-drl/kie-drl-runtime-common/pom.xml                          | 2 +-
 kie-drl/kie-drl-tests-without-index-file/pom.xml                | 2 +-
 kie-drl/kie-drl-tests/pom.xml                                   | 2 +-
 kie-drl/pom.xml                                                 | 2 +-
 kie-internal/pom.xml                                            | 2 +-
 kie-maven-plugin/pom.xml                                        | 2 +-
 kie-memory-compiler/pom.xml                                     | 2 +-
 kie-pmml-trusty/kie-pmml-api/pom.xml                            | 2 +-
 kie-pmml-trusty/kie-pmml-commons/pom.xml                        | 2 +-
 kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/pom.xml | 2 +-
 .../kie-pmml-compiler/kie-pmml-compiler-commons/pom.xml         | 2 +-
 .../kie-pmml-compiler/kie-pmml-compiler-core/pom.xml            | 2 +-
 kie-pmml-trusty/kie-pmml-compiler/pom.xml                       | 2 +-
 kie-pmml-trusty/kie-pmml-dependencies/pom.xml                   | 2 +-
 .../kie-pmml-evaluator/kie-pmml-evaluator-api/pom.xml           | 2 +-
 .../kie-pmml-evaluator/kie-pmml-evaluator-core/pom.xml          | 2 +-
 .../kie-pmml-evaluator/kie-pmml-evaluator-utils/pom.xml         | 2 +-
 kie-pmml-trusty/kie-pmml-evaluator/pom.xml                      | 2 +-
 .../kie-pmml-models-clustering-compiler/pom.xml                 | 2 +-
 .../kie-pmml-models-clustering-evaluator/pom.xml                | 2 +-
 .../kie-pmml-models-clustering-model/pom.xml                    | 2 +-
 .../kie-pmml-models-clustering-tests/pom.xml                    | 2 +-
 .../kie-pmml-models/kie-pmml-models-clustering/pom.xml          | 2 +-
 .../kie-pmml-models-drools-common/pom.xml                       | 2 +-
 .../kie-pmml-models-drools-scorecard-compiler/pom.xml           | 2 +-
 .../kie-pmml-models-drools-scorecard-evaluator/pom.xml          | 2 +-
 .../kie-pmml-models-drools-scorecard-model/pom.xml              | 2 +-
 .../kie-pmml-models-drools-scorecard-tests/pom.xml              | 2 +-
 .../kie-pmml-models-drools-scorecard/pom.xml                    | 2 +-
 .../kie-pmml-models-drools-tree-compiler/pom.xml                | 2 +-
 .../kie-pmml-models-drools-tree-evaluator/pom.xml               | 2 +-
 .../kie-pmml-models-drools-tree-model/pom.xml                   | 2 +-
 .../kie-pmml-models-drools-tree-tests/pom.xml                   | 2 +-
 .../kie-pmml-models-drools/kie-pmml-models-drools-tree/pom.xml  | 2 +-
 kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/pom.xml  | 2 +-
 .../kie-pmml-models-mining-compiler/pom.xml                     | 2 +-
 .../kie-pmml-models-mining-evaluator/pom.xml                    | 2 +-
 .../kie-pmml-models-mining/kie-pmml-models-mining-model/pom.xml | 2 +-
 .../kie-pmml-models-mining/kie-pmml-models-mining-tests/pom.xml | 2 +-
 kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/pom.xml  | 2 +-
 .../kie-pmml-models-regression-compiler/pom.xml                 | 2 +-
 .../kie-pmml-models-regression-evaluator/pom.xml                | 2 +-
 .../kie-pmml-models-regression-model/pom.xml                    | 2 +-
 .../kie-pmml-models-regression-tests/pom.xml                    | 2 +-
 .../kie-pmml-models/kie-pmml-models-regression/pom.xml          | 2 +-
 .../kie-pmml-models-scorecard-compiler/pom.xml                  | 2 +-
 .../kie-pmml-models-scorecard-evaluator/pom.xml                 | 2 +-
 .../kie-pmml-models-scorecard-model/pom.xml                     | 2 +-
 .../kie-pmml-models-scorecard-tests/pom.xml                     | 2 +-
 .../kie-pmml-models/kie-pmml-models-scorecard/pom.xml           | 2 +-
 kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tests/pom.xml   | 2 +-
 .../kie-pmml-models-tree/kie-pmml-models-tree-compiler/pom.xml  | 2 +-
 .../kie-pmml-models-tree/kie-pmml-models-tree-evaluator/pom.xml | 2 +-
 .../kie-pmml-models-tree/kie-pmml-models-tree-model/pom.xml     | 2 +-
 .../kie-pmml-models-tree/kie-pmml-models-tree-tests/pom.xml     | 2 +-
 kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/pom.xml    | 2 +-
 kie-pmml-trusty/kie-pmml-models/pom.xml                         | 2 +-
 kie-pmml-trusty/pom.xml                                         | 2 +-
 kie-test-util/pom.xml                                           | 2 +-
 kie-util/kie-util-maven-integration/pom.xml                     | 2 +-
 kie-util/kie-util-maven-support/pom.xml                         | 2 +-
 kie-util/kie-util-xml/pom.xml                                   | 2 +-
 kie-util/pom.xml                                                | 2 +-
 pom.xml                                                         | 2 +-
 237 files changed, 237 insertions(+), 237 deletions(-)

diff --git a/bom/drools-bom/pom.xml b/bom/drools-bom/pom.xml
index 29113e6069d..746b669770a 100644
--- a/bom/drools-bom/pom.xml
+++ b/bom/drools-bom/pom.xml
@@ -6,7 +6,7 @@
   
     org.kie
     kie-core-bom
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../kie-core-bom/pom.xml
   
 
diff --git a/bom/kie-core-bom/pom.xml b/bom/kie-core-bom/pom.xml
index 218e56abd2f..5122046c010 100644
--- a/bom/kie-core-bom/pom.xml
+++ b/bom/kie-core-bom/pom.xml
@@ -6,7 +6,7 @@
   
     org.kie
     drools-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../../pom.xml
   
 
diff --git a/bom/kie-dmn-bom/pom.xml b/bom/kie-dmn-bom/pom.xml
index 29f0e66e8c9..8258db48be6 100644
--- a/bom/kie-dmn-bom/pom.xml
+++ b/bom/kie-dmn-bom/pom.xml
@@ -6,7 +6,7 @@
   
     org.kie
     kie-core-bom
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../kie-core-bom/pom.xml
   
 
diff --git a/bom/kie-efesto-bom/pom.xml b/bom/kie-efesto-bom/pom.xml
index 057bfbf01c8..9c71bf1c2fc 100644
--- a/bom/kie-efesto-bom/pom.xml
+++ b/bom/kie-efesto-bom/pom.xml
@@ -6,7 +6,7 @@
   
     org.kie
     kie-core-bom
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../kie-core-bom/pom.xml
   
 
diff --git a/bom/kie-pmml-bom/pom.xml b/bom/kie-pmml-bom/pom.xml
index bfcad96f6e9..ac05d058a0d 100644
--- a/bom/kie-pmml-bom/pom.xml
+++ b/bom/kie-pmml-bom/pom.xml
@@ -6,7 +6,7 @@
   
     org.kie
     kie-core-bom
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../kie-core-bom/pom.xml
   
 
diff --git a/bom/pom.xml b/bom/pom.xml
index abca80b30b5..411a4269a1d 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -5,7 +5,7 @@
     
         drools-parent
         org.kie
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
     
     4.0.0
 
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 75c04d16d64..f095313e2b9 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -25,7 +25,7 @@
   
     drools-parent
     org.kie
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-alphanetwork-compiler/pom.xml b/drools-alphanetwork-compiler/pom.xml
index 197fc0b52c8..3f1d6a7da7c 100644
--- a/drools-alphanetwork-compiler/pom.xml
+++ b/drools-alphanetwork-compiler/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-base/pom.xml b/drools-base/pom.xml
index fa5f01b22a2..10280ecc307 100644
--- a/drools-base/pom.xml
+++ b/drools-base/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-beliefs/pom.xml b/drools-beliefs/pom.xml
index 360e3589447..d3e31fc78f1 100644
--- a/drools-beliefs/pom.xml
+++ b/drools-beliefs/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-commands/pom.xml b/drools-commands/pom.xml
index 312d3c4e7bb..1568464ee93 100644
--- a/drools-commands/pom.xml
+++ b/drools-commands/pom.xml
@@ -27,7 +27,7 @@
     
         org.kie
         drools-build-parent
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
         ../build-parent/pom.xml
     
 
diff --git a/drools-compiler/pom.xml b/drools-compiler/pom.xml
index de12663f490..557640fdfbb 100644
--- a/drools-compiler/pom.xml
+++ b/drools-compiler/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-core/pom.xml b/drools-core/pom.xml
index c211045c17c..098b30fa9ab 100644
--- a/drools-core/pom.xml
+++ b/drools-core/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-decisiontables/pom.xml b/drools-decisiontables/pom.xml
index 1c8f945a143..f916aee6d04 100644
--- a/drools-decisiontables/pom.xml
+++ b/drools-decisiontables/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-distribution/pom.xml b/drools-distribution/pom.xml
index ce287c16f54..0c06ae39b3b 100644
--- a/drools-distribution/pom.xml
+++ b/drools-distribution/pom.xml
@@ -6,7 +6,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-docs/pom.xml b/drools-docs/pom.xml
index 16d0b1a53b0..502d3159e5c 100755
--- a/drools-docs/pom.xml
+++ b/drools-docs/pom.xml
@@ -7,7 +7,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-drl/drools-drl-ast/pom.xml b/drools-drl/drools-drl-ast/pom.xml
index ec0a6387c31..9bb34bde163 100644
--- a/drools-drl/drools-drl-ast/pom.xml
+++ b/drools-drl/drools-drl-ast/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-drl
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   org.drools
diff --git a/drools-drl/drools-drl-extensions/pom.xml b/drools-drl/drools-drl-extensions/pom.xml
index 78c32643518..49e47da5844 100644
--- a/drools-drl/drools-drl-extensions/pom.xml
+++ b/drools-drl/drools-drl-extensions/pom.xml
@@ -26,7 +26,7 @@
     
         org.drools
         drools-drl
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
     
 
     org.drools
diff --git a/drools-drl/drools-drl-parser/pom.xml b/drools-drl/drools-drl-parser/pom.xml
index 9676f32dc85..da1b10925f9 100644
--- a/drools-drl/drools-drl-parser/pom.xml
+++ b/drools-drl/drools-drl-parser/pom.xml
@@ -26,7 +26,7 @@
     
         org.drools
         drools-drl
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
     
 
     org.drools
diff --git a/drools-drl/pom.xml b/drools-drl/pom.xml
index 3e14d841491..91f12f3d758 100644
--- a/drools-drl/pom.xml
+++ b/drools-drl/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml
index 328d895a431..12ef4e2131d 100644
--- a/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml
+++ b/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml
@@ -23,7 +23,7 @@
   
     org.drools
     drools-drlonyaml-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   drools-drlonyaml-cli-tests
   Drools :: DRL on YAML :: CLI tests
diff --git a/drools-drlonyaml-parent/drools-drlonyaml-cli/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-cli/pom.xml
index 89ae43d7c4c..454968596f5 100644
--- a/drools-drlonyaml-parent/drools-drlonyaml-cli/pom.xml
+++ b/drools-drlonyaml-parent/drools-drlonyaml-cli/pom.xml
@@ -23,7 +23,7 @@
   
     org.drools
     drools-drlonyaml-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   drools-drlonyaml-cli
   Drools :: DRL on YAML :: CLI
diff --git a/drools-drlonyaml-parent/drools-drlonyaml-integration-tests/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-integration-tests/pom.xml
index ddf5fba5537..d9eaa5c8b58 100644
--- a/drools-drlonyaml-parent/drools-drlonyaml-integration-tests/pom.xml
+++ b/drools-drlonyaml-parent/drools-drlonyaml-integration-tests/pom.xml
@@ -23,7 +23,7 @@
   
     org.drools
     drools-drlonyaml-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   drools-drlonyaml-integration-tests
   Drools :: DRL on YAML :: Integration Tests
diff --git a/drools-drlonyaml-parent/drools-drlonyaml-model/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-model/pom.xml
index 154766237f0..028ef1f3813 100644
--- a/drools-drlonyaml-parent/drools-drlonyaml-model/pom.xml
+++ b/drools-drlonyaml-parent/drools-drlonyaml-model/pom.xml
@@ -23,7 +23,7 @@
   
     org.drools
     drools-drlonyaml-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   drools-drlonyaml-model
   Drools :: DRL on YAML :: model
diff --git a/drools-drlonyaml-parent/drools-drlonyaml-schemagen/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-schemagen/pom.xml
index 7902be5b094..7f739d6509d 100644
--- a/drools-drlonyaml-parent/drools-drlonyaml-schemagen/pom.xml
+++ b/drools-drlonyaml-parent/drools-drlonyaml-schemagen/pom.xml
@@ -23,7 +23,7 @@
   
     org.drools
     drools-drlonyaml-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   drools-drlonyaml-schemagen
   Drools :: DRL on YAML :: schema generator
diff --git a/drools-drlonyaml-parent/drools-drlonyaml-todrl/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-todrl/pom.xml
index 947b5959527..809af59c402 100644
--- a/drools-drlonyaml-parent/drools-drlonyaml-todrl/pom.xml
+++ b/drools-drlonyaml-parent/drools-drlonyaml-todrl/pom.xml
@@ -23,7 +23,7 @@
   
     org.drools
     drools-drlonyaml-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   drools-drlonyaml-todrl
   Drools :: DRL on YAML :: to DRL emitter
diff --git a/drools-drlonyaml-parent/pom.xml b/drools-drlonyaml-parent/pom.xml
index 1e8996b466c..dc5f742ac8e 100644
--- a/drools-drlonyaml-parent/pom.xml
+++ b/drools-drlonyaml-parent/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
   org.drools
diff --git a/drools-ecj/pom.xml b/drools-ecj/pom.xml
index 0a9f1a4be0e..1393a5669d0 100644
--- a/drools-ecj/pom.xml
+++ b/drools-ecj/pom.xml
@@ -26,7 +26,7 @@
     
         org.kie
         drools-build-parent
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
         ../build-parent/pom.xml
     
 
diff --git a/drools-engine-classic/pom.xml b/drools-engine-classic/pom.xml
index e11a55dcde6..0e53c414bab 100644
--- a/drools-engine-classic/pom.xml
+++ b/drools-engine-classic/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-engine/pom.xml b/drools-engine/pom.xml
index 9c0fe6e116c..d4abc804ebe 100644
--- a/drools-engine/pom.xml
+++ b/drools-engine/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-examples-api/default-kiesession-from-file/pom.xml b/drools-examples-api/default-kiesession-from-file/pom.xml
index 19592f8aae2..c9155eafa17 100644
--- a/drools-examples-api/default-kiesession-from-file/pom.xml
+++ b/drools-examples-api/default-kiesession-from-file/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-examples-api
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   default-kiesession-from-file
diff --git a/drools-examples-api/default-kiesession/pom.xml b/drools-examples-api/default-kiesession/pom.xml
index 33fcd56c93a..ba5b8452f3c 100644
--- a/drools-examples-api/default-kiesession/pom.xml
+++ b/drools-examples-api/default-kiesession/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-examples-api
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   default-kiesession
diff --git a/drools-examples-api/kie-module-from-multiple-files/pom.xml b/drools-examples-api/kie-module-from-multiple-files/pom.xml
index a8b14fdd656..7cc5e54f7c6 100644
--- a/drools-examples-api/kie-module-from-multiple-files/pom.xml
+++ b/drools-examples-api/kie-module-from-multiple-files/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-examples-api
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   kie-module-from-multiple-files
diff --git a/drools-examples-api/kiebase-inclusion/pom.xml b/drools-examples-api/kiebase-inclusion/pom.xml
index 65078f14f19..05ae135c261 100644
--- a/drools-examples-api/kiebase-inclusion/pom.xml
+++ b/drools-examples-api/kiebase-inclusion/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-examples-api
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   kiebase-inclusion
diff --git a/drools-examples-api/kiecontainer-from-kierepo/pom.xml b/drools-examples-api/kiecontainer-from-kierepo/pom.xml
index 91231fe5980..433bc2fb657 100644
--- a/drools-examples-api/kiecontainer-from-kierepo/pom.xml
+++ b/drools-examples-api/kiecontainer-from-kierepo/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-examples-api
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   kiecontainer-from-kierepo
diff --git a/drools-examples-api/kiefilesystem-example/pom.xml b/drools-examples-api/kiefilesystem-example/pom.xml
index c425cd37d55..d3537b51834 100644
--- a/drools-examples-api/kiefilesystem-example/pom.xml
+++ b/drools-examples-api/kiefilesystem-example/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-examples-api
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   kiefilesystem-example
diff --git a/drools-examples-api/kiemodulemodel-example/pom.xml b/drools-examples-api/kiemodulemodel-example/pom.xml
index d0580834e72..fc6b6c3eb4f 100644
--- a/drools-examples-api/kiemodulemodel-example/pom.xml
+++ b/drools-examples-api/kiemodulemodel-example/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-examples-api
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   kiemodulemodel-example
diff --git a/drools-examples-api/multiple-kbases/pom.xml b/drools-examples-api/multiple-kbases/pom.xml
index 63a7a44622b..ad3aa3926c7 100644
--- a/drools-examples-api/multiple-kbases/pom.xml
+++ b/drools-examples-api/multiple-kbases/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-examples-api
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   multiple-kbases
diff --git a/drools-examples-api/named-kiesession-from-file/pom.xml b/drools-examples-api/named-kiesession-from-file/pom.xml
index 0143d764b47..ab0c04a8e78 100644
--- a/drools-examples-api/named-kiesession-from-file/pom.xml
+++ b/drools-examples-api/named-kiesession-from-file/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-examples-api
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   Drools :: API examples :: Named KieSession from File
diff --git a/drools-examples-api/named-kiesession/pom.xml b/drools-examples-api/named-kiesession/pom.xml
index 5e959770239..ff558c4a6e1 100644
--- a/drools-examples-api/named-kiesession/pom.xml
+++ b/drools-examples-api/named-kiesession/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-examples-api
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   named-kiesession
diff --git a/drools-examples-api/pom.xml b/drools-examples-api/pom.xml
index ece2104a726..68742076319 100644
--- a/drools-examples-api/pom.xml
+++ b/drools-examples-api/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-examples-api/reactive-kiesession/pom.xml b/drools-examples-api/reactive-kiesession/pom.xml
index 2be3fac933a..b532d6ae6d4 100644
--- a/drools-examples-api/reactive-kiesession/pom.xml
+++ b/drools-examples-api/reactive-kiesession/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-examples-api
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   reactive-kiesession
diff --git a/drools-examples/pom.xml b/drools-examples/pom.xml
index f8e8c3d83b8..870cb960e3f 100644
--- a/drools-examples/pom.xml
+++ b/drools-examples/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-fastutil/pom.xml b/drools-fastutil/pom.xml
index b1555c678c1..5e453e09b5d 100644
--- a/drools-fastutil/pom.xml
+++ b/drools-fastutil/pom.xml
@@ -27,7 +27,7 @@
     
         org.kie
         drools-build-parent
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
         ../build-parent/pom.xml
     
 
diff --git a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-common/pom.xml b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-common/pom.xml
index 5b89620c265..96f0e980d9c 100644
--- a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-common/pom.xml
+++ b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-common/pom.xml
@@ -25,7 +25,7 @@
   
     drools-impact-analysis-graph
     org.drools
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/pom.xml b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/pom.xml
index 86b6d5abeda..a9ef1f3f238 100644
--- a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/pom.xml
+++ b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/pom.xml
@@ -25,7 +25,7 @@
   
     drools-impact-analysis-graph
     org.drools
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-impact-analysis/drools-impact-analysis-graph/pom.xml b/drools-impact-analysis/drools-impact-analysis-graph/pom.xml
index 5ec3219a0a9..589f0965d16 100644
--- a/drools-impact-analysis/drools-impact-analysis-graph/pom.xml
+++ b/drools-impact-analysis/drools-impact-analysis-graph/pom.xml
@@ -25,7 +25,7 @@
   
     drools-impact-analysis
     org.drools
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-impact-analysis/drools-impact-analysis-itests/pom.xml b/drools-impact-analysis/drools-impact-analysis-itests/pom.xml
index a08236b8db5..d9e9e08faa5 100644
--- a/drools-impact-analysis/drools-impact-analysis-itests/pom.xml
+++ b/drools-impact-analysis/drools-impact-analysis-itests/pom.xml
@@ -25,7 +25,7 @@
   
     drools-impact-analysis
     org.drools
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-impact-analysis/drools-impact-analysis-model/pom.xml b/drools-impact-analysis/drools-impact-analysis-model/pom.xml
index 9f5ae9a7716..340e29b53a0 100644
--- a/drools-impact-analysis/drools-impact-analysis-model/pom.xml
+++ b/drools-impact-analysis/drools-impact-analysis-model/pom.xml
@@ -25,7 +25,7 @@
   
     drools-impact-analysis
     org.drools
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-impact-analysis/drools-impact-analysis-parser/pom.xml b/drools-impact-analysis/drools-impact-analysis-parser/pom.xml
index 625032e446f..ca8d52cecd4 100644
--- a/drools-impact-analysis/drools-impact-analysis-parser/pom.xml
+++ b/drools-impact-analysis/drools-impact-analysis-parser/pom.xml
@@ -25,7 +25,7 @@
   
     drools-impact-analysis
     org.drools
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-impact-analysis/pom.xml b/drools-impact-analysis/pom.xml
index 1856e1d8979..92cfcc77c70 100644
--- a/drools-impact-analysis/pom.xml
+++ b/drools-impact-analysis/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-io/pom.xml b/drools-io/pom.xml
index 170c040b935..2cb54a3ae1b 100644
--- a/drools-io/pom.xml
+++ b/drools-io/pom.xml
@@ -27,7 +27,7 @@
     
         org.kie
         drools-build-parent
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
         ../build-parent/pom.xml
     
 
diff --git a/drools-kiesession/pom.xml b/drools-kiesession/pom.xml
index cb430877ced..31c361a1500 100644
--- a/drools-kiesession/pom.xml
+++ b/drools-kiesession/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-legacy-test-util/pom.xml b/drools-legacy-test-util/pom.xml
index 5f5953ddf71..e8d1fef3e1e 100644
--- a/drools-legacy-test-util/pom.xml
+++ b/drools-legacy-test-util/pom.xml
@@ -26,7 +26,7 @@
     
         org.kie
         drools-build-parent
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
         ../build-parent/pom.xml
     
 
diff --git a/drools-metric/pom.xml b/drools-metric/pom.xml
index 5c777c109a7..2f946343221 100644
--- a/drools-metric/pom.xml
+++ b/drools-metric/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-model/drools-canonical-model/pom.xml b/drools-model/drools-canonical-model/pom.xml
index 578754fe234..58d14809398 100644
--- a/drools-model/drools-canonical-model/pom.xml
+++ b/drools-model/drools-canonical-model/pom.xml
@@ -27,7 +27,7 @@
   
     org.drools
     drools-model
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   Drools :: Canonical Model
diff --git a/drools-model/drools-codegen-common/pom.xml b/drools-model/drools-codegen-common/pom.xml
index 8b6e2ff7e7d..52a5bea8ddf 100644
--- a/drools-model/drools-codegen-common/pom.xml
+++ b/drools-model/drools-codegen-common/pom.xml
@@ -27,7 +27,7 @@
     
         org.drools
         drools-model
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
     
 
     org.drools
diff --git a/drools-model/drools-model-codegen/pom.xml b/drools-model/drools-model-codegen/pom.xml
index c9948110b94..ae5732e79b7 100644
--- a/drools-model/drools-model-codegen/pom.xml
+++ b/drools-model/drools-model-codegen/pom.xml
@@ -27,7 +27,7 @@
     
         org.drools
         drools-model
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
     
 
     org.drools
diff --git a/drools-model/drools-model-compiler/pom.xml b/drools-model/drools-model-compiler/pom.xml
index d42dea084d3..c7128d54f13 100644
--- a/drools-model/drools-model-compiler/pom.xml
+++ b/drools-model/drools-model-compiler/pom.xml
@@ -27,7 +27,7 @@
   
     org.drools
     drools-model
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   Drools :: Model :: Compiler
diff --git a/drools-model/drools-mvel-compiler/pom.xml b/drools-model/drools-mvel-compiler/pom.xml
index 79e1cc9203f..7bb56461fac 100644
--- a/drools-model/drools-mvel-compiler/pom.xml
+++ b/drools-model/drools-mvel-compiler/pom.xml
@@ -27,7 +27,7 @@
   
     org.drools
     drools-model
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   Drools :: MVEL Compiler
diff --git a/drools-model/drools-mvel-parser/pom.xml b/drools-model/drools-mvel-parser/pom.xml
index 7c063510ec3..00c721b6eca 100644
--- a/drools-model/drools-mvel-parser/pom.xml
+++ b/drools-model/drools-mvel-parser/pom.xml
@@ -24,7 +24,7 @@
   
     org.drools
     drools-model
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   Drools :: MVEL Parser
diff --git a/drools-model/pom.xml b/drools-model/pom.xml
index 7e77f0d9f3e..95c0633c99d 100644
--- a/drools-model/pom.xml
+++ b/drools-model/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-mvel/pom.xml b/drools-mvel/pom.xml
index 8a6eb92eeba..df99d589db3 100644
--- a/drools-mvel/pom.xml
+++ b/drools-mvel/pom.xml
@@ -26,7 +26,7 @@
     
         org.kie
         drools-build-parent
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
         ../build-parent/pom.xml
     
 
diff --git a/drools-persistence/drools-persistence-api/pom.xml b/drools-persistence/drools-persistence-api/pom.xml
index a00b6f44a67..3e3834dc25d 100644
--- a/drools-persistence/drools-persistence-api/pom.xml
+++ b/drools-persistence/drools-persistence-api/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-persistence
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   drools-persistence-api
diff --git a/drools-persistence/drools-persistence-jpa/pom.xml b/drools-persistence/drools-persistence-jpa/pom.xml
index d86ded1a391..b8ca48cc45a 100644
--- a/drools-persistence/drools-persistence-jpa/pom.xml
+++ b/drools-persistence/drools-persistence-jpa/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-persistence
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   drools-persistence-jpa
diff --git a/drools-persistence/pom.xml b/drools-persistence/pom.xml
index b17eb405989..6ffc3fa973a 100644
--- a/drools-persistence/pom.xml
+++ b/drools-persistence/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-quarkus-extension/drools-quarkus-deployment/pom.xml b/drools-quarkus-extension/drools-quarkus-deployment/pom.xml
index 996771b4e74..0b46a52cb8a 100644
--- a/drools-quarkus-extension/drools-quarkus-deployment/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-deployment/pom.xml
@@ -26,7 +26,7 @@
     
       org.drools
       drools-quarkus-extension
-      9.46.0-SNAPSHOT
+      999-SNAPSHOT
     
 
   Drools :: Quarkus Extension :: Deployment
diff --git a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml
index 0da79019017..191726b14c3 100644
--- a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-quarkus-examples
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   Drools :: Quarkus Extension :: Examples :: Reactive
diff --git a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/pom.xml b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/pom.xml
index cc03fb0957e..7408ab126de 100644
--- a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-quarkus-examples
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   Drools :: Quarkus Extension :: Examples :: Reactive
diff --git a/drools-quarkus-extension/drools-quarkus-examples/pom.xml b/drools-quarkus-extension/drools-quarkus-examples/pom.xml
index 49114a40b7c..14185bad235 100644
--- a/drools-quarkus-extension/drools-quarkus-examples/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-examples/pom.xml
@@ -26,7 +26,7 @@
     
         org.drools
         drools-quarkus-extension
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
     
 
     Drools :: Quarkus Extension :: Examples
diff --git a/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/pom.xml b/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/pom.xml
index a3233611e91..e06d5791feb 100644
--- a/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-quarkus-extension
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   Drools :: Quarkus Extension :: Integration Test :: Hotreload
diff --git a/drools-quarkus-extension/drools-quarkus-integration-test/pom.xml b/drools-quarkus-extension/drools-quarkus-integration-test/pom.xml
index 1d3f53b5acb..77e1fb06d06 100644
--- a/drools-quarkus-extension/drools-quarkus-integration-test/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-integration-test/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-quarkus-extension
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   Drools :: Quarkus Extension :: Integration Test
diff --git a/drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml b/drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml
index cf9791129a6..6c98b8c0155 100644
--- a/drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-quarkus-extension
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   Drools :: Quarkus Extension :: Quickstart Integration Test
diff --git a/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/pom.xml b/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/pom.xml
index c393cdea5f7..eadb1faa02e 100644
--- a/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-quarkus-extension
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   Drools :: Quarkus Extension :: Integration Test with Rule Unit
diff --git a/drools-quarkus-extension/drools-quarkus-util-deployment/pom.xml b/drools-quarkus-extension/drools-quarkus-util-deployment/pom.xml
index cc32fcc8597..5ee6b051085 100644
--- a/drools-quarkus-extension/drools-quarkus-util-deployment/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-util-deployment/pom.xml
@@ -26,7 +26,7 @@
     
         org.drools
         drools-quarkus-extension
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
     
 
     Drools :: Quarkus Extension :: Util :: Deployment
diff --git a/drools-quarkus-extension/drools-quarkus/pom.xml b/drools-quarkus-extension/drools-quarkus/pom.xml
index f42935a1559..fc40ab6777f 100644
--- a/drools-quarkus-extension/drools-quarkus/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus/pom.xml
@@ -26,7 +26,7 @@
     
         org.drools
         drools-quarkus-extension
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
     
 
     Drools :: Quarkus Extension :: Runtime
diff --git a/drools-quarkus-extension/pom.xml b/drools-quarkus-extension/pom.xml
index b07c74a41cc..ddb0533f432 100644
--- a/drools-quarkus-extension/pom.xml
+++ b/drools-quarkus-extension/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-reliability/drools-reliability-core/pom.xml b/drools-reliability/drools-reliability-core/pom.xml
index 75adfa5d2ab..0a51ea14a5d 100644
--- a/drools-reliability/drools-reliability-core/pom.xml
+++ b/drools-reliability/drools-reliability-core/pom.xml
@@ -25,7 +25,7 @@
   
     org.drools
     drools-reliability
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-reliability/drools-reliability-h2mvstore/pom.xml b/drools-reliability/drools-reliability-h2mvstore/pom.xml
index e7822561630..67d3ebec2de 100644
--- a/drools-reliability/drools-reliability-h2mvstore/pom.xml
+++ b/drools-reliability/drools-reliability-h2mvstore/pom.xml
@@ -25,7 +25,7 @@
   
     org.drools
     drools-reliability
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-reliability/drools-reliability-infinispan/pom.xml b/drools-reliability/drools-reliability-infinispan/pom.xml
index 6e2734a1e48..73d06000077 100644
--- a/drools-reliability/drools-reliability-infinispan/pom.xml
+++ b/drools-reliability/drools-reliability-infinispan/pom.xml
@@ -25,7 +25,7 @@
   
     org.drools
     drools-reliability
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-reliability/drools-reliability-tests/pom.xml b/drools-reliability/drools-reliability-tests/pom.xml
index 778d5d8adab..907f780f237 100644
--- a/drools-reliability/drools-reliability-tests/pom.xml
+++ b/drools-reliability/drools-reliability-tests/pom.xml
@@ -25,7 +25,7 @@
   
     org.drools
     drools-reliability
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-reliability/pom.xml b/drools-reliability/pom.xml
index 04cf276f685..866b0d9f0a4 100644
--- a/drools-reliability/pom.xml
+++ b/drools-reliability/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
   4.0.0
diff --git a/drools-retediagram/pom.xml b/drools-retediagram/pom.xml
index 337ce3aac33..e1b9122311d 100644
--- a/drools-retediagram/pom.xml
+++ b/drools-retediagram/pom.xml
@@ -24,7 +24,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-ruleunits/drools-ruleunits-api/pom.xml b/drools-ruleunits/drools-ruleunits-api/pom.xml
index c3bc5862564..c21457dd9df 100755
--- a/drools-ruleunits/drools-ruleunits-api/pom.xml
+++ b/drools-ruleunits/drools-ruleunits-api/pom.xml
@@ -26,7 +26,7 @@
     
         org.drools
         drools-ruleunits
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
     
 
     org.drools
diff --git a/drools-ruleunits/drools-ruleunits-dsl/pom.xml b/drools-ruleunits/drools-ruleunits-dsl/pom.xml
index 23fcc1ef9fa..409d0f1f181 100755
--- a/drools-ruleunits/drools-ruleunits-dsl/pom.xml
+++ b/drools-ruleunits/drools-ruleunits-dsl/pom.xml
@@ -26,7 +26,7 @@
     
         org.drools
         drools-ruleunits
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
     
 
     org.drools
diff --git a/drools-ruleunits/drools-ruleunits-engine/pom.xml b/drools-ruleunits/drools-ruleunits-engine/pom.xml
index 7d82836464c..5493ddffa34 100644
--- a/drools-ruleunits/drools-ruleunits-engine/pom.xml
+++ b/drools-ruleunits/drools-ruleunits-engine/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-ruleunits
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   drools-ruleunits-engine
diff --git a/drools-ruleunits/drools-ruleunits-impl/pom.xml b/drools-ruleunits/drools-ruleunits-impl/pom.xml
index a7c529a124e..ad4b8029a24 100755
--- a/drools-ruleunits/drools-ruleunits-impl/pom.xml
+++ b/drools-ruleunits/drools-ruleunits-impl/pom.xml
@@ -26,7 +26,7 @@
     
         org.drools
         drools-ruleunits
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
     
 
     org.drools
diff --git a/drools-ruleunits/pom.xml b/drools-ruleunits/pom.xml
index 0de6b31d8d2..587640b8259 100644
--- a/drools-ruleunits/pom.xml
+++ b/drools-ruleunits/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-scenario-simulation/drools-scenario-simulation-api/pom.xml b/drools-scenario-simulation/drools-scenario-simulation-api/pom.xml
index e7e5515f0b3..39f16b938f8 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-api/pom.xml
+++ b/drools-scenario-simulation/drools-scenario-simulation-api/pom.xml
@@ -25,7 +25,7 @@
   
     drools-scenario-simulation
     org.drools
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/pom.xml b/drools-scenario-simulation/drools-scenario-simulation-backend/pom.xml
index 38a77da6406..03b8f5abfea 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/pom.xml
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/pom.xml
@@ -25,7 +25,7 @@
   
     drools-scenario-simulation
     org.drools
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/pom.xml b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/pom.xml
index d4b4f4d746f..f66ab6a315a 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/pom.xml
+++ b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/pom.xml
@@ -25,7 +25,7 @@
   
     drools-scenario-simulation
     org.drools
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-scenario-simulation/pom.xml b/drools-scenario-simulation/pom.xml
index 130cc7552de..d1b98256a56 100644
--- a/drools-scenario-simulation/pom.xml
+++ b/drools-scenario-simulation/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-serialization-protobuf/pom.xml b/drools-serialization-protobuf/pom.xml
index 6d5f60524b8..728273f4cf4 100644
--- a/drools-serialization-protobuf/pom.xml
+++ b/drools-serialization-protobuf/pom.xml
@@ -26,7 +26,7 @@
     
         org.kie
         drools-build-parent
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
         ../build-parent/pom.xml
     
 
diff --git a/drools-templates/pom.xml b/drools-templates/pom.xml
index 0f2bd94a120..9194b46c1d4 100644
--- a/drools-templates/pom.xml
+++ b/drools-templates/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-test-coverage/pom.xml b/drools-test-coverage/pom.xml
index 2c8ec509b10..7e54cdb19f6 100644
--- a/drools-test-coverage/pom.xml
+++ b/drools-test-coverage/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-test-coverage/standalone/kie-ci-with-domain/pom.xml b/drools-test-coverage/standalone/kie-ci-with-domain/pom.xml
index 9bae1496ad7..7e3090a231f 100644
--- a/drools-test-coverage/standalone/kie-ci-with-domain/pom.xml
+++ b/drools-test-coverage/standalone/kie-ci-with-domain/pom.xml
@@ -28,7 +28,7 @@
   
     org.drools.testcoverage
     drools-standalone-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   drools-kie-ci-with-domain-parent
diff --git a/drools-test-coverage/standalone/kie-ci-with-domain/test-domain/pom.xml b/drools-test-coverage/standalone/kie-ci-with-domain/test-domain/pom.xml
index 97db998c637..5207a73bd06 100644
--- a/drools-test-coverage/standalone/kie-ci-with-domain/test-domain/pom.xml
+++ b/drools-test-coverage/standalone/kie-ci-with-domain/test-domain/pom.xml
@@ -28,7 +28,7 @@
   
     org.drools.testcoverage
     drools-kie-ci-with-domain-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   drools-kie-ci-with-domain-test-domain
diff --git a/drools-test-coverage/standalone/kie-ci-with-domain/test-kjar/pom.xml b/drools-test-coverage/standalone/kie-ci-with-domain/test-kjar/pom.xml
index c3b227a1b81..4e58859b497 100644
--- a/drools-test-coverage/standalone/kie-ci-with-domain/test-kjar/pom.xml
+++ b/drools-test-coverage/standalone/kie-ci-with-domain/test-kjar/pom.xml
@@ -28,7 +28,7 @@
   
     org.drools.testcoverage
     drools-kie-ci-with-domain-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   drools-kie-ci-with-domain-test-kjar
diff --git a/drools-test-coverage/standalone/kie-ci-with-domain/tests/pom.xml b/drools-test-coverage/standalone/kie-ci-with-domain/tests/pom.xml
index 539a0a7fadc..9b8ff7c8d4a 100644
--- a/drools-test-coverage/standalone/kie-ci-with-domain/tests/pom.xml
+++ b/drools-test-coverage/standalone/kie-ci-with-domain/tests/pom.xml
@@ -28,7 +28,7 @@
   
     org.drools.testcoverage
     drools-kie-ci-with-domain-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   drools-kie-ci-with-domain-tests
diff --git a/drools-test-coverage/standalone/kie-ci-without-domain/pom.xml b/drools-test-coverage/standalone/kie-ci-without-domain/pom.xml
index a4448ae039f..9f58d0a603f 100644
--- a/drools-test-coverage/standalone/kie-ci-without-domain/pom.xml
+++ b/drools-test-coverage/standalone/kie-ci-without-domain/pom.xml
@@ -28,7 +28,7 @@
   
     org.drools.testcoverage
     drools-standalone-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   drools-kie-ci-without-domain-parent
diff --git a/drools-test-coverage/standalone/kie-ci-without-domain/test-domain/pom.xml b/drools-test-coverage/standalone/kie-ci-without-domain/test-domain/pom.xml
index 919e661d435..603ca5ddfad 100644
--- a/drools-test-coverage/standalone/kie-ci-without-domain/test-domain/pom.xml
+++ b/drools-test-coverage/standalone/kie-ci-without-domain/test-domain/pom.xml
@@ -28,7 +28,7 @@
   
     org.drools.testcoverage
     drools-kie-ci-without-domain-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   drools-kie-ci-without-domain-test-domain
diff --git a/drools-test-coverage/standalone/kie-ci-without-domain/test-kjar/pom.xml b/drools-test-coverage/standalone/kie-ci-without-domain/test-kjar/pom.xml
index 1e22b4a2e02..dd653e5df9c 100644
--- a/drools-test-coverage/standalone/kie-ci-without-domain/test-kjar/pom.xml
+++ b/drools-test-coverage/standalone/kie-ci-without-domain/test-kjar/pom.xml
@@ -28,7 +28,7 @@
   
     org.drools.testcoverage
     drools-kie-ci-without-domain-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   drools-kie-ci-without-domain-test-kjar
diff --git a/drools-test-coverage/standalone/kie-ci-without-domain/tests/pom.xml b/drools-test-coverage/standalone/kie-ci-without-domain/tests/pom.xml
index 6a28a134277..3a89a203fd9 100644
--- a/drools-test-coverage/standalone/kie-ci-without-domain/tests/pom.xml
+++ b/drools-test-coverage/standalone/kie-ci-without-domain/tests/pom.xml
@@ -28,7 +28,7 @@
   
     org.drools.testcoverage
     drools-kie-ci-without-domain-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   drools-kie-ci-without-domain-tests
diff --git a/drools-test-coverage/standalone/pom.xml b/drools-test-coverage/standalone/pom.xml
index d168bfccce9..61f8b699f64 100644
--- a/drools-test-coverage/standalone/pom.xml
+++ b/drools-test-coverage/standalone/pom.xml
@@ -28,7 +28,7 @@
   
     org.drools.testcoverage
     drools-test-coverage-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   drools-standalone-parent
diff --git a/drools-test-coverage/test-compiler-integration/pom.xml b/drools-test-coverage/test-compiler-integration/pom.xml
index 1dcdd9700ba..6ccf1cbdc67 100644
--- a/drools-test-coverage/test-compiler-integration/pom.xml
+++ b/drools-test-coverage/test-compiler-integration/pom.xml
@@ -26,7 +26,7 @@
   
     drools-test-coverage-parent
     org.drools.testcoverage
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-test-coverage/test-integration-nomvel/pom.xml b/drools-test-coverage/test-integration-nomvel/pom.xml
index 19054c68639..3472bf3087f 100644
--- a/drools-test-coverage/test-integration-nomvel/pom.xml
+++ b/drools-test-coverage/test-integration-nomvel/pom.xml
@@ -26,7 +26,7 @@
     
         drools-test-coverage-parent
         org.drools.testcoverage
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
     
     4.0.0
 
diff --git a/drools-test-coverage/test-integration-notms/pom.xml b/drools-test-coverage/test-integration-notms/pom.xml
index b5541768c84..4f51657a1e6 100644
--- a/drools-test-coverage/test-integration-notms/pom.xml
+++ b/drools-test-coverage/test-integration-notms/pom.xml
@@ -26,7 +26,7 @@
     
         drools-test-coverage-parent
         org.drools.testcoverage
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
     
     4.0.0
 
diff --git a/drools-test-coverage/test-integration-noxml/pom.xml b/drools-test-coverage/test-integration-noxml/pom.xml
index 2cd51ff3e10..a65f9429e32 100644
--- a/drools-test-coverage/test-integration-noxml/pom.xml
+++ b/drools-test-coverage/test-integration-noxml/pom.xml
@@ -26,7 +26,7 @@
     
         drools-test-coverage-parent
         org.drools.testcoverage
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
     
     4.0.0
 
diff --git a/drools-test-coverage/test-integration-ruleunits/pom.xml b/drools-test-coverage/test-integration-ruleunits/pom.xml
index 7685d2abc4f..de55fe50ef3 100644
--- a/drools-test-coverage/test-integration-ruleunits/pom.xml
+++ b/drools-test-coverage/test-integration-ruleunits/pom.xml
@@ -26,7 +26,7 @@
   
     drools-test-coverage-parent
     org.drools.testcoverage
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-jar/pom.xml b/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-jar/pom.xml
index c62c1de7533..da5805e7899 100644
--- a/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-jar/pom.xml
+++ b/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-jar/pom.xml
@@ -26,7 +26,7 @@
   
     test-integration-ruleunits
     org.drools.testcoverage
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-tests/pom.xml b/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-tests/pom.xml
index 7bde04802b4..3a76fbaae73 100644
--- a/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-tests/pom.xml
+++ b/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-tests/pom.xml
@@ -26,7 +26,7 @@
   
     test-integration-ruleunits
     org.drools.testcoverage
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-test-coverage/test-suite/pom.xml b/drools-test-coverage/test-suite/pom.xml
index 429796c4521..f68be80bd92 100644
--- a/drools-test-coverage/test-suite/pom.xml
+++ b/drools-test-coverage/test-suite/pom.xml
@@ -28,7 +28,7 @@
   
     org.drools.testcoverage
     drools-test-coverage-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   drools-test-suite
diff --git a/drools-tms/pom.xml b/drools-tms/pom.xml
index f275dd94288..a04ae00e2a1 100644
--- a/drools-tms/pom.xml
+++ b/drools-tms/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-traits/pom.xml b/drools-traits/pom.xml
index cf1f66b00f6..9386b4ff1b8 100644
--- a/drools-traits/pom.xml
+++ b/drools-traits/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-util/pom.xml b/drools-util/pom.xml
index fea264ed260..7bc2377c5fc 100644
--- a/drools-util/pom.xml
+++ b/drools-util/pom.xml
@@ -27,7 +27,7 @@
     
         org.kie
         drools-build-parent
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
         ../build-parent/pom.xml
     
 
diff --git a/drools-verifier/drools-verifier-api/pom.xml b/drools-verifier/drools-verifier-api/pom.xml
index c7a012b7c68..f0e2651bb3a 100644
--- a/drools-verifier/drools-verifier-api/pom.xml
+++ b/drools-verifier/drools-verifier-api/pom.xml
@@ -26,7 +26,7 @@
     
         org.drools
         drools-verifier
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
     
     4.0.0
 
diff --git a/drools-verifier/drools-verifier-core/pom.xml b/drools-verifier/drools-verifier-core/pom.xml
index 7c4208ea61f..7ed73099134 100644
--- a/drools-verifier/drools-verifier-core/pom.xml
+++ b/drools-verifier/drools-verifier-core/pom.xml
@@ -25,7 +25,7 @@
     
         drools-verifier
         org.drools
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
     
     4.0.0
 
diff --git a/drools-verifier/drools-verifier-drl/pom.xml b/drools-verifier/drools-verifier-drl/pom.xml
index 39b2a490c3f..edbf986b9fe 100644
--- a/drools-verifier/drools-verifier-drl/pom.xml
+++ b/drools-verifier/drools-verifier-drl/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-verifier
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   drools-verifier-drl
diff --git a/drools-verifier/pom.xml b/drools-verifier/pom.xml
index 58e711cdd25..a248d812686 100644
--- a/drools-verifier/pom.xml
+++ b/drools-verifier/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-wiring/drools-wiring-api/pom.xml b/drools-wiring/drools-wiring-api/pom.xml
index 56738b61172..ae3a1228f74 100755
--- a/drools-wiring/drools-wiring-api/pom.xml
+++ b/drools-wiring/drools-wiring-api/pom.xml
@@ -26,7 +26,7 @@
     
         org.drools
         drools-wiring
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
     
 
     org.drools
diff --git a/drools-wiring/drools-wiring-dynamic/pom.xml b/drools-wiring/drools-wiring-dynamic/pom.xml
index a55951ff43f..355a9d666df 100755
--- a/drools-wiring/drools-wiring-dynamic/pom.xml
+++ b/drools-wiring/drools-wiring-dynamic/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-wiring
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   org.drools
diff --git a/drools-wiring/drools-wiring-static/pom.xml b/drools-wiring/drools-wiring-static/pom.xml
index d3eb30c4982..07bd2d42bdb 100755
--- a/drools-wiring/drools-wiring-static/pom.xml
+++ b/drools-wiring/drools-wiring-static/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-wiring
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   org.drools
diff --git a/drools-wiring/pom.xml b/drools-wiring/pom.xml
index d6a958ce688..99e28042bb4 100644
--- a/drools-wiring/pom.xml
+++ b/drools-wiring/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-xml-support/pom.xml b/drools-xml-support/pom.xml
index ca212a2c4b6..0f0c11aa764 100644
--- a/drools-xml-support/pom.xml
+++ b/drools-xml-support/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/efesto/efesto-common-utils/pom.xml b/efesto/efesto-common-utils/pom.xml
index faff12a313a..5736f74c116 100644
--- a/efesto/efesto-common-utils/pom.xml
+++ b/efesto/efesto-common-utils/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   efesto-common-utils
diff --git a/efesto/efesto-core/efesto-common-api/pom.xml b/efesto/efesto-core/efesto-common-api/pom.xml
index e083232c2a4..ae1b879663d 100644
--- a/efesto/efesto-core/efesto-common-api/pom.xml
+++ b/efesto/efesto-core/efesto-common-api/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto-core
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   efesto-common-api
diff --git a/efesto/efesto-core/efesto-common-core/pom.xml b/efesto/efesto-core/efesto-common-core/pom.xml
index 4488d7dc72c..3d2f0a74f15 100644
--- a/efesto/efesto-core/efesto-common-core/pom.xml
+++ b/efesto/efesto-core/efesto-common-core/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto-core
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   efesto-common-core
diff --git a/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-api/pom.xml b/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-api/pom.xml
index cf10dbf0c45..66a049cf98a 100644
--- a/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-api/pom.xml
+++ b/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-api/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto-compilation-manager
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   efesto-compilation-manager-api
diff --git a/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-core/pom.xml b/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-core/pom.xml
index aa9e9108a39..c7924cb8ebb 100644
--- a/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-core/pom.xml
+++ b/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-core/pom.xml
@@ -39,7 +39,7 @@
   
     org.kie
     efesto-compilation-manager
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   efesto-compilation-manager-core
diff --git a/efesto/efesto-core/efesto-compilation-manager/pom.xml b/efesto/efesto-core/efesto-compilation-manager/pom.xml
index bed0864d9aa..6e51ae94762 100644
--- a/efesto/efesto-core/efesto-compilation-manager/pom.xml
+++ b/efesto/efesto-core/efesto-compilation-manager/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto-core
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   pom
 
diff --git a/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-api/pom.xml b/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-api/pom.xml
index d6cdc38cfc2..86c4e36b169 100644
--- a/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-api/pom.xml
+++ b/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-api/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto-runtime-manager
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
  efesto-runtime-manager-api
diff --git a/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/pom.xml b/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/pom.xml
index 6327eceeba9..6336caec134 100644
--- a/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/pom.xml
+++ b/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto-runtime-manager
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   efesto-runtime-manager-core
diff --git a/efesto/efesto-core/efesto-runtime-manager/pom.xml b/efesto/efesto-core/efesto-runtime-manager/pom.xml
index 933b674841f..389435f97b7 100644
--- a/efesto/efesto-core/efesto-runtime-manager/pom.xml
+++ b/efesto/efesto-core/efesto-runtime-manager/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto-core
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   pom
 
diff --git a/efesto/efesto-core/pom.xml b/efesto/efesto-core/pom.xml
index b4fbf23e982..17531c9c2e3 100644
--- a/efesto/efesto-core/pom.xml
+++ b/efesto/efesto-core/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   pom
 
diff --git a/efesto/efesto-dependencies/pom.xml b/efesto/efesto-dependencies/pom.xml
index b5dac1332ca..32e9829db1e 100644
--- a/efesto/efesto-dependencies/pom.xml
+++ b/efesto/efesto-dependencies/pom.xml
@@ -25,7 +25,7 @@
   
     efesto
     org.kie
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/efesto/pom.xml b/efesto/pom.xml
index 8864c32572c..697c654c2f2 100644
--- a/efesto/pom.xml
+++ b/efesto/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/jpmml-migration-recipe/pom.xml b/jpmml-migration-recipe/pom.xml
index af0a2fd98f3..7efc9d5232b 100644
--- a/jpmml-migration-recipe/pom.xml
+++ b/jpmml-migration-recipe/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-api/pom.xml b/kie-api/pom.xml
index c39c6a0c4a1..5c9fa280d88 100644
--- a/kie-api/pom.xml
+++ b/kie-api/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-archetypes/kie-drools-dmn-archetype/pom.xml b/kie-archetypes/kie-drools-dmn-archetype/pom.xml
index 031120f023e..1e0d8076dbc 100644
--- a/kie-archetypes/kie-drools-dmn-archetype/pom.xml
+++ b/kie-archetypes/kie-drools-dmn-archetype/pom.xml
@@ -24,7 +24,7 @@
   
     org.kie
     kie-archetypes
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   kie-drools-dmn-archetype
diff --git a/kie-archetypes/kie-drools-exec-model-archetype/pom.xml b/kie-archetypes/kie-drools-exec-model-archetype/pom.xml
index 11492e34857..e778f279f4f 100644
--- a/kie-archetypes/kie-drools-exec-model-archetype/pom.xml
+++ b/kie-archetypes/kie-drools-exec-model-archetype/pom.xml
@@ -24,7 +24,7 @@
   
     org.kie
     kie-archetypes
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   kie-drools-exec-model-archetype
diff --git a/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/pom.xml b/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/pom.xml
index 760bc16e05e..c13fdad131a 100644
--- a/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/pom.xml
+++ b/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/pom.xml
@@ -24,7 +24,7 @@
   
     org.kie
     kie-archetypes
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   kie-drools-exec-model-ruleunit-archetype
diff --git a/kie-archetypes/kie-drools-yaml-archetype/pom.xml b/kie-archetypes/kie-drools-yaml-archetype/pom.xml
index e28761f13c2..6560436ad7a 100644
--- a/kie-archetypes/kie-drools-yaml-archetype/pom.xml
+++ b/kie-archetypes/kie-drools-yaml-archetype/pom.xml
@@ -24,7 +24,7 @@
   
     org.kie
     kie-archetypes
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   kie-drools-yaml-archetype
diff --git a/kie-archetypes/pom.xml b/kie-archetypes/pom.xml
index db39906da60..0e761a3a19b 100644
--- a/kie-archetypes/pom.xml
+++ b/kie-archetypes/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-ci/pom.xml b/kie-ci/pom.xml
index 3463106ca1a..e4a2f76a294 100644
--- a/kie-ci/pom.xml
+++ b/kie-ci/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-dmn/kie-dmn-api/pom.xml b/kie-dmn/kie-dmn-api/pom.xml
index 29dc0ce3f5f..f795af7a654 100644
--- a/kie-dmn/kie-dmn-api/pom.xml
+++ b/kie-dmn/kie-dmn-api/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     kie-dmn
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   kie-dmn-api
diff --git a/kie-dmn/kie-dmn-backend/pom.xml b/kie-dmn/kie-dmn-backend/pom.xml
index 46414eb9160..f4e3e5ef299 100644
--- a/kie-dmn/kie-dmn-backend/pom.xml
+++ b/kie-dmn/kie-dmn-backend/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     kie-dmn
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   kie-dmn-backend
diff --git a/kie-dmn/kie-dmn-core-jsr223-jq/pom.xml b/kie-dmn/kie-dmn-core-jsr223-jq/pom.xml
index 903328c2a2c..6c243d11255 100644
--- a/kie-dmn/kie-dmn-core-jsr223-jq/pom.xml
+++ b/kie-dmn/kie-dmn-core-jsr223-jq/pom.xml
@@ -23,7 +23,7 @@
     
         org.kie
         kie-dmn
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
     
     kie-dmn-core-jsr223-jq
     KIE :: Decision Model Notation :: JSR-223 JQ ScriptEngine
diff --git a/kie-dmn/kie-dmn-core-jsr223/pom.xml b/kie-dmn/kie-dmn-core-jsr223/pom.xml
index 1e5d21c5206..b0f93bc3ac2 100644
--- a/kie-dmn/kie-dmn-core-jsr223/pom.xml
+++ b/kie-dmn/kie-dmn-core-jsr223/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   kie-dmn-core-jsr223
   KIE :: Decision Model Notation :: Core JSR-223
diff --git a/kie-dmn/kie-dmn-core/pom.xml b/kie-dmn/kie-dmn-core/pom.xml
index 7eae5d4dedd..b617fa75445 100644
--- a/kie-dmn/kie-dmn-core/pom.xml
+++ b/kie-dmn/kie-dmn-core/pom.xml
@@ -27,7 +27,7 @@
   
     kie-dmn
     org.kie
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   kie-dmn-core
diff --git a/kie-dmn/kie-dmn-feel/pom.xml b/kie-dmn/kie-dmn-feel/pom.xml
index 25cd680ffcf..6648b65ba52 100644
--- a/kie-dmn/kie-dmn-feel/pom.xml
+++ b/kie-dmn/kie-dmn-feel/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     kie-dmn
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   kie-dmn-feel
diff --git a/kie-dmn/kie-dmn-legacy-tests/pom.xml b/kie-dmn/kie-dmn-legacy-tests/pom.xml
index 16a31d57fd1..7f60fcd8fe1 100644
--- a/kie-dmn/kie-dmn-legacy-tests/pom.xml
+++ b/kie-dmn/kie-dmn-legacy-tests/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   kie-dmn-legacy-tests
   
diff --git a/kie-dmn/kie-dmn-model/pom.xml b/kie-dmn/kie-dmn-model/pom.xml
index 4b9e1ee9f9f..b100d06055a 100644
--- a/kie-dmn/kie-dmn-model/pom.xml
+++ b/kie-dmn/kie-dmn-model/pom.xml
@@ -27,7 +27,7 @@
   
     kie-dmn
     org.kie
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   kie-dmn-model
diff --git a/kie-dmn/kie-dmn-openapi/pom.xml b/kie-dmn/kie-dmn-openapi/pom.xml
index b63ab9f81f3..1dd39104235 100644
--- a/kie-dmn/kie-dmn-openapi/pom.xml
+++ b/kie-dmn/kie-dmn-openapi/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   kie-dmn-openapi
   
diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests-trusty/pom.xml b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests-trusty/pom.xml
index 64dacbfe40f..8171a8418e5 100644
--- a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests-trusty/pom.xml
+++ b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests-trusty/pom.xml
@@ -25,7 +25,7 @@
   
     kie-dmn-pmml-tests-parent
     org.kie
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/pom.xml b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/pom.xml
index 9da9e7d335e..cf4d997a2de 100644
--- a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/pom.xml
+++ b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/pom.xml
@@ -25,7 +25,7 @@
   
     kie-dmn-pmml-tests-parent
     org.kie
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/pom.xml b/kie-dmn/kie-dmn-pmml-tests-parent/pom.xml
index db909667c2b..85c37fa46aa 100644
--- a/kie-dmn/kie-dmn-pmml-tests-parent/pom.xml
+++ b/kie-dmn/kie-dmn-pmml-tests-parent/pom.xml
@@ -25,7 +25,7 @@
   
     kie-dmn
     org.kie
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
   pom
diff --git a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn-cli/pom.xml b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn-cli/pom.xml
index 290e81ebff8..26574c8bf64 100644
--- a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn-cli/pom.xml
+++ b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn-cli/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn-ruleset2dmn-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   kie-dmn-ruleset2dmn-cli
   
diff --git a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/pom.xml b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/pom.xml
index a49b93b00fb..dc55881fa36 100644
--- a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/pom.xml
+++ b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn-ruleset2dmn-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   kie-dmn-ruleset2dmn
 
diff --git a/kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml b/kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml
index 597b84a0e64..b3df0c2cbc0 100644
--- a/kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml
+++ b/kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   kie-dmn-ruleset2dmn-parent
   pom
diff --git a/kie-dmn/kie-dmn-signavio/pom.xml b/kie-dmn/kie-dmn-signavio/pom.xml
index c4f4a9efbb3..feb101a85b3 100644
--- a/kie-dmn/kie-dmn-signavio/pom.xml
+++ b/kie-dmn/kie-dmn-signavio/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   kie-dmn-signavio
   
diff --git a/kie-dmn/kie-dmn-tck/pom.xml b/kie-dmn/kie-dmn-tck/pom.xml
index dbe80e03504..8cd07ebced6 100644
--- a/kie-dmn/kie-dmn-tck/pom.xml
+++ b/kie-dmn/kie-dmn-tck/pom.xml
@@ -26,7 +26,7 @@
   
     kie-dmn
     org.kie
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
   pom
diff --git a/kie-dmn/kie-dmn-trisotech/pom.xml b/kie-dmn/kie-dmn-trisotech/pom.xml
index 6ec92140996..9d0bb085b65 100644
--- a/kie-dmn/kie-dmn-trisotech/pom.xml
+++ b/kie-dmn/kie-dmn-trisotech/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-dmn
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   kie-dmn-trisotech
 
diff --git a/kie-dmn/kie-dmn-validation-bootstrap/pom.xml b/kie-dmn/kie-dmn-validation-bootstrap/pom.xml
index 3d78022cbbd..08e23433b78 100644
--- a/kie-dmn/kie-dmn-validation-bootstrap/pom.xml
+++ b/kie-dmn/kie-dmn-validation-bootstrap/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-dmn
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   kie-dmn-validation-bootstrap
 
diff --git a/kie-dmn/kie-dmn-validation/pom.xml b/kie-dmn/kie-dmn-validation/pom.xml
index 5ab7798b378..3056ba4025c 100644
--- a/kie-dmn/kie-dmn-validation/pom.xml
+++ b/kie-dmn/kie-dmn-validation/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   kie-dmn-validation
     jar
diff --git a/kie-dmn/kie-dmn-xls2dmn-cli/pom.xml b/kie-dmn/kie-dmn-xls2dmn-cli/pom.xml
index 3f742cf8eb8..f14c01845f5 100644
--- a/kie-dmn/kie-dmn-xls2dmn-cli/pom.xml
+++ b/kie-dmn/kie-dmn-xls2dmn-cli/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   kie-dmn-xls2dmn-cli
   jar
diff --git a/kie-dmn/pom.xml b/kie-dmn/pom.xml
index 47e3bdf220e..641934c6efe 100644
--- a/kie-dmn/pom.xml
+++ b/kie-dmn/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-drl/kie-drl-api/pom.xml b/kie-drl/kie-drl-api/pom.xml
index 3dca87da619..48683881105 100644
--- a/kie-drl/kie-drl-api/pom.xml
+++ b/kie-drl/kie-drl-api/pom.xml
@@ -25,7 +25,7 @@
   
     kie-drl
     org.kie
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-drl/kie-drl-compilation-common/pom.xml b/kie-drl/kie-drl-compilation-common/pom.xml
index ca1074f6faa..a2539d7742b 100644
--- a/kie-drl/kie-drl-compilation-common/pom.xml
+++ b/kie-drl/kie-drl-compilation-common/pom.xml
@@ -25,7 +25,7 @@
   
     kie-drl
     org.kie
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/kie-drl-kiesession-local-runtime/pom.xml b/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/kie-drl-kiesession-local-runtime/pom.xml
index 0141af12e4d..36957018dd8 100644
--- a/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/kie-drl-kiesession-local-runtime/pom.xml
+++ b/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/kie-drl-kiesession-local-runtime/pom.xml
@@ -25,7 +25,7 @@
   
     kie-drl-kiesession-local
     org.kie
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/pom.xml b/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/pom.xml
index 474b22726ed..70e33832b6a 100644
--- a/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/pom.xml
+++ b/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/pom.xml
@@ -25,7 +25,7 @@
     
         kie-drl-implementations
         org.kie
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
     
     4.0.0
     pom
diff --git a/kie-drl/kie-drl-implementations/kie-drl-map-input/kie-drl-map-input-runtime/pom.xml b/kie-drl/kie-drl-implementations/kie-drl-map-input/kie-drl-map-input-runtime/pom.xml
index ea2da4e4577..6acf02e3371 100644
--- a/kie-drl/kie-drl-implementations/kie-drl-map-input/kie-drl-map-input-runtime/pom.xml
+++ b/kie-drl/kie-drl-implementations/kie-drl-map-input/kie-drl-map-input-runtime/pom.xml
@@ -26,7 +26,7 @@
   
     kie-drl-map-input
     org.kie
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
 
   kie-drl-map-input-runtime
diff --git a/kie-drl/kie-drl-implementations/kie-drl-map-input/pom.xml b/kie-drl/kie-drl-implementations/kie-drl-map-input/pom.xml
index 5f793fb0208..ee3d942c6b6 100644
--- a/kie-drl/kie-drl-implementations/kie-drl-map-input/pom.xml
+++ b/kie-drl/kie-drl-implementations/kie-drl-map-input/pom.xml
@@ -25,7 +25,7 @@
     
         kie-drl-implementations
         org.kie
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
     
     4.0.0
     pom
diff --git a/kie-drl/kie-drl-implementations/pom.xml b/kie-drl/kie-drl-implementations/pom.xml
index a6555a95a83..e2cbbde632b 100644
--- a/kie-drl/kie-drl-implementations/pom.xml
+++ b/kie-drl/kie-drl-implementations/pom.xml
@@ -27,7 +27,7 @@
     
         kie-drl
         org.kie
-        9.46.0-SNAPSHOT
+        999-SNAPSHOT
     
 
     KIE :: DRL :: Implementations
diff --git a/kie-drl/kie-drl-runtime-common/pom.xml b/kie-drl/kie-drl-runtime-common/pom.xml
index 0099f5638c9..acc29c9d5ec 100644
--- a/kie-drl/kie-drl-runtime-common/pom.xml
+++ b/kie-drl/kie-drl-runtime-common/pom.xml
@@ -25,7 +25,7 @@
   
     kie-drl
     org.kie
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-drl/kie-drl-tests-without-index-file/pom.xml b/kie-drl/kie-drl-tests-without-index-file/pom.xml
index fe73310120e..d9bb55a40b8 100644
--- a/kie-drl/kie-drl-tests-without-index-file/pom.xml
+++ b/kie-drl/kie-drl-tests-without-index-file/pom.xml
@@ -25,7 +25,7 @@
   
     kie-drl
     org.kie
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-drl/kie-drl-tests/pom.xml b/kie-drl/kie-drl-tests/pom.xml
index 3c535f5a81f..a06ca97ce53 100644
--- a/kie-drl/kie-drl-tests/pom.xml
+++ b/kie-drl/kie-drl-tests/pom.xml
@@ -25,7 +25,7 @@
   
     kie-drl
     org.kie
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-drl/pom.xml b/kie-drl/pom.xml
index 3631ff868e5..9a41c500675 100644
--- a/kie-drl/pom.xml
+++ b/kie-drl/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-internal/pom.xml b/kie-internal/pom.xml
index 64da37681cc..6dc0f3923b4 100644
--- a/kie-internal/pom.xml
+++ b/kie-internal/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-maven-plugin/pom.xml b/kie-maven-plugin/pom.xml
index 1a1f0170e2b..84c2fb42225 100644
--- a/kie-maven-plugin/pom.xml
+++ b/kie-maven-plugin/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-memory-compiler/pom.xml b/kie-memory-compiler/pom.xml
index bc681e6a1b6..2cb34dc36f2 100644
--- a/kie-memory-compiler/pom.xml
+++ b/kie-memory-compiler/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-pmml-trusty/kie-pmml-api/pom.xml b/kie-pmml-trusty/kie-pmml-api/pom.xml
index ecfe6df4d1d..bf6e14b8d85 100644
--- a/kie-pmml-trusty/kie-pmml-api/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-api/pom.xml
@@ -25,7 +25,7 @@
   
     kie-pmml-trusty
     org.kie
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-commons/pom.xml b/kie-pmml-trusty/kie-pmml-commons/pom.xml
index 3460285aaba..a48ee3e2f91 100644
--- a/kie-pmml-trusty/kie-pmml-commons/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-commons/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-trusty
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/pom.xml b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/pom.xml
index 5f411cc8268..bdbd389a054 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-compiler
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/pom.xml b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/pom.xml
index 395ecbd498e..0a13eaaa5c1 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-compiler
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-core/pom.xml b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-core/pom.xml
index c67aba7c643..f49f28d89a8 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-core/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-core/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-compiler
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-compiler/pom.xml
index b18db33d519..98e830b5610 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-compiler/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-trusty
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-dependencies/pom.xml b/kie-pmml-trusty/kie-pmml-dependencies/pom.xml
index fe129f23cae..6a5189bb164 100644
--- a/kie-pmml-trusty/kie-pmml-dependencies/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-dependencies/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-trusty
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-api/pom.xml b/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-api/pom.xml
index f77a7609ca0..e4949cc055c 100644
--- a/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-api/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-api/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-evaluator
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-core/pom.xml b/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-core/pom.xml
index 2f5f1338557..8cd4132f6e8 100644
--- a/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-core/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-core/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-evaluator
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-utils/pom.xml b/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-utils/pom.xml
index 394cd5be907..57b6e0dcb67 100644
--- a/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-utils/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-utils/pom.xml
@@ -25,7 +25,7 @@
   
     kie-pmml-evaluator
     org.kie
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-evaluator/pom.xml
index 617f9625156..d515066be81 100644
--- a/kie-pmml-trusty/kie-pmml-evaluator/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-evaluator/pom.xml
@@ -24,7 +24,7 @@
   
     org.kie
     kie-pmml-trusty
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
   pom
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-compiler/pom.xml
index 6794413ce5e..5e608f69dad 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-compiler/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-compiler/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-clustering
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-evaluator/pom.xml
index 88986a284f0..2c114511081 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-evaluator/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-evaluator/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-clustering
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-model/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-model/pom.xml
index 32e93735ade..d49d922a839 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-model/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-model/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-clustering
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/pom.xml
index f76924675ce..e372b21567c 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-clustering
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/pom.xml
index efd7d14747d..34d74cb7b18 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
   pom
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/pom.xml
index 1d65fa5ac0e..3ab657bded6 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-models-drools
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-compiler/pom.xml
index 4e30b327c01..1490d2bdc49 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-compiler/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-compiler/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-drools-scorecard
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-evaluator/pom.xml
index 2cfaf27ab71..feaaf7b680b 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-evaluator/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-evaluator/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-drools-scorecard
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-model/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-model/pom.xml
index d1aee553c67..5c39df37f78 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-model/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-model/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-drools-scorecard
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/pom.xml
index 55cf47a4ec2..7470725587b 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-drools-scorecard
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/pom.xml
index 34bb547e759..2b4be7de10a 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-drools
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
   pom
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-compiler/pom.xml
index ffe4443996b..e3497d8fadb 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-compiler/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-compiler/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-drools-tree
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-evaluator/pom.xml
index 7d15de1a63c..b44999edd38 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-evaluator/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-evaluator/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-drools-tree
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-model/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-model/pom.xml
index 7d3354e510b..a2b34731bfd 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-model/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-model/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-drools-tree
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/pom.xml
index 5fd2f3dde5b..f9887d6dbfc 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-drools-tree
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/pom.xml
index 7c3b9aa4cbf..4b3b2caef35 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-drools
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
   pom
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/pom.xml
index 380b8da09e8..7b948f5ebe0 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/pom.xml
index 7dd6ccb1c8c..8c71fc416f0 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-mining
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-evaluator/pom.xml
index 0484ef442e2..f4fa6346f79 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-evaluator/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-evaluator/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-mining
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-model/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-model/pom.xml
index e9804e3467a..6b8544c4287 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-model/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-model/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-mining
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/pom.xml
index 9ba58c4c888..ec653d9b869 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-mining
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/pom.xml
index e77ebf1e0af..3db531c2b54 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
   pom
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/pom.xml
index 0824beb29d6..85a37091448 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-models-regression
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-evaluator/pom.xml
index 9b9e96a1283..eb215bcd8e0 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-evaluator/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-evaluator/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-models-regression
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-model/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-model/pom.xml
index 4c899d44f81..ecd89309e7b 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-model/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-model/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-models-regression
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/pom.xml
index ffe3eabdd50..2f0a142d8d9 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-models-regression
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/pom.xml
index f79efe3dbd5..115896672e3 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-pmml-models
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
   pom
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-compiler/pom.xml
index 6691dcba55f..3d6f0ef6bc5 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-compiler/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-compiler/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-scorecard
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-evaluator/pom.xml
index bb2a9c7feb4..8030b72f83d 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-evaluator/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-evaluator/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-scorecard
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-model/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-model/pom.xml
index 2e486228746..0de66627ca5 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-model/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-model/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-scorecard
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/pom.xml
index 47563db9f81..4d99c67b000 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-scorecard
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/pom.xml
index f0e12bbaee5..80e760699b7 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
   pom
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tests/pom.xml
index 809e3ff83b5..8dca71c4ce9 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tests/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tests/pom.xml
@@ -25,7 +25,7 @@
   
     kie-pmml-models
     org.kie
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-compiler/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-compiler/pom.xml
index 6b9863250ff..5175ebb3e78 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-compiler/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-compiler/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-tree
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-evaluator/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-evaluator/pom.xml
index 2bce2fc53a6..65cd0316c5e 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-evaluator/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-evaluator/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-tree
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-model/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-model/pom.xml
index 6ef246de31d..3f594ff8e78 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-model/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-model/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-tree
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/pom.xml
index 0319cfac314..fde2ac9b99e 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models-tree
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/pom.xml b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/pom.xml
index a61ae82749a..0abe85c65d5 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-models
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
   pom
diff --git a/kie-pmml-trusty/kie-pmml-models/pom.xml b/kie-pmml-trusty/kie-pmml-models/pom.xml
index b69006f4e40..23bddf0731c 100644
--- a/kie-pmml-trusty/kie-pmml-models/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-models/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-pmml-trusty
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-pmml-trusty/pom.xml b/kie-pmml-trusty/pom.xml
index c98a83b264e..e29272d561c 100644
--- a/kie-pmml-trusty/pom.xml
+++ b/kie-pmml-trusty/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-test-util/pom.xml b/kie-test-util/pom.xml
index e73862dcd0d..f6fd0e317e5 100644
--- a/kie-test-util/pom.xml
+++ b/kie-test-util/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-util/kie-util-maven-integration/pom.xml b/kie-util/kie-util-maven-integration/pom.xml
index 2c29553a1c0..fd416f1f66e 100644
--- a/kie-util/kie-util-maven-integration/pom.xml
+++ b/kie-util/kie-util-maven-integration/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-util
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-util/kie-util-maven-support/pom.xml b/kie-util/kie-util-maven-support/pom.xml
index b8dcb26f95f..a4b77056857 100644
--- a/kie-util/kie-util-maven-support/pom.xml
+++ b/kie-util/kie-util-maven-support/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-util
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-util/kie-util-xml/pom.xml b/kie-util/kie-util-xml/pom.xml
index 5515801457b..350383f8280 100644
--- a/kie-util/kie-util-xml/pom.xml
+++ b/kie-util/kie-util-xml/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-util
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-util/pom.xml b/kie-util/pom.xml
index e933f733ce5..25bd1563603 100644
--- a/kie-util/pom.xml
+++ b/kie-util/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    9.46.0-SNAPSHOT
+    999-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/pom.xml b/pom.xml
index a110248bd5e..d3c126a785e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
   org.kie
   drools-parent
   pom
-  9.46.0-SNAPSHOT
+  999-SNAPSHOT
 
   Drools :: Parent
   

From e079b8917eb928f2c447d07a48d5f230dce8d159 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Dec 2023 11:42:52 +0100
Subject: [PATCH 07/29] Bump ch.qos.logback:logback-classic in /build-parent
 (#5612)

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.2.9 to 1.2.13.
- [Commits](https://github.com/qos-ch/logback/compare/v_1.2.9...v_1.2.13)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build-parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index f095313e2b9..49ac0008763 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -54,7 +54,7 @@
       - A version property must be specified in the format "version.{groupId}", optionally with a suffix to make it unique.
       - Version properties must be sorted alphabetically (other form of sorting were found to be unclear and ambiguous).
     -->
-    1.2.9
+    1.2.13
     1.16.0
     3.2.2
     1.1.1

From 76c65a152e31909c7551791cc2cc3ed9281bff02 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Dec 2023 11:43:52 +0100
Subject: [PATCH 08/29] Bump ch.qos.logback:logback-classic (#5616)

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.2.9 to 1.2.13.
- [Commits](https://github.com/qos-ch/logback/compare/v_1.2.9...v_1.2.13)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../projects/integrationtestDefaults/reference/pom.xml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kie-archetypes/kie-drools-yaml-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml b/kie-archetypes/kie-drools-yaml-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
index cf2ffc0924c..3cf83709b0e 100644
--- a/kie-archetypes/kie-drools-yaml-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
+++ b/kie-archetypes/kie-drools-yaml-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
@@ -35,7 +35,7 @@
     ${project.version}
     1.7.2
     4.11
-    1.2.9
+    1.2.13
   
 
   

From c4e502ecd4faf033222349649b98ff8a72e16930 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Dec 2023 11:44:44 +0100
Subject: [PATCH 09/29] Bump ch.qos.logback:logback-classic (#5615)

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.2.9 to 1.2.13.
- [Commits](https://github.com/qos-ch/logback/compare/v_1.2.9...v_1.2.13)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../projects/integrationtestDefaults/reference/pom.xml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml b/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
index 31568de9810..44eb227f86c 100644
--- a/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
+++ b/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
@@ -35,7 +35,7 @@
     ${project.version}
     1.7.2
     4.11
-    1.2.9
+    1.2.13
   
 
   

From 023d26eaf8234255ed36d2219d826d54ace3d22c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Dec 2023 11:45:14 +0100
Subject: [PATCH 10/29] Bump ch.qos.logback:logback-classic (#5614)

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.2.9 to 1.2.13.
- [Commits](https://github.com/qos-ch/logback/compare/v_1.2.9...v_1.2.13)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../projects/integrationtestDefaults/reference/pom.xml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kie-archetypes/kie-drools-exec-model-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml b/kie-archetypes/kie-drools-exec-model-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
index 6300c20ec94..96cc018d032 100644
--- a/kie-archetypes/kie-drools-exec-model-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
+++ b/kie-archetypes/kie-drools-exec-model-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
@@ -35,7 +35,7 @@
     ${project.version}
     1.7.2
     4.11
-    1.2.9
+    1.2.13
   
 
   

From a4f311208c61d8035b7c75f33567442c9f843617 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Dec 2023 11:45:44 +0100
Subject: [PATCH 11/29] Bump ch.qos.logback:logback-classic (#5613)

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.2.9 to 1.2.13.
- [Commits](https://github.com/qos-ch/logback/compare/v_1.2.9...v_1.2.13)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../projects/integrationtestDefaults/reference/pom.xml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kie-archetypes/kie-drools-dmn-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml b/kie-archetypes/kie-drools-dmn-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
index e5746ae9b40..3cc59574101 100644
--- a/kie-archetypes/kie-drools-dmn-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
+++ b/kie-archetypes/kie-drools-dmn-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
@@ -35,7 +35,7 @@
     ${project.version}
     1.7.2
     4.11
-    1.2.9
+    1.2.13
   
 
   

From 93ce7412b4b26dedf33bbf4eeacb829a38989ffc Mon Sep 17 00:00:00 2001
From: Mario Fusco 
Date: Wed, 20 Dec 2023 09:22:42 +0100
Subject: [PATCH 12/29] bump logback to 1.2.13 in maven archetypes (#5635)

---
 .../drools-drlonyaml-cli-tests/pom.xml                    | 8 ++++----
 .../projects/integrationtestDefaults/archetype.properties | 2 +-
 .../projects/integrationtestDefaults/archetype.properties | 2 +-
 .../projects/integrationtestDefaults/archetype.properties | 2 +-
 .../projects/integrationtestDefaults/archetype.properties | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml
index 12ef4e2131d..0ff6b0f9605 100644
--- a/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml
+++ b/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml
@@ -82,7 +82,7 @@
                         ${project.basedir}/src/test/resources/given/test1.drl.txt
                         --output=${project.build.outputDirectory}/converted.test1.yml
                     
-                    logback-classic-1.2.9.jar,slf4j-jboss-logmanager-1.2.0.Final.jar
+                    logback-classic-1.2.13.jar,slf4j-jboss-logmanager-1.2.0.Final.jar
                 
             
             
@@ -100,7 +100,7 @@
                         ${project.basedir}/src/test/resources/given/test2.yml
                         --output=${project.build.outputDirectory}/converted.test2.drl
                     
-                    logback-classic-1.2.9.jar,slf4j-jboss-logmanager-1.2.0.Final.jar
+                    logback-classic-1.2.13.jar,slf4j-jboss-logmanager-1.2.0.Final.jar
                 
             
             
@@ -117,7 +117,7 @@
                         batch2yaml
                         ${project.basedir}/src/test/resources/batch_drl_files
                     
-                    logback-classic-1.2.9.jar,slf4j-jboss-logmanager-1.2.0.Final.jar
+                    logback-classic-1.2.13.jar,slf4j-jboss-logmanager-1.2.0.Final.jar
                 
             
             
@@ -134,7 +134,7 @@
                         batch2drl
                         ${project.basedir}/src/test/resources/batch_yml_files
                     
-                    logback-classic-1.2.9.jar,slf4j-jboss-logmanager-1.2.0.Final.jar
+                    logback-classic-1.2.13.jar,slf4j-jboss-logmanager-1.2.0.Final.jar
                 
             
         
diff --git a/kie-archetypes/kie-drools-dmn-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties b/kie-archetypes/kie-drools-dmn-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
index c7ece5a6066..50794831098 100644
--- a/kie-archetypes/kie-drools-dmn-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
+++ b/kie-archetypes/kie-drools-dmn-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
@@ -24,4 +24,4 @@ artifactId=basic
 droolsVersion=${project.version}
 slf4jVersion=1.7.2
 junitVersion=4.11
-logbackVersion=1.2.9
+logbackVersion=1.2.13
diff --git a/kie-archetypes/kie-drools-exec-model-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties b/kie-archetypes/kie-drools-exec-model-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
index c7ece5a6066..50794831098 100644
--- a/kie-archetypes/kie-drools-exec-model-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
+++ b/kie-archetypes/kie-drools-exec-model-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
@@ -24,4 +24,4 @@ artifactId=basic
 droolsVersion=${project.version}
 slf4jVersion=1.7.2
 junitVersion=4.11
-logbackVersion=1.2.9
+logbackVersion=1.2.13
diff --git a/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties b/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
index 5837029ce10..d0b7cce9aad 100644
--- a/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
+++ b/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
@@ -25,5 +25,5 @@ artifactId=basic
 droolsVersion=${project.version}
 slf4jVersion=1.7.2
 junitVersion=4.11
-logbackVersion=1.2.9
+logbackVersion=1.2.13
 
diff --git a/kie-archetypes/kie-drools-yaml-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties b/kie-archetypes/kie-drools-yaml-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
index c7ece5a6066..50794831098 100644
--- a/kie-archetypes/kie-drools-yaml-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
+++ b/kie-archetypes/kie-drools-yaml-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
@@ -24,4 +24,4 @@ artifactId=basic
 droolsVersion=${project.version}
 slf4jVersion=1.7.2
 junitVersion=4.11
-logbackVersion=1.2.9
+logbackVersion=1.2.13

From 31a6c87e41d8c16cf1540886bfd2aa91e41fdc35 Mon Sep 17 00:00:00 2001
From: Mario Fusco 
Date: Wed, 20 Dec 2023 10:24:44 +0100
Subject: [PATCH 13/29] [KIE-781] Improve performance of InfixOpNode (#5634)

---
 .../kie/dmn/feel/lang/ast/NameRefNode.java    |   8 +-
 .../lang/ast/infixexecutors/AddExecutor.java  | 127 +++++++-----------
 .../infixexecutors/ClassIdentifierTuple.java  |  56 --------
 .../lang/ast/infixexecutors/DivExecutor.java  |  92 ++++++-------
 .../infixexecutors/EvaluatedParameters.java   |  38 ------
 .../lang/ast/infixexecutors/MultExecutor.java |  78 ++++++-----
 .../lang/ast/infixexecutors/SubExecutor.java  |  97 +++++++------
 .../org/kie/dmn/feel/util/EvalHelper.java     |  56 ++++----
 .../ClassidentifierTupleTest.java             |  35 -----
 9 files changed, 216 insertions(+), 371 deletions(-)
 delete mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/ClassIdentifierTuple.java
 delete mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/EvaluatedParameters.java
 delete mode 100644 kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/infixexecutors/ClassidentifierTupleTest.java

diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/NameRefNode.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/NameRefNode.java
index 4d79ee526eb..cb4a5b20245 100644
--- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/NameRefNode.java
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/NameRefNode.java
@@ -22,7 +22,6 @@
 import org.kie.dmn.api.feel.runtime.events.FEELEvent;
 import org.kie.dmn.feel.lang.EvaluationContext;
 import org.kie.dmn.feel.lang.Type;
-import org.kie.dmn.feel.util.EvalHelper;
 import org.kie.dmn.feel.util.Msg;
 
 public class NameRefNode
@@ -43,12 +42,11 @@ public NameRefNode(ParserRuleContext ctx, String text, Type type) {
 
     @Override
     public Object evaluate(EvaluationContext ctx) {
-        String varName = EvalHelper.normalizeVariableName( getText() );
-        if( ! ctx.isDefined( varName ) ) {
+        Object result = ctx.getValue( getText() );
+        if ( result == null && !ctx.isDefined( getText() ) ) {
             ctx.notifyEvt( astEvent( FEELEvent.Severity.ERROR, Msg.createMessage( Msg.UNKNOWN_VARIABLE_REFERENCE, getText()), null) );
-            return null;
         }
-        return ctx.getValue( varName );
+        return result;
     }
 
     @Override
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/AddExecutor.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/AddExecutor.java
index 3af4d454fa4..3b3e6d348f8 100644
--- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/AddExecutor.java
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/AddExecutor.java
@@ -18,32 +18,26 @@
  */
 package org.kie.dmn.feel.lang.ast.infixexecutors;
 
+import java.math.BigDecimal;
+import java.math.MathContext;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.chrono.ChronoPeriod;
+import java.time.temporal.Temporal;
+import java.time.temporal.TemporalAmount;
+
 import org.kie.dmn.api.feel.runtime.events.FEELEvent;
 import org.kie.dmn.feel.lang.EvaluationContext;
 import org.kie.dmn.feel.lang.ast.InfixOpNode;
-import org.kie.dmn.feel.lang.types.impl.ComparablePeriod;
 import org.kie.dmn.feel.runtime.events.InvalidParametersEvent;
 import org.kie.dmn.feel.util.Msg;
 
-import java.math.MathContext;
-import java.time.*;
-import java.time.chrono.ChronoPeriod;
-import java.time.temporal.Temporal;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.BiFunction;
-
 import static org.kie.dmn.feel.lang.ast.infixexecutors.InfixExecutorUtils.addLocalDateAndDuration;
-import static org.kie.dmn.feel.lang.ast.infixexecutors.InfixExecutorUtils.math;
+import static org.kie.dmn.feel.util.EvalHelper.getBigDecimalOrNull;
 
 public class AddExecutor implements InfixExecutor {
 
     private static final AddExecutor INSTANCE = new AddExecutor();
-    private final Map> addFunctionsByClassesTuple;
-
-    private AddExecutor() {
-        addFunctionsByClassesTuple = getAddFunctionsByClassesTuple();
-    }
 
     public static AddExecutor instance() {
         return INSTANCE;
@@ -51,7 +45,7 @@ public static AddExecutor instance() {
 
     @Override
     public Object evaluate(Object left, Object right, EvaluationContext ctx) {
-        return evaluate(new EvaluatedParameters(left, right), ctx);
+        return add(left, right, ctx);
     }
 
     @Override
@@ -59,69 +53,50 @@ public Object evaluate(InfixOpNode infixNode, EvaluationContext ctx) {
         return evaluate(infixNode.getLeft().evaluate(ctx), infixNode.getRight().evaluate(ctx), ctx);
     }
 
-    private Object evaluate(EvaluatedParameters params, EvaluationContext ctx) {
-        if (params.getLeft() == null || params.getRight() == null) {
+    private Object add(Object left, Object right, EvaluationContext ctx) {
+        if (left == null || right == null) {
             return null;
         }
-        ClassIdentifierTuple identifierTuple = new ClassIdentifierTuple(params.getLeft(), params.getRight());
-        if (addFunctionsByClassesTuple.containsKey(identifierTuple)) {
-            return addFunctionsByClassesTuple.get(identifierTuple).apply(params, ctx);
-        } else {
-            return math(params.getLeft(), params.getRight(), ctx, (l, r) -> l.add(r, MathContext.DECIMAL128));
+
+        if (left instanceof Number) {
+            BigDecimal leftNumber = getBigDecimalOrNull(left);
+            return leftNumber != null && right instanceof Number ?
+                    leftNumber.add(getBigDecimalOrNull(right), MathContext.DECIMAL128) :
+                    null;
+        }
+
+        if (left instanceof String) {
+            return right instanceof String ? left + (String) right : null;
         }
-    }
 
-    private Map> getAddFunctionsByClassesTuple() {
-        Map> toReturn = new HashMap<>();
-        toReturn.put(new ClassIdentifierTuple(String.class, String.class), (parameters, ctx) -> parameters.getLeft() + (String) parameters.getRight());
-        toReturn.put(new ClassIdentifierTuple(ChronoPeriod.class, ChronoPeriod.class), (parameters, ctx) ->
-                new ComparablePeriod(((ChronoPeriod) parameters.getLeft()).plus((ChronoPeriod) parameters.getRight())));
-        toReturn.put(new ClassIdentifierTuple(Duration.class, Duration.class), (parameters, ctx) ->
-                ((Duration) parameters.getLeft()).plus((Duration) parameters.getRight()));
-        toReturn.put(new ClassIdentifierTuple(ZonedDateTime.class, ChronoPeriod.class), (parameters, ctx) ->
-                ((ZonedDateTime) parameters.getLeft()).plus((ChronoPeriod) parameters.getRight()));
-        toReturn.put(new ClassIdentifierTuple(OffsetDateTime.class, ChronoPeriod.class), (parameters, ctx) ->
-                ((OffsetDateTime) parameters.getLeft()).plus((ChronoPeriod) parameters.getRight()));
-        toReturn.put(new ClassIdentifierTuple(LocalDateTime.class, ChronoPeriod.class), (parameters, ctx) ->
-                ((LocalDateTime) parameters.getLeft()).plus((ChronoPeriod) parameters.getRight()));
-        toReturn.put(new ClassIdentifierTuple(LocalDate.class, ChronoPeriod.class), (parameters, ctx) ->
-                ((LocalDate) parameters.getLeft()).plus((ChronoPeriod) parameters.getRight()));
-        toReturn.put(new ClassIdentifierTuple(ZonedDateTime.class, Duration.class), (parameters, ctx) ->
-                ((ZonedDateTime) parameters.getLeft()).plus((Duration) parameters.getRight()));
-        toReturn.put(new ClassIdentifierTuple(OffsetDateTime.class, Duration.class), (parameters, ctx) ->
-                ((OffsetDateTime) parameters.getLeft()).plus((Duration) parameters.getRight()));
-        toReturn.put(new ClassIdentifierTuple(LocalDateTime.class, Duration.class), (parameters, ctx) ->
-                ((LocalDateTime) parameters.getLeft()).plus((Duration) parameters.getRight()));
-        toReturn.put(new ClassIdentifierTuple(LocalDate.class, Duration.class), (parameters, ctx) ->
-                addLocalDateAndDuration((LocalDate) parameters.getLeft(), (Duration) parameters.getRight()));
-        toReturn.put(new ClassIdentifierTuple(ChronoPeriod.class, ZonedDateTime.class), (parameters, ctx) ->
-                ((ZonedDateTime) parameters.getRight()).plus((ChronoPeriod) parameters.getLeft()));
-        toReturn.put(new ClassIdentifierTuple(ChronoPeriod.class, OffsetDateTime.class), (parameters, ctx) ->
-                ((OffsetDateTime) parameters.getRight()).plus((ChronoPeriod) parameters.getLeft()));
-        toReturn.put(new ClassIdentifierTuple(ChronoPeriod.class, LocalDateTime.class), (parameters, ctx) ->
-                ((LocalDateTime) parameters.getRight()).plus((ChronoPeriod) parameters.getLeft()));
-        toReturn.put(new ClassIdentifierTuple(ChronoPeriod.class, LocalDate.class), (parameters, ctx) ->
-                ((LocalDate) parameters.getRight()).plus((ChronoPeriod) parameters.getLeft()));
-        toReturn.put(new ClassIdentifierTuple(Duration.class, ZonedDateTime.class), (parameters, ctx) ->
-                ((ZonedDateTime) parameters.getRight()).plus((Duration) parameters.getLeft()));
-        toReturn.put(new ClassIdentifierTuple(Duration.class, OffsetDateTime.class), (parameters, ctx) ->
-                ((OffsetDateTime) parameters.getRight()).plus((Duration) parameters.getLeft()));
-        toReturn.put(new ClassIdentifierTuple(Duration.class, LocalDateTime.class), (parameters, ctx) ->
-                ((LocalDateTime) parameters.getRight()).plus((Duration) parameters.getLeft()));
-        toReturn.put(new ClassIdentifierTuple(Duration.class, LocalDate.class), (parameters, ctx) ->
-                addLocalDateAndDuration((LocalDate) parameters.getRight(), (Duration) parameters.getLeft()));
-        toReturn.put(new ClassIdentifierTuple(LocalTime.class, Duration.class), (parameters, ctx) ->
-                ((LocalTime) parameters.getLeft()).plus((Duration) parameters.getRight()));
-        toReturn.put(new ClassIdentifierTuple(Duration.class, LocalTime.class), (parameters, ctx) ->
-                ((LocalTime) parameters.getRight()).plus((Duration) parameters.getLeft()));
-        toReturn.put(new ClassIdentifierTuple(OffsetTime.class, Duration.class), (parameters, ctx) ->
-                ((OffsetTime) parameters.getLeft()).plus((Duration) parameters.getRight()));
-        toReturn.put(new ClassIdentifierTuple(Duration.class, OffsetTime.class), (parameters, ctx) ->
-                ((OffsetTime) parameters.getRight()).plus((Duration) parameters.getLeft()));
-        toReturn.put(new ClassIdentifierTuple(Temporal.class, Temporal.class), (parameters, ctx) -> {
-            ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.OPERATION_IS_UNDEFINED_FOR_PARAMETERS.getMask()));
-            return null;
-        });
-        return toReturn;
+        if (left instanceof Duration) {
+            if (right instanceof LocalDate) {
+                return addLocalDateAndDuration((LocalDate) right, (Duration) left);
+            }
+            if (right instanceof Duration) {
+                return ((Duration) left).plus((Duration) right);
+            }
+        }
+        if (right instanceof Duration && left instanceof LocalDate) {
+            return addLocalDateAndDuration((LocalDate) left, (Duration) right);
+        }
+
+        if (left instanceof Temporal) {
+            if (right instanceof TemporalAmount) {
+                return ((Temporal) left).plus((TemporalAmount) right);
+            }
+        } else if (left instanceof TemporalAmount) {
+            if (right instanceof Temporal) {
+                return ((Temporal) right).plus((TemporalAmount) left);
+            }
+            if (right instanceof ChronoPeriod) {
+                return ((ChronoPeriod) right).plus((TemporalAmount) left);
+            }
+        }
+
+        ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.OPERATION_IS_UNDEFINED_FOR_PARAMETERS.getMask()));
+        return null;
     }
+
+
 }
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/ClassIdentifierTuple.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/ClassIdentifierTuple.java
deleted file mode 100644
index bbecdbccfb6..00000000000
--- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/ClassIdentifierTuple.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.kie.dmn.feel.lang.ast.infixexecutors;
-
-import java.util.Objects;
-
-public class ClassIdentifierTuple {
-
-    private final Class LEFT_TYPE;
-    private final Class RIGHT_TYPE;
-
-
-    public ClassIdentifierTuple(Object leftObject, Object rightObject) {
-        this.LEFT_TYPE = leftObject != null ? leftObject.getClass() : null;
-        this.RIGHT_TYPE = rightObject != null ? rightObject.getClass() : null;
-    }
-
-    public ClassIdentifierTuple(Class leftType, Class rightType) {
-        this.LEFT_TYPE = leftType;
-        this.RIGHT_TYPE = rightType;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        ClassIdentifierTuple that = (ClassIdentifierTuple) o;
-        return isEquals(LEFT_TYPE, that.LEFT_TYPE) && isEquals(RIGHT_TYPE, that.RIGHT_TYPE);
-    }
-
-    @Override
-    public int hashCode() {
-        return 1;
-    }
-
-    static boolean isEquals(Class thisClass, Class thatClass) {
-        return (thisClass != null && thatClass != null) &&
-                (Objects.equals(thisClass, thatClass) || thatClass.isAssignableFrom(thisClass));
-    }
-}
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/DivExecutor.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/DivExecutor.java
index 9a2bb13479b..5b8e577da77 100644
--- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/DivExecutor.java
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/DivExecutor.java
@@ -18,33 +18,28 @@
  */
 package org.kie.dmn.feel.lang.ast.infixexecutors;
 
-import org.kie.dmn.api.feel.runtime.events.FEELEvent;
-import org.kie.dmn.feel.lang.EvaluationContext;
-import org.kie.dmn.feel.lang.ast.InfixOpNode;
-import org.kie.dmn.feel.lang.types.impl.ComparablePeriod;
-import org.kie.dmn.feel.runtime.events.InvalidParametersEvent;
-import org.kie.dmn.feel.util.EvalHelper;
-import org.kie.dmn.feel.util.Msg;
-
 import java.math.BigDecimal;
 import java.math.MathContext;
 import java.math.RoundingMode;
 import java.time.Duration;
 import java.time.chrono.ChronoPeriod;
 import java.time.temporal.TemporalAmount;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.BiFunction;
+
+import org.kie.dmn.api.feel.runtime.events.FEELEvent;
+import org.kie.dmn.feel.lang.EvaluationContext;
+import org.kie.dmn.feel.lang.ast.InfixOpNode;
+import org.kie.dmn.feel.lang.types.impl.ComparablePeriod;
+import org.kie.dmn.feel.runtime.events.InvalidParametersEvent;
+import org.kie.dmn.feel.util.Msg;
 
 import static org.kie.dmn.feel.lang.ast.infixexecutors.InfixExecutorUtils.math;
+import static org.kie.dmn.feel.util.EvalHelper.getBigDecimalOrNull;
 
 public class DivExecutor implements InfixExecutor {
 
     private static final DivExecutor INSTANCE = new DivExecutor();
-    private final Map> sumFunctionsByClassesTuple;
 
     private DivExecutor() {
-        sumFunctionsByClassesTuple = getSumFunctionsByClassesTuple();
     }
 
     public static DivExecutor instance() {
@@ -53,7 +48,7 @@ public static DivExecutor instance() {
 
     @Override
     public Object evaluate(Object left, Object right, EvaluationContext ctx) {
-        return evaluate(new EvaluatedParameters(left, right), ctx);
+        return div(left, right, ctx);
     }
 
     @Override
@@ -61,42 +56,47 @@ public Object evaluate(InfixOpNode infixNode, EvaluationContext ctx) {
         return evaluate(infixNode.getLeft().evaluate(ctx), infixNode.getRight().evaluate(ctx), ctx);
     }
 
-    private Object evaluate(EvaluatedParameters params, EvaluationContext ctx) {
-        if (params.getLeft() == null || params.getRight() == null) {
+    private Object div(Object left, Object right, EvaluationContext ctx) {
+        if (left == null || right == null) {
             return null;
         }
-        ClassIdentifierTuple identifierTuple = new ClassIdentifierTuple(params.getLeft(), params.getRight());
-        if (sumFunctionsByClassesTuple.containsKey(identifierTuple)) {
-            return sumFunctionsByClassesTuple.get(identifierTuple).apply(params, ctx);
-        } else {
-            return math(params.getLeft(), params.getRight(), ctx, (l, r) -> l.divide(r, MathContext.DECIMAL128));
-        }
-    }
 
-    private Map> getSumFunctionsByClassesTuple() {
-        Map> toReturn = new HashMap<>();
-        toReturn.put(new ClassIdentifierTuple(Duration.class, Number.class), (parameters, ctx) -> {
-            final BigDecimal durationNumericValue = BigDecimal.valueOf(((Duration) parameters.getLeft()).toNanos());
-            final BigDecimal rightDecimal = BigDecimal.valueOf(((Number) parameters.getRight()).doubleValue());
-            return Duration.ofNanos(durationNumericValue.divide(rightDecimal, 0, RoundingMode.HALF_EVEN).longValue());
-        });
-        toReturn.put(new ClassIdentifierTuple(Number.class, TemporalAmount.class), (parameters, ctx) -> {
-            ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.OPERATION_IS_UNDEFINED_FOR_PARAMETERS.getMask()));
+        if (left instanceof Number) {
+            if (right instanceof Number) {
+                return math(left, right, ctx, (l, r) -> l.divide(r, MathContext.DECIMAL128));
+            }
+            if (right instanceof TemporalAmount) {
+                ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.OPERATION_IS_UNDEFINED_FOR_PARAMETERS.getMask()));
+            }
             return null;
-        });
-        toReturn.put(new ClassIdentifierTuple(Duration.class, Duration.class), (parameters, ctx) ->
-                EvalHelper.getBigDecimalOrNull(((Duration) parameters.getLeft()).getSeconds()).divide(EvalHelper.getBigDecimalOrNull(((Duration) parameters.getRight()).getSeconds()), MathContext.DECIMAL128));
-        toReturn.put(new ClassIdentifierTuple(ChronoPeriod.class, Number.class), (parameters, ctx) -> {
-            final BigDecimal rightDecimal = EvalHelper.getBigDecimalOrNull(parameters.getRight());
-            if (rightDecimal.compareTo(BigDecimal.ZERO) == 0) {
-                ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.DIVISION_BY_ZERO.getMask()));
-                return null;
-            } else {
-                return ComparablePeriod.ofMonths(EvalHelper.getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) parameters.getLeft())).divide(rightDecimal, MathContext.DECIMAL128).intValue());
+        }
+
+        if (left instanceof Duration) {
+            if (right instanceof Number) {
+                final BigDecimal durationNumericValue = BigDecimal.valueOf(((Duration) left).toNanos());
+                final BigDecimal rightDecimal = BigDecimal.valueOf(((Number) right).doubleValue());
+                return Duration.ofNanos(durationNumericValue.divide(rightDecimal, 0, RoundingMode.HALF_EVEN).longValue());
+            }
+            if (right instanceof Duration) {
+                return getBigDecimalOrNull(((Duration) left).getSeconds()).divide(getBigDecimalOrNull(((Duration) right).getSeconds()), MathContext.DECIMAL128);
             }
-        });
-        toReturn.put(new ClassIdentifierTuple(ChronoPeriod.class, ChronoPeriod.class), (parameters, ctx) ->
-                EvalHelper.getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) parameters.getLeft())).divide(EvalHelper.getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) parameters.getRight())), MathContext.DECIMAL128));
-        return toReturn;
+        }
+
+        if (left instanceof ChronoPeriod) {
+            if (right instanceof Number) {
+                final BigDecimal rightDecimal = getBigDecimalOrNull(right);
+                if (rightDecimal.compareTo(BigDecimal.ZERO) == 0) {
+                    ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.DIVISION_BY_ZERO.getMask()));
+                    return null;
+                } else {
+                    return ComparablePeriod.ofMonths(getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) left)).divide(rightDecimal, MathContext.DECIMAL128).intValue());
+                }
+            }
+            if (right instanceof ChronoPeriod) {
+                return getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) left)).divide(getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) right)), MathContext.DECIMAL128);
+            }
+        }
+
+        return null;
     }
 }
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/EvaluatedParameters.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/EvaluatedParameters.java
deleted file mode 100644
index a4f14dfd4bd..00000000000
--- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/EvaluatedParameters.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.kie.dmn.feel.lang.ast.infixexecutors;
-
-public class EvaluatedParameters {
-
-        private final Object left;
-        private final Object right;
-
-        public EvaluatedParameters(Object leftObject, Object rightObject) {
-            this.left = leftObject;
-            this.right = rightObject;
-        }
-
-        public Object getLeft() {
-            return left;
-        }
-
-        public Object getRight() {
-            return right;
-        }
-    }
\ No newline at end of file
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/MultExecutor.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/MultExecutor.java
index 3b435ce50b1..2fcab1286cf 100644
--- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/MultExecutor.java
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/MultExecutor.java
@@ -18,29 +18,23 @@
  */
 package org.kie.dmn.feel.lang.ast.infixexecutors;
 
-import org.kie.dmn.feel.lang.EvaluationContext;
-import org.kie.dmn.feel.lang.ast.InfixOpNode;
-import org.kie.dmn.feel.lang.types.impl.ComparablePeriod;
-import org.kie.dmn.feel.util.EvalHelper;
-
 import java.math.BigDecimal;
 import java.math.MathContext;
-import java.time.*;
+import java.time.Duration;
 import java.time.chrono.ChronoPeriod;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.BiFunction;
+
+import org.kie.dmn.feel.lang.EvaluationContext;
+import org.kie.dmn.feel.lang.ast.InfixOpNode;
+import org.kie.dmn.feel.lang.types.impl.ComparablePeriod;
 
 import static org.kie.dmn.feel.lang.ast.infixexecutors.InfixExecutorUtils.isAllowedMultiplicationBasedOnSpec;
-import static org.kie.dmn.feel.lang.ast.infixexecutors.InfixExecutorUtils.math;
+import static org.kie.dmn.feel.util.EvalHelper.getBigDecimalOrNull;
 
 public class MultExecutor implements InfixExecutor {
 
     private static final MultExecutor INSTANCE = new MultExecutor();
-    private final Map> multFunctionsByClassesTuple;
 
     private MultExecutor() {
-        multFunctionsByClassesTuple = getMultFunctionsByClassesTuple();
     }
 
     public static MultExecutor instance() {
@@ -49,7 +43,7 @@ public static MultExecutor instance() {
 
     @Override
     public Object evaluate(Object left, Object right, EvaluationContext ctx) {
-        return evaluate(new EvaluatedParameters(left, right), ctx);
+        return mult(left, right, ctx);
     }
 
     @Override
@@ -57,35 +51,45 @@ public Object evaluate(InfixOpNode infixNode, EvaluationContext ctx) {
         return evaluate(infixNode.getLeft().evaluate(ctx), infixNode.getRight().evaluate(ctx), ctx);
     }
 
-    private Object evaluate(EvaluatedParameters params, EvaluationContext ctx) {
-        if ( params.getLeft() == null || params.getRight() == null ) {
+    private Object mult(Object left, Object right, EvaluationContext ctx) {
+        if (left == null || right == null) {
             return null;
-        } else if (!isAllowedMultiplicationBasedOnSpec(params.getLeft(), params.getRight(), ctx)) {
+        }
+        if (!isAllowedMultiplicationBasedOnSpec(left, right, ctx)) {
             return null;
         }
-        ClassIdentifierTuple identifierTuple = new ClassIdentifierTuple(params.getLeft(), params.getRight());
-        if (multFunctionsByClassesTuple.containsKey(identifierTuple)) {
-            return multFunctionsByClassesTuple.get(identifierTuple).apply(params, ctx);
-        } else {
-            return math( params.getLeft(), params.getRight(), ctx, (l, r) -> l.multiply( r, MathContext.DECIMAL128 ) );
+
+        if (left instanceof Number) {
+            if (right instanceof Number) {
+                BigDecimal leftNumber = getBigDecimalOrNull(left);
+                return leftNumber != null && right instanceof Number ?
+                        leftNumber.multiply(getBigDecimalOrNull(right), MathContext.DECIMAL128) :
+                        null;
+            }
+            if (right instanceof Duration) {
+                return Duration.ofSeconds(getBigDecimalOrNull(left).multiply(getBigDecimalOrNull(((Duration) right).getSeconds()), MathContext.DECIMAL128).longValue());
+            }
+            if (right instanceof ChronoPeriod) {
+                return ComparablePeriod.ofMonths(getBigDecimalOrNull(left).multiply(getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) right)), MathContext.DECIMAL128).intValue());
+            }
+            return null;
         }
-    }
 
-    private Map> getMultFunctionsByClassesTuple() {
-        Map> toReturn = new HashMap<>();
-        toReturn.put(new ClassIdentifierTuple(Duration.class, Number.class), (parameters, ctx) -> {
-            final BigDecimal durationNumericValue = BigDecimal.valueOf(((Duration) parameters.getLeft()).toNanos());
-            final BigDecimal rightDecimal = BigDecimal.valueOf(((Number) parameters.getRight()).doubleValue());
+        if (left instanceof Duration && right instanceof Number) {
+            final BigDecimal durationNumericValue = BigDecimal.valueOf(((Duration) left).toNanos());
+            final BigDecimal rightDecimal = BigDecimal.valueOf(((Number) right).doubleValue());
             return Duration.ofNanos(durationNumericValue.multiply(rightDecimal).longValue());
-        });
-        toReturn.put(new ClassIdentifierTuple(Number.class, Duration.class), (parameters, ctx) ->
-                Duration.ofSeconds(EvalHelper.getBigDecimalOrNull(parameters.getLeft()).multiply(EvalHelper.getBigDecimalOrNull(((Duration) parameters.getRight()).getSeconds()), MathContext.DECIMAL128).longValue()));
-        toReturn.put(new ClassIdentifierTuple(ChronoPeriod.class, Number.class), (parameters, ctx) ->
-                ComparablePeriod.ofMonths(EvalHelper.getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) parameters.getLeft())).multiply(EvalHelper.getBigDecimalOrNull(parameters.getRight()), MathContext.DECIMAL128).intValue()));
-        toReturn.put(new ClassIdentifierTuple(Number.class, ChronoPeriod.class), (parameters, ctx) ->
-                ComparablePeriod.ofMonths(EvalHelper.getBigDecimalOrNull(parameters.getLeft()).multiply(EvalHelper.getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) parameters.getRight())), MathContext.DECIMAL128).intValue()));
-        toReturn.put(new ClassIdentifierTuple(ChronoPeriod.class, ChronoPeriod.class), (parameters, ctx) ->
-                EvalHelper.getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) parameters.getLeft())).multiply(EvalHelper.getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) parameters.getRight())), MathContext.DECIMAL128));
-        return toReturn;
+        }
+
+        if (left instanceof ChronoPeriod) {
+            if (right instanceof Number) {
+                return ComparablePeriod.ofMonths(getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) left)).multiply(getBigDecimalOrNull(right), MathContext.DECIMAL128).intValue());
+            }
+            if (right instanceof ChronoPeriod) {
+                return getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) left)).multiply(getBigDecimalOrNull(ComparablePeriod.toTotalMonths((ChronoPeriod) right)), MathContext.DECIMAL128);
+            }
+        }
+
+        return null;
     }
 }
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/SubExecutor.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/SubExecutor.java
index 2516a3c0dbd..46d7c0b6255 100644
--- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/SubExecutor.java
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/SubExecutor.java
@@ -18,28 +18,28 @@
  */
 package org.kie.dmn.feel.lang.ast.infixexecutors;
 
-import org.kie.dmn.feel.lang.EvaluationContext;
-import org.kie.dmn.feel.lang.ast.InfixOpNode;
-import org.kie.dmn.feel.lang.types.impl.ComparablePeriod;
-
+import java.math.BigDecimal;
 import java.math.MathContext;
-import java.time.*;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.chrono.ChronoPeriod;
 import java.time.temporal.Temporal;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.BiFunction;
+import java.time.temporal.TemporalAmount;
+
+import org.kie.dmn.feel.lang.EvaluationContext;
+import org.kie.dmn.feel.lang.ast.InfixOpNode;
+import org.kie.dmn.feel.lang.types.impl.ComparablePeriod;
 
-import static org.kie.dmn.feel.lang.ast.infixexecutors.InfixExecutorUtils.math;
 import static org.kie.dmn.feel.lang.ast.infixexecutors.InfixExecutorUtils.subtractTemporals;
+import static org.kie.dmn.feel.util.EvalHelper.getBigDecimalOrNull;
 
 public class SubExecutor implements InfixExecutor {
 
     private static final SubExecutor INSTANCE = new SubExecutor();
-    private final Map> subFunctionsByClassesTuple;
 
     private SubExecutor() {
-        subFunctionsByClassesTuple = getSubFunctionsByClassesTuple();
     }
 
     public static SubExecutor instance() {
@@ -48,7 +48,7 @@ public static SubExecutor instance() {
 
     @Override
     public Object evaluate(Object left, Object right, EvaluationContext ctx) {
-        return evaluate(new EvaluatedParameters(left, right), ctx);
+        return sub(left, right, ctx);
     }
 
     @Override
@@ -56,49 +56,42 @@ public Object evaluate(InfixOpNode infixNode, EvaluationContext ctx) {
         return evaluate(infixNode.getLeft().evaluate(ctx), infixNode.getRight().evaluate(ctx), ctx);
     }
 
-    private Object evaluate(EvaluatedParameters params, EvaluationContext ctx) {
-        if (params.getLeft() == null || params.getRight() == null) {
+    private Object sub(Object left, Object right, EvaluationContext ctx) {
+        if (left == null || right == null) {
             return null;
         }
-        ClassIdentifierTuple identifierTuple = new ClassIdentifierTuple(params.getLeft(), params.getRight());
-        if (subFunctionsByClassesTuple.containsKey(identifierTuple)) {
-            return subFunctionsByClassesTuple.get(identifierTuple).apply(params, ctx);
-        } else {
-            return math(params.getLeft(), params.getRight(), ctx, (l, r) -> l.subtract(r, MathContext.DECIMAL128));
+
+        if (left instanceof Number) {
+            BigDecimal leftNumber = getBigDecimalOrNull(left);
+            return leftNumber != null && right instanceof Number ?
+                    leftNumber.subtract(getBigDecimalOrNull(right), MathContext.DECIMAL128) :
+                    null;
+        }
+
+        if (right instanceof Duration) {
+            if (left instanceof LocalDate) {
+                LocalDateTime leftLDT = LocalDateTime.of((LocalDate) left, LocalTime.MIDNIGHT);
+                LocalDateTime evaluated = leftLDT.minus((Duration) right);
+                return LocalDate.of(evaluated.getYear(), evaluated.getMonth(), evaluated.getDayOfMonth());
+            }
+            if (left instanceof Duration) {
+                return ((Duration) left).minus((Duration) right);
+            }
+        }
+
+        if (left instanceof Temporal) {
+            if (right instanceof Temporal) {
+                return subtractTemporals((Temporal) left, (Temporal) right, ctx);
+            }
+            if (right instanceof TemporalAmount) {
+                return ((Temporal) left).minus((TemporalAmount) right);
+            }
+        }
+
+        if (left instanceof ChronoPeriod && right instanceof ChronoPeriod) {
+            return new ComparablePeriod(((ChronoPeriod) left).minus((ChronoPeriod) right));
         }
-    }
 
-    private Map> getSubFunctionsByClassesTuple() {
-        Map> toReturn = new HashMap<>();
-        toReturn.put(new ClassIdentifierTuple(Temporal.class, Temporal.class), (parameters, ctx) ->
-                subtractTemporals((Temporal) parameters.getLeft(), (Temporal) parameters.getRight(), ctx));
-        toReturn.put(new ClassIdentifierTuple(ChronoPeriod.class, ChronoPeriod.class), (parameters, ctx) ->
-                new ComparablePeriod(((ChronoPeriod) parameters.getLeft()).minus((ChronoPeriod) parameters.getRight())));
-        toReturn.put(new ClassIdentifierTuple(Duration.class, Duration.class), (parameters, ctx) ->
-                ((Duration) parameters.getLeft()).minus((Duration) parameters.getRight()));
-        toReturn.put(new ClassIdentifierTuple(ZonedDateTime.class, ChronoPeriod.class), (parameters, ctx) ->
-                ((ZonedDateTime) parameters.getLeft()).minus((ChronoPeriod) parameters.getRight()));
-        toReturn.put(new ClassIdentifierTuple(OffsetDateTime.class, ChronoPeriod.class), (parameters, ctx) ->
-                ((OffsetDateTime) parameters.getLeft()).minus((ChronoPeriod) parameters.getRight()));
-        toReturn.put(new ClassIdentifierTuple(LocalDateTime.class, ChronoPeriod.class), (parameters, ctx) ->
-                ((LocalDateTime) parameters.getLeft()).minus((ChronoPeriod) parameters.getRight()));
-        toReturn.put(new ClassIdentifierTuple(LocalDate.class, ChronoPeriod.class), (parameters, ctx) ->
-                ((LocalDate) parameters.getLeft()).minus((ChronoPeriod) parameters.getRight()));
-        toReturn.put(new ClassIdentifierTuple(ZonedDateTime.class, Duration.class), (parameters, ctx) ->
-                ((ZonedDateTime) parameters.getLeft()).minus((Duration) parameters.getRight()));
-        toReturn.put(new ClassIdentifierTuple(OffsetDateTime.class, Duration.class), (parameters, ctx) ->
-                ((OffsetDateTime) parameters.getLeft()).minus((Duration) parameters.getRight()));
-        toReturn.put(new ClassIdentifierTuple(LocalDateTime.class, Duration.class), (parameters, ctx) ->
-                ((LocalDateTime) parameters.getLeft()).minus((Duration) parameters.getRight()));
-        toReturn.put(new ClassIdentifierTuple(LocalDate.class, Duration.class), (parameters, ctx) -> {
-            LocalDateTime leftLDT = LocalDateTime.of((LocalDate) parameters.getLeft(), LocalTime.MIDNIGHT);
-            LocalDateTime evaluated = leftLDT.minus((Duration) parameters.getRight());
-            return LocalDate.of(evaluated.getYear(), evaluated.getMonth(), evaluated.getDayOfMonth());
-        });
-        toReturn.put(new ClassIdentifierTuple(LocalTime.class, Duration.class), (parameters, ctx) ->
-                ((LocalTime) parameters.getLeft()).minus((Duration) parameters.getRight()));
-        toReturn.put(new ClassIdentifierTuple(OffsetTime.class, Duration.class), (parameters, ctx) ->
-                ((OffsetTime) parameters.getLeft()).minus((Duration) parameters.getRight()));
-        return toReturn;
+        return null;
     }
 }
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/util/EvalHelper.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/util/EvalHelper.java
index 5b57a19b0b0..3e4a3e00da7 100644
--- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/util/EvalHelper.java
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/util/EvalHelper.java
@@ -41,8 +41,6 @@
 import java.util.Optional;
 import java.util.TimeZone;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.BiPredicate;
 import java.util.stream.Stream;
 
@@ -150,33 +148,39 @@ private static boolean isValidChar(char c) {
     }
 
     public static BigDecimal getBigDecimalOrNull(Object value) {
-        if (!(value instanceof Number
-              || value instanceof String)
-            || (value instanceof Double
-                && (value.toString().equals("NaN") || value.toString().equals("Infinity") || value.toString().equals("-Infinity")))) {
-            return null;
+        if ( value instanceof BigDecimal ) {
+            return (BigDecimal) value;
         }
-        if ( !BigDecimal.class.isAssignableFrom( value.getClass() ) ) {
-            if ( value instanceof Long || value instanceof Integer || value instanceof Short || value instanceof Byte ||
-                 value instanceof AtomicLong || value instanceof AtomicInteger ) {
-                value = new BigDecimal( ((Number) value).longValue(), MathContext.DECIMAL128 );
-            } else if ( value instanceof BigInteger ) {
-                value = new BigDecimal( (BigInteger) value, MathContext.DECIMAL128 );
-            } else if ( value instanceof String ) {
-                try {
-                    // we need to remove leading zeros to prevent octal conversion
-                    value = new BigDecimal( ((String) value).replaceFirst("^0+(?!$)", ""), MathContext.DECIMAL128 );
-                } catch (NumberFormatException e) {
-                    return null;
-                }
-            } else {
-                // doubleValue() sometimes produce rounding errors, so we need to use toString() instead
-                // We also need to remove trailing zeros, if there are some so for 10d we get BigDecimal.valueOf(10)
-                // instead of BigDecimal.valueOf(10.0).
-                value = new BigDecimal( removeTrailingZeros(value.toString()), MathContext.DECIMAL128 );
+
+        if ( value instanceof BigInteger ) {
+            return new BigDecimal((BigInteger) value, MathContext.DECIMAL128);
+        }
+
+        if ( value instanceof Double || value instanceof Float ) {
+            String stringVal = value.toString();
+            if (stringVal.equals("NaN") || stringVal.equals("Infinity") || stringVal.equals("-Infinity")) {
+                return null;
             }
+            // doubleValue() sometimes produce rounding errors, so we need to use toString() instead
+            // We also need to remove trailing zeros, if there are some so for 10d we get BigDecimal.valueOf(10)
+            // instead of BigDecimal.valueOf(10.0).
+            return new BigDecimal( removeTrailingZeros(value.toString()), MathContext.DECIMAL128 );
         }
-        return (BigDecimal) value;
+
+        if ( value instanceof Number ) {
+            return new BigDecimal( ((Number) value).longValue(), MathContext.DECIMAL128 );
+        }
+
+        if ( value instanceof String ) {
+            try {
+                // we need to remove leading zeros to prevent octal conversion
+                return new BigDecimal(((String) value).replaceFirst("^0+(?!$)", ""), MathContext.DECIMAL128);
+            } catch (NumberFormatException e) {
+                return null;
+            }
+        }
+
+        return null;
     }
 
     public static Object coerceNumber(Object value) {
diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/infixexecutors/ClassidentifierTupleTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/infixexecutors/ClassidentifierTupleTest.java
deleted file mode 100644
index 70ecd6b7d25..00000000000
--- a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/infixexecutors/ClassidentifierTupleTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.kie.dmn.feel.lang.ast.infixexecutors;
-
-import org.junit.Test;
-import org.kie.dmn.feel.lang.types.impl.ComparablePeriod;
-
-import java.time.chrono.ChronoPeriod;
-
-import static org.junit.Assert.assertTrue;
-
-
-public class ClassidentifierTupleTest {
-
-    @Test
-    public void testClassidentifierTuple_isEquals() {
-        assertTrue(ClassIdentifierTuple.isEquals(ComparablePeriod.class, ChronoPeriod.class));
-    }
-}
\ No newline at end of file

From 26ece0fed01488ca4f64fe13e73c732047a750b5 Mon Sep 17 00:00:00 2001
From: Toshiya Kobayashi 
Date: Wed, 20 Dec 2023 18:27:26 +0900
Subject: [PATCH 14/29] [KIE-766] exists and not don't work correctly with
 multiple constraints with BigDecimal (#5623)

---
 .../org/drools/base/util/index/IndexUtil.java |   2 +-
 .../drools/core/util/index/IndexUtilTest.java |  22 ++-
 .../operators/ExistsTest.java                 | 184 ++++++++++++++++++
 3 files changed, 205 insertions(+), 3 deletions(-)

diff --git a/drools-base/src/main/java/org/drools/base/util/index/IndexUtil.java b/drools-base/src/main/java/org/drools/base/util/index/IndexUtil.java
index a867f9f7693..ff92741f8ab 100644
--- a/drools-base/src/main/java/org/drools/base/util/index/IndexUtil.java
+++ b/drools-base/src/main/java/org/drools/base/util/index/IndexUtil.java
@@ -62,7 +62,7 @@ public static boolean compositeAllowed(BetaNodeFieldConstraint[] constraints, sh
     }
 
     public static boolean isIndexable(BetaNodeFieldConstraint constraint, short nodeType, KieBaseConfiguration config) {
-        return constraint instanceof IndexableConstraint && ((IndexableConstraint)constraint).isIndexable(nodeType, config);
+        return constraint instanceof IndexableConstraint && ((IndexableConstraint)constraint).isIndexable(nodeType, config) && !isBigDecimalEqualityConstraint((IndexableConstraint)constraint);
     }
 
     public static boolean canHaveRangeIndex(short nodeType, IndexableConstraint constraint, KieBaseConfiguration config) {
diff --git a/drools-core/src/test/java/org/drools/core/util/index/IndexUtilTest.java b/drools-core/src/test/java/org/drools/core/util/index/IndexUtilTest.java
index 61a6b336387..6ca3cf46b95 100644
--- a/drools-core/src/test/java/org/drools/core/util/index/IndexUtilTest.java
+++ b/drools-core/src/test/java/org/drools/core/util/index/IndexUtilTest.java
@@ -135,7 +135,7 @@ public void isIndexableForNodeWithIntAndBigDecimalAndString() {
     }
 
     @Test
-    public void isIndexableForNodeWithBigDecimal() {
+    public void isIndexableForJoinNodeWithBigDecimal() {
         RuleBaseConfiguration config = getRuleBaseConfiguration();
         FakeBetaNodeFieldConstraint bigDecimalEqualsConstraint = new FakeBetaNodeFieldConstraint(ConstraintTypeOperator.EQUAL, new FakeReadAccessor(ValueType.BIG_DECIMAL_TYPE));
         BetaNodeFieldConstraint[] constraints = new FakeBetaNodeFieldConstraint[]{bigDecimalEqualsConstraint};
@@ -143,6 +143,24 @@ public void isIndexableForNodeWithBigDecimal() {
         assertThat(indexed).as("BigDecimal is not indexed").containsExactly(false);
     }
 
+    @Test
+    public void isIndexableForExistsNodeWithBigDecimal() {
+        RuleBaseConfiguration config = getRuleBaseConfiguration();
+        FakeBetaNodeFieldConstraint bigDecimalEqualsConstraint = new FakeBetaNodeFieldConstraint(ConstraintTypeOperator.EQUAL, new FakeReadAccessor(ValueType.BIG_DECIMAL_TYPE));
+        BetaNodeFieldConstraint[] constraints = new FakeBetaNodeFieldConstraint[]{bigDecimalEqualsConstraint};
+        boolean[] indexed = IndexUtil.isIndexableForNode(IndexPrecedenceOption.EQUALITY_PRIORITY, NodeTypeEnums.ExistsNode, config.getCompositeKeyDepth(), constraints, config);
+        assertThat(indexed).as("BigDecimal is not indexed").containsExactly(false);
+    }
+
+    @Test
+    public void isIndexableForNotNodeWithBigDecimal() {
+        RuleBaseConfiguration config = getRuleBaseConfiguration();
+        FakeBetaNodeFieldConstraint bigDecimalEqualsConstraint = new FakeBetaNodeFieldConstraint(ConstraintTypeOperator.EQUAL, new FakeReadAccessor(ValueType.BIG_DECIMAL_TYPE));
+        BetaNodeFieldConstraint[] constraints = new FakeBetaNodeFieldConstraint[]{bigDecimalEqualsConstraint};
+        boolean[] indexed = IndexUtil.isIndexableForNode(IndexPrecedenceOption.EQUALITY_PRIORITY, NodeTypeEnums.NotNode, config.getCompositeKeyDepth(), constraints, config);
+        assertThat(indexed).as("BigDecimal is not indexed").containsExactly(false);
+    }
+
     static class FakeBetaNodeFieldConstraint implements BetaNodeFieldConstraint,
                                                         IndexableConstraint {
 
@@ -163,7 +181,7 @@ public boolean isUnification() {
 
         @Override
         public boolean isIndexable(short nodeType, KieBaseConfiguration config) {
-            return false;
+            return constraintType.isIndexableForNode(nodeType, this, config);
         }
 
         @Override
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/operators/ExistsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/operators/ExistsTest.java
index cebb40e4b5e..e4c9d13e39f 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/operators/ExistsTest.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/operators/ExistsTest.java
@@ -18,6 +18,7 @@
  */
 package org.drools.compiler.integrationtests.operators;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -287,4 +288,187 @@ public void testSharedExistsWithNot() {
             ksession.dispose();
         }
     }
+
+    @Test
+    public void existsAndNotWithSingleCoercion_shouldNotMatchExists() {
+        // KIE-766
+        final String drl =
+                "package org.drools.compiler.integrationtests.operators;\n" +
+                           "import " + StringHolder.class.getCanonicalName() + "\n" +
+                           "import " + BDHolder.class.getCanonicalName() + "\n" +
+                           "global java.util.List list \n" +
+                           "rule R1\n" +
+                           "  when\n" +
+                           "    $stringHolder : StringHolder( $value1 : value1 )\n" +
+                           "    exists BDHolder( $value1 == value1 )\n" +
+                           "  then\n" +
+                           "    list.add(\"R1\");\n" +
+                           "end\n" +
+                           "rule R2\n" +
+                           "  when\n" +
+                           "    $stringHolder : StringHolder( $value1 : value1 )\n" +
+                           "    not BDHolder( $value1 == value1 )\n" +
+                           "  then\n" +
+                           "    list.add(\"R2\");\n" +
+                           "end\n";
+
+        final KieBase kbase = KieBaseUtil.getKieBaseFromKieModuleFromDrl("exists-test",
+                                                                         kieBaseTestConfiguration,
+                                                                         drl);
+        final KieSession ksession = kbase.newKieSession();
+        try {
+            final List list = new ArrayList<>();
+            ksession.setGlobal("list", list);
+
+            ksession.insert(new StringHolder("9999", "567"));
+            ksession.insert(new BDHolder(new BigDecimal("0"), new BigDecimal("567")));
+            ksession.fireAllRules();
+
+            assertThat(list).hasSize(1);
+            assertThat(list).as("BDHolder shouldn't match the exists constraints").containsExactly("R2");
+        } finally {
+            ksession.dispose();
+        }
+    }
+
+    @Test
+    public void existsAndNotWithMultipleCoercion_shouldNotMatchExists() {
+        // KIE-766
+        final String drl =
+                "package org.drools.compiler.integrationtests.operators;\n" +
+                           "import " + StringHolder.class.getCanonicalName() + "\n" +
+                           "import " + BDHolder.class.getCanonicalName() + "\n" +
+                           "global java.util.List list \n" +
+                           "rule R1\n" +
+                           "  when\n" +
+                           "    $stringHolder : StringHolder( $value1 : value1, $value2 : value2 )\n" +
+                           "    exists BDHolder( $value1 == value1, $value2 == value2 )\n" +
+                           "  then\n" +
+                           "    list.add(\"R1\");\n" +
+                           "end\n" +
+                           "rule R2\n" +
+                           "  when\n" +
+                           "    $stringHolder : StringHolder( $value1 : value1, $value2 : value2 )\n" +
+                           "    not BDHolder( $value1 == value1, $value2 == value2 )\n" +
+                           "  then\n" +
+                           "    list.add(\"R2\");\n" +
+                           "end\n";
+
+        final KieBase kbase = KieBaseUtil.getKieBaseFromKieModuleFromDrl("exists-test",
+                                                                         kieBaseTestConfiguration,
+                                                                         drl);
+        final KieSession ksession = kbase.newKieSession();
+        try {
+            final List list = new ArrayList<>();
+            ksession.setGlobal("list", list);
+
+            ksession.insert(new StringHolder("9999", "567"));
+            ksession.insert(new BDHolder(new BigDecimal("0"), new BigDecimal("567")));
+            ksession.fireAllRules();
+
+            assertThat(list).hasSize(1);
+            assertThat(list).as("BDHolder shouldn't match the exists constraints").containsExactly("R2");
+        } finally {
+            ksession.dispose();
+        }
+    }
+
+    @Test
+    public void existsAndNotWithBigDecimals_shouldNotMatchExists() {
+        // KIE-766
+        final String drl =
+                "package org.drools.compiler.integrationtests.operators;\n" +
+                           "import " + BDHolder.class.getCanonicalName() + "\n" +
+                           "global java.util.List list \n" +
+                           "rule R1\n" +
+                           "  when\n" +
+                           "    $bdHolder1 : BDHolder( $value1 : value1, $value2 : value2 )\n" +
+                           "    exists BDHolder( this != $bdHolder1, $value1 == value1, $value2 == value2 )\n" +
+                           "  then\n" +
+                           "    list.add(\"R1\");\n" +
+                           "end\n" +
+                           "rule R2\n" +
+                           "  when\n" +
+                           "    $bdHolder1 : BDHolder( $value1 : value1, $value2 : value2 )\n" +
+                           "    not BDHolder( this != $bdHolder1, $value1 == value1, $value2 == value2 )\n" +
+                           "  then\n" +
+                           "    list.add(\"R2\");\n" +
+                           "end\n";
+
+        final KieBase kbase = KieBaseUtil.getKieBaseFromKieModuleFromDrl("exists-test",
+                                                                         kieBaseTestConfiguration,
+                                                                         drl);
+        final KieSession ksession = kbase.newKieSession();
+        try {
+            final List list = new ArrayList<>();
+            ksession.setGlobal("list", list);
+
+            ksession.insert(new BDHolder(new BigDecimal("9999"), new BigDecimal("567")));
+            ksession.insert(new BDHolder(new BigDecimal("0"), new BigDecimal("567")));
+            ksession.fireAllRules();
+
+            assertThat(list).hasSize(2);
+            assertThat(list).as("BDHolder shouldn't match the exists constraints. R2 fires twice because 2 objects can match as $bdHolder1")
+                            .containsExactly("R2", "R2");
+        } finally {
+            ksession.dispose();
+        }
+    }
+
+    public static class StringHolder {
+
+        private String value1;
+        private String value2;
+
+        public StringHolder(String value1, String value2) {
+            this.value1 = value1;
+            this.value2 = value2;
+        }
+
+        public String getValue1() {
+            return value1;
+        }
+
+        public void setValue1(String value1) {
+            this.value1 = value1;
+        }
+
+        public String getValue2() {
+            return value2;
+        }
+
+        public void setValue2(String value2) {
+            this.value2 = value2;
+        }
+
+    }
+
+    public static class BDHolder {
+
+        private BigDecimal value1;
+        private BigDecimal value2;
+
+        public BDHolder(BigDecimal value1, BigDecimal value2) {
+            super();
+            this.value1 = value1;
+            this.value2 = value2;
+        }
+
+        public BigDecimal getValue1() {
+            return value1;
+        }
+
+        public void setValue1(BigDecimal value1) {
+            this.value1 = value1;
+        }
+
+        public BigDecimal getValue2() {
+            return value2;
+        }
+
+        public void setValue2(BigDecimal value2) {
+            this.value2 = value2;
+        }
+
+    }
 }

From ce7c76fd2093f1f6a1efbdce17fb226e23dab609 Mon Sep 17 00:00:00 2001
From: Paolo Bizzarri 
Date: Wed, 20 Dec 2023 10:53:30 +0100
Subject: [PATCH 15/29] Removing use of InternalRuleBase (#5577)

---
 .../main/java/org/drools/base/RuleBase.java   | 27 +++++++++++++++++++
 .../builder/impl/KnowledgeBuilderImpl.java    |  4 +--
 .../builder/impl/processors/ReteCompiler.java | 10 +++----
 .../kie/builder/impl/AbstractKieModule.java   |  6 +++--
 .../kie/builder/impl/KieContainerImpl.java    |  8 +++---
 .../drools/core/impl/InternalRuleBase.java    | 14 ----------
 .../management/DroolsManagementAgent.java     | 16 +++++------
 .../management/KnowledgeBaseMonitoring.java   |  5 ++--
 .../rulebase/KnowledgeBaseFactory.java        |  4 +--
 .../rulebase/SessionsAwareKnowledgeBase.java  |  4 +--
 10 files changed, 57 insertions(+), 41 deletions(-)

diff --git a/drools-base/src/main/java/org/drools/base/RuleBase.java b/drools-base/src/main/java/org/drools/base/RuleBase.java
index 90253297633..564d444d281 100644
--- a/drools-base/src/main/java/org/drools/base/RuleBase.java
+++ b/drools-base/src/main/java/org/drools/base/RuleBase.java
@@ -19,8 +19,17 @@
 package org.drools.base;
 
 
+import java.lang.reflect.Type;
+import java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.Future;
+
+import org.drools.base.definitions.InternalKnowledgePackage;
+import org.drools.base.definitions.rule.impl.RuleImpl;
+import org.drools.base.rule.InvalidPatternException;
 import org.drools.base.rule.TypeDeclaration;
 import org.kie.api.KieBaseConfiguration;
+import org.kie.api.definition.KiePackage;
 
 public interface RuleBase {
     ClassLoader getRootClassLoader();
@@ -30,4 +39,22 @@ public interface RuleBase {
     TypeDeclaration getTypeDeclaration(Class classType);
 
     KieBaseConfiguration getConfiguration();
+    
+    InternalKnowledgePackage[] getPackages();
+    InternalKnowledgePackage getPackage(String name);
+    Future addPackage(KiePackage pkg ); 
+    void addPackages( Collection newPkgs );
+    Map getPackagesMap();
+
+    void addRules( Collection rules ) throws InvalidPatternException;
+    void removeRules( Collection rules ) throws InvalidPatternException;
+
+    String getId();
+    
+    String getContainerId();
+    void setContainerId(String containerId);
+    
+    Map getGlobals();
+
+
 }
diff --git a/drools-compiler/src/main/java/org/drools/compiler/builder/impl/KnowledgeBuilderImpl.java b/drools-compiler/src/main/java/org/drools/compiler/builder/impl/KnowledgeBuilderImpl.java
index bce0435301f..cd19e2ded43 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/builder/impl/KnowledgeBuilderImpl.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/builder/impl/KnowledgeBuilderImpl.java
@@ -34,6 +34,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.function.Supplier;
 
+import org.drools.base.RuleBase;
 import org.drools.base.base.ObjectType;
 import org.drools.base.definitions.InternalKnowledgePackage;
 import org.drools.base.definitions.rule.impl.RuleImpl;
@@ -60,7 +61,6 @@
 import org.drools.compiler.compiler.ResourceTypeDeclarationWarning;
 import org.drools.compiler.kie.builder.impl.BuildContext;
 import org.drools.compiler.lang.descr.CompositePackageDescr;
-import org.drools.core.impl.InternalRuleBase;
 import org.drools.core.impl.RuleBaseFactory;
 import org.drools.drl.ast.descr.AttributeDescr;
 import org.drools.drl.ast.descr.ImportDescr;
@@ -941,7 +941,7 @@ public KieBase newKnowledgeBase(KieBaseConfiguration conf) {
             }
             throw new IllegalArgumentException("Could not parse knowledge. See the logs for details.");
         }
-        InternalRuleBase kbase = RuleBaseFactory.newRuleBase(conf);
+        RuleBase kbase = RuleBaseFactory.newRuleBase(conf);
         kbase.addPackages(asList(getPackages()));
         return KnowledgeBaseFactory.newKnowledgeBase(kbase);
     }
diff --git a/drools-compiler/src/main/java/org/drools/compiler/builder/impl/processors/ReteCompiler.java b/drools-compiler/src/main/java/org/drools/compiler/builder/impl/processors/ReteCompiler.java
index 4c8dd6f66e9..768e5df7ac4 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/builder/impl/processors/ReteCompiler.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/builder/impl/processors/ReteCompiler.java
@@ -21,20 +21,20 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.drools.base.definitions.InternalKnowledgePackage;
-import org.drools.base.definitions.rule.impl.RuleImpl;
+import org.drools.base.RuleBase;
 import org.drools.compiler.builder.impl.AssetFilter;
 import org.drools.compiler.compiler.PackageRegistry;
-import org.drools.core.impl.InternalRuleBase;
+import org.drools.base.definitions.InternalKnowledgePackage;
+import org.drools.base.definitions.rule.impl.RuleImpl;
 import org.drools.drl.ast.descr.PackageDescr;
 import org.drools.drl.ast.descr.RuleDescr;
 import org.kie.internal.builder.ResourceChange;
 
 public class ReteCompiler extends AbstractPackageCompilationPhase {
     private final AssetFilter assetFilter;
-    private InternalRuleBase kBase;
+    private RuleBase kBase;
 
-    public ReteCompiler(PackageRegistry pkgRegistry, PackageDescr packageDescr, InternalRuleBase kBase, AssetFilter assetFilter) {
+    public ReteCompiler(PackageRegistry pkgRegistry, PackageDescr packageDescr, RuleBase kBase, AssetFilter assetFilter) {
         super(pkgRegistry, packageDescr);
         this.kBase = kBase;
         this.assetFilter = assetFilter;
diff --git a/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/AbstractKieModule.java b/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/AbstractKieModule.java
index be8c7744827..16e8186af63 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/AbstractKieModule.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/AbstractKieModule.java
@@ -39,7 +39,8 @@
 import org.drools.compiler.builder.impl.KnowledgeBuilderConfigurationImpl;
 import org.drools.compiler.kproject.models.KieBaseModelImpl;
 import org.drools.core.RuleBaseConfiguration;
-import org.drools.core.impl.InternalRuleBase;
+import org.drools.base.definitions.InternalKnowledgePackage;
+import org.drools.base.definitions.impl.KnowledgePackageImpl;
 import org.drools.core.impl.RuleBaseFactory;
 import org.drools.io.ResourceConfigurationImpl;
 import org.drools.kiesession.rulebase.InternalKnowledgeBase;
@@ -69,6 +70,7 @@
 import org.kie.util.maven.support.ReleaseIdImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.drools.base.RuleBase;
 
 import static org.kie.internal.builder.KnowledgeBuilderFactory.newKnowledgeBuilderConfiguration;
 
@@ -220,7 +222,7 @@ public InternalKnowledgeBase createKieBase(KieBaseModelImpl kBaseModel, KieProje
             ((RuleBaseConfiguration)conf).setClassLoader(cl);
         }
 
-        InternalRuleBase kBase = RuleBaseFactory.newRuleBase(kBaseModel.getName(), conf);
+        RuleBase kBase = RuleBaseFactory.newRuleBase(kBaseModel.getName(), conf);
         kBase.addPackages( pkgs );
         return KnowledgeBaseFactory.newKnowledgeBase(kBase);
     }
diff --git a/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieContainerImpl.java b/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieContainerImpl.java
index 323b66e1cbb..9d1a4a33418 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieContainerImpl.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieContainerImpl.java
@@ -32,6 +32,7 @@
 
 import javax.management.ObjectName;
 
+import org.drools.base.RuleBase;
 import org.drools.compiler.builder.InternalKnowledgeBuilder;
 import org.drools.compiler.builder.impl.KnowledgeBuilderConfigurationImpl;
 import org.drools.compiler.kie.builder.MaterializedLambda;
@@ -41,7 +42,6 @@
 import org.drools.compiler.management.KieContainerMonitor;
 import org.drools.core.SessionConfiguration;
 import org.drools.core.impl.InternalKieContainer;
-import org.drools.core.impl.InternalRuleBase;
 import org.drools.core.management.DroolsManagementAgent;
 import org.drools.core.management.DroolsManagementAgent.CBSKey;
 import org.drools.core.reteoo.RuntimeComponentFactory;
@@ -735,10 +735,10 @@ public void dispose() {
         Set cbskeys = new HashSet<>();
         if ( isMBeanOptionEnabled() ) {
             for (Entry kv : kSessions.entrySet()) {
-                cbskeys.add(new DroolsManagementAgent.CBSKey(containerId, ((InternalRuleBase) kv.getValue().getKieBase()).getId(), kv.getKey()));
+                cbskeys.add(new DroolsManagementAgent.CBSKey(containerId, ((RuleBase) kv.getValue().getKieBase()).getId(), kv.getKey()));
             }
             for (Entry kv : statelessKSessions.entrySet()) {
-                cbskeys.add(new DroolsManagementAgent.CBSKey(containerId, ((InternalRuleBase) kv.getValue().getKieBase()).getId(), kv.getKey()));
+                cbskeys.add(new DroolsManagementAgent.CBSKey(containerId, ((RuleBase) kv.getValue().getKieBase()).getId(), kv.getKey()));
             }
         }
 
@@ -753,7 +753,7 @@ public void dispose() {
                 DroolsManagementAgent.getInstance().unregisterKnowledgeSessionBean(c);
             }
             for (KieBase kb : kBases.values()) {
-                DroolsManagementAgent.getInstance().unregisterKnowledgeBase((InternalRuleBase) kb);
+                DroolsManagementAgent.getInstance().unregisterKnowledgeBase((RuleBase) kb);
             }
             DroolsManagementAgent.getInstance().unregisterMBeansFromOwner(this);
         }
diff --git a/drools-core/src/main/java/org/drools/core/impl/InternalRuleBase.java b/drools-core/src/main/java/org/drools/core/impl/InternalRuleBase.java
index f4002ac8a1a..5f93204d9b2 100644
--- a/drools-core/src/main/java/org/drools/core/impl/InternalRuleBase.java
+++ b/drools-core/src/main/java/org/drools/core/impl/InternalRuleBase.java
@@ -22,9 +22,7 @@
 import java.lang.reflect.Type;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.Future;
 
 import org.drools.base.RuleBase;
 import org.drools.base.common.RuleBasePartitionId;
@@ -80,7 +78,6 @@ public interface InternalRuleBase extends RuleBase {
 
     Set getEntryPointIds();
 
-    String getId();
 
     RuleBasePartitionId createNewPartitionId();
     boolean isPartitioned();
@@ -99,7 +96,6 @@ public interface InternalRuleBase extends RuleBase {
 
     FactHandleFactory newFactHandleFactory(long id, long counter) throws IOException;
 
-    Map getGlobals();
 
     int getNodeCount();
     int getMemoryCount();
@@ -120,11 +116,6 @@ public interface InternalRuleBase extends RuleBase {
 
     Class registerAndLoadTypeDefinition( String className, byte[] def ) throws ClassNotFoundException;
 
-    InternalKnowledgePackage[] getPackages();
-    InternalKnowledgePackage getPackage(String name);
-    Future addPackage(KiePackage pkg );
-    void addPackages( Collection newPkgs );
-    Map getPackagesMap();
 
     ClassFieldAccessorCache getClassFieldAccessorCache();
 
@@ -141,9 +132,6 @@ public interface InternalRuleBase extends RuleBase {
 
     void processAllTypesDeclaration( Collection pkgs );
 
-    void addRules( Collection rules ) throws InvalidPatternException;
-    void removeRules( Collection rules ) throws InvalidPatternException;
-
     default void beforeIncrementalUpdate(KieBaseUpdate kieBaseUpdate) { }
     default void afterIncrementalUpdate(KieBaseUpdate kieBaseUpdate) { }
 
@@ -160,8 +148,6 @@ default void afterIncrementalUpdate(KieBaseUpdate kieBaseUpdate) { }
 
     ReleaseId getResolvedReleaseId();
     void setResolvedReleaseId(ReleaseId currentReleaseId);
-    String getContainerId();
-    void setContainerId(String containerId);
 
     RuleUnitDescriptionRegistry getRuleUnitDescriptionRegistry();
     boolean hasUnits();
diff --git a/drools-core/src/main/java/org/drools/core/management/DroolsManagementAgent.java b/drools-core/src/main/java/org/drools/core/management/DroolsManagementAgent.java
index 5bacd15b864..3c7d467fa16 100644
--- a/drools-core/src/main/java/org/drools/core/management/DroolsManagementAgent.java
+++ b/drools-core/src/main/java/org/drools/core/management/DroolsManagementAgent.java
@@ -28,8 +28,8 @@
 import javax.management.ObjectName;
 import javax.management.StandardMBean;
 
+import org.drools.base.RuleBase;
 import org.drools.core.common.InternalWorkingMemory;
-import org.drools.core.impl.InternalRuleBase;
 import org.drools.core.reteoo.RuntimeComponentFactory;
 import org.kie.api.builder.model.KieSessionModel;
 import org.kie.api.event.KieRuntimeEventManager;
@@ -59,7 +59,7 @@ static DroolsManagementAgent getInstance() {
         return DroolsManagementAgentHolder.INSTANCE;
     }
 
-    static ObjectName createObjectNameFor(InternalRuleBase kbase) {
+    static ObjectName createObjectNameFor(RuleBase kbase) {
         return DroolsManagementAgent.createObjectName(
                     DroolsManagementAgent.createObjectNameBy(kbase.getContainerId())
                     + ",kbaseId=" + ObjectName.quote(kbase.getId())
@@ -101,9 +101,9 @@ static String ksessionType(KieSessionModel.KieSessionType ksessionType) {
 
     long getNextKnowledgeSessionId();
 
-    void registerKnowledgeBase(InternalRuleBase kbase);
+    void registerKnowledgeBase(RuleBase kbase);
     
-    void unregisterKnowledgeBase(InternalRuleBase kbase);
+    void unregisterKnowledgeBase(RuleBase kbase);
     
     void registerKnowledgeSessionUnderName(CBSKey cbsKey, KieRuntimeEventManager ksession);
 
@@ -240,7 +240,7 @@ public synchronized long getNextKnowledgeSessionId() {
         }
 
         @Override
-        public void registerKnowledgeBase(InternalRuleBase kbase) {
+        public void registerKnowledgeBase(RuleBase kbase) {
             KnowledgeBaseMonitoring mbean = new KnowledgeBaseMonitoring( kbase );
             registerMBean( kbase,
                     mbean,
@@ -248,7 +248,7 @@ public void registerKnowledgeBase(InternalRuleBase kbase) {
         }
 
         @Override
-        public void unregisterKnowledgeBase(InternalRuleBase kbase) {
+        public void unregisterKnowledgeBase(RuleBase kbase) {
             unregisterMBeansFromOwner(kbase);
         }
 
@@ -417,12 +417,12 @@ public long getNextKnowledgeSessionId() {
         }
 
         @Override
-        public void registerKnowledgeBase(InternalRuleBase kbase) {
+        public void registerKnowledgeBase(RuleBase kbase) {
 
         }
 
         @Override
-        public void unregisterKnowledgeBase(InternalRuleBase kbase) {
+        public void unregisterKnowledgeBase(RuleBase kbase) {
 
         }
 
diff --git a/drools-core/src/main/java/org/drools/core/management/KnowledgeBaseMonitoring.java b/drools-core/src/main/java/org/drools/core/management/KnowledgeBaseMonitoring.java
index 609a89e6706..5a4ba38a6bc 100644
--- a/drools-core/src/main/java/org/drools/core/management/KnowledgeBaseMonitoring.java
+++ b/drools-core/src/main/java/org/drools/core/management/KnowledgeBaseMonitoring.java
@@ -52,6 +52,7 @@
 import javax.management.openmbean.TabularDataSupport;
 import javax.management.openmbean.TabularType;
 
+import org.drools.base.RuleBase;
 import org.drools.core.impl.InternalRuleBase;
 import org.drools.core.reteoo.EntryPointNode;
 import org.drools.core.reteoo.ObjectTypeNode;
@@ -114,8 +115,8 @@ public class KnowledgeBaseMonitoring
     // ************************************************************************************************
 
     // Constructor
-    public KnowledgeBaseMonitoring(InternalRuleBase kbase) {
-        this.kbase = kbase;
+    public KnowledgeBaseMonitoring(RuleBase kbase) {
+        this.kbase = (InternalRuleBase) kbase;
         this.name = DroolsManagementAgent.createObjectNameFor(kbase);
 
         initOpenMBeanInfo();
diff --git a/drools-kiesession/src/main/java/org/drools/kiesession/rulebase/KnowledgeBaseFactory.java b/drools-kiesession/src/main/java/org/drools/kiesession/rulebase/KnowledgeBaseFactory.java
index e46556d34d8..f0cb87b8d6a 100644
--- a/drools-kiesession/src/main/java/org/drools/kiesession/rulebase/KnowledgeBaseFactory.java
+++ b/drools-kiesession/src/main/java/org/drools/kiesession/rulebase/KnowledgeBaseFactory.java
@@ -19,9 +19,9 @@
 package org.drools.kiesession.rulebase;
 
 import org.drools.core.impl.KnowledgeBaseImpl;
-import org.drools.core.impl.InternalRuleBase;
 import org.kie.api.KieBaseConfiguration;
 import org.kie.internal.conf.CompositeBaseConfiguration;
+import org.drools.base.RuleBase;
 
 public class KnowledgeBaseFactory {
 
@@ -37,7 +37,7 @@ public static InternalKnowledgeBase newKnowledgeBase(String kbaseId, KieBaseConf
         return newKnowledgeBase(new KnowledgeBaseImpl(kbaseId, (CompositeBaseConfiguration) conf));
     }
 
-    public static InternalKnowledgeBase newKnowledgeBase(InternalRuleBase delegate) {
+    public static InternalKnowledgeBase newKnowledgeBase(RuleBase delegate) {
         return new SessionsAwareKnowledgeBase(delegate);
     }
 }
diff --git a/drools-kiesession/src/main/java/org/drools/kiesession/rulebase/SessionsAwareKnowledgeBase.java b/drools-kiesession/src/main/java/org/drools/kiesession/rulebase/SessionsAwareKnowledgeBase.java
index ff12cfc7369..fa0b36af59f 100644
--- a/drools-kiesession/src/main/java/org/drools/kiesession/rulebase/SessionsAwareKnowledgeBase.java
+++ b/drools-kiesession/src/main/java/org/drools/kiesession/rulebase/SessionsAwareKnowledgeBase.java
@@ -18,6 +18,7 @@
  */
 package org.drools.kiesession.rulebase;
 
+import org.drools.base.RuleBase;
 import org.drools.base.common.RuleBasePartitionId;
 import org.drools.base.definitions.InternalKnowledgePackage;
 import org.drools.base.definitions.rule.impl.RuleImpl;
@@ -32,7 +33,6 @@
 import org.drools.core.common.ReteEvaluator;
 import org.drools.core.impl.EnvironmentFactory;
 import org.drools.core.impl.InternalKieContainer;
-import org.drools.core.impl.InternalRuleBase;
 import org.drools.core.impl.KieBaseUpdate;
 import org.drools.core.impl.KnowledgeBaseImpl;
 import org.drools.core.impl.RuleBaseFactory;
@@ -108,7 +108,7 @@ public SessionsAwareKnowledgeBase(KieBaseConfiguration kbaseConfiguration) {
         this(RuleBaseFactory.newRuleBase(kbaseConfiguration));
     }
 
-    public SessionsAwareKnowledgeBase(InternalRuleBase delegate) {
+    public SessionsAwareKnowledgeBase(RuleBase delegate) {
         this.delegate = (KnowledgeBaseImpl) delegate;
 
         if (this.delegate.getRuleBaseConfiguration().getSessionPoolSize() > 0) {

From 129e1b459dcee892fddbced1113b831b6245b0fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tibor=20Zim=C3=A1nyi?= 
Date: Wed, 20 Dec 2023 15:00:28 +0100
Subject: [PATCH 16/29] [NO ISSUE] Shade kie-dmn-xls2dmn-cli runner separately.
 (#5637)

---
 kie-dmn/kie-dmn-xls2dmn-cli/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kie-dmn/kie-dmn-xls2dmn-cli/pom.xml b/kie-dmn/kie-dmn-xls2dmn-cli/pom.xml
index f14c01845f5..adf7488f631 100644
--- a/kie-dmn/kie-dmn-xls2dmn-cli/pom.xml
+++ b/kie-dmn/kie-dmn-xls2dmn-cli/pom.xml
@@ -116,7 +116,6 @@
       
         org.apache.maven.plugins
         maven-shade-plugin
-        3.2.4
         
           
             package
@@ -124,6 +123,8 @@
               shade
             
             
+              true
+              runner
                
                 
                   *:*

From 19c2b922beca6eabe8e44e938cda9352e898a3f7 Mon Sep 17 00:00:00 2001
From: mdproctor 
Date: Wed, 20 Dec 2023 16:52:53 +0000
Subject: [PATCH 17/29] Flat Lambdas and Multi Variable Indexes
 [apache/incubator-kie-issues#770] (#5630)

* Flat Lambdas and Multi Variable Indexes #770

* Update IndexUtilTest.java

---------

Co-authored-by: Mario Fusco 
---
 .../drools/base/rule/IndexableConstraint.java |   8 +-
 .../base/rule/MutableTypeConstraint.java      |   6 +-
 .../accessor/RightTupleValueExtractor.java    |  28 ++
 .../rule/accessor/TupleValueExtractor.java    |   4 +
 ...eldConstraint.java => BetaConstraint.java} |  10 +-
 .../rule/constraint/QueryNameConstraint.java  |  16 +-
 .../base/rule/constraint/XpathConstraint.java |   6 +-
 ...ieldIndex.java => IndexedValueReader.java} |  30 +-
 .../org/drools/base/util/index/IndexUtil.java |  54 ++-
 .../drools/core/common/BetaConstraints.java   |  25 +-
 .../core/common/DefaultBetaConstraints.java   |  27 +-
 .../core/common/DoubleBetaConstraints.java    |  15 +-
 .../DoubleNonIndexSkipBetaConstraints.java    |  19 +-
 .../core/common/EmptyBetaConstraints.java     |  13 +-
 .../core/common/MultipleBetaConstraint.java   |  20 +-
 .../common/QuadroupleBetaConstraints.java     |  15 +-
 ...QuadroupleNonIndexSkipBetaConstraints.java |  23 +-
 .../core/common/SingleBetaConstraints.java    |  60 +--
 .../SingleNonIndexSkipBetaConstraints.java    |  29 +-
 .../core/common/TripleBetaConstraints.java    |  15 +-
 .../TripleNonIndexSkipBetaConstraints.java    |  21 +-
 .../common/TupleStartEqualsConstraint.java    |   8 +-
 .../core/phreak/PhreakAccumulateNode.java     |  22 +-
 .../core/phreak/PhreakAsyncReceiveNode.java   |   2 +-
 .../core/phreak/PhreakAsyncSendNode.java      |   6 +-
 .../drools/core/phreak/PhreakExistsNode.java  |  18 +-
 .../drools/core/phreak/PhreakFromNode.java    |   6 +-
 .../drools/core/phreak/PhreakJoinNode.java    |  30 +-
 .../org/drools/core/phreak/PhreakNotNode.java |  21 +-
 .../core/phreak/ReactiveObjectUtil.java       |   2 +-
 .../core/phreak/RuleNetworkEvaluator.java     |   2 +-
 .../drools/core/reteoo/AccumulateNode.java    |   6 +-
 .../org/drools/core/reteoo/BetaMemory.java    |   8 +-
 .../java/org/drools/core/reteoo/BetaNode.java |  10 +-
 .../org/drools/core/reteoo/LeftTuple.java     |   2 +-
 .../drools/core/reteoo/NotNodeLeftTuple.java  |   2 +-
 .../reteoo/builder/AccumulateBuilder.java     |   6 +-
 .../builder/BetaNodeConstraintFactory.java    |  12 +-
 .../BetaNodeConstraintFactoryImpl.java        |  12 +-
 .../core/reteoo/builder/BuildContext.java     |  12 +-
 .../core/reteoo/builder/BuildUtils.java       |  23 +-
 .../core/reteoo/builder/CollectBuilder.java   |   8 +-
 .../reteoo/builder/GroupElementBuilder.java   |   6 +-
 .../builder/InstanceNotEqualsConstraint.java  |   8 +-
 .../core/reteoo/builder/PatternBuilder.java   |  12 +-
 .../drools/core/util/AbstractHashTable.java   |  40 +-
 .../util/index/AbstractTupleIndexTree.java    |   8 +-
 .../drools/core/util/index/IndexFactory.java  |  15 +-
 .../drools/core/util/index/IndexMemory.java   |   2 +-
 .../org/drools/core/util/index/IndexSpec.java |  76 ++-
 .../core/util/index/TupleIndexHashTable.java  |  38 +-
 .../core/util/index/TupleIndexRBTree.java     |   8 +-
 .../drools/core/util/index/IndexUtilTest.java |  46 +-
 .../fastutil/FastUtilHashTupleMemory.java     |  37 +-
 .../drools/fastutil/FastUtilIndexMemory.java  |   6 +-
 .../drools/fastutil/FastUtilTreeMemory.java   |   4 +-
 .../fastutil/FastUtilTreeMemoryTest.java      |  27 +-
 ...BetaConstraintsPositionalIndexingTest.java | 282 ++++++++++++
 .../org/drools/core/positional/Functions.java |  28 ++
 .../drools/core/positional/IntFunctions.java  |  28 ++
 .../positional/PositionalConsequence.java     | 121 +++++
 .../core/positional/PositionalConstraint.java | 435 ++++++++++++++++++
 .../drools/core/positional/Predicates.java    |  28 ++
 .../drools/core/positional/VoidFunctions.java |  28 ++
 .../common/DefaultBetaConstraintsMetric.java  |  14 +-
 .../common/DoubleBetaConstraintsMetric.java   |  17 +-
 .../QuadroupleBetaConstraintsMetric.java      |  17 +-
 .../common/SingleBetaConstraintsMetric.java   |  17 +-
 .../common/TripleBetaConstraintsMetric.java   |  17 +-
 .../MetricBetaNodeConstraintFactoryImpl.java  |  12 +-
 .../java/org/drools/model/AlphaIndex.java     |   1 +
 .../model/codegen/execmodel/IndexTest.java    |   2 +-
 .../constraints/AbstractConstraint.java       |   3 +-
 .../constraints/CombinedConstraint.java       |  14 +-
 .../constraints/LambdaConstraint.java         |  56 ++-
 .../constraints/UnificationConstraint.java    |  47 +-
 .../org/drools/mvel/EvaluatorConstraint.java  |   6 +-
 .../java/org/drools/mvel/MVELConstraint.java  |  69 +--
 .../drools/mvel/MVELConstraintBuilder.java    |   2 +-
 .../org/drools/retediagram/ReteDiagram.java   |   8 +-
 .../integrationtests/IndexingTest.java        |  39 ++
 .../JoinNodeRangeIndexingTest.java            |   1 -
 ...stractTupleIndexHashTableIteratorTest.java |   8 +-
 .../drools/mvel/BaseBetaConstraintsTest.java  |  26 +-
 .../mvel/DefaultBetaConstraintsTest.java      | 130 +++---
 .../mvel/DoubleBetaConstraintsTest.java       |  30 +-
 .../org/drools/mvel/FieldConstraintTest.java  |   4 +
 .../LeftTupleIndexHashTableIteratorTest.java  |   6 +-
 .../mvel/QuadroupleBetaConstraintsTest.java   |  74 +--
 .../RightTupleIndexHashTableIteratorTest.java |   6 +-
 .../mvel/SingleBetaConstraintsTest.java       |  18 +-
 .../mvel/TripleBetaConstraintsTest.java       |  42 +-
 .../mvel/extractors/FieldIndexEntryTest.java  |  18 +-
 .../phreak/FakeBetaNodeFieldConstraint.java   |   8 +-
 .../phreak/ReteTesterHelper.java              |  10 +-
 .../util/RightTupleIndexHashTableTest.java    |  43 +-
 96 files changed, 1917 insertions(+), 793 deletions(-)
 create mode 100644 drools-base/src/main/java/org/drools/base/rule/accessor/RightTupleValueExtractor.java
 rename drools-base/src/main/java/org/drools/base/rule/constraint/{BetaNodeFieldConstraint.java => BetaConstraint.java} (84%)
 rename drools-base/src/main/java/org/drools/base/util/{FieldIndex.java => IndexedValueReader.java} (78%)
 create mode 100644 drools-kiesession/src/test/java/org/drools/core/positional/BetaConstraintsPositionalIndexingTest.java
 create mode 100644 drools-kiesession/src/test/java/org/drools/core/positional/Functions.java
 create mode 100644 drools-kiesession/src/test/java/org/drools/core/positional/IntFunctions.java
 create mode 100644 drools-kiesession/src/test/java/org/drools/core/positional/PositionalConsequence.java
 create mode 100644 drools-kiesession/src/test/java/org/drools/core/positional/PositionalConstraint.java
 create mode 100644 drools-kiesession/src/test/java/org/drools/core/positional/Predicates.java
 create mode 100644 drools-kiesession/src/test/java/org/drools/core/positional/VoidFunctions.java

diff --git a/drools-base/src/main/java/org/drools/base/rule/IndexableConstraint.java b/drools-base/src/main/java/org/drools/base/rule/IndexableConstraint.java
index 2828349f07b..5a412bd4be3 100644
--- a/drools-base/src/main/java/org/drools/base/rule/IndexableConstraint.java
+++ b/drools-base/src/main/java/org/drools/base/rule/IndexableConstraint.java
@@ -22,7 +22,7 @@
 import org.drools.base.rule.accessor.ReadAccessor;
 import org.drools.base.rule.accessor.TupleValueExtractor;
 import org.drools.base.rule.constraint.Constraint;
-import org.drools.base.util.FieldIndex;
+import org.drools.base.util.IndexedValueReader;
 import org.drools.base.util.index.ConstraintTypeOperator;
 import org.kie.api.KieBaseConfiguration;
 
@@ -36,11 +36,13 @@ public interface IndexableConstraint extends Constraint {
 
     FieldValue getField();
 
-    FieldIndex getFieldIndex();
+    IndexedValueReader getFieldIndex();
 
     ReadAccessor getFieldExtractor();
 
     default void unsetUnification() { }
 
-    TupleValueExtractor getIndexExtractor();
+    TupleValueExtractor getRightIndexExtractor();
+
+    TupleValueExtractor getLeftIndexExtractor();
 }
diff --git a/drools-base/src/main/java/org/drools/base/rule/MutableTypeConstraint.java b/drools-base/src/main/java/org/drools/base/rule/MutableTypeConstraint.java
index c05541824ce..f7ab0896988 100644
--- a/drools-base/src/main/java/org/drools/base/rule/MutableTypeConstraint.java
+++ b/drools-base/src/main/java/org/drools/base/rule/MutableTypeConstraint.java
@@ -25,16 +25,16 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.drools.base.rule.constraint.AlphaNodeFieldConstraint;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.base.rule.constraint.Constraint;
 
 /**
  * A base class for constraints
  */
-public abstract class MutableTypeConstraint
+public abstract class MutableTypeConstraint
     implements
         AlphaNodeFieldConstraint,
-        BetaNodeFieldConstraint,
+        BetaConstraint,
     Externalizable {
 
     private ConstraintType type = Constraint.ConstraintType.UNKNOWN;
diff --git a/drools-base/src/main/java/org/drools/base/rule/accessor/RightTupleValueExtractor.java b/drools-base/src/main/java/org/drools/base/rule/accessor/RightTupleValueExtractor.java
new file mode 100644
index 00000000000..45d07205614
--- /dev/null
+++ b/drools-base/src/main/java/org/drools/base/rule/accessor/RightTupleValueExtractor.java
@@ -0,0 +1,28 @@
+package org.drools.base.rule.accessor;
+
+import org.drools.base.base.ValueResolver;
+import org.drools.base.base.ValueType;
+import org.drools.base.reteoo.BaseTuple;
+
+public class RightTupleValueExtractor implements TupleValueExtractor {
+    private ReadAccessor extractor;
+
+    public RightTupleValueExtractor(ReadAccessor extractor) {
+        this.extractor = extractor;
+    }
+
+    @Override
+    public ValueType getValueType() {
+        return extractor.getValueType();
+    }
+
+    @Override
+    public Object getValue(ValueResolver valueResolver, BaseTuple tuple) {
+        return extractor.getValue(valueResolver, tuple.getFactHandle().getObject());
+    }
+
+    @Override
+    public TupleValueExtractor clone() {
+        return new RightTupleValueExtractor(extractor);
+    }
+}
diff --git a/drools-base/src/main/java/org/drools/base/rule/accessor/TupleValueExtractor.java b/drools-base/src/main/java/org/drools/base/rule/accessor/TupleValueExtractor.java
index ce458aff533..b7c423ff7ee 100644
--- a/drools-base/src/main/java/org/drools/base/rule/accessor/TupleValueExtractor.java
+++ b/drools-base/src/main/java/org/drools/base/rule/accessor/TupleValueExtractor.java
@@ -33,4 +33,8 @@ default Object getValue( BaseTuple tuple) {
     Object getValue(ValueResolver valueResolver, BaseTuple tuple);
 
     TupleValueExtractor clone();
+
+    default int getIndex() {
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/drools-base/src/main/java/org/drools/base/rule/constraint/BetaNodeFieldConstraint.java b/drools-base/src/main/java/org/drools/base/rule/constraint/BetaConstraint.java
similarity index 84%
rename from drools-base/src/main/java/org/drools/base/rule/constraint/BetaNodeFieldConstraint.java
rename to drools-base/src/main/java/org/drools/base/rule/constraint/BetaConstraint.java
index 103da6ae55e..1e9932bc8a2 100644
--- a/drools-base/src/main/java/org/drools/base/rule/constraint/BetaNodeFieldConstraint.java
+++ b/drools-base/src/main/java/org/drools/base/rule/constraint/BetaConstraint.java
@@ -22,20 +22,20 @@
 import org.drools.base.rule.ContextEntry;
 import org.kie.api.runtime.rule.FactHandle;
 
-public interface BetaNodeFieldConstraint
+public interface BetaConstraint
     extends
     Constraint {
 
-    boolean isAllowedCachedLeft(ContextEntry context,
+    boolean isAllowedCachedLeft(C context,
                                 FactHandle handle);
 
     boolean isAllowedCachedRight(BaseTuple tuple,
-                                 ContextEntry context);
+                                 C context);
 
-    ContextEntry createContextEntry();
+    C createContext();
 
     /**
      * Clone this constraints only if it is already used by a different node, otherwise returns this
      */
-    BetaNodeFieldConstraint cloneIfInUse();
+     T cloneIfInUse();
 }
diff --git a/drools-base/src/main/java/org/drools/base/rule/constraint/QueryNameConstraint.java b/drools-base/src/main/java/org/drools/base/rule/constraint/QueryNameConstraint.java
index 0d48a352387..401d152164e 100644
--- a/drools-base/src/main/java/org/drools/base/rule/constraint/QueryNameConstraint.java
+++ b/drools-base/src/main/java/org/drools/base/rule/constraint/QueryNameConstraint.java
@@ -25,14 +25,15 @@
 
 import org.drools.base.base.DroolsQuery;
 import org.drools.base.base.ValueResolver;
+import org.drools.base.rule.accessor.FieldValue;
+import org.drools.base.rule.accessor.TupleValueExtractor;
+import org.drools.base.util.index.ConstraintTypeOperator;
 import org.drools.base.base.field.ObjectFieldImpl;
 import org.drools.base.rule.Declaration;
 import org.drools.base.rule.IndexableConstraint;
 import org.drools.base.rule.accessor.AcceptsReadAccessor;
-import org.drools.base.rule.accessor.FieldValue;
 import org.drools.base.rule.accessor.ReadAccessor;
-import org.drools.base.util.FieldIndex;
-import org.drools.base.util.index.ConstraintTypeOperator;
+import org.drools.base.util.IndexedValueReader;
 import org.kie.api.KieBaseConfiguration;
 import org.kie.api.runtime.rule.FactHandle;
 
@@ -76,7 +77,7 @@ public FieldValue getField() {
         return fieldValue;
     }
 
-    public FieldIndex getFieldIndex() {
+    public IndexedValueReader getFieldIndex() {
         return null;
     }
 
@@ -89,7 +90,12 @@ public void setReadAccessor(ReadAccessor readAccessor) {
     }
 
     @Override
-    public Declaration getIndexExtractor() {
+    public TupleValueExtractor getRightIndexExtractor() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Declaration getLeftIndexExtractor() {
         throw new UnsupportedOperationException();
     }
 
diff --git a/drools-base/src/main/java/org/drools/base/rule/constraint/XpathConstraint.java b/drools-base/src/main/java/org/drools/base/rule/constraint/XpathConstraint.java
index 585658ccedf..519baa71d7b 100644
--- a/drools-base/src/main/java/org/drools/base/rule/constraint/XpathConstraint.java
+++ b/drools-base/src/main/java/org/drools/base/rule/constraint/XpathConstraint.java
@@ -52,7 +52,7 @@
 
 import static org.drools.util.ClassUtils.convertFromPrimitiveType;
 
-public class XpathConstraint extends MutableTypeConstraint {
+public class XpathConstraint extends MutableTypeConstraint {
 
     private LinkedList chunks;
 
@@ -120,7 +120,7 @@ public boolean isAllowedCachedRight(BaseTuple tuple, ContextEntry context) {
     }
 
     @Override
-    public ContextEntry createContextEntry() {
+    public ContextEntry createContext() {
         throw new UnsupportedOperationException();
     }
 
@@ -401,7 +401,7 @@ public List getAlphaConstraints() {
             return getConstraintsByType(ConstraintType.ALPHA);
         }
 
-        public List getBetaConstraints() {
+        public List getBetaConstraints() {
             return getConstraintsByType(ConstraintType.BETA);
         }
 
diff --git a/drools-base/src/main/java/org/drools/base/util/FieldIndex.java b/drools-base/src/main/java/org/drools/base/util/IndexedValueReader.java
similarity index 78%
rename from drools-base/src/main/java/org/drools/base/util/FieldIndex.java
rename to drools-base/src/main/java/org/drools/base/util/IndexedValueReader.java
index 011eb240ee8..708cc8990a0 100644
--- a/drools-base/src/main/java/org/drools/base/util/FieldIndex.java
+++ b/drools-base/src/main/java/org/drools/base/util/IndexedValueReader.java
@@ -18,42 +18,38 @@
  */
 package org.drools.base.util;
 
+import org.drools.base.reteoo.BaseTuple;
+import org.drools.base.rule.accessor.TupleValueExtractor;
+
 import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-
-import org.drools.base.reteoo.BaseTuple;
-import org.drools.base.rule.Declaration;
-import org.drools.base.rule.accessor.ReadAccessor;
-import org.drools.base.rule.accessor.TupleValueExtractor;
-
-public class FieldIndex implements Externalizable {
-
+public class IndexedValueReader implements Externalizable {
     private static final long serialVersionUID = 510l;
 
     private TupleValueExtractor leftExtractor;
-    private ReadAccessor rightExtractor;
+    private TupleValueExtractor rightExtractor;
     private boolean requiresCoercion;
 
-    public FieldIndex() {
+    public IndexedValueReader() {
     }
 
-    public FieldIndex(ReadAccessor rightExtractor, TupleValueExtractor leftExtractor) {
-        this.rightExtractor = rightExtractor;
+    public IndexedValueReader(TupleValueExtractor leftExtractor, TupleValueExtractor rightExtractor) {
         this.leftExtractor = leftExtractor;
+        this.rightExtractor = rightExtractor;
         this.requiresCoercion = isCoercionRequired(rightExtractor, leftExtractor);
     }
 
-    private boolean isCoercionRequired(ReadAccessor extractor, TupleValueExtractor declaration) {
+    private boolean isCoercionRequired(TupleValueExtractor extractor, TupleValueExtractor declaration) {
         return extractor.getValueType() != declaration.getValueType();
     }
 
     @Override
     public void readExternal(ObjectInput in) throws IOException,
                                                     ClassNotFoundException {
-        rightExtractor = (ReadAccessor) in.readObject();
-        leftExtractor = (Declaration) in.readObject();
+        rightExtractor = (TupleValueExtractor) in.readObject();
+        leftExtractor = (TupleValueExtractor) in.readObject();
         requiresCoercion = isCoercionRequired(rightExtractor, leftExtractor);
     }
 
@@ -67,7 +63,7 @@ public TupleValueExtractor getLeftExtractor() {
         return this.leftExtractor;
     }
 
-    public ReadAccessor getRightExtractor() {
+    public TupleValueExtractor getRightExtractor() {
         return this.rightExtractor;
     }
 
@@ -80,6 +76,6 @@ public Object indexedValueOf(BaseTuple tuple, boolean left) {
                 (requiresCoercion ?
                         rightExtractor.getValueType().coerce(leftExtractor.getValue(tuple)) :
                         leftExtractor.getValue(tuple)) :
-                rightExtractor.getValue(null, tuple.getFactHandle().getObject());
+                rightExtractor.getValue(tuple);
     }
 }
diff --git a/drools-base/src/main/java/org/drools/base/util/index/IndexUtil.java b/drools-base/src/main/java/org/drools/base/util/index/IndexUtil.java
index ff92741f8ab..86031f33df7 100644
--- a/drools-base/src/main/java/org/drools/base/util/index/IndexUtil.java
+++ b/drools-base/src/main/java/org/drools/base/util/index/IndexUtil.java
@@ -23,7 +23,7 @@
 import org.drools.base.rule.IndexableConstraint;
 import org.drools.base.rule.accessor.ReadAccessor;
 import org.drools.base.rule.accessor.TupleValueExtractor;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.kie.api.KieBaseConfiguration;
 import org.kie.api.conf.BetaRangeIndexOption;
 import org.kie.internal.conf.IndexPrecedenceOption;
@@ -34,7 +34,7 @@ public class IndexUtil {
     static boolean USE_COMPARISON_INDEX = true;
     static boolean USE_COMPARISON_INDEX_JOIN = true;
 
-    public static boolean compositeAllowed(BetaNodeFieldConstraint[] constraints, short betaNodeType, KieBaseConfiguration config) {
+    public static boolean compositeAllowed(BetaConstraint[] constraints, short betaNodeType, KieBaseConfiguration config) {
         // 1) If there is 1 or more unification restrictions it cannot be composite
         // 2) Ensures any non unification restrictions are first
         int firstUnification = -1;
@@ -61,7 +61,7 @@ public static boolean compositeAllowed(BetaNodeFieldConstraint[] constraints, sh
         return (firstUnification == -1);
     }
 
-    public static boolean isIndexable(BetaNodeFieldConstraint constraint, short nodeType, KieBaseConfiguration config) {
+    public static boolean isIndexable(BetaConstraint constraint, short nodeType, KieBaseConfiguration config) {
         return constraint instanceof IndexableConstraint && ((IndexableConstraint)constraint).isIndexable(nodeType, config) && !isBigDecimalEqualityConstraint((IndexableConstraint)constraint);
     }
 
@@ -71,6 +71,7 @@ public static boolean canHaveRangeIndex(short nodeType, IndexableConstraint cons
 
     private static boolean canHaveRangeIndexForNodeType(short nodeType, KieBaseConfiguration config) {
         if (USE_COMPARISON_INDEX_JOIN && config.getOption(BetaRangeIndexOption.KEY).isBetaRangeIndexEnabled()) {
+            boolean b = USE_COMPARISON_INDEX && (nodeType == NodeTypeEnums.NotNode || nodeType == NodeTypeEnums.ExistsNode || nodeType == NodeTypeEnums.JoinNode);
             return USE_COMPARISON_INDEX && (nodeType == NodeTypeEnums.NotNode || nodeType == NodeTypeEnums.ExistsNode || nodeType == NodeTypeEnums.JoinNode);
         } else {
             return USE_COMPARISON_INDEX && (nodeType == NodeTypeEnums.NotNode || nodeType == NodeTypeEnums.ExistsNode);
@@ -78,20 +79,20 @@ private static boolean canHaveRangeIndexForNodeType(short nodeType, KieBaseConfi
     }
 
     private static boolean areRangeIndexCompatibleOperands(IndexableConstraint constraint) {
-        ReadAccessor fieldExtractor;
-        TupleValueExtractor indexingDeclaration;
+        TupleValueExtractor rightTupleExtractor;
+        TupleValueExtractor leftTupleExtractor;
         try {
-            fieldExtractor = constraint.getFieldExtractor();
-            indexingDeclaration = constraint.getIndexExtractor();
+            rightTupleExtractor = constraint.getRightIndexExtractor();
+            leftTupleExtractor = constraint.getLeftIndexExtractor();
         } catch (UnsupportedOperationException uoe) {
             return false;
         }
-        if (fieldExtractor == null || indexingDeclaration == null) {
+        if (rightTupleExtractor == null || leftTupleExtractor == null) {
             return false;
         }
 
-        ValueType leftValueType = fieldExtractor.getValueType();
-        ValueType rightValueType = indexingDeclaration.getValueType();
+        ValueType leftValueType = rightTupleExtractor.getValueType();
+        ValueType rightValueType = leftTupleExtractor.getValueType();
 
         if (leftValueType != null && rightValueType != null) {
             if (leftValueType.isNumber() && rightValueType.isNumber()) {
@@ -104,7 +105,7 @@ private static boolean areRangeIndexCompatibleOperands(IndexableConstraint const
         return false;
     }
 
-    public static boolean isIndexableForNode(short nodeType, BetaNodeFieldConstraint constraint, KieBaseConfiguration config) {
+    public static boolean isIndexableForNode(short nodeType, BetaConstraint constraint, KieBaseConfiguration config) {
         if ( !(constraint instanceof IndexableConstraint) ) {
             return false;
         }
@@ -118,10 +119,21 @@ public static boolean isIndexableForNode(short nodeType, BetaNodeFieldConstraint
 
     public static boolean isBigDecimalEqualityConstraint(IndexableConstraint indexableConstraint) {
         // Note : BigDecimal is not indexable for equality, because new BigDecimal("10").equals(new BigDecimal("10.00")) returns false
-        return indexableConstraint.getConstraintType() == ConstraintTypeOperator.EQUAL && indexableConstraint.getFieldExtractor() != null && indexableConstraint.getFieldExtractor().getValueType() == ValueType.BIG_DECIMAL_TYPE;
+        if (indexableConstraint.getConstraintType() == ConstraintTypeOperator.EQUAL) {
+            if (indexableConstraint.getFieldExtractor() != null) {
+                return indexableConstraint.getFieldExtractor() != null && indexableConstraint.getFieldExtractor().getValueType() == ValueType.BIG_DECIMAL_TYPE;
+            } else {
+                return isBigDecimalEqualityConstraint(indexableConstraint.getLeftIndexExtractor()) || isBigDecimalEqualityConstraint(indexableConstraint.getRightIndexExtractor());
+            }
+        }
+        return false;
+    }
+
+    private static boolean isBigDecimalEqualityConstraint(TupleValueExtractor tupleValueExtractor) {
+        return tupleValueExtractor != null && tupleValueExtractor.getValueType()  == ValueType.BIG_DECIMAL_TYPE;
     }
 
-    public static boolean[] isIndexableForNode(IndexPrecedenceOption indexPrecedenceOption, short nodeType, int keyDepth, BetaNodeFieldConstraint[] constraints, KieBaseConfiguration config) {
+    public static boolean[] isIndexableForNode(IndexPrecedenceOption indexPrecedenceOption, short nodeType, int keyDepth, BetaConstraint[] constraints, KieBaseConfiguration config) {
         if (keyDepth < 1) {
             return new boolean[constraints.length];
         }
@@ -131,7 +143,7 @@ public static boolean[] isIndexableForNode(IndexPrecedenceOption indexPrecedence
                 findIndexableWithPatternOrder(nodeType, keyDepth, constraints, config);
     }
 
-    private static boolean[] findIndexableWithEqualityPriority(short nodeType, int keyDepth, BetaNodeFieldConstraint[] constraints, KieBaseConfiguration config) {
+    private static boolean[] findIndexableWithEqualityPriority(short nodeType, int keyDepth, BetaConstraint[] constraints, KieBaseConfiguration config) {
         boolean[] indexable = new boolean[constraints.length];
         if (hasEqualIndexable(keyDepth, indexable, constraints)) {
             return indexable;
@@ -151,7 +163,7 @@ private static boolean[] findIndexableWithEqualityPriority(short nodeType, int k
         return indexable;
     }
 
-    private static boolean[] findIndexableWithPatternOrder(short nodeType, int keyDepth, BetaNodeFieldConstraint[] constraints, KieBaseConfiguration config) {
+    private static boolean[] findIndexableWithPatternOrder(short nodeType, int keyDepth, BetaConstraint[] constraints, KieBaseConfiguration config) {
         boolean[] indexable = new boolean[constraints.length];
         for (int i = 0; i < constraints.length; i++) {
             if (isIndexable(constraints[i], nodeType, config)) {
@@ -167,11 +179,11 @@ private static boolean[] findIndexableWithPatternOrder(short nodeType, int keyDe
         return indexable;
     }
 
-    private static boolean hasEqualIndexable(int keyDepth, boolean[] indexable, BetaNodeFieldConstraint[] constraints) {
+    private static boolean hasEqualIndexable(int keyDepth, boolean[] indexable, BetaConstraint[] constraints) {
         return sortEqualIndexable(keyDepth, indexable, constraints, 0);
     }
 
-    private static boolean sortEqualIndexable(int keyDepth, boolean[] indexable, BetaNodeFieldConstraint[] constraints, int start) {
+    private static boolean sortEqualIndexable(int keyDepth, boolean[] indexable, BetaConstraint[] constraints, int start) {
         boolean hasEqualIndexable = false;
         int indexableCouter = 0;
         for (int i = start; i < constraints.length; i++) {
@@ -186,18 +198,18 @@ private static boolean sortEqualIndexable(int keyDepth, boolean[] indexable, Bet
         return hasEqualIndexable;
     }
 
-    private static void sortRangeIndexable(BetaNodeFieldConstraint[] constraints, boolean[] indexable, int i) {
+    private static void sortRangeIndexable(BetaConstraint[] constraints, boolean[] indexable, int i) {
         swap(constraints, i, 0);
         indexable[0] = true;
     }
 
-    public static boolean isEqualIndexable(BetaNodeFieldConstraint constraint) {
+    public static boolean isEqualIndexable(BetaConstraint constraint) {
         return constraint instanceof IndexableConstraint && ((IndexableConstraint)constraint).getConstraintType() == ConstraintTypeOperator.EQUAL && !isBigDecimalEqualityConstraint((IndexableConstraint)constraint);
     }
 
-    private static void swap(BetaNodeFieldConstraint[] constraints, int p1, int p2) {
+    private static void swap(BetaConstraint[] constraints, int p1, int p2) {
         if (p1 != p2) {
-            BetaNodeFieldConstraint temp = constraints[p2];
+            BetaConstraint temp = constraints[p2];
             constraints[p2] = constraints[p1];
             constraints[p1] = temp;
         }
diff --git a/drools-core/src/main/java/org/drools/core/common/BetaConstraints.java b/drools-core/src/main/java/org/drools/core/common/BetaConstraints.java
index 89fdbaefbbb..344defe27a8 100644
--- a/drools-core/src/main/java/org/drools/core/common/BetaConstraints.java
+++ b/drools-core/src/main/java/org/drools/core/common/BetaConstraints.java
@@ -22,9 +22,9 @@
 import java.util.List;
 
 import org.drools.base.base.ObjectType;
-import org.drools.base.rule.ContextEntry;
+import org.drools.base.reteoo.BaseTuple;
 import org.drools.base.rule.Pattern;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.core.RuleBaseConfiguration;
 import org.drools.core.reteoo.BetaMemory;
 import org.drools.core.reteoo.Tuple;
@@ -32,27 +32,26 @@
 import org.drools.util.bitmask.BitMask;
 import org.kie.api.runtime.rule.FactHandle;
 
-public interface BetaConstraints
+public interface BetaConstraints
     extends
     Externalizable {
 
-    ContextEntry[] createContext();
+    C createContext();
 
-    void updateFromTuple(ContextEntry[] context,
+    void updateFromTuple(C context,
                          ReteEvaluator reteEvaluator,
                          Tuple tuple);
 
-    void updateFromFactHandle(ContextEntry[] context,
+    void updateFromFactHandle(C context,
                               ReteEvaluator reteEvaluator,
                               FactHandle handle);
 
-    boolean isAllowedCachedLeft(ContextEntry[] context,
+    boolean isAllowedCachedLeft(C context,
                                 FactHandle handle);
 
-    boolean isAllowedCachedRight(ContextEntry[] context,
-                                 Tuple tuple);
+    boolean isAllowedCachedRight(BaseTuple tuple, C context);
 
-    BetaNodeFieldConstraint[] getConstraints();
+    BetaConstraint[] getConstraints();
 
     BetaConstraints getOriginalConstraint();
     
@@ -65,16 +64,16 @@ boolean isAllowedCachedRight(ContextEntry[] context,
     BetaMemory createBetaMemory(final RuleBaseConfiguration config,
                                 final short nodeType );
 
-    void resetTuple(final ContextEntry[] context);
+    void resetTuple(final C context);
 
-    void resetFactHandle(final ContextEntry[] context);
+    void resetFactHandle(final C context);
 
     BitMask getListenedPropertyMask(Pattern pattern, ObjectType modifiedType, List settableProperties);
 
     void init(BuildContext context, short betaNodeType);
     void initIndexes(int depth, short betaNodeType, RuleBaseConfiguration config);
 
-    BetaConstraints cloneIfInUse();
+     T cloneIfInUse();
 
     boolean isLeftUpdateOptimizationAllowed();
 
diff --git a/drools-core/src/main/java/org/drools/core/common/DefaultBetaConstraints.java b/drools-core/src/main/java/org/drools/core/common/DefaultBetaConstraints.java
index 9260152db1c..1030ca16f11 100644
--- a/drools-core/src/main/java/org/drools/core/common/DefaultBetaConstraints.java
+++ b/drools-core/src/main/java/org/drools/core/common/DefaultBetaConstraints.java
@@ -26,11 +26,12 @@
 import java.util.Optional;
 
 import org.drools.base.base.ObjectType;
+import org.drools.base.reteoo.BaseTuple;
 import org.drools.base.rule.ContextEntry;
 import org.drools.base.rule.IndexableConstraint;
 import org.drools.base.rule.MutableTypeConstraint;
 import org.drools.base.rule.Pattern;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.core.RuleBaseConfiguration;
 import org.drools.core.reteoo.BetaMemory;
 import org.drools.core.reteoo.Tuple;
@@ -47,13 +48,13 @@
 
 public class DefaultBetaConstraints
     implements
-    BetaConstraints {
+    BetaConstraints {
 
     private static final long serialVersionUID = 510l;
 
     protected transient boolean           disableIndexing;
 
-    protected BetaNodeFieldConstraint[]   constraints;
+    protected BetaConstraint[] constraints;
 
     protected IndexPrecedenceOption       indexPrecedenceOption;
 
@@ -64,7 +65,7 @@ public class DefaultBetaConstraints
     public DefaultBetaConstraints() {
 
     }
-    public DefaultBetaConstraints(final BetaNodeFieldConstraint[] constraints,
+    public DefaultBetaConstraints(final BetaConstraint[] constraints,
                                   final RuleBaseConfiguration conf) {
         this( constraints,
               conf,
@@ -72,7 +73,7 @@ public DefaultBetaConstraints(final BetaNodeFieldConstraint[] constraints,
 
     }
 
-    public DefaultBetaConstraints(final BetaNodeFieldConstraint[] constraints,
+    public DefaultBetaConstraints(final BetaConstraint[] constraints,
                                   final RuleBaseConfiguration conf,
                                   final boolean disableIndexing) {
         this.constraints = constraints;
@@ -82,7 +83,7 @@ public DefaultBetaConstraints(final BetaNodeFieldConstraint[] constraints,
 
     public DefaultBetaConstraints cloneIfInUse() {
         if (constraints[0] instanceof MutableTypeConstraint && ((MutableTypeConstraint)constraints[0]).setInUse()) {
-            BetaNodeFieldConstraint[] clonedConstraints = new BetaNodeFieldConstraint[constraints.length];
+            BetaConstraint[] clonedConstraints = new BetaConstraint[constraints.length];
             for (int i = 0; i < constraints.length; i++) {
                 clonedConstraints[i] = constraints[i].cloneIfInUse();
             }
@@ -125,7 +126,7 @@ public void initIndexes(int depth, short betaNodeType, RuleBaseConfiguration con
     }
 
     public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        constraints = (BetaNodeFieldConstraint[])in.readObject();
+        constraints = (BetaConstraint[])in.readObject();
         indexed     = in.readInt();
         indexPrecedenceOption = (IndexPrecedenceOption) in.readObject();
     }
@@ -139,7 +140,7 @@ public void writeExternal(ObjectOutput out) throws IOException {
     public ContextEntry[] createContext() {
         ContextEntry[] entries = new ContextEntry[constraints.length];
         for (int i = 0; i < constraints.length; i++) {
-            entries[i] = constraints[i].createContextEntry();
+            entries[i] = constraints[i].createContext();
         }
         return entries;
     }
@@ -194,8 +195,8 @@ public boolean isAllowedCachedLeft(final ContextEntry[] context,
     /* (non-Javadoc)
      * @see org.kie.common.BetaNodeConstraints#isAllowedCachedRight(org.kie.reteoo.ReteTuple)
      */
-    public boolean isAllowedCachedRight(final ContextEntry[] context,
-                                        final Tuple tuple) {
+    public boolean isAllowedCachedRight(final BaseTuple tuple,
+                                        final ContextEntry[] context) {
         for (int i = indexed; i < constraints.length; i++) {
             if ( !constraints[i].isAllowedCachedRight(tuple, context[i]) ) {
                 return false;
@@ -228,7 +229,7 @@ public int hashCode() {
     /* (non-Javadoc)
      * @see org.kie.common.BetaNodeConstraints#getConstraints()
      */
-    public BetaNodeFieldConstraint[] getConstraints() {
+    public BetaConstraint[] getConstraints() {
         return constraints;
     }
 
@@ -268,7 +269,7 @@ public BetaConstraints getOriginalConstraint() {
 
     public BitMask getListenedPropertyMask(Pattern pattern, ObjectType modifiedType, List settableProperties) {
         BitMask mask = getEmptyPropertyReactiveMask(settableProperties.size());
-        for (BetaNodeFieldConstraint constraint : constraints) {
+        for (BetaConstraint constraint : constraints) {
             mask = mask.setAll(constraint.getListenedPropertyMask(Optional.of(pattern), modifiedType, settableProperties));
         }
         return mask;
@@ -282,7 +283,7 @@ public boolean isLeftUpdateOptimizationAllowed() {
     }
 
     private boolean calcLeftUpdateOptimizationAllowed() {
-        for (BetaNodeFieldConstraint constraint : constraints) {
+        for (BetaConstraint constraint : constraints) {
             if ( !(constraint instanceof IndexableConstraint && ((IndexableConstraint)constraint).getConstraintType().isEquality()) ) {
                 return false;
             }
diff --git a/drools-core/src/main/java/org/drools/core/common/DoubleBetaConstraints.java b/drools-core/src/main/java/org/drools/core/common/DoubleBetaConstraints.java
index ea7cd3226dd..ab8bbaf7816 100644
--- a/drools-core/src/main/java/org/drools/core/common/DoubleBetaConstraints.java
+++ b/drools-core/src/main/java/org/drools/core/common/DoubleBetaConstraints.java
@@ -22,10 +22,11 @@
 import java.util.Optional;
 
 import org.drools.base.base.ObjectType;
+import org.drools.base.reteoo.BaseTuple;
 import org.drools.base.rule.ContextEntry;
 import org.drools.base.rule.MutableTypeConstraint;
 import org.drools.base.rule.Pattern;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.core.RuleBaseConfiguration;
 import org.drools.core.reteoo.Tuple;
 import org.drools.core.reteoo.builder.BuildContext;
@@ -39,20 +40,20 @@ public class DoubleBetaConstraints extends MultipleBetaConstraint {
 
     public DoubleBetaConstraints() { }
 
-    public DoubleBetaConstraints(final BetaNodeFieldConstraint[] constraints,
+    public DoubleBetaConstraints(final BetaConstraint[] constraints,
                                  final RuleBaseConfiguration conf) {
         this( constraints,
               conf,
               false );
     }
 
-    public DoubleBetaConstraints(final BetaNodeFieldConstraint[] constraints,
+    public DoubleBetaConstraints(final BetaConstraint[] constraints,
                                  final RuleBaseConfiguration conf,
                                  final boolean disableIndexing) {
         super(constraints, conf, disableIndexing);
     }
 
-    protected DoubleBetaConstraints( BetaNodeFieldConstraint[] constraints,
+    protected DoubleBetaConstraints( BetaConstraint[] constraints,
                                    IndexPrecedenceOption indexPrecedenceOption,
                                    boolean disableIndexing) {
         super(constraints, indexPrecedenceOption, disableIndexing);
@@ -60,7 +61,7 @@ protected DoubleBetaConstraints( BetaNodeFieldConstraint[] constraints,
 
     public DoubleBetaConstraints cloneIfInUse() {
         if (constraints[0] instanceof MutableTypeConstraint && ((MutableTypeConstraint)constraints[0]).setInUse()) {
-            BetaNodeFieldConstraint[] clonedConstraints = new BetaNodeFieldConstraint[constraints.length];
+            BetaConstraint[] clonedConstraints = new BetaConstraint[constraints.length];
             for (int i = 0; i < constraints.length; i++) {
                 clonedConstraints[i] = constraints[i].cloneIfInUse();
             }
@@ -117,8 +118,8 @@ public boolean isAllowedCachedLeft(final ContextEntry[] context,
     /* (non-Javadoc)
      * @see org.kie.common.BetaNodeConstraints#isAllowedCachedRight(org.kie.reteoo.ReteTuple)
      */
-    public boolean isAllowedCachedRight(final ContextEntry[] context,
-                                        final Tuple tuple) {
+    public boolean isAllowedCachedRight(final BaseTuple tuple,
+                                        final ContextEntry[] context) {
         return constraints[0].isAllowedCachedRight( tuple, context[0] ) &&
                constraints[1].isAllowedCachedRight( tuple, context[1] );
     }
diff --git a/drools-core/src/main/java/org/drools/core/common/DoubleNonIndexSkipBetaConstraints.java b/drools-core/src/main/java/org/drools/core/common/DoubleNonIndexSkipBetaConstraints.java
index 24a4a32b26a..573bf2879e4 100644
--- a/drools-core/src/main/java/org/drools/core/common/DoubleNonIndexSkipBetaConstraints.java
+++ b/drools-core/src/main/java/org/drools/core/common/DoubleNonIndexSkipBetaConstraints.java
@@ -25,10 +25,11 @@
 import java.util.Optional;
 
 import org.drools.base.base.ObjectType;
+import org.drools.base.reteoo.BaseTuple;
 import org.drools.base.rule.ContextEntry;
 import org.drools.base.rule.MutableTypeConstraint;
 import org.drools.base.rule.Pattern;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.core.RuleBaseConfiguration;
 import org.drools.core.reteoo.BetaMemory;
 import org.drools.core.reteoo.Tuple;
@@ -38,18 +39,18 @@
 
 public class DoubleNonIndexSkipBetaConstraints 
     implements
-    BetaConstraints {
+    BetaConstraints {
     
     private DoubleBetaConstraints constraints;
     
-    private BetaNodeFieldConstraint constraint0;
-    private BetaNodeFieldConstraint constraint1;
+    private BetaConstraint constraint0;
+    private BetaConstraint constraint1;
     
     public DoubleNonIndexSkipBetaConstraints() { }
 
     public DoubleNonIndexSkipBetaConstraints(DoubleBetaConstraints constraints) {
         this.constraints = constraints;
-        BetaNodeFieldConstraint[] constraint = constraints.getConstraints();
+        BetaConstraint[] constraint = constraints.getConstraints();
         this.constraint0 = constraint[0];
         this.constraint1 = constraint[1];
     }
@@ -119,7 +120,7 @@ public int hashCode() {
         return constraints.hashCode();
     }
 
-    public BetaNodeFieldConstraint[] getConstraints() {
+    public BetaConstraint[] getConstraints() {
         return constraints.getConstraints();
     }
 
@@ -146,9 +147,9 @@ public boolean isAllowedCachedLeft(final ContextEntry[] context,
                                                                                                        handle );
     }
 
-    public boolean isAllowedCachedRight(ContextEntry[] context,
-                                        Tuple tuple) {
-        return this.constraints.isAllowedCachedRight( context, tuple );
+    public boolean isAllowedCachedRight(final BaseTuple tuple,
+                                        final ContextEntry[] context) {
+        return this.constraints.isAllowedCachedRight( tuple, context );
     }
 
     public BitMask getListenedPropertyMask(Pattern pattern, ObjectType modifiedType, List settableProperties) {
diff --git a/drools-core/src/main/java/org/drools/core/common/EmptyBetaConstraints.java b/drools-core/src/main/java/org/drools/core/common/EmptyBetaConstraints.java
index 803b64e00a4..f8172727f73 100644
--- a/drools-core/src/main/java/org/drools/core/common/EmptyBetaConstraints.java
+++ b/drools-core/src/main/java/org/drools/core/common/EmptyBetaConstraints.java
@@ -24,9 +24,10 @@
 import java.util.List;
 
 import org.drools.base.base.ObjectType;
+import org.drools.base.reteoo.BaseTuple;
 import org.drools.base.rule.ContextEntry;
 import org.drools.base.rule.Pattern;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.core.RuleBaseConfiguration;
 import org.drools.core.reteoo.BetaMemory;
 import org.drools.core.reteoo.Tuple;
@@ -39,7 +40,7 @@
 
 public class EmptyBetaConstraints
     implements
-    BetaConstraints {
+    BetaConstraints {
 
     private static final BetaConstraints INSTANCE = new EmptyBetaConstraints();
     private static final ContextEntry[]  EMPTY    = new ContextEntry[0];
@@ -95,8 +96,8 @@ public boolean isAllowedCachedLeft(final ContextEntry[] context,
     /* (non-Javadoc)
      * @see org.kie.common.BetaNodeConstraints#isAllowedCachedRight(org.kie.reteoo.ReteTuple)
      */
-    public boolean isAllowedCachedRight(final ContextEntry[] context,
-                                        final Tuple tuple) {
+    public boolean isAllowedCachedRight(final BaseTuple tuple,
+                                        final ContextEntry[] context) {
         return true;
     }
 
@@ -127,8 +128,8 @@ public int hashCode() {
     /* (non-Javadoc)
      * @see org.kie.common.BetaNodeConstraints#getConstraints()
      */
-    public BetaNodeFieldConstraint[] getConstraints() {
-        return new BetaNodeFieldConstraint[0];
+    public BetaConstraint[] getConstraints() {
+        return new BetaConstraint[0];
     }
 
     /**
diff --git a/drools-core/src/main/java/org/drools/core/common/MultipleBetaConstraint.java b/drools-core/src/main/java/org/drools/core/common/MultipleBetaConstraint.java
index d082fc12cb0..835ec3e3d28 100644
--- a/drools-core/src/main/java/org/drools/core/common/MultipleBetaConstraint.java
+++ b/drools-core/src/main/java/org/drools/core/common/MultipleBetaConstraint.java
@@ -24,19 +24,19 @@
 
 import org.drools.base.rule.ContextEntry;
 import org.drools.base.rule.IndexableConstraint;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
 import org.drools.core.RuleBaseConfiguration;
 import org.drools.core.reteoo.BetaMemory;
 import org.drools.core.reteoo.builder.BuildContext;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.core.util.index.IndexFactory;
 import org.kie.internal.conf.IndexPrecedenceOption;
 
 import static org.drools.base.util.index.IndexUtil.compositeAllowed;
 import static org.drools.base.util.index.IndexUtil.isIndexableForNode;
 
-public abstract class MultipleBetaConstraint implements BetaConstraints {
-    protected BetaNodeFieldConstraint[] constraints;
-    protected boolean[]                 indexed;
+public abstract class MultipleBetaConstraint implements BetaConstraints {
+    protected BetaConstraint[] constraints;
+    protected boolean[]                      indexed;
     protected IndexPrecedenceOption     indexPrecedenceOption;
     protected transient boolean         disableIndexing;
 
@@ -44,13 +44,13 @@ public abstract class MultipleBetaConstraint implements BetaConstraints {
 
     public MultipleBetaConstraint() { }
 
-    public MultipleBetaConstraint( BetaNodeFieldConstraint[] constraints,
+    public MultipleBetaConstraint( BetaConstraint[] constraints,
                                    RuleBaseConfiguration conf,
                                    boolean disableIndexing) {
         this(constraints, conf.getIndexPrecedenceOption(), disableIndexing);
     }
 
-    protected MultipleBetaConstraint( BetaNodeFieldConstraint[] constraints,
+    protected MultipleBetaConstraint( BetaConstraint[] constraints,
                                       IndexPrecedenceOption indexPrecedenceOption,
                                       boolean disableIndexing) {
         this.constraints = constraints;
@@ -59,7 +59,7 @@ protected MultipleBetaConstraint( BetaNodeFieldConstraint[] constraints,
     }
 
     public final void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        constraints = (BetaNodeFieldConstraint[])in.readObject();
+        constraints = (BetaConstraint[])in.readObject();
         indexed = (boolean[]) in.readObject();
         indexPrecedenceOption = (IndexPrecedenceOption) in.readObject();
     }
@@ -109,14 +109,14 @@ public BetaMemory createBetaMemory(final RuleBaseConfiguration config,
         return IndexFactory.createBetaMemory(config, nodeType, constraints);
     }
 
-    public final BetaNodeFieldConstraint[] getConstraints() {
+    public final BetaConstraint[] getConstraints() {
         return constraints;
     }
 
     public final ContextEntry[] createContext() {
         ContextEntry[] entries = new ContextEntry[constraints.length];
         for (int i = 0; i < constraints.length; i++) {
-            entries[i] = constraints[i].createContextEntry();
+            entries[i] = constraints[i].createContext();
         }
         return entries;
     }
@@ -133,7 +133,7 @@ public boolean isLeftUpdateOptimizationAllowed() {
     }
 
     private boolean calcLeftUpdateOptimizationAllowed() {
-        for (BetaNodeFieldConstraint constraint : constraints) {
+        for (BetaConstraint constraint : constraints) {
             if ( !(constraint instanceof IndexableConstraint && ((IndexableConstraint)constraint).getConstraintType().isEquality()) ) {
                 return false;
             }
diff --git a/drools-core/src/main/java/org/drools/core/common/QuadroupleBetaConstraints.java b/drools-core/src/main/java/org/drools/core/common/QuadroupleBetaConstraints.java
index e662d567682..6cbea95bb25 100644
--- a/drools-core/src/main/java/org/drools/core/common/QuadroupleBetaConstraints.java
+++ b/drools-core/src/main/java/org/drools/core/common/QuadroupleBetaConstraints.java
@@ -22,10 +22,11 @@
 import java.util.Optional;
 
 import org.drools.base.base.ObjectType;
+import org.drools.base.reteoo.BaseTuple;
 import org.drools.base.rule.ContextEntry;
 import org.drools.base.rule.MutableTypeConstraint;
 import org.drools.base.rule.Pattern;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.core.RuleBaseConfiguration;
 import org.drools.core.reteoo.Tuple;
 import org.drools.core.reteoo.builder.BuildContext;
@@ -39,20 +40,20 @@ public class QuadroupleBetaConstraints extends MultipleBetaConstraint {
 
     public QuadroupleBetaConstraints() { }
 
-    public QuadroupleBetaConstraints(final BetaNodeFieldConstraint[] constraints,
+    public QuadroupleBetaConstraints(final BetaConstraint[] constraints,
                                      final RuleBaseConfiguration conf) {
         this(constraints,
                 conf,
                 false);
     }
 
-    public QuadroupleBetaConstraints(final BetaNodeFieldConstraint[] constraints,
+    public QuadroupleBetaConstraints(final BetaConstraint[] constraints,
                                      final RuleBaseConfiguration conf,
                                      final boolean disableIndexing) {
         super(constraints, conf, disableIndexing);
     }
 
-    protected QuadroupleBetaConstraints( BetaNodeFieldConstraint[] constraints,
+    protected QuadroupleBetaConstraints( BetaConstraint[] constraints,
                                    IndexPrecedenceOption indexPrecedenceOption,
                                    boolean disableIndexing) {
         super(constraints, indexPrecedenceOption, disableIndexing);
@@ -60,7 +61,7 @@ protected QuadroupleBetaConstraints( BetaNodeFieldConstraint[] constraints,
 
     public QuadroupleBetaConstraints cloneIfInUse() {
         if (constraints[0] instanceof MutableTypeConstraint && ((MutableTypeConstraint)constraints[0]).setInUse()) {
-            BetaNodeFieldConstraint[] clonedConstraints = new BetaNodeFieldConstraint[constraints.length];
+            BetaConstraint[] clonedConstraints = new BetaConstraint[constraints.length];
             for (int i = 0; i < constraints.length; i++) {
                 clonedConstraints[i] = constraints[i].cloneIfInUse();
             }
@@ -131,8 +132,8 @@ public boolean isAllowedCachedLeft(final ContextEntry[] context,
     /* (non-Javadoc)
      * @see org.kie.common.BetaNodeConstraints#isAllowedCachedRight(org.kie.reteoo.ReteTuple)
      */
-    public boolean isAllowedCachedRight(final ContextEntry[] context,
-                                        final Tuple tuple) {
+    public boolean isAllowedCachedRight(final BaseTuple tuple,
+                                        final ContextEntry[] context) {
         return constraints[0].isAllowedCachedRight(tuple, context[0]) &&
                constraints[1].isAllowedCachedRight(tuple, context[1]) &&
                constraints[2].isAllowedCachedRight( tuple, context[2] ) &&
diff --git a/drools-core/src/main/java/org/drools/core/common/QuadroupleNonIndexSkipBetaConstraints.java b/drools-core/src/main/java/org/drools/core/common/QuadroupleNonIndexSkipBetaConstraints.java
index 75c22f20a9f..61b9554df5a 100644
--- a/drools-core/src/main/java/org/drools/core/common/QuadroupleNonIndexSkipBetaConstraints.java
+++ b/drools-core/src/main/java/org/drools/core/common/QuadroupleNonIndexSkipBetaConstraints.java
@@ -25,10 +25,11 @@
 import java.util.Optional;
 
 import org.drools.base.base.ObjectType;
+import org.drools.base.reteoo.BaseTuple;
 import org.drools.base.rule.ContextEntry;
 import org.drools.base.rule.MutableTypeConstraint;
 import org.drools.base.rule.Pattern;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.core.RuleBaseConfiguration;
 import org.drools.core.reteoo.BetaMemory;
 import org.drools.core.reteoo.Tuple;
@@ -38,14 +39,14 @@
 
 public class QuadroupleNonIndexSkipBetaConstraints
         implements
-        BetaConstraints {
+        BetaConstraints {
 
     private QuadroupleBetaConstraints constraints;
 
-    private BetaNodeFieldConstraint constraint0;
-    private BetaNodeFieldConstraint constraint1;
-    private BetaNodeFieldConstraint constraint2;
-    private BetaNodeFieldConstraint constraint3;
+    private BetaConstraint constraint0;
+    private BetaConstraint constraint1;
+    private BetaConstraint constraint2;
+    private BetaConstraint constraint3;
 
     public QuadroupleNonIndexSkipBetaConstraints() {
 
@@ -53,7 +54,7 @@ public QuadroupleNonIndexSkipBetaConstraints() {
 
     public QuadroupleNonIndexSkipBetaConstraints(QuadroupleBetaConstraints constraints) {
         this.constraints = constraints;
-        BetaNodeFieldConstraint[] constraint = constraints.getConstraints();
+        BetaConstraint[] constraint = constraints.getConstraints();
         this.constraint0 = constraint[0];
         this.constraint1 = constraint[1];
         this.constraint2 = constraint[2];
@@ -125,7 +126,7 @@ public int hashCode() {
         return constraints.hashCode();
     }
 
-    public BetaNodeFieldConstraint[] getConstraints() {
+    public BetaConstraint[] getConstraints() {
         return constraints.getConstraints();
     }
 
@@ -153,9 +154,9 @@ public boolean isAllowedCachedLeft(final ContextEntry[] context,
                 && this.constraint3.isAllowedCachedLeft(context[3], handle);
     }
 
-    public boolean isAllowedCachedRight(ContextEntry[] context,
-                                        Tuple tuple) {
-        return this.constraints.isAllowedCachedRight(context, tuple);
+    public boolean isAllowedCachedRight(final BaseTuple tuple,
+                                        final ContextEntry[] context) {
+        return this.constraints.isAllowedCachedRight(tuple, context);
     }
 
     public BitMask getListenedPropertyMask(Pattern pattern, ObjectType modifiedType, List settableProperties) {
diff --git a/drools-core/src/main/java/org/drools/core/common/SingleBetaConstraints.java b/drools-core/src/main/java/org/drools/core/common/SingleBetaConstraints.java
index d4a00df2046..9a5008f75aa 100644
--- a/drools-core/src/main/java/org/drools/core/common/SingleBetaConstraints.java
+++ b/drools-core/src/main/java/org/drools/core/common/SingleBetaConstraints.java
@@ -25,10 +25,11 @@
 import java.util.Optional;
 
 import org.drools.base.base.ObjectType;
+import org.drools.base.reteoo.BaseTuple;
 import org.drools.base.rule.ContextEntry;
 import org.drools.base.rule.MutableTypeConstraint;
 import org.drools.base.rule.Pattern;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.base.util.index.IndexUtil;
 import org.drools.core.RuleBaseConfiguration;
 import org.drools.core.reteoo.BetaMemory;
@@ -40,11 +41,11 @@
 
 public class SingleBetaConstraints
     implements
-    BetaConstraints {
+    BetaConstraints {
 
     private static final long serialVersionUID = 510l;
 
-    protected BetaNodeFieldConstraint constraint;
+    protected BetaConstraint constraint;
 
     protected boolean indexed;
 
@@ -54,21 +55,21 @@ public SingleBetaConstraints() {
 
     }
 
-    public SingleBetaConstraints(final BetaNodeFieldConstraint[] constraint,
+    public SingleBetaConstraints(final BetaConstraint[] constraint,
                                  final RuleBaseConfiguration conf) {
         this(constraint[0],
              conf,
              false);
     }
 
-    public SingleBetaConstraints(final BetaNodeFieldConstraint constraint,
+    public SingleBetaConstraints(final BetaConstraint constraint,
                                  final RuleBaseConfiguration conf) {
         this(constraint,
              conf,
              false);
     }
 
-    public SingleBetaConstraints(final BetaNodeFieldConstraint constraint,
+    public SingleBetaConstraints(final BetaConstraint constraint,
                                  final RuleBaseConfiguration conf,
                                  final boolean disableIndex) {
         this.constraint = constraint;
@@ -90,7 +91,7 @@ public void initIndexes(int depth, short betaNodeType, RuleBaseConfiguration con
     }
 
     public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        constraint = (BetaNodeFieldConstraint) in.readObject();
+        constraint = (BetaConstraint) in.readObject();
         indexed = in.readBoolean();
 
     }
@@ -102,50 +103,53 @@ public void writeExternal(ObjectOutput out) throws IOException {
 
     public SingleBetaConstraints cloneIfInUse() {
         if (constraint instanceof MutableTypeConstraint && ((MutableTypeConstraint) constraint).setInUse()) {
-            SingleBetaConstraints clone = new SingleBetaConstraints(constraint.cloneIfInUse(), null, disableIndex);
-            clone.indexed = indexed;
-            return clone;
+            return clone();
         }
         return this;
     }
 
-    public ContextEntry[] createContext() {
-        return new ContextEntry[]{this.constraint.createContextEntry()};
+    public SingleBetaConstraints clone() {
+        SingleBetaConstraints clone = new SingleBetaConstraints(constraint.cloneIfInUse(), null, disableIndex);
+        clone.indexed = indexed;
+        return clone;
+    }
+
+    public ContextEntry createContext() {
+        return this.constraint.createContext();
     }
 
     /* (non-Javadoc)
      * @see org.kie.common.BetaNodeConstraints#updateFromTuple(org.kie.reteoo.ReteTuple)
      */
-    public void updateFromTuple(final ContextEntry[] context,
+    public void updateFromTuple(final ContextEntry context,
                                 final ReteEvaluator reteEvaluator,
                                 final Tuple tuple) {
-        context[0].updateFromTuple(reteEvaluator, tuple);
+        context.updateFromTuple(reteEvaluator, tuple);
     }
 
     /* (non-Javadoc)
      * @see org.kie.common.BetaNodeConstraints#updateFromFactHandle(org.kie.common.InternalFactHandle)
      */
-    public void updateFromFactHandle(final ContextEntry[] context,
+    public void updateFromFactHandle(final ContextEntry context,
                                      final ReteEvaluator reteEvaluator,
                                      final FactHandle handle) {
-        context[0].updateFromFactHandle(reteEvaluator, handle);
+        context.updateFromFactHandle(reteEvaluator, handle);
     }
 
     /* (non-Javadoc)
      * @see org.kie.common.BetaNodeConstraints#isAllowedCachedLeft(java.lang.Object)
      */
-    public boolean isAllowedCachedLeft(final ContextEntry[] context,
+    public boolean isAllowedCachedLeft(final ContextEntry context,
                                        final FactHandle handle) {
-        return this.indexed || this.constraint.isAllowedCachedLeft(context[0],
+        return this.indexed || this.constraint.isAllowedCachedLeft(context,
                                                                    handle);
     }
 
     /* (non-Javadoc)
      * @see org.kie.common.BetaNodeConstraints#isAllowedCachedRight(org.kie.reteoo.ReteTuple)
      */
-    public boolean isAllowedCachedRight(final ContextEntry[] context,
-                                        final Tuple tuple) {
-        return this.constraint.isAllowedCachedRight(tuple, context[0]);
+    public boolean isAllowedCachedRight(final BaseTuple tuple, final ContextEntry context) {
+        return this.constraint.isAllowedCachedRight(tuple, context);
     }
 
     public boolean isIndexed() {
@@ -169,15 +173,15 @@ public int hashCode() {
         return this.constraint.hashCode();
     }
 
-    public BetaNodeFieldConstraint getConstraint() {
+    public BetaConstraint getConstraint() {
         return this.constraint;
     }
 
     /* (non-Javadoc)
      * @see org.kie.common.BetaNodeConstraints#getConstraints()
      */
-    public BetaNodeFieldConstraint[] getConstraints() {
-        return new BetaNodeFieldConstraint[]{this.constraint};
+    public BetaConstraint[] getConstraints() {
+        return new BetaConstraint[]{this.constraint};
     }
 
     /**
@@ -201,12 +205,12 @@ public boolean equals(final Object object) {
         return this.constraint == other.constraint || this.constraint.equals(other.constraint);
     }
 
-    public void resetFactHandle(ContextEntry[] context) {
-        context[0].resetFactHandle();
+    public void resetFactHandle(ContextEntry context) {
+        context.resetFactHandle();
     }
 
-    public void resetTuple(ContextEntry[] context) {
-        context[0].resetTuple();
+    public void resetTuple(ContextEntry context) {
+        context.resetTuple();
     }
 
     public BetaConstraints getOriginalConstraint() {
diff --git a/drools-core/src/main/java/org/drools/core/common/SingleNonIndexSkipBetaConstraints.java b/drools-core/src/main/java/org/drools/core/common/SingleNonIndexSkipBetaConstraints.java
index 8a13e34194b..f4d62239531 100644
--- a/drools-core/src/main/java/org/drools/core/common/SingleNonIndexSkipBetaConstraints.java
+++ b/drools-core/src/main/java/org/drools/core/common/SingleNonIndexSkipBetaConstraints.java
@@ -25,10 +25,11 @@
 import java.util.Optional;
 
 import org.drools.base.base.ObjectType;
+import org.drools.base.reteoo.BaseTuple;
 import org.drools.base.rule.ContextEntry;
 import org.drools.base.rule.MutableTypeConstraint;
 import org.drools.base.rule.Pattern;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.core.RuleBaseConfiguration;
 import org.drools.core.reteoo.BetaMemory;
 import org.drools.core.reteoo.Tuple;
@@ -38,11 +39,11 @@
 
 public class SingleNonIndexSkipBetaConstraints 
     implements
-    BetaConstraints {
+    BetaConstraints {
     
     private SingleBetaConstraints constraints;
     
-    private BetaNodeFieldConstraint constraint;
+    private BetaConstraint constraint;
     
     public SingleNonIndexSkipBetaConstraints() {
 
@@ -80,17 +81,17 @@ public BetaConstraints getOriginalConstraint() {
         return this.constraints;
     }
 
-    public ContextEntry[] createContext() {
+    public ContextEntry createContext() {
         return constraints.createContext();
     }
 
-    public void updateFromTuple(ContextEntry[] context,
+    public void updateFromTuple(ContextEntry context,
                                 ReteEvaluator reteEvaluator,
                                 Tuple tuple) {
         constraints.updateFromTuple( context, reteEvaluator, tuple );
     }
 
-    public void updateFromFactHandle(ContextEntry[] context,
+    public void updateFromFactHandle(ContextEntry context,
                                      ReteEvaluator reteEvaluator,
                                      FactHandle handle) {
         constraints.updateFromFactHandle( context, reteEvaluator, handle );
@@ -118,7 +119,7 @@ public int hashCode() {
         return constraints.hashCode();
     }
 
-    public BetaNodeFieldConstraint[] getConstraints() {
+    public BetaConstraint[] getConstraints() {
         return constraints.getConstraints();
     }
 
@@ -126,11 +127,11 @@ public boolean equals(Object object) {
         return object instanceof SingleNonIndexSkipBetaConstraints && constraints.equals( ((SingleNonIndexSkipBetaConstraints)object).constraints );
     }
 
-    public void resetFactHandle(ContextEntry[] context) {
+    public void resetFactHandle(ContextEntry context) {
         constraints.resetFactHandle( context );
     }
 
-    public void resetTuple(ContextEntry[] context) {
+    public void resetTuple(ContextEntry context) {
         constraints.resetTuple( context );
     }
 
@@ -138,15 +139,15 @@ public String toString() {
         return constraints.toString();
     }
 
-    public boolean isAllowedCachedLeft(final ContextEntry[] context,
+    public boolean isAllowedCachedLeft(final ContextEntry context,
                                        final FactHandle handle) {
-        return this.constraint.isAllowedCachedLeft( context[0],
+        return this.constraint.isAllowedCachedLeft( context,
                                                      handle );
     }
 
-    public boolean isAllowedCachedRight(ContextEntry[] context,
-                                        Tuple tuple) {
-        return this.constraints.isAllowedCachedRight( context, tuple );
+    public boolean isAllowedCachedRight(final BaseTuple tuple,
+                                        final ContextEntry context) {
+        return this.constraints.isAllowedCachedRight(tuple, context);
     }
 
     public BitMask getListenedPropertyMask(Pattern pattern, ObjectType modifiedType, List settableProperties) {
diff --git a/drools-core/src/main/java/org/drools/core/common/TripleBetaConstraints.java b/drools-core/src/main/java/org/drools/core/common/TripleBetaConstraints.java
index 179284acee6..2fa95914e14 100644
--- a/drools-core/src/main/java/org/drools/core/common/TripleBetaConstraints.java
+++ b/drools-core/src/main/java/org/drools/core/common/TripleBetaConstraints.java
@@ -22,10 +22,11 @@
 import java.util.Optional;
 
 import org.drools.base.base.ObjectType;
+import org.drools.base.reteoo.BaseTuple;
 import org.drools.base.rule.ContextEntry;
 import org.drools.base.rule.MutableTypeConstraint;
 import org.drools.base.rule.Pattern;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.core.RuleBaseConfiguration;
 import org.drools.core.reteoo.Tuple;
 import org.drools.core.reteoo.builder.BuildContext;
@@ -39,20 +40,20 @@ public class TripleBetaConstraints extends MultipleBetaConstraint {
 
     public TripleBetaConstraints() { }
 
-    public TripleBetaConstraints(final BetaNodeFieldConstraint[] constraints,
+    public TripleBetaConstraints(final BetaConstraint[] constraints,
                                  final RuleBaseConfiguration conf) {
         this(constraints,
                 conf,
                 false);
     }
 
-    public TripleBetaConstraints(final BetaNodeFieldConstraint[] constraints,
+    public TripleBetaConstraints(final BetaConstraint[] constraints,
                                  final RuleBaseConfiguration conf,
                                  final boolean disableIndexing) {
         super(constraints, conf, disableIndexing);
     }
 
-    protected TripleBetaConstraints( BetaNodeFieldConstraint[] constraints,
+    protected TripleBetaConstraints( BetaConstraint[] constraints,
                                    IndexPrecedenceOption indexPrecedenceOption,
                                    boolean disableIndexing) {
         super(constraints, indexPrecedenceOption, disableIndexing);
@@ -60,7 +61,7 @@ protected TripleBetaConstraints( BetaNodeFieldConstraint[] constraints,
 
     public TripleBetaConstraints cloneIfInUse() {
         if (constraints[0] instanceof MutableTypeConstraint && ((MutableTypeConstraint)constraints[0]).setInUse()) {
-            BetaNodeFieldConstraint[] clonedConstraints = new BetaNodeFieldConstraint[constraints.length];
+            BetaConstraint[] clonedConstraints = new BetaConstraint[constraints.length];
             for (int i = 0; i < constraints.length; i++) {
                 clonedConstraints[i] = constraints[i].cloneIfInUse();
             }
@@ -124,8 +125,8 @@ public boolean isAllowedCachedLeft(final ContextEntry[] context,
     /* (non-Javadoc)
      * @see org.kie.common.BetaNodeConstraints#isAllowedCachedRight(org.kie.reteoo.ReteTuple)
      */
-    public boolean isAllowedCachedRight(final ContextEntry[] context,
-                                        final Tuple tuple) {
+    public boolean isAllowedCachedRight(final BaseTuple tuple,
+                                        final ContextEntry[] context) {
         return constraints[0].isAllowedCachedRight( tuple, context[0] ) &&
                constraints[1].isAllowedCachedRight( tuple, context[1] ) &&
                constraints[2].isAllowedCachedRight( tuple, context[2] );
diff --git a/drools-core/src/main/java/org/drools/core/common/TripleNonIndexSkipBetaConstraints.java b/drools-core/src/main/java/org/drools/core/common/TripleNonIndexSkipBetaConstraints.java
index cc84cab3e9d..de425ccdd96 100644
--- a/drools-core/src/main/java/org/drools/core/common/TripleNonIndexSkipBetaConstraints.java
+++ b/drools-core/src/main/java/org/drools/core/common/TripleNonIndexSkipBetaConstraints.java
@@ -25,10 +25,11 @@
 import java.util.Optional;
 
 import org.drools.base.base.ObjectType;
+import org.drools.base.reteoo.BaseTuple;
 import org.drools.base.rule.ContextEntry;
 import org.drools.base.rule.MutableTypeConstraint;
 import org.drools.base.rule.Pattern;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.core.RuleBaseConfiguration;
 import org.drools.core.reteoo.BetaMemory;
 import org.drools.core.reteoo.Tuple;
@@ -38,13 +39,13 @@
 
 public class TripleNonIndexSkipBetaConstraints
     implements
-    BetaConstraints {
+    BetaConstraints {
 
     private TripleBetaConstraints constraints;
 
-    private BetaNodeFieldConstraint constraint0;
-    private BetaNodeFieldConstraint constraint1;
-    private BetaNodeFieldConstraint constraint2;
+    private BetaConstraint constraint0;
+    private BetaConstraint constraint1;
+    private BetaConstraint constraint2;
 
     public TripleNonIndexSkipBetaConstraints() {
 
@@ -52,7 +53,7 @@ public TripleNonIndexSkipBetaConstraints() {
 
     public TripleNonIndexSkipBetaConstraints(TripleBetaConstraints constraints) {
         this.constraints = constraints;
-        BetaNodeFieldConstraint[] constraint = constraints.getConstraints();
+        BetaConstraint[] constraint = constraints.getConstraints();
         this.constraint0 = constraint[0];
         this.constraint1 = constraint[1];
         this.constraint2 = constraint[2];
@@ -123,7 +124,7 @@ public int hashCode() {
         return constraints.hashCode();
     }
 
-    public BetaNodeFieldConstraint[] getConstraints() {
+    public BetaConstraint[] getConstraints() {
         return constraints.getConstraints();
     }
 
@@ -151,9 +152,9 @@ public boolean isAllowedCachedLeft(final ContextEntry[] context,
                                                                                                                                                          handle );
     }
 
-    public boolean isAllowedCachedRight(ContextEntry[] context,
-                                        Tuple tuple) {
-        return this.constraints.isAllowedCachedRight( context, tuple );
+    public boolean isAllowedCachedRight(final BaseTuple tuple,
+                                        final ContextEntry[] context) {
+        return this.constraints.isAllowedCachedRight( tuple, context );
     }
 
     public BitMask getListenedPropertyMask(Pattern pattern, ObjectType modifiedType, List settableProperties) {
diff --git a/drools-core/src/main/java/org/drools/core/common/TupleStartEqualsConstraint.java b/drools-core/src/main/java/org/drools/core/common/TupleStartEqualsConstraint.java
index 4d2ee359722..a8d607d0d72 100755
--- a/drools-core/src/main/java/org/drools/core/common/TupleStartEqualsConstraint.java
+++ b/drools-core/src/main/java/org/drools/core/common/TupleStartEqualsConstraint.java
@@ -26,8 +26,8 @@
 import org.drools.base.reteoo.BaseTuple;
 import org.drools.base.rule.ContextEntry;
 import org.drools.base.rule.Declaration;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
 import org.drools.core.reteoo.LeftTuple;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.core.reteoo.Tuple;
 import org.kie.api.runtime.rule.FactHandle;
 
@@ -52,7 +52,7 @@
  */
 public class TupleStartEqualsConstraint
     implements
-    BetaNodeFieldConstraint {
+    BetaConstraint {
 
     private static final long                       serialVersionUID = 510l;
 
@@ -88,7 +88,7 @@ public boolean isTemporal() {
         return false;
     }
 
-    public ContextEntry createContextEntry() {
+    public ContextEntry createContext() {
         return new TupleStartEqualsConstraintContextEntry();
     }
 
@@ -190,7 +190,7 @@ public ConstraintType getType() {
         return ConstraintType.BETA;
     }
 
-    public BetaNodeFieldConstraint cloneIfInUse() {
+    public BetaConstraint cloneIfInUse() {
         return this;
     }
 }
diff --git a/drools-core/src/main/java/org/drools/core/phreak/PhreakAccumulateNode.java b/drools-core/src/main/java/org/drools/core/phreak/PhreakAccumulateNode.java
index c63a815acc3..7d8419b550f 100644
--- a/drools-core/src/main/java/org/drools/core/phreak/PhreakAccumulateNode.java
+++ b/drools-core/src/main/java/org/drools/core/phreak/PhreakAccumulateNode.java
@@ -37,8 +37,8 @@
 import org.drools.core.reteoo.LeftTupleSink;
 import org.drools.core.reteoo.RightTuple;
 import org.drools.core.reteoo.RightTupleImpl;
-import org.drools.core.reteoo.Tuple;
 import org.drools.core.reteoo.TupleMemory;
+import org.drools.core.reteoo.Tuple;
 import org.drools.core.util.AbstractHashTable;
 import org.drools.core.util.FastIterator;
 import org.kie.api.runtime.rule.FactHandle;
@@ -141,7 +141,7 @@ private void doLeftInserts(AccumulateNode accNode,
         BetaMemory bm = am.getBetaMemory();
         TupleMemory ltm = bm.getLeftTupleMemory();
         TupleMemory rtm = bm.getRightTupleMemory();
-        ContextEntry[] contextEntry = bm.getContext();
+        Object contextEntry = bm.getContext();
         BetaConstraints constraints = accNode.getRawConstraints();
 
         boolean leftTupleMemoryEnabled = accNode.isLeftTupleMemoryEnabled();
@@ -223,7 +223,7 @@ private void doRightInserts(AccumulateNode accNode,
         BetaMemory bm = am.getBetaMemory();
         TupleMemory ltm = bm.getLeftTupleMemory();
         TupleMemory rtm = bm.getRightTupleMemory();
-        ContextEntry[] contextEntry = bm.getContext();
+        Object contextEntry = bm.getContext();
         BetaConstraints constraints = accNode.getRawConstraints();
 
         if (srcRightTuples.getInsertSize() > 32 && rtm instanceof AbstractHashTable ) {
@@ -249,8 +249,8 @@ private void doRightInserts(AccumulateNode accNode,
                 FastIterator leftIt = accNode.getLeftIterator( ltm );
 
                 for ( LeftTuple leftTuple = accNode.getFirstLeftTuple( rightTuple, ltm, leftIt ); leftTuple != null; leftTuple = (LeftTuple) leftIt.next( leftTuple ) ) {
-                    if ( constraints.isAllowedCachedRight( contextEntry,
-                                                           leftTuple ) ) {
+                    if ( constraints.isAllowedCachedRight(leftTuple, contextEntry
+                                                         ) ) {
                         final BaseAccumulation accctx = (BaseAccumulation) leftTuple.getContextObject();
                         addMatch( accNode, accumulate, leftTuple, rightTuple,
                                   null, null, reteEvaluator, am,
@@ -278,7 +278,7 @@ private void doLeftUpdates(AccumulateNode accNode,
         BetaMemory bm = am.getBetaMemory();
         TupleMemory rtm = bm.getRightTupleMemory();
         Accumulate accumulate = accNode.getAccumulate();
-        ContextEntry[] contextEntry = bm.getContext();
+        Object contextEntry = bm.getContext();
         BetaConstraints constraints = accNode.getRawConstraints();
 
         for (LeftTuple leftTuple = srcLeftTuples.getUpdateFirst(); leftTuple != null; ) {
@@ -413,7 +413,7 @@ private void doRightUpdates(AccumulateNode accNode,
                                 TupleSets trgLeftTuples) {
         BetaMemory bm = am.getBetaMemory();
         TupleMemory ltm = bm.getLeftTupleMemory();
-        ContextEntry[] contextEntry = bm.getContext();
+        Object contextEntry = bm.getContext();
         BetaConstraints constraints = accNode.getRawConstraints();
         Accumulate accumulate = accNode.getAccumulate();
 
@@ -480,8 +480,8 @@ private void doRightUpdatesProcessChildren(AccumulateNode accNode,
             // either we are indexed and changed buckets or
             // we had no children before, but there is a bucket to potentially match, so try as normal assert
             for (; leftTuple != null; leftTuple = (LeftTuple) leftIt.next(leftTuple)) {
-                if (constraints.isAllowedCachedRight(bm.getContext(),
-                                                     leftTuple)) {
+                if (constraints.isAllowedCachedRight(leftTuple, bm.getContext()
+                                                    )) {
                     if (leftTuple.getStagedType() == LeftTuple.NONE) {
                         trgLeftTuples.addUpdate(leftTuple);
                     }
@@ -495,8 +495,8 @@ private void doRightUpdatesProcessChildren(AccumulateNode accNode,
         } else {
             // in the same bucket, so iterate and compare
             for (; leftTuple != null; leftTuple = (LeftTuple) leftIt.next(leftTuple)) {
-                if (constraints.isAllowedCachedRight(bm.getContext(),
-                                                     leftTuple)) {
+                if (constraints.isAllowedCachedRight(leftTuple, bm.getContext()
+                                                    )) {
                     if (leftTuple.getStagedType() == LeftTuple.NONE) {
                         trgLeftTuples.addUpdate(leftTuple);
                     }
diff --git a/drools-core/src/main/java/org/drools/core/phreak/PhreakAsyncReceiveNode.java b/drools-core/src/main/java/org/drools/core/phreak/PhreakAsyncReceiveNode.java
index 601279f0503..d4c2a7ffdb0 100644
--- a/drools-core/src/main/java/org/drools/core/phreak/PhreakAsyncReceiveNode.java
+++ b/drools-core/src/main/java/org/drools/core/phreak/PhreakAsyncReceiveNode.java
@@ -70,7 +70,7 @@ private static void doPropagateChildLeftTuples(AsyncReceiveNode node,
                                                    TupleSets trgLeftTuples) {
 
         BetaConstraints betaConstraints = node.getBetaConstraints();
-        ContextEntry[] context = betaConstraints.createContext();
+        Object context = betaConstraints.createContext();
 
         TupleList leftTuples = memory.getInsertOrUpdateLeftTuples();
         for ( LeftTuple leftTuple = (LeftTuple) leftTuples.getFirst(); leftTuple != null; leftTuple = (LeftTuple) leftTuple.getNext() ) {
diff --git a/drools-core/src/main/java/org/drools/core/phreak/PhreakAsyncSendNode.java b/drools-core/src/main/java/org/drools/core/phreak/PhreakAsyncSendNode.java
index 21637bc42ad..d5f7017ca0b 100644
--- a/drools-core/src/main/java/org/drools/core/phreak/PhreakAsyncSendNode.java
+++ b/drools-core/src/main/java/org/drools/core/phreak/PhreakAsyncSendNode.java
@@ -61,7 +61,7 @@ public void doLeftInserts(AsyncSendNode node,
                               TupleSets srcLeftTuples) {
 
         BetaMemory bm = memory.getBetaMemory();
-        ContextEntry[] context = bm.getContext();
+        Object context = bm.getContext();
         BetaConstraints betaConstraints = node.getBetaConstraints();
         AlphaNodeFieldConstraint[] alphaConstraints = node.getAlphaConstraints();
         DataProvider dataProvider = node.getDataProvider();
@@ -96,7 +96,7 @@ public void doLeftInserts(AsyncSendNode node,
     }
 
     private void fetchAndSendResults(AsyncSendNode node, AsyncSendMemory memory, ReteEvaluator reteEvaluator,
-                                     ContextEntry[] context, BetaConstraints betaConstraints, AlphaNodeFieldConstraint[] alphaConstraints,
+                                     Object context, BetaConstraints betaConstraints, AlphaNodeFieldConstraint[] alphaConstraints,
                                      DataProvider dataProvider, Class resultClass, LeftTuple leftTuple, PropagationContext propagationContext ) {
         for (final java.util.Iterator it = dataProvider.getResults(leftTuple,
                                                                       reteEvaluator,
@@ -131,7 +131,7 @@ public void propagate( AsyncSendNode node,
                            ReteEvaluator reteEvaluator,
                            InternalFactHandle factHandle,
                            BetaConstraints betaConstraints,
-                           ContextEntry[] context ) {
+                           Object context ) {
         if (betaConstraints.isAllowedCachedLeft(context, factHandle)) {
             AsyncMessagesCoordinator.get().propagate( node.getMessageId(), new AsyncMessage( reteEvaluator, factHandle.getObject() ) );
         }
diff --git a/drools-core/src/main/java/org/drools/core/phreak/PhreakExistsNode.java b/drools-core/src/main/java/org/drools/core/phreak/PhreakExistsNode.java
index 95d796c565a..b826bf6e36a 100644
--- a/drools-core/src/main/java/org/drools/core/phreak/PhreakExistsNode.java
+++ b/drools-core/src/main/java/org/drools/core/phreak/PhreakExistsNode.java
@@ -111,7 +111,7 @@ public void doLeftInserts(ExistsNode existsNode,
                               TupleSets trgLeftTuples) {
         TupleMemory ltm = bm.getLeftTupleMemory();
         TupleMemory rtm = bm.getRightTupleMemory();
-        ContextEntry[] contextEntry = bm.getContext();
+        Object contextEntry = bm.getContext();
         BetaConstraints constraints = existsNode.getRawConstraints();
 
         for (LeftTuple leftTuple = srcLeftTuples.getInsertFirst(); leftTuple != null; ) {
@@ -147,7 +147,7 @@ public void doRightInserts(ExistsNode existsNode,
                                TupleSets trgLeftTuples) {
         TupleMemory ltm = bm.getLeftTupleMemory();
         TupleMemory rtm = bm.getRightTupleMemory();
-        ContextEntry[] contextEntry = bm.getContext();
+        Object contextEntry = bm.getContext();
         BetaConstraints constraints = existsNode.getRawConstraints();
 
         for (RightTuple rightTuple = srcRightTuples.getInsertFirst(); rightTuple != null; ) {
@@ -172,8 +172,8 @@ public void doRightInserts(ExistsNode existsNode,
                     }
 
                     // we know that only unblocked LeftTuples are  still in the memory
-                    if ( constraints.isAllowedCachedRight( contextEntry,
-                                                           leftTuple ) ) {
+                    if ( constraints.isAllowedCachedRight(leftTuple, contextEntry
+                                                         ) ) {
                         leftTuple.setBlocker( rightTuple );
                         rightTuple.addBlocked( leftTuple );
 
@@ -200,7 +200,7 @@ public void doLeftUpdates(ExistsNode existsNode,
                               TupleSets stagedLeftTuples) {
         TupleMemory ltm = bm.getLeftTupleMemory();
         TupleMemory rtm = bm.getRightTupleMemory();
-        ContextEntry[] contextEntry = bm.getContext();
+        Object contextEntry = bm.getContext();
         BetaConstraints constraints = existsNode.getRawConstraints();
         boolean leftUpdateOptimizationAllowed = existsNode.isLeftUpdateOptimizationAllowed();
 
@@ -299,7 +299,7 @@ public void doRightUpdates(ExistsNode existsNode,
                                TupleSets stagedLeftTuples) {
         TupleMemory ltm = bm.getLeftTupleMemory();
         TupleMemory rtm = bm.getRightTupleMemory();
-        ContextEntry[] contextEntry = bm.getContext();
+        Object contextEntry = bm.getContext();
         BetaConstraints constraints = existsNode.getRawConstraints();
 
         boolean iterateFromStart = existsNode.isIndexedUnificationJoin() || rtm.getIndexType().isComparison();
@@ -329,8 +329,8 @@ public void doRightUpdates(ExistsNode existsNode,
                     }
 
                     // we know that only unblocked LeftTuples are  still in the memory
-                    if ( constraints.isAllowedCachedRight( contextEntry,
-                                                           leftTuple ) ) {
+                    if ( constraints.isAllowedCachedRight(leftTuple, contextEntry
+                                                         ) ) {
                         leftTuple.setBlocker( rightTuple );
                         rightTuple.addBlocked( leftTuple );
 
@@ -448,7 +448,7 @@ public void doRightDeletes(ExistsNode existsNode,
                                TupleSets stagedLeftTuples) {
         TupleMemory rtm = bm.getRightTupleMemory();
         TupleMemory ltm = bm.getLeftTupleMemory();
-        ContextEntry[] contextEntry = bm.getContext();
+        Object contextEntry = bm.getContext();
         BetaConstraints constraints = existsNode.getRawConstraints();
 
         for (RightTuple rightTuple = srcRightTuples.getDeleteFirst(); rightTuple != null; ) {
diff --git a/drools-core/src/main/java/org/drools/core/phreak/PhreakFromNode.java b/drools-core/src/main/java/org/drools/core/phreak/PhreakFromNode.java
index 6a4f5198c86..11ee9d585ba 100644
--- a/drools-core/src/main/java/org/drools/core/phreak/PhreakFromNode.java
+++ b/drools-core/src/main/java/org/drools/core/phreak/PhreakFromNode.java
@@ -77,7 +77,7 @@ public void doLeftInserts(FromNode fromNode,
                               TupleSets trgLeftTuples) {
 
         BetaMemory bm = fm.getBetaMemory();
-        ContextEntry[] context = bm.getContext();
+        Object context = bm.getContext();
         BetaConstraints betaConstraints = fromNode.getBetaConstraints();
         AlphaNodeFieldConstraint[] alphaConstraints = fromNode.getAlphaConstraints();
         DataProvider dataProvider = fromNode.getDataProvider();
@@ -132,7 +132,7 @@ public void doLeftUpdates(FromNode fromNode,
                               TupleSets trgLeftTuples,
                               TupleSets stagedLeftTuples) {
         BetaMemory bm = fm.getBetaMemory();
-        ContextEntry[] context = bm.getContext();
+        Object context = bm.getContext();
         BetaConstraints betaConstraints = fromNode.getBetaConstraints();
         AlphaNodeFieldConstraint[] alphaConstraints = fromNode.getAlphaConstraints();
         DataProvider dataProvider = fromNode.getDataProvider();
@@ -237,7 +237,7 @@ public static void propagate( LeftTupleSink sink,
                                   RightTuple rightTuple,
                                   BetaConstraints betaConstraints,
                                   PropagationContext propagationContext,
-                                  ContextEntry[] context,
+                                  Object context,
                                   boolean useLeftMemory,
                                   TupleSets trgLeftTuples,
                                   TupleSets stagedLeftTuples ) {
diff --git a/drools-core/src/main/java/org/drools/core/phreak/PhreakJoinNode.java b/drools-core/src/main/java/org/drools/core/phreak/PhreakJoinNode.java
index 313e0505f5a..d61c9ccf80b 100644
--- a/drools-core/src/main/java/org/drools/core/phreak/PhreakJoinNode.java
+++ b/drools-core/src/main/java/org/drools/core/phreak/PhreakJoinNode.java
@@ -80,13 +80,13 @@ public void doNode(JoinNode joinNode,
 
     public void doLeftInserts(JoinNode joinNode,
                               LeftTupleSink sink,
-                              BetaMemory bm,
+                              BetaMemory bm,
                               ReteEvaluator reteEvaluator,
                               TupleSets srcLeftTuples,
                               TupleSets trgLeftTuples) {
         TupleMemory ltm = bm.getLeftTupleMemory();
         TupleMemory rtm = bm.getRightTupleMemory();
-        ContextEntry[] contextEntry = bm.getContext();
+        Object contextEntry = bm.getContext();
         BetaConstraints constraints = joinNode.getRawConstraints();
 
         for (LeftTuple leftTuple = srcLeftTuples.getInsertFirst(); leftTuple != null; ) {
@@ -124,13 +124,13 @@ public void doLeftInserts(JoinNode joinNode,
 
     public void doRightInserts(JoinNode joinNode,
                                LeftTupleSink sink,
-                               BetaMemory bm,
+                               BetaMemory bm,
                                ReteEvaluator reteEvaluator,
                                TupleSets srcRightTuples,
                                TupleSets trgLeftTuples) {
         TupleMemory ltm = bm.getLeftTupleMemory();
         TupleMemory rtm = bm.getRightTupleMemory();
-        ContextEntry[] contextEntry = bm.getContext();
+        Object contextEntry = bm.getContext();
         BetaConstraints constraints = joinNode.getRawConstraints();
 
         if (srcRightTuples.getInsertSize() > 32 && rtm instanceof AbstractHashTable ) {
@@ -154,8 +154,8 @@ public void doRightInserts(JoinNode joinNode,
                         continue;
                     }
 
-                    if ( constraints.isAllowedCachedRight( contextEntry,
-                                                           leftTuple ) ) {
+                    if ( constraints.isAllowedCachedRight(leftTuple, contextEntry
+                                                         ) ) {
                         insertChildLeftTuple( trgLeftTuples,
                                               leftTuple,
                                               rightTuple,
@@ -174,13 +174,13 @@ public void doRightInserts(JoinNode joinNode,
 
     public void doLeftUpdates(JoinNode joinNode,
                               LeftTupleSink sink,
-                              BetaMemory bm,
+                              BetaMemory bm,
                               ReteEvaluator reteEvaluator,
                               TupleSets srcLeftTuples,
                               TupleSets trgLeftTuples,
                               TupleSets stagedLeftTuples) {
         TupleMemory rtm = bm.getRightTupleMemory();
-        ContextEntry[] contextEntry = bm.getContext();
+        Object contextEntry = bm.getContext();
         BetaConstraints constraints = joinNode.getRawConstraints();
 
         for (LeftTuple leftTuple = srcLeftTuples.getUpdateFirst(); leftTuple != null; ) {
@@ -220,7 +220,7 @@ public LeftTuple doLeftUpdatesProcessChildren(LeftTuple childLeftTuple,
                                                   LeftTuple leftTuple,
                                                   RightTuple rightTuple,
                                                   TupleSets stagedLeftTuples,
-                                                  ContextEntry[] contextEntry,
+                                                  Object contextEntry,
                                                   BetaConstraints constraints,
                                                   LeftTupleSink sink,
                                                   FastIterator it,
@@ -283,7 +283,7 @@ public void doRightUpdates(JoinNode joinNode,
                                TupleSets trgLeftTuples,
                                TupleSets stagedLeftTuples) {
         TupleMemory ltm = bm.getLeftTupleMemory();
-        ContextEntry[] contextEntry = bm.getContext();
+        Object contextEntry = bm.getContext();
         BetaConstraints constraints = joinNode.getRawConstraints();
 
         for (RightTuple rightTuple = srcRightTuples.getUpdateFirst(); rightTuple != null; ) {
@@ -326,7 +326,7 @@ public LeftTuple doRightUpdatesProcessChildren(LeftTuple childLeftTuple,
                                                    LeftTuple leftTuple,
                                                    RightTuple rightTuple,
                                                    TupleSets stagedLeftTuples,
-                                                   ContextEntry[] contextEntry,
+                                                   Object contextEntry,
                                                    BetaConstraints constraints,
                                                    LeftTupleSink sink,
                                                    FastIterator it,
@@ -340,8 +340,8 @@ public LeftTuple doRightUpdatesProcessChildren(LeftTuple childLeftTuple,
                     continue;
                 }
 
-                if (constraints.isAllowedCachedRight(contextEntry,
-                                                     leftTuple)) {
+                if (constraints.isAllowedCachedRight(leftTuple, contextEntry
+                                                    )) {
                     insertChildLeftTuple(trgLeftTuples,
                                          leftTuple,
                                          rightTuple,
@@ -358,8 +358,8 @@ public LeftTuple doRightUpdatesProcessChildren(LeftTuple childLeftTuple,
                     // ignore, as it will get processed via left iteration. Children cannot be processed twice
                     continue;
                 }
-                if (constraints.isAllowedCachedRight(contextEntry,
-                                                     leftTuple)) {
+                if (constraints.isAllowedCachedRight(leftTuple, contextEntry
+                                                    )) {
                     // insert, childLeftTuple is not updated
                     if (childLeftTuple == null || childLeftTuple.getLeftParent() != leftTuple) {
                         insertChildLeftTuple(trgLeftTuples,
diff --git a/drools-core/src/main/java/org/drools/core/phreak/PhreakNotNode.java b/drools-core/src/main/java/org/drools/core/phreak/PhreakNotNode.java
index 0e8766dde8d..e56f173d884 100644
--- a/drools-core/src/main/java/org/drools/core/phreak/PhreakNotNode.java
+++ b/drools-core/src/main/java/org/drools/core/phreak/PhreakNotNode.java
@@ -18,7 +18,6 @@
  */
 package org.drools.core.phreak;
 
-import org.drools.base.rule.ContextEntry;
 import org.drools.core.common.BetaConstraints;
 import org.drools.core.common.PropagationContext;
 import org.drools.core.common.ReteEvaluator;
@@ -115,7 +114,7 @@ public void doLeftInserts(NotNode notNode,
                               TupleSets trgLeftTuples) {
         TupleMemory ltm = bm.getLeftTupleMemory();
         TupleMemory rtm = bm.getRightTupleMemory();
-        ContextEntry[] contextEntry = bm.getContext();
+        Object contextEntry = bm.getContext();
         BetaConstraints constraints = notNode.getRawConstraints();
 
         for (LeftTuple leftTuple = srcLeftTuples.getInsertFirst(); leftTuple != null; ) {
@@ -148,7 +147,7 @@ public void doRightInserts(NotNode notNode,
 
         TupleMemory ltm = bm.getLeftTupleMemory();
         TupleMemory rtm = bm.getRightTupleMemory();
-        ContextEntry[] contextEntry = bm.getContext();
+        Object contextEntry = bm.getContext();
         BetaConstraints constraints = notNode.getRawConstraints();
 
         // this must be processed here, rather than initial insert, as we need to link the blocker
@@ -177,8 +176,8 @@ public void doRightInserts(NotNode notNode,
                     }
 
                     // we know that only unblocked LeftTuples are  still in the memory
-                    if ( constraints.isAllowedCachedRight( contextEntry,
-                                                           leftTuple ) ) {
+                    if ( constraints.isAllowedCachedRight(leftTuple, contextEntry
+                                                         ) ) {
                         leftTuple.setBlocker( rightTuple );
                         rightTuple.addBlocked( leftTuple );
 
@@ -223,7 +222,7 @@ public void doLeftUpdates(NotNode notNode,
                               TupleSets stagedLeftTuples) {
         TupleMemory ltm = bm.getLeftTupleMemory();
         TupleMemory rtm = bm.getRightTupleMemory();
-        ContextEntry[] contextEntry = bm.getContext();
+        Object contextEntry = bm.getContext();
         BetaConstraints constraints = notNode.getRawConstraints();
         boolean leftUpdateOptimizationAllowed = notNode.isLeftUpdateOptimizationAllowed();
 
@@ -316,7 +315,7 @@ public void doRightUpdates(NotNode notNode,
                                TupleSets stagedLeftTuples) {
         TupleMemory ltm = bm.getLeftTupleMemory();
         TupleMemory rtm = bm.getRightTupleMemory();
-        ContextEntry[] contextEntry = bm.getContext();
+        Object contextEntry = bm.getContext();
         BetaConstraints constraints = notNode.getRawConstraints();
 
         boolean iterateFromStart = notNode.isIndexedUnificationJoin() || rtm.getIndexType().isComparison();
@@ -345,8 +344,8 @@ public void doRightUpdates(NotNode notNode,
                     }
 
                     // we know that only unblocked LeftTuples are  still in the memory
-                    if ( constraints.isAllowedCachedRight( contextEntry,
-                                                           leftTuple ) ) {
+                    if ( constraints.isAllowedCachedRight(leftTuple, contextEntry
+                                                         ) ) {
                         leftTuple.setBlocker( rightTuple );
                         rightTuple.addBlocked( leftTuple );
 
@@ -373,7 +372,7 @@ public void doRightUpdates(NotNode notNode,
         constraints.resetTuple(contextEntry);
     }
 
-    public static boolean updateBlockersAndPropagate(NotNode notNode, RightTuple rightTuple, ReteEvaluator reteEvaluator, TupleMemory rtm, ContextEntry[] contextEntry,
+    public static boolean updateBlockersAndPropagate(NotNode notNode, RightTuple rightTuple, ReteEvaluator reteEvaluator, TupleMemory rtm, Object contextEntry,
                                                      BetaConstraints constraints, boolean iterateFromStart, LeftTupleSink sink, TupleSets trgLeftTuples, TupleMemory ltm) {
         LeftTuple firstBlocked = rightTuple.getTempBlocked();
         if ( firstBlocked != null ) {
@@ -467,7 +466,7 @@ public void doRightDeletes(NotNode notNode,
                                TupleSets trgLeftTuples) {
         TupleMemory ltm = bm.getLeftTupleMemory();
         TupleMemory rtm = bm.getRightTupleMemory();
-        ContextEntry[] contextEntry = bm.getContext();
+        Object contextEntry = bm.getContext();
         BetaConstraints constraints = notNode.getRawConstraints();
 
         for (RightTuple rightTuple = srcRightTuples.getDeleteFirst(); rightTuple != null; ) {
diff --git a/drools-core/src/main/java/org/drools/core/phreak/ReactiveObjectUtil.java b/drools-core/src/main/java/org/drools/core/phreak/ReactiveObjectUtil.java
index fbddf9819e8..4b106c055f1 100644
--- a/drools-core/src/main/java/org/drools/core/phreak/ReactiveObjectUtil.java
+++ b/drools-core/src/main/java/org/drools/core/phreak/ReactiveObjectUtil.java
@@ -92,7 +92,7 @@ public void internalExecute(ReteEvaluator reteEvaluator ) {
             InternalFactHandle factHandle = node.createFactHandle( reteEvaluator, object );
 
             if ( type != ModificationType.REMOVE && isAllowed( factHandle, node.getAlphaConstraints(), reteEvaluator, mem ) ) {
-                ContextEntry[] context = mem.getBetaMemory().getContext();
+                Object context = mem.getBetaMemory().getContext();
                 BetaConstraints betaConstraints = node.getBetaConstraints();
                 betaConstraints.updateFromTuple( context, reteEvaluator, leftTuple );
 
diff --git a/drools-core/src/main/java/org/drools/core/phreak/RuleNetworkEvaluator.java b/drools-core/src/main/java/org/drools/core/phreak/RuleNetworkEvaluator.java
index e64269ad056..eb96082a70b 100644
--- a/drools-core/src/main/java/org/drools/core/phreak/RuleNetworkEvaluator.java
+++ b/drools-core/src/main/java/org/drools/core/phreak/RuleNetworkEvaluator.java
@@ -761,7 +761,7 @@ private void doRiaNode2(ReteEvaluator reteEvaluator,
     }
 
     public static void findLeftTupleBlocker(BetaNode betaNode, TupleMemory rtm,
-                                            ContextEntry[] contextEntry, BetaConstraints constraints,
+                                            Object contextEntry, BetaConstraints constraints,
                                             LeftTuple leftTuple, boolean useLeftMemory) {
         // This method will also remove rightTuples that are from subnetwork where no leftmemory use used
         FastIterator it = betaNode.getRightIterator(rtm);
diff --git a/drools-core/src/main/java/org/drools/core/reteoo/AccumulateNode.java b/drools-core/src/main/java/org/drools/core/reteoo/AccumulateNode.java
index 429390441e8..bdfedfe6ab8 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/AccumulateNode.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/AccumulateNode.java
@@ -175,7 +175,7 @@ public boolean equals( final Object object ) {
         return this.leftInput.getId() == other.leftInput.getId() && this.rightInput.getId() == other.rightInput.getId() &&
                this.constraints.equals( other.constraints ) &&
                this.accumulate.equals( other.accumulate ) &&
-               resultBinder.equals( other.resultBinder ) &&
+               this.resultBinder.equals( other.resultBinder ) &&
                Arrays.equals( this.resultConstraints, other.resultConstraints );
     }
 
@@ -199,8 +199,8 @@ public static abstract class AccumulateMemory extends AbstractBaseLinkedListNode
         SegmentNodeMemory {
 
         public Object             workingMemoryContext;
-        private final BetaMemory  betaMemory;
-        public ContextEntry[]     resultsContext;
+        private final BetaMemory  betaMemory;
+        public Object     resultsContext;
 
         protected AccumulateMemory( BetaMemory betaMemory ) {
             this.betaMemory = betaMemory;
diff --git a/drools-core/src/main/java/org/drools/core/reteoo/BetaMemory.java b/drools-core/src/main/java/org/drools/core/reteoo/BetaMemory.java
index 4b88c92ca26..992af8aa708 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/BetaMemory.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/BetaMemory.java
@@ -26,7 +26,7 @@
 import org.drools.core.reteoo.RightInputAdapterNode.RiaPathMemory;
 import org.drools.core.util.AbstractBaseLinkedListNode;
 
-public class BetaMemory extends AbstractBaseLinkedListNode
+public class BetaMemory extends AbstractBaseLinkedListNode
         implements
         SegmentNodeMemory {
 
@@ -34,7 +34,7 @@ public class BetaMemory extends AbstractBaseLinkedListNode
     private TupleMemory                leftTupleMemory;
     private TupleMemory                rightTupleMemory;
     private TupleSets      stagedRightTuples;
-    private ContextEntry[]             context;
+    private C                          context;
     // the node type this memory belongs to
     private short                      nodeType;
     private SegmentMemory              segmentMemory;
@@ -47,7 +47,7 @@ public BetaMemory() {
 
     public BetaMemory(final TupleMemory tupleMemory,
                       final TupleMemory objectMemory,
-                      final ContextEntry[] context,
+                      final C context,
                       final short nodeType) {
         this.leftTupleMemory = tupleMemory;
         this.rightTupleMemory = objectMemory;
@@ -83,7 +83,7 @@ public void setRiaRuleMemory(RiaPathMemory riaRuleMemory) {
     /**
      * @return the context
      */
-    public ContextEntry[] getContext() {
+    public C getContext() {
         return context;
     }
 
diff --git a/drools-core/src/main/java/org/drools/core/reteoo/BetaNode.java b/drools-core/src/main/java/org/drools/core/reteoo/BetaNode.java
index f892ddd7724..0d92e2aa571 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/BetaNode.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/BetaNode.java
@@ -28,7 +28,6 @@
 import org.drools.base.reteoo.NodeTypeEnums;
 import org.drools.base.rule.IndexableConstraint;
 import org.drools.base.rule.Pattern;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
 import org.drools.base.util.index.IndexUtil;
 import org.drools.core.RuleBaseConfiguration;
 import org.drools.core.common.BetaConstraints;
@@ -49,6 +48,7 @@
 import org.drools.core.common.UpdateContext;
 import org.drools.core.reteoo.AccumulateNode.AccumulateMemory;
 import org.drools.core.reteoo.builder.BuildContext;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.core.util.FastIterator;
 import org.drools.util.bitmask.AllSetBitMask;
 import org.drools.util.bitmask.BitMask;
@@ -228,9 +228,9 @@ public ObjectSource unwrapRightInput() {
     private void setUnificationJoin() {
         // If this join uses a indexed, ==, constraint on a query parameter then set indexedUnificationJoin to true
         // This ensure we get the correct iterator
-        BetaNodeFieldConstraint[] betaCconstraints = this.constraints.getConstraints();
+        BetaConstraint[] betaCconstraints = this.constraints.getConstraints();
         if ( betaCconstraints.length > 0 ) {
-            BetaNodeFieldConstraint c = betaCconstraints[0];
+            BetaConstraint c = betaCconstraints[0];
             if ( indexable && ((IndexableConstraint) c).isUnification() ) {
                 if ( this.constraints instanceof SingleBetaConstraints ) {
                     setConstraints( new SingleNonIndexSkipBetaConstraints( (SingleBetaConstraints) this.constraints ) );
@@ -442,7 +442,7 @@ public boolean isIndexedUnificationJoin() {
         return indexedUnificationJoin;
     }
 
-    public BetaNodeFieldConstraint[] getConstraints() {
+    public BetaConstraint[] getConstraints() {
         return constraints.getConstraints();
     }
 
@@ -451,7 +451,7 @@ public BetaConstraints getRawConstraints() {
     }
     
     private void setConstraints(BetaConstraints constraints) {
-        this.constraints = constraints.cloneIfInUse();
+        this.constraints = (BetaConstraints) constraints.cloneIfInUse();
     }
 
     public void networkUpdated(UpdateContext updateContext) {
diff --git a/drools-core/src/main/java/org/drools/core/reteoo/LeftTuple.java b/drools-core/src/main/java/org/drools/core/reteoo/LeftTuple.java
index daa4c9986ae..74ded13ebfe 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/LeftTuple.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/LeftTuple.java
@@ -36,7 +36,7 @@ public class LeftTuple
         extends AbstractTuple {
     private static final long  serialVersionUID = 540l;
 
-    private int                index;
+    private int      index;
 
     private LeftTuple parent;
 
diff --git a/drools-core/src/main/java/org/drools/core/reteoo/NotNodeLeftTuple.java b/drools-core/src/main/java/org/drools/core/reteoo/NotNodeLeftTuple.java
index b0ccf791335..5c461730491 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/NotNodeLeftTuple.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/NotNodeLeftTuple.java
@@ -178,7 +178,7 @@ public Collection getAccumulatedObjects() {
         TupleMemory rtm = bm.getRightTupleMemory();
         FastIterator it = betaNode.getRightIterator( rtm );
 
-        ContextEntry[] contextEntry = bm.getContext();
+        Object contextEntry = bm.getContext();
         constraints.updateFromTuple( contextEntry, reteEvaluator, this );
 
         Collection result = new ArrayList<>();
diff --git a/drools-core/src/main/java/org/drools/core/reteoo/builder/AccumulateBuilder.java b/drools-core/src/main/java/org/drools/core/reteoo/builder/AccumulateBuilder.java
index fafbfbdfb01..f5c9b2ac48d 100755
--- a/drools-core/src/main/java/org/drools/core/reteoo/builder/AccumulateBuilder.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/builder/AccumulateBuilder.java
@@ -25,12 +25,12 @@
 import org.drools.base.rule.GroupElement;
 import org.drools.base.rule.RuleConditionElement;
 import org.drools.base.rule.constraint.AlphaNodeFieldConstraint;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
 import org.drools.core.common.BetaConstraints;
 import org.drools.core.reteoo.AccumulateNode;
 import org.drools.core.reteoo.CoreComponentFactory;
 import org.drools.core.reteoo.LeftTupleSource;
 import org.drools.core.reteoo.RightInputAdapterNode;
+import org.drools.base.rule.constraint.BetaConstraint;
 
 public class AccumulateBuilder
         implements
@@ -45,7 +45,7 @@ public void build(final BuildContext context,
         final Accumulate accumulate = (Accumulate) rce;
         context.pushRuleComponent( accumulate );
 
-        final List resultBetaConstraints = context.getBetaconstraints();
+        final List           resultBetaConstraints  = context.getBetaconstraints();
         final List resultAlphaConstraints = context.getAlphaConstraints();
 
         RuleConditionElement source = accumulate.getSource();
@@ -82,7 +82,7 @@ public void build(final BuildContext context,
             context.setTupleSource( tupleSource );
 
             // create a tuple start equals constraint and set it in the context
-            final List betaConstraints = new ArrayList<>();
+            final List betaConstraints = new ArrayList<>();
             context.setBetaconstraints( betaConstraints ); // Empty list ensures EmptyBetaConstraints is assigned
         }
 
diff --git a/drools-core/src/main/java/org/drools/core/reteoo/builder/BetaNodeConstraintFactory.java b/drools-core/src/main/java/org/drools/core/reteoo/builder/BetaNodeConstraintFactory.java
index 5e3dbdd0003..03b2c162553 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/builder/BetaNodeConstraintFactory.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/builder/BetaNodeConstraintFactory.java
@@ -18,34 +18,34 @@
  */
 package org.drools.core.reteoo.builder;
 
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
 import org.drools.core.RuleBaseConfiguration;
 import org.drools.core.common.DefaultBetaConstraints;
 import org.drools.core.common.DoubleBetaConstraints;
 import org.drools.core.common.QuadroupleBetaConstraints;
 import org.drools.core.common.SingleBetaConstraints;
 import org.drools.core.common.TripleBetaConstraints;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.kie.api.internal.utils.KieService;
 
 public interface BetaNodeConstraintFactory extends KieService {
 
-    SingleBetaConstraints createSingleBetaConstraints(final BetaNodeFieldConstraint constraint,
+    SingleBetaConstraints createSingleBetaConstraints(final BetaConstraint constraint,
                                                       final RuleBaseConfiguration conf,
                                                       final boolean disableIndex);
 
-    DoubleBetaConstraints createDoubleBetaConstraints(final BetaNodeFieldConstraint[] constraints,
+    DoubleBetaConstraints createDoubleBetaConstraints(final BetaConstraint[] constraints,
                                                       final RuleBaseConfiguration conf,
                                                       final boolean disableIndexing);
 
-    TripleBetaConstraints createTripleBetaConstraints(final BetaNodeFieldConstraint[] constraints,
+    TripleBetaConstraints createTripleBetaConstraints(final BetaConstraint[] constraints,
                                                       final RuleBaseConfiguration conf,
                                                       final boolean disableIndexing);
 
-    QuadroupleBetaConstraints createQuadroupleBetaConstraints(final BetaNodeFieldConstraint[] constraints,
+    QuadroupleBetaConstraints createQuadroupleBetaConstraints(final BetaConstraint[] constraints,
                                                               final RuleBaseConfiguration conf,
                                                               final boolean disableIndexing);
 
-    DefaultBetaConstraints createDefaultBetaConstraints(final BetaNodeFieldConstraint[] constraints,
+    DefaultBetaConstraints createDefaultBetaConstraints(final BetaConstraint[] constraints,
                                                         final RuleBaseConfiguration conf,
                                                         final boolean disableIndexing);
 
diff --git a/drools-core/src/main/java/org/drools/core/reteoo/builder/BetaNodeConstraintFactoryImpl.java b/drools-core/src/main/java/org/drools/core/reteoo/builder/BetaNodeConstraintFactoryImpl.java
index ddcf2cf8ab1..46e8410e63a 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/builder/BetaNodeConstraintFactoryImpl.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/builder/BetaNodeConstraintFactoryImpl.java
@@ -18,46 +18,46 @@
  */
 package org.drools.core.reteoo.builder;
 
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
 import org.drools.core.RuleBaseConfiguration;
 import org.drools.core.common.DefaultBetaConstraints;
 import org.drools.core.common.DoubleBetaConstraints;
 import org.drools.core.common.QuadroupleBetaConstraints;
 import org.drools.core.common.SingleBetaConstraints;
 import org.drools.core.common.TripleBetaConstraints;
+import org.drools.base.rule.constraint.BetaConstraint;
 
 public class BetaNodeConstraintFactoryImpl implements BetaNodeConstraintFactory {
 
     @Override
-    public SingleBetaConstraints createSingleBetaConstraints(final BetaNodeFieldConstraint constraint,
+    public SingleBetaConstraints createSingleBetaConstraints(final BetaConstraint constraint,
                                                              final RuleBaseConfiguration conf,
                                                              final boolean disableIndex) {
         return new SingleBetaConstraints(constraint, conf, disableIndex);
     }
 
     @Override
-    public DoubleBetaConstraints createDoubleBetaConstraints(final BetaNodeFieldConstraint[] constraints,
+    public DoubleBetaConstraints createDoubleBetaConstraints(final BetaConstraint[] constraints,
                                                              final RuleBaseConfiguration conf,
                                                              final boolean disableIndexing) {
         return new DoubleBetaConstraints(constraints, conf, disableIndexing);
     }
 
     @Override
-    public TripleBetaConstraints createTripleBetaConstraints(final BetaNodeFieldConstraint[] constraints,
+    public TripleBetaConstraints createTripleBetaConstraints(final BetaConstraint[] constraints,
                                                              final RuleBaseConfiguration conf,
                                                              final boolean disableIndexing) {
         return new TripleBetaConstraints(constraints, conf, disableIndexing);
     }
 
     @Override
-    public QuadroupleBetaConstraints createQuadroupleBetaConstraints(final BetaNodeFieldConstraint[] constraints,
+    public QuadroupleBetaConstraints createQuadroupleBetaConstraints(final BetaConstraint[] constraints,
                                                                      final RuleBaseConfiguration conf,
                                                                      final boolean disableIndexing) {
         return new QuadroupleBetaConstraints(constraints, conf, disableIndexing);
     }
 
     @Override
-    public DefaultBetaConstraints createDefaultBetaConstraints(final BetaNodeFieldConstraint[] constraints,
+    public DefaultBetaConstraints createDefaultBetaConstraints(final BetaConstraint[] constraints,
                                                                final RuleBaseConfiguration conf,
                                                                final boolean disableIndexing) {
         return new DefaultBetaConstraints(constraints, conf, disableIndexing);
diff --git a/drools-core/src/main/java/org/drools/core/reteoo/builder/BuildContext.java b/drools-core/src/main/java/org/drools/core/reteoo/builder/BuildContext.java
index 03ada1be5d5..d402736b736 100755
--- a/drools-core/src/main/java/org/drools/core/reteoo/builder/BuildContext.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/builder/BuildContext.java
@@ -35,7 +35,7 @@
 import org.drools.base.rule.RuleComponent;
 import org.drools.base.rule.RuleConditionElement;
 import org.drools.base.rule.constraint.AlphaNodeFieldConstraint;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.base.rule.constraint.XpathConstraint;
 import org.drools.core.common.BaseNode;
 import org.drools.core.common.InternalWorkingMemory;
@@ -71,11 +71,11 @@ public class BuildContext implements RuleBuildContext {
     // the rule component being processed at the moment
     private final Deque ruleComponent = new ArrayDeque<>();
     // a build stack to track nested elements
-    private Deque buildstack;
+    private Deque    buildstack;
     // beta constraints from the last pattern attached
-    private List    betaconstraints;
+    private List           betaconstraints;
     // alpha constraints from the last pattern attached
-    private List   alphaConstraints;
+    private List alphaConstraints;
     // xpath constraints from the last pattern attached
     private List            xpathConstraints;
 
@@ -245,11 +245,11 @@ public Collection getBuildstack() {
         return this.buildstack == null ? Collections.emptyList() : buildstack;
     }
 
-    public List getBetaconstraints() {
+    public List getBetaconstraints() {
         return this.betaconstraints;
     }
 
-    public void setBetaconstraints(final List betaconstraints) {
+    public void setBetaconstraints(final List betaconstraints) {
         this.betaconstraints = betaconstraints;
     }
 
diff --git a/drools-core/src/main/java/org/drools/core/reteoo/builder/BuildUtils.java b/drools-core/src/main/java/org/drools/core/reteoo/builder/BuildUtils.java
index 0edca81cddb..aedd6b4e120 100755
--- a/drools-core/src/main/java/org/drools/core/reteoo/builder/BuildUtils.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/builder/BuildUtils.java
@@ -33,7 +33,7 @@
 import org.drools.base.rule.Pattern;
 import org.drools.base.rule.RuleConditionElement;
 import org.drools.base.rule.constraint.AlphaNodeFieldConstraint;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.base.time.Interval;
 import org.drools.base.time.TimeUtils;
 import org.drools.core.common.BaseNode;
@@ -161,9 +161,9 @@ private void mergeNodes(BaseNode node, BaseNode duplicate) {
             alphaConstraint.addPackageNames(((AlphaNode) duplicate).getConstraint().getPackageNames());
             alphaConstraint.mergeEvaluationContext(((AlphaNode) duplicate).getConstraint());
         } else if (node instanceof BetaNode) {
-            BetaNodeFieldConstraint[] betaConstraints = ((BetaNode) node).getConstraints();
-            int i = 0;
-            for (BetaNodeFieldConstraint betaConstraint : betaConstraints) {
+            BetaConstraint[] betaConstraints = ((BetaNode) node).getConstraints();
+            int              i               = 0;
+            for (BetaConstraint betaConstraint : betaConstraints) {
                 betaConstraint.addPackageNames(((BetaNode) duplicate).getConstraints()[i].getPackageNames());
                 betaConstraint.mergeEvaluationContext(((BetaNode) duplicate).getConstraints()[i]);
                 i++;
@@ -203,9 +203,14 @@ private boolean areNodesCompatibleForSharing(BuildContext context, BaseNode node
      * @param list the list of constraints
      */
     public BetaConstraints createBetaNodeConstraint(final BuildContext context,
-                                                    final List list,
+                                                    final List list,
                                                     final boolean disableIndexing) {
         BetaConstraints constraints;
+        if ( list.size() == 1 && list.get(0) instanceof BetaConstraints) {
+            // If the constraint also implements BetaConstraints us it directly, do not wrap.
+            return (BetaConstraints) list.get(0);
+        }
+
         switch ( list.size() ) {
             case 0 :
                 constraints = EmptyBetaConstraints.getInstance();
@@ -216,22 +221,22 @@ public BetaConstraints createBetaNodeConstraint(final BuildContext context,
                                                          disableIndexing );
                 break;
             case 2 :
-                constraints = BetaNodeConstraintFactory.Factory.get().createDoubleBetaConstraints( list.toArray( new BetaNodeFieldConstraint[list.size()] ),
+                constraints = BetaNodeConstraintFactory.Factory.get().createDoubleBetaConstraints( list.toArray( new BetaConstraint[list.size()]),
                                                          context.getRuleBase().getRuleBaseConfiguration(),
                                                          disableIndexing );
                 break;
             case 3 :
-                constraints = BetaNodeConstraintFactory.Factory.get().createTripleBetaConstraints( list.toArray( new BetaNodeFieldConstraint[list.size()] ),
+                constraints = BetaNodeConstraintFactory.Factory.get().createTripleBetaConstraints( list.toArray( new BetaConstraint[list.size()]),
                                                          context.getRuleBase().getRuleBaseConfiguration(),
                                                          disableIndexing );
                 break;
             case 4 :
-                constraints = BetaNodeConstraintFactory.Factory.get().createQuadroupleBetaConstraints( list.toArray( new BetaNodeFieldConstraint[list.size()] ),
+                constraints = BetaNodeConstraintFactory.Factory.get().createQuadroupleBetaConstraints( list.toArray( new BetaConstraint[list.size()]),
                                                              context.getRuleBase().getRuleBaseConfiguration(),
                                                              disableIndexing );
                 break;
             default :
-                constraints = BetaNodeConstraintFactory.Factory.get().createDefaultBetaConstraints( list.toArray( new BetaNodeFieldConstraint[list.size()] ),
+                constraints = BetaNodeConstraintFactory.Factory.get().createDefaultBetaConstraints( list.toArray( new BetaConstraint[list.size()]),
                                                           context.getRuleBase().getRuleBaseConfiguration(),
                                                           disableIndexing );
         }
diff --git a/drools-core/src/main/java/org/drools/core/reteoo/builder/CollectBuilder.java b/drools-core/src/main/java/org/drools/core/reteoo/builder/CollectBuilder.java
index 7b5af6a4228..da62bed442f 100755
--- a/drools-core/src/main/java/org/drools/core/reteoo/builder/CollectBuilder.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/builder/CollectBuilder.java
@@ -27,7 +27,6 @@
 import org.drools.base.rule.RuleConditionElement;
 import org.drools.base.rule.SingleAccumulate;
 import org.drools.base.rule.constraint.AlphaNodeFieldConstraint;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
 import org.drools.core.base.accumulators.CollectAccumulator;
 import org.drools.core.common.BetaConstraints;
 import org.drools.core.common.TupleStartEqualsConstraint;
@@ -35,6 +34,7 @@
 import org.drools.core.reteoo.CoreComponentFactory;
 import org.drools.core.reteoo.LeftTupleSource;
 import org.drools.core.reteoo.RightInputAdapterNode;
+import org.drools.base.rule.constraint.BetaConstraint;
 
 public class CollectBuilder
     implements
@@ -51,7 +51,7 @@ public void build(final BuildContext context,
         final Collect collect = (Collect) rce;
         context.pushRuleComponent( collect );
 
-        final List resultBetaConstraints = context.getBetaconstraints();
+        final List           resultBetaConstraints  = context.getBetaconstraints();
         final List resultAlphaConstraints = context.getAlphaConstraints();
 
         final Pattern sourcePattern = collect.getSourcePattern();
@@ -81,8 +81,8 @@ public void build(final BuildContext context,
             context.setTupleSource( tupleSource );
 
             // create a tuple start equals constraint and set it in the context
-            final TupleStartEqualsConstraint constraint = TupleStartEqualsConstraint.getInstance();
-            final List betaConstraints = new ArrayList<>();
+            final TupleStartEqualsConstraint constraint      = TupleStartEqualsConstraint.getInstance();
+            final List       betaConstraints = new ArrayList<>();
             betaConstraints.add( constraint );
             context.setBetaconstraints( betaConstraints );
             existSubNetwort = true;
diff --git a/drools-core/src/main/java/org/drools/core/reteoo/builder/GroupElementBuilder.java b/drools-core/src/main/java/org/drools/core/reteoo/builder/GroupElementBuilder.java
index 6df4f4782ad..9b2eca4ded0 100755
--- a/drools-core/src/main/java/org/drools/core/reteoo/builder/GroupElementBuilder.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/builder/GroupElementBuilder.java
@@ -29,7 +29,6 @@
 import org.drools.base.rule.GroupElement.Type;
 import org.drools.base.rule.Pattern;
 import org.drools.base.rule.RuleConditionElement;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
 import org.drools.core.RuleBaseConfiguration;
 import org.drools.core.common.BetaConstraints;
 import org.drools.core.common.TupleStartEqualsConstraint;
@@ -41,6 +40,7 @@
 import org.drools.core.reteoo.ObjectSource;
 import org.drools.core.reteoo.ObjectTypeNode;
 import org.drools.core.reteoo.RightInputAdapterNode;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.kie.api.definition.rule.Propagation;
 
 public class GroupElementBuilder
@@ -260,7 +260,7 @@ public void build(final BuildContext context,
 
                 // create a tuple start equals constraint and set it in the context
                 final TupleStartEqualsConstraint constraint = TupleStartEqualsConstraint.getInstance();
-                final List predicates = new ArrayList<>();
+                final List       predicates = new ArrayList<>();
                 predicates.add( constraint );
                 context.setBetaconstraints( predicates );
             }
@@ -338,7 +338,7 @@ public void build(final BuildContext context,
                 context.setTupleSource( tupleSource );
 
 
-                final List betaConstraints = new ArrayList<>();
+                final List betaConstraints = new ArrayList<>();
                 context.setBetaconstraints( betaConstraints ); // Empty list ensures EmptyBetaConstraints is assigned
             }
 
diff --git a/drools-core/src/main/java/org/drools/core/reteoo/builder/InstanceNotEqualsConstraint.java b/drools-core/src/main/java/org/drools/core/reteoo/builder/InstanceNotEqualsConstraint.java
index 476c920dc82..0d3b667aa89 100644
--- a/drools-core/src/main/java/org/drools/core/reteoo/builder/InstanceNotEqualsConstraint.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/builder/InstanceNotEqualsConstraint.java
@@ -27,12 +27,12 @@
 import org.drools.base.rule.ContextEntry;
 import org.drools.base.rule.Declaration;
 import org.drools.base.rule.Pattern;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.kie.api.runtime.rule.FactHandle;
 
 public class InstanceNotEqualsConstraint
     implements
-    BetaNodeFieldConstraint {
+    BetaConstraint {
 
     private static final long          serialVersionUID = 510l;
 
@@ -75,7 +75,7 @@ public boolean isTemporal() {
         return false;
     }
 
-    public ContextEntry createContextEntry() {
+    public ContextEntry createContext() {
         return new InstanceNotEqualsConstraintContextEntry( this.otherPattern );
     }
 
@@ -182,7 +182,7 @@ public void resetFactHandle() {
         }
     }
 
-    public BetaNodeFieldConstraint cloneIfInUse() {
+    public BetaConstraint cloneIfInUse() {
         return this;
     }
 }
diff --git a/drools-core/src/main/java/org/drools/core/reteoo/builder/PatternBuilder.java b/drools-core/src/main/java/org/drools/core/reteoo/builder/PatternBuilder.java
index 421ca3ce239..e15c1c3ea5e 100755
--- a/drools-core/src/main/java/org/drools/core/reteoo/builder/PatternBuilder.java
+++ b/drools-core/src/main/java/org/drools/core/reteoo/builder/PatternBuilder.java
@@ -38,7 +38,7 @@
 import org.drools.base.rule.TypeDeclaration;
 import org.drools.base.rule.WindowReference;
 import org.drools.base.rule.constraint.AlphaNodeFieldConstraint;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.base.rule.constraint.Constraint;
 import org.drools.base.rule.constraint.XpathConstraint;
 import org.drools.base.time.impl.Timer;
@@ -189,7 +189,7 @@ private Constraints createConstraints(BuildContext context, Pattern pattern) {
                     linkAlphaConstraint( (AlphaNodeFieldConstraint) constraint, constraints.alphaConstraints );
                     break;
                 case BETA:
-                    linkBetaConstraint( (BetaNodeFieldConstraint) constraint, constraints.betaConstraints );
+                    linkBetaConstraint((BetaConstraint) constraint, constraints.betaConstraints);
                     if ( isNegative && context.getRuleBase().getRuleBaseConfiguration().getEventProcessingMode() == EventProcessingOption.STREAM && pattern.getObjectType().isEvent() && constraint.isTemporal() ) {
                         checkDelaying( context, constraint );
                     }
@@ -204,7 +204,7 @@ private Constraints createConstraints(BuildContext context, Pattern pattern) {
         return constraints;
     }
 
-    protected void linkBetaConstraint( BetaNodeFieldConstraint constraint, List betaConstraints ) {
+    protected void linkBetaConstraint(BetaConstraint constraint, List betaConstraints) {
         betaConstraints.add( constraint );
     }
 
@@ -390,7 +390,7 @@ private void attachObjectTypeNode( final BuildContext context, final BuildUtils
      */
     private void checkRemoveIdentities(final BuildContext context,
                                        final Pattern pattern,
-                                       final List betaConstraints) {
+                                       final List betaConstraints) {
         if ( context.getRuleBase().getRuleBaseConfiguration().isRemoveIdentities() && pattern.getObjectType().getClass() == ClassObjectType.class ) {
             // Check if this object type exists before
             // If it does we need stop instance equals cross product
@@ -416,7 +416,7 @@ public boolean requiresLeftActivation(final BuildUtils utils,
 
     private static class Constraints {
         private final List alphaConstraints = new ArrayList<>();
-        private final List betaConstraints = new ArrayList<>();
-        private final List xpathConstraints = new ArrayList<>();
+        private final List           betaConstraints  = new ArrayList<>();
+        private final List          xpathConstraints = new ArrayList<>();
     }
 }
diff --git a/drools-core/src/main/java/org/drools/core/util/AbstractHashTable.java b/drools-core/src/main/java/org/drools/core/util/AbstractHashTable.java
index a9b71182578..bdc28f1a7a7 100644
--- a/drools-core/src/main/java/org/drools/core/util/AbstractHashTable.java
+++ b/drools-core/src/main/java/org/drools/core/util/AbstractHashTable.java
@@ -24,7 +24,7 @@
 import java.io.ObjectOutput;
 import java.util.Objects;
 
-import org.drools.base.util.FieldIndex;
+import org.drools.base.util.IndexedValueReader;
 import org.drools.core.reteoo.Tuple;
 import org.drools.core.util.index.TupleList;
 
@@ -186,7 +186,7 @@ public String toString() {
     }
 
     public interface Index extends Externalizable {
-        FieldIndex getFieldIndex(int index);
+        IndexedValueReader getFieldIndex(int index);
         HashEntry hashCodeOf(Tuple tuple, boolean left);
     }
 
@@ -194,7 +194,7 @@ public static class SingleIndex implements Index {
 
         private static final long    serialVersionUID = 510l;
 
-        private FieldIndex index;
+        private IndexedValueReader index;
 
         private int startResult;
 
@@ -204,7 +204,7 @@ public SingleIndex() {
 
         }
 
-        public SingleIndex(final FieldIndex[] indexes,
+        public SingleIndex(final IndexedValueReader[] indexes,
                            final int startResult) {
             this.startResult = startResult;
             this.index = indexes[0];
@@ -213,7 +213,7 @@ public SingleIndex(final FieldIndex[] indexes,
         @Override
         public void readExternal(ObjectInput in) throws IOException,
                                                 ClassNotFoundException {
-            index = (FieldIndex) in.readObject();
+            index = (IndexedValueReader) in.readObject();
             startResult = in.readInt();
         }
 
@@ -224,7 +224,7 @@ public void writeExternal(ObjectOutput out) throws IOException {
         }
 
         @Override
-        public FieldIndex getFieldIndex(int index) {
+        public IndexedValueReader getFieldIndex(int index) {
             if ( index > 0 ) {
                 throw new IllegalArgumentException( "IndexUtil position " + index + " does not exist" );
             }
@@ -284,8 +284,8 @@ public static class DoubleCompositeIndex implements Index {
 
         private static final long serialVersionUID = 510l;
 
-        private FieldIndex index1;
-        private FieldIndex index2;
+        private IndexedValueReader index1;
+        private IndexedValueReader index2;
 
         private int startResult;
 
@@ -295,7 +295,7 @@ public DoubleCompositeIndex() {
 
         }
 
-        public DoubleCompositeIndex(final FieldIndex[] indexes,
+        public DoubleCompositeIndex(final IndexedValueReader[] indexes,
                                     final int startResult) {
             this.startResult = startResult;
 
@@ -306,8 +306,8 @@ public DoubleCompositeIndex(final FieldIndex[] indexes,
         @Override
         public void readExternal(ObjectInput in) throws IOException,
                                                 ClassNotFoundException {
-            index1 = (FieldIndex) in.readObject();
-            index2 = (FieldIndex) in.readObject();
+            index1 = (IndexedValueReader) in.readObject();
+            index2 = (IndexedValueReader) in.readObject();
             startResult = in.readInt();
         }
 
@@ -319,7 +319,7 @@ public void writeExternal(ObjectOutput out) throws IOException {
         }
 
         @Override
-        public FieldIndex getFieldIndex(int index) {
+        public IndexedValueReader getFieldIndex(int index) {
             switch ( index ) {
                 case 0 :
                     return index1;
@@ -340,9 +340,9 @@ public static class TripleCompositeIndex implements Index {
 
         private static final long serialVersionUID = 510l;
 
-        private FieldIndex index1;
-        private FieldIndex index2;
-        private FieldIndex index3;
+        private IndexedValueReader index1;
+        private IndexedValueReader index2;
+        private IndexedValueReader index3;
 
         private int startResult;
 
@@ -352,7 +352,7 @@ public TripleCompositeIndex() {
 
         }
 
-        public TripleCompositeIndex(final FieldIndex[] indexes,
+        public TripleCompositeIndex(final IndexedValueReader[] indexes,
                                     final int startResult) {
             this.startResult = startResult;
 
@@ -364,9 +364,9 @@ public TripleCompositeIndex(final FieldIndex[] indexes,
         @Override
         public void readExternal(ObjectInput in) throws IOException,
                                                 ClassNotFoundException {
-            index1 = (FieldIndex) in.readObject();
-            index2 = (FieldIndex) in.readObject();
-            index3 = (FieldIndex) in.readObject();
+            index1 = (IndexedValueReader) in.readObject();
+            index2 = (IndexedValueReader) in.readObject();
+            index3 = (IndexedValueReader) in.readObject();
             startResult = in.readInt();
         }
 
@@ -379,7 +379,7 @@ public void writeExternal(ObjectOutput out) throws IOException {
         }
 
         @Override
-        public FieldIndex getFieldIndex(int index) {
+        public IndexedValueReader getFieldIndex(int index) {
             switch ( index ) {
                 case 0 :
                     return index1;
diff --git a/drools-core/src/main/java/org/drools/core/util/index/AbstractTupleIndexTree.java b/drools-core/src/main/java/org/drools/core/util/index/AbstractTupleIndexTree.java
index d5c6d4d0a8d..f47126971e7 100644
--- a/drools-core/src/main/java/org/drools/core/util/index/AbstractTupleIndexTree.java
+++ b/drools-core/src/main/java/org/drools/core/util/index/AbstractTupleIndexTree.java
@@ -18,12 +18,12 @@
  */
 package org.drools.core.util.index;
 
-import org.drools.base.util.FieldIndex;
 import org.drools.base.util.index.ConstraintTypeOperator;
 import org.drools.core.reteoo.Tuple;
+import org.drools.base.util.IndexedValueReader;
 
 public abstract class AbstractTupleIndexTree {
-    protected FieldIndex index;
+    protected IndexedValueReader index;
 
     protected ConstraintTypeOperator constraintType;
 
@@ -46,8 +46,8 @@ protected Comparable getRightIndexedValue(Tuple tuple) {
 
     protected Comparable getIndexedValue(Tuple tuple, boolean left) {
         return left ?
-               (Comparable) index.getLeftExtractor().getValue( tuple ) :
-               (Comparable) index.getRightExtractor().getValue( tuple.getFactHandle().getObject() );
+               (Comparable) index.getLeftExtractor().getValue( null, tuple ) :
+               (Comparable) index.getRightExtractor().getValue( null, tuple );
     }
 
     public static class IndexTupleList extends TupleList {
diff --git a/drools-core/src/main/java/org/drools/core/util/index/IndexFactory.java b/drools-core/src/main/java/org/drools/core/util/index/IndexFactory.java
index 5769458d340..9c92a940be6 100644
--- a/drools-core/src/main/java/org/drools/core/util/index/IndexFactory.java
+++ b/drools-core/src/main/java/org/drools/core/util/index/IndexFactory.java
@@ -19,15 +19,15 @@
 package org.drools.core.util.index;
 
 import org.drools.base.rule.ContextEntry;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
 import org.drools.base.util.index.ConstraintTypeOperator;
 import org.drools.core.RuleBaseConfiguration;
 import org.drools.core.reteoo.BetaMemory;
 import org.drools.core.reteoo.TupleMemory;
+import org.drools.base.rule.constraint.BetaConstraint;
 
 public interface IndexFactory {
 
-    static BetaMemory createBetaMemory(RuleBaseConfiguration config, short nodeType, BetaNodeFieldConstraint... constraints) {
+    static BetaMemory createBetaMemory(RuleBaseConfiguration config, short nodeType, BetaConstraint... constraints) {
         if (config.getCompositeKeyDepth() < 1) {
             return new BetaMemory( config.isSequential() ? null : new TupleList(),
                     new TupleList(),
@@ -77,10 +77,15 @@ private static TupleMemory createLeftMemory(RuleBaseConfiguration config, IndexS
         return new TupleList();
     }
 
-    private static ContextEntry[] createContext(BetaNodeFieldConstraint... constraints) {
-        ContextEntry[] entries = new ContextEntry[constraints.length];
+    private static Object createContext(BetaConstraint... constraints) {
+        if (constraints.length == 1) {
+            // no array needed
+            return constraints[0].createContext();
+        }
+
+        Object[] entries = new ContextEntry[constraints.length];
         for (int i = 0; i < constraints.length; i++) {
-            entries[i] = constraints[i].createContextEntry();
+            entries[i] = constraints[i].createContext();
         }
         return entries;
     }
diff --git a/drools-core/src/main/java/org/drools/core/util/index/IndexMemory.java b/drools-core/src/main/java/org/drools/core/util/index/IndexMemory.java
index 2844c870718..7d56a265613 100644
--- a/drools-core/src/main/java/org/drools/core/util/index/IndexMemory.java
+++ b/drools-core/src/main/java/org/drools/core/util/index/IndexMemory.java
@@ -134,7 +134,7 @@ static class InternalEqualityMemoryFactory implements IndexMemory.Factory {
 
         @Override
         public TupleMemory createMemory(IndexSpec indexSpec, boolean isLeft) {
-            return new TupleIndexHashTable(indexSpec.getIndexes(), isLeft);
+            return new TupleIndexHashTable(indexSpec.getIndex(), isLeft);
         }
     }
 
diff --git a/drools-core/src/main/java/org/drools/core/util/index/IndexSpec.java b/drools-core/src/main/java/org/drools/core/util/index/IndexSpec.java
index 36f094d7916..338f2c1c4d2 100644
--- a/drools-core/src/main/java/org/drools/core/util/index/IndexSpec.java
+++ b/drools-core/src/main/java/org/drools/core/util/index/IndexSpec.java
@@ -18,39 +18,85 @@
  */
 package org.drools.core.util.index;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.drools.base.rule.IndexableConstraint;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
-import org.drools.base.util.FieldIndex;
+import org.drools.base.rule.constraint.BetaConstraint;
+import org.drools.base.util.IndexedValueReader;
 import org.drools.base.util.index.ConstraintTypeOperator;
 import org.drools.core.RuleBaseConfiguration;
+import org.drools.core.util.AbstractHashTable.DoubleCompositeIndex;
+import org.drools.core.util.AbstractHashTable.Index;
+import org.drools.core.util.AbstractHashTable.SingleIndex;
+import org.drools.core.util.AbstractHashTable.TripleCompositeIndex;
 import org.kie.internal.conf.IndexPrecedenceOption;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
 
 import static org.drools.base.util.index.IndexUtil.isEqualIndexable;
 
 public class IndexSpec {
     private ConstraintTypeOperator constraintType = ConstraintTypeOperator.UNKNOWN;
-    private FieldIndex[] indexes;
+    private IndexedValueReader[]   indexes;
 
-    IndexSpec(short nodeType, BetaNodeFieldConstraint[] constraints, RuleBaseConfiguration config) {
+    public IndexSpec(short nodeType, BetaConstraint[] constraints, RuleBaseConfiguration config) {
         init(nodeType, constraints, config);
     }
 
+    public IndexSpec(IndexedValueReader[] indexes, ConstraintTypeOperator constraintType) {
+        this.indexes = indexes;
+        this.constraintType = constraintType;
+    }
+
+    public IndexSpec(IndexedValueReader[] indexes) {
+        this.indexes = indexes;
+        this.constraintType = ConstraintTypeOperator.EQUAL;
+    }
+
     public ConstraintTypeOperator getConstraintType() {
         return constraintType;
     }
 
-    public FieldIndex[] getIndexes() {
+    public IndexedValueReader[] getIndexes() {
         return indexes;
     }
 
-    public FieldIndex getIndex(int pos) {
+    public Index getIndex() {
+        Index index;
+        int PRIME   = 31;
+        int startResult = PRIME;
+        int i = 1;
+        for ( IndexedValueReader j : indexes ) {
+            startResult += PRIME * startResult + i;
+            i++;
+        }
+
+        switch ( indexes.length ) {
+            case 0 :
+                throw new IllegalArgumentException( "FieldIndexHashTable cannot use an index[] of length  0" );
+            case 1 :
+                index = new SingleIndex(indexes,
+                                        startResult );
+                break;
+            case 2 :
+                index = new DoubleCompositeIndex(indexes,
+                                                 startResult );
+                break;
+            case 3 :
+                index = new TripleCompositeIndex(indexes,
+                                                 startResult );
+                break;
+            default :
+                throw new IllegalArgumentException( "FieldIndexHashTable cannot use an index[] of length  great than 3" );
+        }
+
+        return index;
+    }
+
+    public IndexedValueReader getIndex(int pos) {
         return indexes[pos];
     }
 
-    private void init(short nodeType, BetaNodeFieldConstraint[] constraints, RuleBaseConfiguration config) {
+    public void init(short nodeType, BetaConstraint[] constraints, RuleBaseConfiguration config) {
         int keyDepth = config.getCompositeKeyDepth();
         IndexPrecedenceOption indexPrecedenceOption = config.getIndexPrecedenceOption();
         int firstIndexableConstraint = indexPrecedenceOption == IndexPrecedenceOption.EQUALITY_PRIORITY ?
@@ -58,7 +104,7 @@ private void init(short nodeType, BetaNodeFieldConstraint[] constraints, RuleBas
                 determineTypeWithPatternOrder(nodeType, constraints, config);
 
         if (constraintType == ConstraintTypeOperator.EQUAL) {
-            List indexList = new ArrayList<>();
+            List indexList = new ArrayList<>();
             if (isEqualIndexable(constraints[firstIndexableConstraint])) {
                 indexList.add(((IndexableConstraint) constraints[firstIndexableConstraint]).getFieldIndex());
             }
@@ -69,15 +115,15 @@ private void init(short nodeType, BetaNodeFieldConstraint[] constraints, RuleBas
                     indexList.add(((IndexableConstraint)constraints[i]).getFieldIndex());
                 }
             }
-            indexes = indexList.toArray(new FieldIndex[indexList.size()]);
+            indexes = indexList.toArray(new IndexedValueReader[indexList.size()]);
 
         } else if (constraintType.isComparison()) {
             // look for a dual constraint to create a range index
-            indexes = new FieldIndex[]{((IndexableConstraint)constraints[firstIndexableConstraint]).getFieldIndex() };
+            indexes = new IndexedValueReader[]{((IndexableConstraint)constraints[firstIndexableConstraint]).getFieldIndex() };
         }
     }
 
-    private int determineTypeWithEqualityPriority(short nodeType, BetaNodeFieldConstraint[] constraints, RuleBaseConfiguration config) {
+    public int determineTypeWithEqualityPriority(short nodeType, BetaConstraint[] constraints, RuleBaseConfiguration config) {
         int indexedConstraintPos = 0;
         for (int i = 0; i < constraints.length; i++) {
             if (constraints[i] instanceof IndexableConstraint) {
@@ -95,7 +141,7 @@ private int determineTypeWithEqualityPriority(short nodeType, BetaNodeFieldConst
         return indexedConstraintPos;
     }
 
-    private int determineTypeWithPatternOrder(short nodeType, BetaNodeFieldConstraint[] constraints, RuleBaseConfiguration config) {
+    public int determineTypeWithPatternOrder(short nodeType, BetaConstraint[] constraints, RuleBaseConfiguration config) {
         for (int i = 0; i < constraints.length; i++) {
             ConstraintTypeOperator type = ConstraintTypeOperator.getType(constraints[i]);
             if ( type.isIndexableForNode(nodeType, (IndexableConstraint) constraints[i], config) ) {
diff --git a/drools-core/src/main/java/org/drools/core/util/index/TupleIndexHashTable.java b/drools-core/src/main/java/org/drools/core/util/index/TupleIndexHashTable.java
index ae35385ee8a..3de36e097bf 100644
--- a/drools-core/src/main/java/org/drools/core/util/index/TupleIndexHashTable.java
+++ b/drools-core/src/main/java/org/drools/core/util/index/TupleIndexHashTable.java
@@ -22,7 +22,6 @@
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 
-import org.drools.base.util.FieldIndex;
 import org.drools.core.reteoo.AbstractTuple;
 import org.drools.core.reteoo.Tuple;
 import org.drools.core.reteoo.TupleMemory;
@@ -31,14 +30,12 @@
 import org.drools.core.util.Iterator;
 import org.drools.core.util.LinkedList;
 
+import java.util.function.Supplier;
+
 public class TupleIndexHashTable extends AbstractHashTable implements TupleMemory {
 
     private static final long                         serialVersionUID = 510l;
 
-    public static final int                           PRIME            = 31;
-
-    private int                                       startResult;
-
     private transient FieldIndexHashTableFullIterator tupleValueFullIterator;
 
     private transient FullFastIterator                fullFastIterator;
@@ -53,48 +50,25 @@ public TupleIndexHashTable() {
         // constructor for serialisation
     }
 
-    public TupleIndexHashTable(FieldIndex[] index, boolean left) {
+    public TupleIndexHashTable(Index index, boolean left) {
         this( 128, 0.75f, index, left );
     }
 
     public TupleIndexHashTable( int capacity,
                                 float loadFactor,
-                                FieldIndex[] index,
+                                Index index,
                                 boolean left ) {
         super( capacity,
                loadFactor );
 
         this.left = left;
 
-        this.startResult = PRIME;
-        for ( FieldIndex i : index ) {
-            this.startResult += PRIME * this.startResult + i.getRightExtractor().getIndex();
-        }
-
-        switch ( index.length ) {
-            case 0 :
-                throw new IllegalArgumentException( "FieldIndexHashTable cannot use an index[] of length  0" );
-            case 1 :
-                this.index = new SingleIndex( index,
-                                              this.startResult );
-                break;
-            case 2 :
-                this.index = new DoubleCompositeIndex( index,
-                                                       this.startResult );
-                break;
-            case 3 :
-                this.index = new TripleCompositeIndex( index,
-                                                       this.startResult );
-                break;
-            default :
-                throw new IllegalArgumentException( "FieldIndexHashTable cannot use an index[] of length  great than 3" );
-        }
+        this.index = index;
     }
 
     public void readExternal(ObjectInput in) throws IOException,
                                             ClassNotFoundException {
         super.readExternal( in );
-        startResult = in.readInt();
         factSize = in.readInt();
         index = (Index) in.readObject();
         left = in.readBoolean();
@@ -102,7 +76,6 @@ public void readExternal(ObjectInput in) throws IOException,
 
     public void writeExternal(ObjectOutput out) throws IOException {
         super.writeExternal( out );
-        out.writeInt( startResult );
         out.writeInt( factSize );
         out.writeObject( index );
         out.writeBoolean( left );
@@ -464,7 +437,6 @@ public String toString() {
 
     public void clear() {
         super.clear();
-        this.startResult = PRIME;
         this.factSize = 0;
         this.fullFastIterator = null;
         this.tupleValueFullIterator = null;
diff --git a/drools-core/src/main/java/org/drools/core/util/index/TupleIndexRBTree.java b/drools-core/src/main/java/org/drools/core/util/index/TupleIndexRBTree.java
index 18ce1f4a874..7ee214c40fe 100644
--- a/drools-core/src/main/java/org/drools/core/util/index/TupleIndexRBTree.java
+++ b/drools-core/src/main/java/org/drools/core/util/index/TupleIndexRBTree.java
@@ -25,7 +25,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.drools.base.util.FieldIndex;
+import org.drools.base.util.IndexedValueReader;
 import org.drools.base.util.index.ConstraintTypeOperator;
 import org.drools.core.reteoo.AbstractTuple;
 import org.drools.core.reteoo.Tuple;
@@ -45,7 +45,7 @@ public TupleIndexRBTree() {
         // constructor for serialisation
     }
 
-    public TupleIndexRBTree(ConstraintTypeOperator constraintType, FieldIndex index, boolean left) {
+    public TupleIndexRBTree(ConstraintTypeOperator constraintType, IndexedValueReader index, boolean left) {
         this.index = index;
         this.constraintType = constraintType;
         this.left = left;
@@ -62,7 +62,7 @@ public void writeExternal(ObjectOutput out) throws IOException {
 
     public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         tree = (TupleRBTree>) in.readObject();
-        index = (FieldIndex) in.readObject();
+        index = (IndexedValueReader) in.readObject();
         constraintType = (ConstraintTypeOperator) in.readObject();
         factSize = in.readInt();
         left = in.readBoolean();
@@ -191,7 +191,7 @@ private Tuple getNextRight(Comparable key, boolean first) {
         return firstNode == null ? null : firstNode.getFirst();
     }
 
-    public static Comparable coerceType(FieldIndex index, Comparable treeRootKey, Comparable key) {
+    public static Comparable coerceType(IndexedValueReader index, Comparable treeRootKey, Comparable key) {
         // We don't do dynamic coercion other than Numbers. See IndexUtil.areRangeIndexCompatibleOperands().
         if (index.requiresCoercion() && key != null && treeRootKey != null && !key.getClass().equals(treeRootKey.getClass())) {
             if (treeRootKey instanceof Number && key instanceof Number) {
diff --git a/drools-core/src/test/java/org/drools/core/util/index/IndexUtilTest.java b/drools-core/src/test/java/org/drools/core/util/index/IndexUtilTest.java
index 6ca3cf46b95..3cc0a9169da 100644
--- a/drools-core/src/test/java/org/drools/core/util/index/IndexUtilTest.java
+++ b/drools-core/src/test/java/org/drools/core/util/index/IndexUtilTest.java
@@ -32,10 +32,11 @@
 import org.drools.base.rule.IndexableConstraint;
 import org.drools.base.rule.accessor.FieldValue;
 import org.drools.base.rule.accessor.ReadAccessor;
+import org.drools.base.rule.accessor.RightTupleValueExtractor;
 import org.drools.base.rule.accessor.TupleValueExtractor;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.base.rule.constraint.Constraint;
-import org.drools.base.util.FieldIndex;
+import org.drools.base.util.IndexedValueReader;
 import org.drools.base.util.index.ConstraintTypeOperator;
 import org.drools.base.util.index.IndexUtil;
 import org.drools.core.RuleBaseConfiguration;
@@ -99,17 +100,17 @@ public void createBetaMemoryWithBigDecimalEqualsAndOtherIndexableConstraints_sho
         assertThat(betaMemory.getLeftTupleMemory()).isInstanceOf(TupleIndexHashTable.class);
         Index leftIndex = ((TupleIndexHashTable) betaMemory.getLeftTupleMemory()).getIndex();
         assertThat(leftIndex).isInstanceOf(DoubleCompositeIndex.class);
-        FieldIndex leftFieldIndex0 = leftIndex.getFieldIndex(0);
+        IndexedValueReader leftFieldIndex0 = leftIndex.getFieldIndex(0);
         assertThat(leftFieldIndex0.getLeftExtractor().getValueType()).isEqualTo(ValueType.PINTEGER_TYPE);
-        FieldIndex leftFieldIndex1 = leftIndex.getFieldIndex(1);
+        IndexedValueReader leftFieldIndex1 = leftIndex.getFieldIndex(1);
         assertThat(leftFieldIndex1.getLeftExtractor().getValueType()).isEqualTo(ValueType.STRING_TYPE);
 
         assertThat(betaMemory.getRightTupleMemory()).isInstanceOf(TupleIndexHashTable.class);
         Index rightIndex = ((TupleIndexHashTable) betaMemory.getRightTupleMemory()).getIndex();
         assertThat(rightIndex).isInstanceOf(DoubleCompositeIndex.class);
-        FieldIndex rightFieldIndex0 = rightIndex.getFieldIndex(0);
+        IndexedValueReader rightFieldIndex0 = rightIndex.getFieldIndex(0);
         assertThat(rightFieldIndex0.getRightExtractor().getValueType()).isEqualTo(ValueType.PINTEGER_TYPE);
-        FieldIndex rightFieldIndex1 = rightIndex.getFieldIndex(1);
+        IndexedValueReader rightFieldIndex1 = rightIndex.getFieldIndex(1);
         assertThat(rightFieldIndex1.getRightExtractor().getValueType()).isEqualTo(ValueType.STRING_TYPE);
     }
 
@@ -118,8 +119,8 @@ public void isIndexableForNodeWithIntAndString() {
         RuleBaseConfiguration config = getRuleBaseConfiguration();
         FakeBetaNodeFieldConstraint intEqualsConstraint = new FakeBetaNodeFieldConstraint(ConstraintTypeOperator.EQUAL, new FakeReadAccessor(ValueType.PINTEGER_TYPE));
         FakeBetaNodeFieldConstraint stringEqualsConstraint = new FakeBetaNodeFieldConstraint(ConstraintTypeOperator.EQUAL, new FakeReadAccessor(ValueType.STRING_TYPE));
-        BetaNodeFieldConstraint[] constraints = new FakeBetaNodeFieldConstraint[]{intEqualsConstraint, stringEqualsConstraint};
-        boolean[] indexed = IndexUtil.isIndexableForNode(IndexPrecedenceOption.EQUALITY_PRIORITY, NodeTypeEnums.JoinNode, config.getCompositeKeyDepth(), constraints, config);
+        BetaConstraint[]            constraints            = new FakeBetaNodeFieldConstraint[]{intEqualsConstraint, stringEqualsConstraint};
+        boolean[]                   indexed                = IndexUtil.isIndexableForNode(IndexPrecedenceOption.EQUALITY_PRIORITY, NodeTypeEnums.JoinNode, config.getCompositeKeyDepth(), constraints, config);
         assertThat(indexed).containsExactly(true, true);
     }
 
@@ -129,8 +130,8 @@ public void isIndexableForNodeWithIntAndBigDecimalAndString() {
         FakeBetaNodeFieldConstraint intEqualsConstraint = new FakeBetaNodeFieldConstraint(ConstraintTypeOperator.EQUAL, new FakeReadAccessor(ValueType.PINTEGER_TYPE));
         FakeBetaNodeFieldConstraint bigDecimalEqualsConstraint = new FakeBetaNodeFieldConstraint(ConstraintTypeOperator.EQUAL, new FakeReadAccessor(ValueType.BIG_DECIMAL_TYPE));
         FakeBetaNodeFieldConstraint stringEqualsConstraint = new FakeBetaNodeFieldConstraint(ConstraintTypeOperator.EQUAL, new FakeReadAccessor(ValueType.STRING_TYPE));
-        BetaNodeFieldConstraint[] constraints = new FakeBetaNodeFieldConstraint[]{intEqualsConstraint, bigDecimalEqualsConstraint, stringEqualsConstraint};
-        boolean[] indexed = IndexUtil.isIndexableForNode(IndexPrecedenceOption.EQUALITY_PRIORITY, NodeTypeEnums.JoinNode, config.getCompositeKeyDepth(), constraints, config);
+        BetaConstraint[]            constraints            = new FakeBetaNodeFieldConstraint[]{intEqualsConstraint, bigDecimalEqualsConstraint, stringEqualsConstraint};
+        boolean[]                   indexed                = IndexUtil.isIndexableForNode(IndexPrecedenceOption.EQUALITY_PRIORITY, NodeTypeEnums.JoinNode, config.getCompositeKeyDepth(), constraints, config);
         assertThat(indexed).as("BigDecimal is sorted to the last").containsExactly(true, true, false);
     }
 
@@ -138,8 +139,8 @@ public void isIndexableForNodeWithIntAndBigDecimalAndString() {
     public void isIndexableForJoinNodeWithBigDecimal() {
         RuleBaseConfiguration config = getRuleBaseConfiguration();
         FakeBetaNodeFieldConstraint bigDecimalEqualsConstraint = new FakeBetaNodeFieldConstraint(ConstraintTypeOperator.EQUAL, new FakeReadAccessor(ValueType.BIG_DECIMAL_TYPE));
-        BetaNodeFieldConstraint[] constraints = new FakeBetaNodeFieldConstraint[]{bigDecimalEqualsConstraint};
-        boolean[] indexed = IndexUtil.isIndexableForNode(IndexPrecedenceOption.EQUALITY_PRIORITY, NodeTypeEnums.JoinNode, config.getCompositeKeyDepth(), constraints, config);
+        BetaConstraint[]            constraints                = new FakeBetaNodeFieldConstraint[]{bigDecimalEqualsConstraint};
+        boolean[]                   indexed                    = IndexUtil.isIndexableForNode(IndexPrecedenceOption.EQUALITY_PRIORITY, NodeTypeEnums.JoinNode, config.getCompositeKeyDepth(), constraints, config);
         assertThat(indexed).as("BigDecimal is not indexed").containsExactly(false);
     }
 
@@ -147,7 +148,7 @@ public void isIndexableForJoinNodeWithBigDecimal() {
     public void isIndexableForExistsNodeWithBigDecimal() {
         RuleBaseConfiguration config = getRuleBaseConfiguration();
         FakeBetaNodeFieldConstraint bigDecimalEqualsConstraint = new FakeBetaNodeFieldConstraint(ConstraintTypeOperator.EQUAL, new FakeReadAccessor(ValueType.BIG_DECIMAL_TYPE));
-        BetaNodeFieldConstraint[] constraints = new FakeBetaNodeFieldConstraint[]{bigDecimalEqualsConstraint};
+        BetaConstraint[] constraints = new FakeBetaNodeFieldConstraint[]{bigDecimalEqualsConstraint};
         boolean[] indexed = IndexUtil.isIndexableForNode(IndexPrecedenceOption.EQUALITY_PRIORITY, NodeTypeEnums.ExistsNode, config.getCompositeKeyDepth(), constraints, config);
         assertThat(indexed).as("BigDecimal is not indexed").containsExactly(false);
     }
@@ -156,12 +157,12 @@ public void isIndexableForExistsNodeWithBigDecimal() {
     public void isIndexableForNotNodeWithBigDecimal() {
         RuleBaseConfiguration config = getRuleBaseConfiguration();
         FakeBetaNodeFieldConstraint bigDecimalEqualsConstraint = new FakeBetaNodeFieldConstraint(ConstraintTypeOperator.EQUAL, new FakeReadAccessor(ValueType.BIG_DECIMAL_TYPE));
-        BetaNodeFieldConstraint[] constraints = new FakeBetaNodeFieldConstraint[]{bigDecimalEqualsConstraint};
+        BetaConstraint[] constraints = new FakeBetaNodeFieldConstraint[]{bigDecimalEqualsConstraint};
         boolean[] indexed = IndexUtil.isIndexableForNode(IndexPrecedenceOption.EQUALITY_PRIORITY, NodeTypeEnums.NotNode, config.getCompositeKeyDepth(), constraints, config);
         assertThat(indexed).as("BigDecimal is not indexed").containsExactly(false);
     }
 
-    static class FakeBetaNodeFieldConstraint implements BetaNodeFieldConstraint,
+    static class FakeBetaNodeFieldConstraint implements BetaConstraint,
                                                         IndexableConstraint {
 
         private ConstraintTypeOperator constraintType;
@@ -195,8 +196,8 @@ public FieldValue getField() {
         }
 
         @Override
-        public FieldIndex getFieldIndex() {
-            return new FieldIndex(fieldExtractor, new Declaration("$p1", fieldExtractor, null));
+        public IndexedValueReader getFieldIndex() {
+            return new IndexedValueReader(new Declaration("$p1", fieldExtractor, null), new RightTupleValueExtractor(fieldExtractor));
         }
 
         @Override
@@ -205,7 +206,12 @@ public ReadAccessor getFieldExtractor() {
         }
 
         @Override
-        public TupleValueExtractor getIndexExtractor() {
+        public TupleValueExtractor getRightIndexExtractor() {
+            return null;
+        }
+
+        @Override
+        public TupleValueExtractor getLeftIndexExtractor() {
             return null;
         }
 
@@ -220,12 +226,12 @@ public boolean isAllowedCachedRight(BaseTuple tuple, ContextEntry context) {
         }
 
         @Override
-        public ContextEntry createContextEntry() {
+        public ContextEntry createContext() {
             return null;
         }
 
         @Override
-        public BetaNodeFieldConstraint cloneIfInUse() {
+        public BetaConstraint cloneIfInUse() {
             return null;
         }
 
diff --git a/drools-fastutil/src/main/java/org/drools/fastutil/FastUtilHashTupleMemory.java b/drools-fastutil/src/main/java/org/drools/fastutil/FastUtilHashTupleMemory.java
index e745ac035e3..1f88680d664 100644
--- a/drools-fastutil/src/main/java/org/drools/fastutil/FastUtilHashTupleMemory.java
+++ b/drools-fastutil/src/main/java/org/drools/fastutil/FastUtilHashTupleMemory.java
@@ -23,22 +23,16 @@
 import org.drools.core.reteoo.AbstractTuple;
 import org.drools.core.reteoo.Tuple;
 import org.drools.core.reteoo.TupleMemory;
-import org.drools.core.util.AbstractHashTable.DoubleCompositeIndex;
-import org.drools.base.util.FieldIndex;
 import org.drools.core.util.AbstractHashTable.HashEntry;
 import org.drools.core.util.AbstractHashTable.Index;
-import org.drools.core.util.AbstractHashTable.SingleIndex;
-import org.drools.core.util.AbstractHashTable.TripleCompositeIndex;
 import org.drools.core.util.FastIterator;
 import org.drools.core.util.Iterator;
 import org.drools.core.util.LinkedList;
 import org.drools.core.util.index.TupleList;
 
-public class FastUtilHashTupleMemory implements TupleMemory {
-
-    public static final int                    PRIME            = 31;
+import java.util.function.Supplier;
 
-    private int                                startResult;
+public class FastUtilHashTupleMemory implements TupleMemory {
 
     private int                                factSize;
 
@@ -68,7 +62,7 @@ public boolean equals(HashEntry a, HashEntry b) {
         }
     }
 
-    public FastUtilHashTupleMemory(FieldIndex[] index,
+    public FastUtilHashTupleMemory(Index index,
                                    boolean left) {
         this.set = new FastUtilMergableHashSet<>(HashStrategy.get());
 
@@ -76,29 +70,7 @@ public FastUtilHashTupleMemory(FieldIndex[] index,
 
         fullFastIterator = new FullFastIterator(set);
 
-        this.startResult = PRIME;
-        for ( FieldIndex i : index ) {
-            this.startResult += PRIME * this.startResult + i.getRightExtractor().getIndex();
-        }
-
-        switch ( index.length ) {
-            case 0 :
-                throw new IllegalArgumentException( "FieldIndexHashTable cannot use an index[] of length  0" );
-            case 1 :
-                this.index = new SingleIndex(index,
-                                             this.startResult );
-                break;
-            case 2 :
-                this.index = new DoubleCompositeIndex(index,
-                                                      this.startResult );
-                break;
-            case 3 :
-                this.index = new TripleCompositeIndex(index,
-                                                      this.startResult );
-                break;
-            default :
-                throw new IllegalArgumentException( "FieldIndexHashTable cannot use an index[] of length  great than 3" );
-        }
+        this.index = index;
     }
 
     @Override
@@ -230,7 +202,6 @@ public IndexType getIndexType() {
     @Override
     public void clear() {
         set.clear();
-        this.startResult = PRIME;
         this.factSize = 0;
     }
 
diff --git a/drools-fastutil/src/main/java/org/drools/fastutil/FastUtilIndexMemory.java b/drools-fastutil/src/main/java/org/drools/fastutil/FastUtilIndexMemory.java
index b9e565178eb..15a0036cee4 100644
--- a/drools-fastutil/src/main/java/org/drools/fastutil/FastUtilIndexMemory.java
+++ b/drools-fastutil/src/main/java/org/drools/fastutil/FastUtilIndexMemory.java
@@ -19,8 +19,8 @@
 package org.drools.fastutil;
 
 import org.drools.core.reteoo.TupleMemory;
-import org.drools.core.util.index.IndexMemory;
 import org.drools.core.util.index.IndexSpec;
+import org.drools.core.util.index.IndexMemory;
 
 public class FastUtilIndexMemory {
 
@@ -28,14 +28,14 @@ public static class FastUtilEqualityMemoryFactory implements IndexMemory.Factory
 
         @Override
         public TupleMemory createMemory(IndexSpec indexSpec, boolean isLeft) {
-            return new FastUtilHashTupleMemory(indexSpec.getIndexes(), isLeft);
+            return new FastUtilHashTupleMemory(indexSpec.getIndex(), isLeft);
         }
     }
 
     public static class FastUtilComparisonMemoryFactory implements IndexMemory.Factory {
 
         @Override
-        public TupleMemory createMemory(IndexSpec indexSpec, boolean isLeft) {
+            public TupleMemory createMemory(IndexSpec indexSpec, boolean isLeft) {
             return new FastUtilTreeMemory(indexSpec.getConstraintType(), indexSpec.getIndex(0), isLeft);
         }
     }
diff --git a/drools-fastutil/src/main/java/org/drools/fastutil/FastUtilTreeMemory.java b/drools-fastutil/src/main/java/org/drools/fastutil/FastUtilTreeMemory.java
index b3fc5999b88..9311ffbe3d5 100644
--- a/drools-fastutil/src/main/java/org/drools/fastutil/FastUtilTreeMemory.java
+++ b/drools-fastutil/src/main/java/org/drools/fastutil/FastUtilTreeMemory.java
@@ -27,7 +27,7 @@
 import org.drools.core.reteoo.TupleMemory;
 import it.unimi.dsi.fastutil.objects.ObjectIterator;
 import org.drools.core.util.FastIterator;
-import org.drools.base.util.FieldIndex;
+import org.drools.base.util.IndexedValueReader;
 import org.drools.core.util.Iterator;
 import org.drools.core.util.index.AbstractTupleIndexTree;
 import org.drools.base.util.index.ConstraintTypeOperator;
@@ -74,7 +74,7 @@ public TupleList setValue(TupleList value) {
         }
     }
 
-    public FastUtilTreeMemory(ConstraintTypeOperator constraintType, FieldIndex index, boolean left) {
+    public FastUtilTreeMemory(ConstraintTypeOperator constraintType, IndexedValueReader index, boolean left) {
         this.index = index;
         this.constraintType = constraintType;
         this.left = left;
diff --git a/drools-fastutil/src/test/java/org/drools/fastutil/FastUtilTreeMemoryTest.java b/drools-fastutil/src/test/java/org/drools/fastutil/FastUtilTreeMemoryTest.java
index 42feadaa1d4..8be8dfdc11c 100644
--- a/drools-fastutil/src/test/java/org/drools/fastutil/FastUtilTreeMemoryTest.java
+++ b/drools-fastutil/src/test/java/org/drools/fastutil/FastUtilTreeMemoryTest.java
@@ -21,6 +21,7 @@
 import org.drools.base.base.ValueResolver;
 import org.drools.base.base.ValueType;
 import org.drools.base.base.extractors.BaseObjectClassFieldReader;
+import org.drools.base.rule.accessor.RightTupleValueExtractor;
 import org.drools.core.common.DefaultFactHandle;
 import org.drools.core.common.InternalFactHandle;
 import org.drools.base.reteoo.BaseTuple;
@@ -30,7 +31,7 @@
 import org.drools.base.rule.accessor.ReadAccessor;
 import org.drools.base.rule.accessor.TupleValueExtractor;
 import org.drools.core.util.FastIterator;
-import org.drools.base.util.FieldIndex;
+import org.drools.base.util.IndexedValueReader;
 import org.drools.fastutil.FastUtilTreeMemory.TreeFastIterator;
 import org.drools.base.util.index.ConstraintTypeOperator;
 import org.junit.Test;
@@ -42,17 +43,17 @@ public class FastUtilTreeMemoryTest {
     @Test
     public void testMocks() {
         TupleValueExtractor leftValueExtractor = getTupleValueExtractor();
-        ReadAccessor rightValueExtractor = getRightExtractor();
+        TupleValueExtractor rightValueExtractor = getRightExtractor();
 
         Tuple tuple10 = getLeftTuple(10);
 
-        FieldIndex fieldIndex = new FieldIndex(rightValueExtractor, leftValueExtractor);
+        IndexedValueReader fieldIndex = new IndexedValueReader(leftValueExtractor, rightValueExtractor);
         assertThat(fieldIndex.getLeftExtractor().getValue(tuple10)).isEqualTo(10);
     }
 
     @Test
     public void testGreaterThan() {
-        FieldIndex fieldIndex = new FieldIndex(getRightExtractor(), getTupleValueExtractor());
+        IndexedValueReader fieldIndex = new IndexedValueReader(getTupleValueExtractor(), getRightExtractor());
         FastUtilTreeMemory treeMemory = new FastUtilTreeMemory(ConstraintTypeOperator.GREATER_THAN, fieldIndex, !true);
 
         Tuple tuple10 = getLeftTuple(10);
@@ -84,7 +85,7 @@ public void testGreaterThan() {
 
     @Test
     public void testGreaterOrEqual() {
-        FieldIndex fieldIndex = new FieldIndex(getRightExtractor(), getTupleValueExtractor());
+        IndexedValueReader fieldIndex = new IndexedValueReader(getTupleValueExtractor(), getRightExtractor());
         FastUtilTreeMemory treeMemory = new FastUtilTreeMemory(ConstraintTypeOperator.GREATER_OR_EQUAL, fieldIndex, !true);
 
         Tuple tuple10 = getLeftTuple(10);
@@ -116,7 +117,7 @@ public void testGreaterOrEqual() {
 
     @Test
     public void testLessOrEqual() {
-        FieldIndex fieldIndex = new FieldIndex(getRightExtractor(), getTupleValueExtractor());
+        IndexedValueReader fieldIndex = new IndexedValueReader(getTupleValueExtractor(), getRightExtractor());
         FastUtilTreeMemory treeMemory = new FastUtilTreeMemory(ConstraintTypeOperator.LESS_OR_EQUAL, fieldIndex, !true);
 
         Tuple tuple10 = getLeftTuple(10);
@@ -170,7 +171,7 @@ public void testLessOrEqual() {
 
     @Test
     public void testLessThan() {
-        FieldIndex fieldIndex = new FieldIndex(getRightExtractor(), getTupleValueExtractor());
+        IndexedValueReader fieldIndex = new IndexedValueReader(getTupleValueExtractor(), getRightExtractor());
         FastUtilTreeMemory treeMemory = new FastUtilTreeMemory(ConstraintTypeOperator.LESS_THAN, fieldIndex, !true);
 
         Tuple tuple10 = getLeftTuple(10);
@@ -221,8 +222,8 @@ public void testLessThan() {
 
     @Test
     public void testSharedFirstBucket() {
-        FieldIndex fieldIndex = new FieldIndex(getRightExtractor(), getTupleValueExtractor());
-        FastUtilTreeMemory  treeMemory = new FastUtilTreeMemory(ConstraintTypeOperator.GREATER_THAN, fieldIndex, !true);
+        IndexedValueReader fieldIndex = new IndexedValueReader(getTupleValueExtractor(), getRightExtractor());
+        FastUtilTreeMemory treeMemory = new FastUtilTreeMemory(ConstraintTypeOperator.GREATER_THAN, fieldIndex, !true);
 
         Tuple tuple10_1 = getLeftTuple(10);
         Tuple tuple10_2 = getLeftTuple(10);
@@ -267,7 +268,7 @@ public void testSharedFirstBucket() {
 
     @Test
     public void testSharedLastBucket() {
-        FieldIndex fieldIndex = new FieldIndex(getRightExtractor(), getTupleValueExtractor());
+        IndexedValueReader fieldIndex = new IndexedValueReader(getTupleValueExtractor(), getRightExtractor());
         FastUtilTreeMemory treeMemory = new FastUtilTreeMemory(ConstraintTypeOperator.GREATER_THAN, fieldIndex, !true);
 
         Tuple tuple10 = getLeftTuple(10);
@@ -373,7 +374,7 @@ public TupleValueExtractor clone() {
         return extractor;
     }
 
-    public static ReadAccessor getRightExtractor() {
+    public static TupleValueExtractor getRightExtractor() {
         ReadAccessor readAccessor = new BaseObjectClassFieldReader() {
             @Override
             public Object getValue(ValueResolver valueResolver, Object object) {
@@ -381,6 +382,8 @@ public Object getValue(ValueResolver valueResolver, Object object) {
             }
         };
 
-        return readAccessor;
+        RightTupleValueExtractor rightTupleValueExtractor = new RightTupleValueExtractor(readAccessor);
+
+        return rightTupleValueExtractor;
     }
 }
diff --git a/drools-kiesession/src/test/java/org/drools/core/positional/BetaConstraintsPositionalIndexingTest.java b/drools-kiesession/src/test/java/org/drools/core/positional/BetaConstraintsPositionalIndexingTest.java
new file mode 100644
index 00000000000..c0f3a224b74
--- /dev/null
+++ b/drools-kiesession/src/test/java/org/drools/core/positional/BetaConstraintsPositionalIndexingTest.java
@@ -0,0 +1,282 @@
+package org.drools.core.positional;
+
+import org.drools.base.base.ClassObjectType;
+import org.drools.base.base.ObjectType;
+import org.drools.base.base.ValueType;
+import org.drools.base.definitions.impl.KnowledgePackageImpl;
+import org.drools.base.definitions.rule.impl.RuleImpl;
+import org.drools.base.rule.Declaration;
+import org.drools.base.rule.Pattern;
+import org.drools.base.rule.accessor.TupleValueExtractor;
+import org.drools.base.rule.constraint.Constraint.ConstraintType;
+import org.drools.base.util.IndexedValueReader;
+import org.drools.base.util.index.ConstraintTypeOperator;
+import org.drools.core.impl.KnowledgeBaseImpl;
+import org.drools.core.impl.RuleBaseFactory;
+import org.drools.core.positional.Functions.Function1;
+import org.drools.core.positional.Functions.Function2;
+import org.drools.core.positional.PositionalConstraint.PositionalTupleValueExtractor1;
+import org.drools.core.positional.PositionalConstraint.PositionalTupleValueExtractor2;
+import org.drools.core.positional.Predicates.Predicate1;
+import org.drools.core.positional.VoidFunctions.VoidFunction1;
+import org.drools.core.positional.VoidFunctions.VoidFunction2;
+import org.drools.core.positional.VoidFunctions.VoidFunction3;
+import org.drools.core.test.model.Person;
+import org.drools.core.util.index.IndexSpec;
+import org.drools.kiesession.rulebase.SessionsAwareKnowledgeBase;
+import org.junit.Test;
+import org.kie.api.runtime.KieSession;
+import org.kie.internal.conf.CompositeBaseConfiguration;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class BetaConstraintsPositionalIndexingTest {
+    @Test
+    public void testAlphaConsraint() {
+        // Note this test only sets indexes for the join, no tests
+        RuleImpl r1 = new RuleImpl("r1");
+
+        final ObjectType stringObjectType = new ClassObjectType(String.class );
+
+        final Pattern spattern = new Pattern(0,
+                                             stringObjectType,
+                                             "s" );
+
+        PositionalConstraint sconstraint = new PositionalConstraint(new Declaration[] {}, spattern);
+        sconstraint.setPredicate((Predicate1) (a) -> a.equals("London"));
+        sconstraint.setType(ConstraintType.ALPHA);
+        sconstraint.setConstraintTypeOperator(ConstraintTypeOperator.EQUAL);
+        spattern.addConstraint(sconstraint);
+
+        r1.addPattern(spattern);
+
+        List           results = new ArrayList<>();
+        PositionalConsequence c       = new PositionalConsequence<>("default", new Declaration[] {spattern.getDeclaration()});
+        c.setFunction((VoidFunction1) (s) -> {results.add(new Object[] {s}); System.out.println(s);});
+        r1.setConsequence(c);
+
+        KnowledgeBaseImpl base = new KnowledgeBaseImpl("default", (CompositeBaseConfiguration)  RuleBaseFactory.newKnowledgeBaseConfiguration());
+        KnowledgePackageImpl pkg = new KnowledgePackageImpl();
+        pkg.addRule(r1);
+
+        base.addPackage(pkg);
+
+        SessionsAwareKnowledgeBase kbase = new SessionsAwareKnowledgeBase(base);
+        KieSession session = kbase.newKieSession();
+        session.insert("London");
+        session.insert("Paris");
+        session.fireAllRules();
+
+        assertThat(results.size()).isEqualTo(1);
+        assertThat(results.get(0)[0]).isEqualTo("London");
+    }
+
+    @Test
+    public void testSingleInputEqualityIndexExpressions() {
+        VoidFunction2 f1 = (ppattern, pconstraint) -> {
+            TupleValueExtractor leftExtractor = new PositionalTupleValueExtractor1((Function1) (s) -> s, ValueType.STRING_TYPE );
+            TupleValueExtractor rightExtractor = new PositionalTupleValueExtractor1((Function1) (p) -> p.getCity(), ValueType.STRING_TYPE );
+            pconstraint.setIndex(new IndexSpec(new IndexedValueReader[]{new IndexedValueReader(leftExtractor, rightExtractor)}));
+
+            pconstraint.setType(ConstraintType.BETA);
+            pconstraint.setConstraintTypeOperator(ConstraintTypeOperator.EQUAL);
+            ppattern.addConstraint(pconstraint);
+        };
+
+        List           results = new ArrayList<>();
+        VoidFunction1> f2 = (c) -> {
+            c.setFunction((VoidFunction2) (s, p) -> {results.add(new Object[] {s, p}); System.out.println(p.getName() + " lives in " + s);});
+        };
+
+        testBody(null, f1, f2, false);
+
+        assertThat(results.size()).isEqualTo(1);
+        assertThat(results.get(0)[0]).isEqualTo("London");
+        assertThat(((Person)results.get(0)[1]).getName()).isEqualTo("yoda");
+    }
+
+    @Test
+    public void testDoubleInputEqualityIndexExpressions() {
+        VoidFunction2 f1 = (ppattern, pconstraint) -> {
+            TupleValueExtractor  leftExtractor = new PositionalTupleValueExtractor2((Function2) (s, i) -> s.length() + i, ValueType.INTEGER_TYPE );
+            TupleValueExtractor rightExtractor = new PositionalTupleValueExtractor1((Function1) (p) -> p.getCity().length(), ValueType.INTEGER_TYPE );
+            pconstraint.setIndex(new IndexSpec(new IndexedValueReader[]{new IndexedValueReader(leftExtractor, rightExtractor)}));
+
+            pconstraint.setType(ConstraintType.BETA);
+            pconstraint.setConstraintTypeOperator(ConstraintTypeOperator.EQUAL);
+            ppattern.addConstraint(pconstraint);
+        };
+
+        List           results = new ArrayList<>();
+        VoidFunction1> f2 = (c) -> {
+            c.setFunction((VoidFunction3) (s, i, p) -> {results.add(new Object[] {s, i, p}); System.out.println(p.getName() + " lives in " + s);});
+        };
+
+        Person p1 = new Person("yoda", 300);
+        p1.setCity("London");
+
+        Person p2 = new Person("luke", 50);
+        p2.setCity("Rome");
+
+        testBody(null, f1, f2, true);
+
+        assertThat(results.size()).isEqualTo(1);
+        assertThat(results.get(0)[0]).isEqualTo("Paris");
+        assertThat(results.get(0)[1]).isSameAs(1);
+        assertThat(((Person)results.get(0)[2]).getName()).isEqualTo("yoda");
+    }
+
+    @Test
+    public void testSingleInputRangeIndexExpressions() {
+        VoidFunction1 f0 = (spattern) -> {
+            PositionalConstraint sconstraint = new PositionalConstraint(new Declaration[]{}, spattern);
+            sconstraint.setPredicate((Predicate1) (s) -> {try {
+                Integer.valueOf(s);
+                return true;
+            } catch (Exception e) {
+                return false;
+            }});
+            sconstraint.setType(ConstraintType.ALPHA);
+            sconstraint.setConstraintTypeOperator(ConstraintTypeOperator.EQUAL);
+            spattern.addConstraint(sconstraint);
+        };
+
+        VoidFunction2 f1 = (ppattern, pconstraint) -> {
+            TupleValueExtractor leftExtractor = new PositionalTupleValueExtractor1((Function1) (s) -> Integer.valueOf(s), ValueType.INTEGER_TYPE );
+            TupleValueExtractor rightExtractor = new PositionalTupleValueExtractor1((Function1) (p) -> p.getAge(), ValueType.INTEGER_TYPE );
+            pconstraint.setIndex(new IndexSpec(new IndexedValueReader[]{new IndexedValueReader(leftExtractor, rightExtractor)}, ConstraintTypeOperator.LESS_THAN));
+
+            pconstraint.setType(ConstraintType.BETA);
+            pconstraint.setConstraintTypeOperator(ConstraintTypeOperator.LESS_THAN);
+            ppattern.addConstraint(pconstraint);
+        };
+
+        List           results = new ArrayList<>();
+        VoidFunction1> f2 = (c) -> {
+            c.setFunction((VoidFunction2) (s, p) -> {results.add(new Object[] {s, p}); System.out.println(p.getName() + " is younger than " + s);});
+        };
+
+        testBody(f0, f1, f2, false);
+
+        assertThat(results.size()).isEqualTo(1);
+        assertThat(results.get(0)[0]).isEqualTo("50");
+        assertThat(((Person)results.get(0)[1]).getName()).isEqualTo("luke");
+    }
+
+    @Test
+    public void testDoubleInputRangeIndexExpressions() {
+        VoidFunction1 f0 = (spattern) -> {
+            PositionalConstraint sconstraint = new PositionalConstraint(new Declaration[]{}, spattern);
+            sconstraint.setPredicate((Predicate1) (s) -> {try {
+                Integer.valueOf(s);
+                return true;
+            } catch (Exception e) {
+                return false;
+            }});
+            sconstraint.setType(ConstraintType.ALPHA);
+            sconstraint.setConstraintTypeOperator(ConstraintTypeOperator.EQUAL);
+            spattern.addConstraint(sconstraint);
+        };
+
+        VoidFunction2 f1 = (ppattern, pconstraint) -> {
+            TupleValueExtractor leftExtractor = new PositionalTupleValueExtractor2((Function2) (s, i) -> Integer.valueOf(s) + i, ValueType.INTEGER_TYPE );
+            TupleValueExtractor rightExtractor = new PositionalTupleValueExtractor1((Function1) (p) -> p.getAge(), ValueType.INTEGER_TYPE );
+            pconstraint.setIndex(new IndexSpec(new IndexedValueReader[]{new IndexedValueReader(leftExtractor, rightExtractor)}, ConstraintTypeOperator.LESS_THAN));
+
+            pconstraint.setType(ConstraintType.BETA);
+            pconstraint.setConstraintTypeOperator(ConstraintTypeOperator.LESS_THAN);
+            ppattern.addConstraint(pconstraint);
+        };
+
+        List           results = new ArrayList<>();
+        VoidFunction1> f2 = (c) -> {
+            c.setFunction((VoidFunction3) (s, i, p) -> {results.add(new Object[] {s, i, p}); System.out.println(p.getName() + " is younger than " + s);});
+        };
+
+        testBody(f0, f1, f2, true);
+
+        assertThat(results.size()).isEqualTo(1);
+        assertThat(results.get(0)[0]).isEqualTo("50");
+        assertThat(results.get(0)[1]).isEqualTo(1);
+        assertThat(((Person)results.get(0)[2]).getName()).isEqualTo("luke");
+    }
+
+    public void testBody(VoidFunction1 sfunc, VoidFunction2  pfunc, VoidFunction1> cfunc,
+                         boolean addI) {
+        // Note this test only sets indexes for the join, no tests
+
+        RuleImpl r1 = new RuleImpl("r1");
+
+        final ObjectType stringObjectType  = new ClassObjectType(String.class);
+        final ObjectType integerObjectType = new ClassObjectType(Integer.class);
+        final ObjectType personObjectType  = new ClassObjectType(Person.class);
+
+        final Pattern spattern = new Pattern(0,
+                                             stringObjectType,
+                                             "s");
+
+        final Pattern ipattern = new Pattern(0,
+                                             integerObjectType,
+                                             "i");
+
+        final Pattern ppattern = new Pattern(1,
+                                             personObjectType,
+                                             "p");
+
+        if (sfunc != null) {
+            sfunc.apply(spattern);
+        }
+
+        r1.addPattern(spattern);
+
+        PositionalConstraint pconstraint = null;
+        if (addI) {
+            r1.addPattern(ipattern);
+            pconstraint = new PositionalConstraint(new Declaration[]{spattern.getDeclaration(), ipattern.getDeclaration()}, ppattern);
+        } else {
+            pconstraint = new PositionalConstraint(new Declaration[]{spattern.getDeclaration()}, ppattern);
+        }
+        pfunc.apply(ppattern, pconstraint);
+
+        r1.addPattern(ppattern);
+
+        PositionalConsequence c;
+        if (addI) {
+            c = new PositionalConsequence<>("default", new Declaration[]{spattern.getDeclaration(), ipattern.getDeclaration(), ppattern.getDeclaration()});
+        } else {
+            c = new PositionalConsequence<>("default", new Declaration[]{spattern.getDeclaration(), ppattern.getDeclaration()});
+        }
+
+        cfunc.apply(c);
+
+        r1.setConsequence(c);
+
+        KnowledgeBaseImpl base = new KnowledgeBaseImpl("default", (CompositeBaseConfiguration)  RuleBaseFactory.newKnowledgeBaseConfiguration());
+        KnowledgePackageImpl pkg = new KnowledgePackageImpl();
+        pkg.addRule(r1);
+
+        base.addPackage(pkg);
+
+        SessionsAwareKnowledgeBase kbase = new SessionsAwareKnowledgeBase(base);
+        KieSession session = kbase.newKieSession();
+        session.insert("Paris");
+        session.insert("London");
+        session.insert(1);
+
+        session.insert("1");
+        session.insert("50");
+
+        Person p1 = new Person("yoda", 300);
+        p1.setCity("London");
+
+        Person p2 = new Person("luke", 20);
+        p2.setCity("Rome");
+
+        session.insert(p1);
+        session.insert(p2);
+        session.fireAllRules();
+    }
+
+}
diff --git a/drools-kiesession/src/test/java/org/drools/core/positional/Functions.java b/drools-kiesession/src/test/java/org/drools/core/positional/Functions.java
new file mode 100644
index 00000000000..367bfae80d1
--- /dev/null
+++ b/drools-kiesession/src/test/java/org/drools/core/positional/Functions.java
@@ -0,0 +1,28 @@
+package org.drools.core.positional;
+
+public class Functions {
+
+    interface Function1  {
+        R apply(A a);
+    }
+
+    interface Function2  {
+        R apply(A a, B b);
+    }
+
+    interface Function3  {
+        R apply(A a, B b, C c);
+    }
+
+    interface Function4  {
+        R apply(A a, B b, C c, D d);
+    }
+
+    interface Function5  {
+        R apply(A a, B b, C c, D d, E e);
+    }
+
+    interface Function6  {
+        R apply(A a, B b, C c, D d, E e, F f);
+    }
+}
diff --git a/drools-kiesession/src/test/java/org/drools/core/positional/IntFunctions.java b/drools-kiesession/src/test/java/org/drools/core/positional/IntFunctions.java
new file mode 100644
index 00000000000..4fa7cc767b2
--- /dev/null
+++ b/drools-kiesession/src/test/java/org/drools/core/positional/IntFunctions.java
@@ -0,0 +1,28 @@
+package org.drools.core.positional;
+
+public class IntFunctions {
+
+    interface IntFunction1  {
+        int apply(A a);
+    }
+
+    interface IntFunction2  {
+        int apply(A a, B b);
+    }
+
+    interface IntFunction3  {
+        int apply(A a, B b, C c);
+    }
+
+    interface IntFunction4  {
+        int apply(A a, B b, C c, D d);
+    }
+
+    interface IntFunction5  {
+        int apply(A a, B b, C c, D d, E e);
+    }
+
+    interface IntFunction6  {
+        int apply(A a, B b, C c, D d, E e, F f);
+    }
+}
diff --git a/drools-kiesession/src/test/java/org/drools/core/positional/PositionalConsequence.java b/drools-kiesession/src/test/java/org/drools/core/positional/PositionalConsequence.java
new file mode 100644
index 00000000000..74f60e7f6f8
--- /dev/null
+++ b/drools-kiesession/src/test/java/org/drools/core/positional/PositionalConsequence.java
@@ -0,0 +1,121 @@
+package org.drools.core.positional;
+
+import org.drools.base.base.ValueResolver;
+import org.drools.base.reteoo.BaseTuple;
+import org.drools.base.rule.Declaration;
+import org.drools.base.rule.consequence.Consequence;
+import org.drools.base.rule.consequence.ConsequenceContext;
+import org.drools.core.positional.VoidFunctions.VoidFunction1;
+import org.drools.core.positional.VoidFunctions.VoidFunction2;
+import org.drools.core.positional.VoidFunctions.VoidFunction3;
+import org.drools.core.positional.VoidFunctions.VoidFunction4;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+public class PositionalConsequence implements Consequence {
+
+    String name;
+
+    protected final Declaration[] declarations;
+
+    private VoidFunction1                         p1;
+    private VoidFunction2                 p2;
+    private VoidFunction3         p3;
+    private VoidFunction4 p4;
+
+
+    private int pIndex;
+
+    public PositionalConsequence(String name, Declaration[] declarations) {
+        this.declarations = declarations;
+        this.name = name;
+    }
+
+    @Override
+    public void evaluate(T helper, ValueResolver valueResolver) throws Exception {
+        BaseTuple t = helper.getTuple();
+        switch (pIndex) {
+            case 1: {
+                p1.apply(t.getFactHandle().getObject());
+                return;
+            }
+            case 2: {
+                p2.apply(t.getParent().getFactHandle().getObject(), t.getFactHandle().getObject());
+                return;
+            } case 3: {
+                BaseTuple    v2 = t.getParent();
+                p3.apply(v2.getParent().getFactHandle().getObject(),
+                         v2.getFactHandle().getObject(),
+                         t.getFactHandle().getObject());
+                return;
+            } case 4: {
+                BaseTuple    v2 = t.getParent();
+                BaseTuple    v3 = v2.getParent();
+                p4.apply(v2.getParent().getFactHandle().getObject(),
+                         v2.getFactHandle().getObject(),
+                         v3.getFactHandle().getObject(),
+                         t.getFactHandle().getObject());
+                return;
+            } default:
+                throw new RuntimeException("No matching predicate on index: " + pIndex);
+        }
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    public Declaration[] getRequiredDeclarations() {
+        return declarations;
+    }
+
+    public void replaceDeclaration(Declaration oldDecl, Declaration newDecl) {
+
+    }
+
+
+    public int getPIndex() {
+        return pIndex;
+    }
+
+    public  void setFunction(VoidFunction1 p1) {
+        this.p1 = (VoidFunction1) p1;
+        pIndex = 1;
+    }
+
+    public  void setFunction(VoidFunction2 p2) {
+        this.p2 = (VoidFunction2) p2;
+        pIndex = 2;
+    }
+
+    public  void setFunction(VoidFunction3 p3) {
+        this.p3 = (VoidFunction3) p3;
+        pIndex = 3;
+    }
+
+    public  void setFunction(VoidFunction4 p4) {
+        this.p4 = (VoidFunction4) p4;
+        pIndex = 4;
+    }
+
+    @Override
+    public PositionalConsequence clone() {
+        Declaration[]         clonedDeclrs = Arrays.stream(declarations).map(d -> d.clone()).collect(Collectors.toList()).toArray(new Declaration[0]);
+        PositionalConsequence clone        = new PositionalConsequence(name, clonedDeclrs);
+        clone.pIndex = pIndex;
+        clone.p1 = p1;
+        clone.p2 = p2;
+        clone.p3 = p3;
+        clone.p4 = p4;
+
+        Declaration[] clonedDeclarations = new Declaration[declarations.length];
+        for (int i = 0; i < declarations.length; i++) {
+            clonedDeclarations[i] = declarations[i].clone();
+        }
+
+        return clone;
+    }
+
+}
diff --git a/drools-kiesession/src/test/java/org/drools/core/positional/PositionalConstraint.java b/drools-kiesession/src/test/java/org/drools/core/positional/PositionalConstraint.java
new file mode 100644
index 00000000000..454b103f00e
--- /dev/null
+++ b/drools-kiesession/src/test/java/org/drools/core/positional/PositionalConstraint.java
@@ -0,0 +1,435 @@
+package org.drools.core.positional;
+
+import org.drools.base.base.ObjectType;
+import org.drools.base.base.ValueResolver;
+import org.drools.base.base.ValueType;
+import org.drools.base.reteoo.BaseTuple;
+import org.drools.base.rule.Declaration;
+import org.drools.base.rule.MutableTypeConstraint;
+import org.drools.base.rule.Pattern;
+import org.drools.base.rule.accessor.FieldValue;
+import org.drools.base.rule.accessor.ReadAccessor;
+import org.drools.base.rule.accessor.TupleValueExtractor;
+import org.drools.base.rule.constraint.BetaConstraint;
+import org.drools.base.rule.IndexableConstraint;
+import org.drools.base.rule.IntervalProviderConstraint;
+import org.drools.base.time.Interval;
+import org.drools.base.util.IndexedValueReader;
+import org.drools.base.util.index.ConstraintTypeOperator;
+import org.drools.core.RuleBaseConfiguration;
+import org.drools.core.common.BetaConstraints;
+import org.drools.core.common.ReteEvaluator;
+import org.drools.core.positional.Functions.Function1;
+import org.drools.core.positional.Functions.Function2;
+import org.drools.core.positional.PositionalConstraint.PositionalContextEntry;
+import org.drools.core.positional.Predicates.Predicate1;
+import org.drools.core.positional.Predicates.Predicate2;
+import org.drools.core.positional.Predicates.Predicate3;
+import org.drools.core.positional.Predicates.Predicate4;
+import org.drools.core.positional.Predicates.Predicate5;
+import org.drools.core.reteoo.BetaMemory;
+import org.drools.core.reteoo.Tuple;
+import org.drools.core.reteoo.TupleMemory;
+import org.drools.core.reteoo.builder.BuildContext;
+import org.drools.core.util.AbstractHashTable;
+import org.drools.core.util.AbstractHashTable.HashEntry;
+import org.drools.core.util.AbstractHashTable.Index;
+import org.drools.core.util.index.IndexMemory;
+import org.drools.core.util.index.IndexSpec;
+import org.drools.core.util.index.TupleList;
+import org.drools.util.bitmask.BitMask;
+import org.kie.api.KieBaseConfiguration;
+import org.kie.api.runtime.rule.FactHandle;
+
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+public class PositionalConstraint extends MutableTypeConstraint implements BetaConstraints, IndexableConstraint, IntervalProviderConstraint  {
+
+    protected final Declaration[] declarations;
+    private final Pattern pattern;
+
+    private ConstraintTypeOperator operatorType;
+
+    private IndexSpec indexSpec;
+
+    private Predicate1       p1 = (o) -> true;
+    private Predicate2    p2;
+    private Predicate3 p3;
+    private Predicate4 p4;
+
+    private int pIndex;
+
+    public PositionalConstraint(Declaration[] declarations, Pattern pattern) {
+        this.declarations = declarations;
+        this.pattern      = pattern;
+    }
+
+    @Override
+    public Declaration[] getRequiredDeclarations() {
+        return declarations;
+    }
+
+    @Override
+    public void replaceDeclaration(Declaration oldDecl, Declaration newDecl) {
+
+    }
+
+    public Pattern getPattern() {
+        return pattern;
+    }
+
+    public IndexSpec getIndex() {
+        return indexSpec;
+    }
+
+    public void setIndex(IndexSpec indexSpec) {
+        this.indexSpec = indexSpec;
+    }
+
+    public int getPIndex() {
+        return pIndex;
+    }
+
+    public  void setPredicate(Predicate1 p1) {
+        this.p1 = (Predicate1) p1;
+        pIndex = 1;
+    }
+
+    public  void setPredicate(Predicate2 p2) {
+        this.p2 = (Predicate2) p2;
+        pIndex = 2;
+    }
+
+    public  void setPredicate(Predicate3 p3) {
+        this.p3 = (Predicate3) p3;
+        pIndex = 3;
+    }
+
+    public  void setPredicate(Predicate4 p4) {
+        this.p4 = (Predicate4) p4;
+        pIndex = 4;
+    }
+
+    @Override
+    public PositionalConstraint clone() {
+        Declaration[]        clonedDeclrs = Arrays.stream(declarations).map(d -> d.clone()).collect(Collectors.toList()).toArray(new Declaration[0]);
+        PositionalConstraint clone        = new PositionalConstraint(clonedDeclrs, pattern);
+        clone.setType(getType());
+        clone.pIndex = pIndex;
+        clone.p1 = p1;
+        clone.p2 = p2;
+        clone.p3 = p3;
+        clone.p4 = p4;
+
+        Declaration[] clonedDeclarations = new Declaration[declarations.length];
+        for (int i = 0; i < declarations.length; i++) {
+            clonedDeclarations[i] = declarations[i].clone();
+        }
+
+        return clone;
+    }
+
+    @Override
+    public boolean isTemporal() {
+        return false;
+    }
+
+    @Override
+    public PositionalContextEntry createContext() {
+        return new PositionalContextEntry();
+    }
+
+    @Override
+    public void updateFromTuple(PositionalContextEntry context, ReteEvaluator reteEvaluator, Tuple tuple) {
+        context.tp = tuple;
+    }
+
+    @Override
+    public void updateFromFactHandle(PositionalContextEntry context, ReteEvaluator reteEvaluator, FactHandle handle) {
+        context.fh = handle;
+    }
+
+    @Override
+    public boolean isAllowed(FactHandle handle, ValueResolver valueResolver) {
+        return p1.test(handle.getObject());
+    }
+
+    @Override
+    public boolean isAllowedCachedLeft(PositionalContextEntry context, FactHandle h) {
+        return isAllowed(context.tp, h);
+    }
+
+    @Override
+    public boolean isAllowedCachedRight(BaseTuple t, PositionalContextEntry context) {
+        return isAllowed(t, context.fh);
+    }
+
+    public boolean isAllowed(BaseTuple t, FactHandle h) {
+        switch (pIndex) {
+            case 0: {
+                return true;
+            }
+            case 2: {
+                return p2.test(t.getFactHandle().getObject(), h.getObject());
+            } case 3: {
+                return p3.test(t.getParent().getFactHandle().getObject(),
+                               t.getFactHandle().getObject(),
+                               h.getObject());
+            } case 4: {
+                BaseTuple    v2 = t.getParent();
+                return p4.test(v2.getParent(), v2, t, h.getObject());
+            } default:
+                throw new RuntimeException("No matching predicate on index: " + pIndex);
+        }
+    }
+
+    @Override
+    public BetaConstraint[] getConstraints() {
+        return new BetaConstraint[] {this};
+    }
+
+    @Override
+    public BetaConstraints getOriginalConstraint() {
+        return this;
+    }
+
+    @Override
+    public boolean isIndexed() {
+        return p2 != null;
+    }
+
+    @Override
+    public int getIndexCount() {
+        return 0;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return false;
+    }
+
+    @Override
+    public BetaMemory createBetaMemory(RuleBaseConfiguration config, short nodeType) {
+
+        if (config.getCompositeKeyDepth() < 1) {
+            return new BetaMemory( config.isSequential() ? null : new TupleList(),
+                                   new TupleList(),
+                                   createContext(),
+                                   nodeType );
+        }
+
+        return new BetaMemory( createLeftMemory(config, indexSpec),
+                               createRightMemory(config, indexSpec),
+                               createContext(),
+                               nodeType );
+    }
+
+    private static TupleMemory createRightMemory(RuleBaseConfiguration config, IndexSpec indexSpec) {
+        if ( !config.isIndexRightBetaMemory() || indexSpec == null || !indexSpec.getConstraintType().isIndexable() || indexSpec.getIndexes().length == 0 ) {
+            return new TupleList();
+        }
+
+        if (indexSpec.getConstraintType() == ConstraintTypeOperator.EQUAL) {
+            return IndexMemory.createEqualityMemory(indexSpec, false);
+        }
+
+        if (indexSpec.getConstraintType().isComparison()) {
+            return IndexMemory.createComparisonMemory(indexSpec, false);
+        }
+
+        return new TupleList();
+    }
+
+    private static TupleMemory createLeftMemory(RuleBaseConfiguration config, IndexSpec indexSpec) {
+        if (config.isSequential()) {
+            return null;
+        }
+        if ( !config.isIndexLeftBetaMemory() || indexSpec == null || !indexSpec.getConstraintType().isIndexable() || indexSpec.getIndexes().length == 0 ) {
+            return new TupleList();
+        }
+
+        if (indexSpec.getConstraintType() == ConstraintTypeOperator.EQUAL) {
+            return IndexMemory.createEqualityMemory(indexSpec, true);
+        }
+
+        if (indexSpec.getConstraintType().isComparison()) {
+            return IndexMemory.createComparisonMemory(indexSpec, true);
+        }
+
+        return new TupleList();
+    }
+
+    @Override
+    public void resetTuple(PositionalContextEntry context) {
+        context.tp = null;
+    }
+
+    @Override
+    public void resetFactHandle(PositionalContextEntry context) {
+        context.fh = null;
+    }
+
+    @Override
+    public void init(BuildContext context, short betaNodeType) {
+
+    }
+
+    @Override
+    public void initIndexes(int depth, short betaNodeType, RuleBaseConfiguration config) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public MutableTypeConstraint cloneIfInUse() {
+        return super.cloneIfInUse();
+    }
+
+
+
+    @Override
+    public boolean isLeftUpdateOptimizationAllowed() {
+        return false;
+    }
+
+    @Override
+    public void registerEvaluationContext(BuildContext buildContext) {
+
+    }
+
+    @Override
+    public BitMask getListenedPropertyMask(Pattern pattern, ObjectType modifiedType, List settableProperties) {
+        return null;
+    }
+
+    @Override
+    public boolean isUnification() {
+        return false;
+    }
+
+    @Override
+    public boolean isIndexable(short nodeType, KieBaseConfiguration config) {
+        return false;
+    }
+
+    @Override
+    public ConstraintTypeOperator getConstraintType() {
+        return operatorType;
+    }
+
+    public void setConstraintTypeOperator(ConstraintTypeOperator operatorType) {
+        this.operatorType = operatorType;
+    }
+
+    @Override
+    public FieldValue getField() {
+        return null;
+    }
+
+    @Override
+    public IndexedValueReader getFieldIndex() {
+        return null;
+    }
+
+    @Override
+    public ReadAccessor getFieldExtractor() {
+        return null;
+    }
+
+    @Override
+    public TupleValueExtractor getRightIndexExtractor() {
+        return null;
+    }
+
+    @Override
+    public TupleValueExtractor getLeftIndexExtractor() {
+        return null;
+    }
+
+    @Override
+    public Interval getInterval() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void writeExternal(ObjectOutput out) throws IOException {
+
+    }
+
+    @Override
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+
+    }
+
+    public static class PositionalContextEntry {
+        public Tuple      tp;
+        public FactHandle fh;
+    }
+
+    public static class PositionalTupleValueExtractor1 implements TupleValueExtractor {
+        private Function1 func1;
+
+        private ValueType valueType;
+
+        public PositionalTupleValueExtractor1(Function1 func1, ValueType valueType) {
+            this.func1     = func1;
+            this.valueType = valueType;
+        }
+
+        public ValueType getValueType() {
+            return valueType;
+        }
+
+        @Override
+        public B getValue(BaseTuple tuple) {
+            return func1.apply((A) tuple.getFactHandle().getObject());
+        }
+
+        @Override
+        public B getValue(ValueResolver valueResolver, BaseTuple tuple) {
+            return func1.apply((A) tuple.getFactHandle().getObject());
+        }
+
+        @Override
+        public TupleValueExtractor clone() {
+            PositionalTupleValueExtractor1 clone = new PositionalTupleValueExtractor1(func1, valueType);
+            return clone;
+        }
+    }
+
+    public static class PositionalTupleValueExtractor2 implements TupleValueExtractor {
+        private Function2  func2;
+
+        private ValueType valueType;
+
+        public PositionalTupleValueExtractor2(Function2  func2, ValueType valueType) {
+            this.func2     = func2;
+            this.valueType = valueType;
+        }
+
+        public ValueType getValueType() {
+            return valueType;
+        }
+
+        @Override
+        public R getValue(BaseTuple tuple) {
+            return func2.apply((A) tuple.getParent().getFactHandle().getObject(), (B) tuple.getFactHandle().getObject());
+        }
+
+        @Override
+        public R getValue(ValueResolver valueResolver, BaseTuple tuple) {
+            return func2.apply((A) tuple.getParent().getFactHandle().getObject(), (B) tuple.getFactHandle().getObject());
+        }
+
+        @Override
+        public TupleValueExtractor clone() {
+            PositionalTupleValueExtractor2 clone = new PositionalTupleValueExtractor2(func2, valueType);
+            return clone;
+        }
+    }
+}
diff --git a/drools-kiesession/src/test/java/org/drools/core/positional/Predicates.java b/drools-kiesession/src/test/java/org/drools/core/positional/Predicates.java
new file mode 100644
index 00000000000..54caf11f69b
--- /dev/null
+++ b/drools-kiesession/src/test/java/org/drools/core/positional/Predicates.java
@@ -0,0 +1,28 @@
+package org.drools.core.positional;
+
+public class Predicates {
+
+    interface Predicate1  {
+        boolean test(A a);
+    }
+
+    interface Predicate2  {
+        boolean test(A a, B b);
+    }
+
+    interface Predicate3  {
+        boolean test(A a, B b, C c);
+    }
+
+    interface Predicate4  {
+        boolean test(A a, B b, C c, D d);
+    }
+
+    interface Predicate5  {
+        boolean test(A a, B b, C c, D d, E e);
+    }
+
+    interface Predicate6  {
+        boolean test(A a, B b, C c, D d, E e, F f);
+    }
+}
diff --git a/drools-kiesession/src/test/java/org/drools/core/positional/VoidFunctions.java b/drools-kiesession/src/test/java/org/drools/core/positional/VoidFunctions.java
new file mode 100644
index 00000000000..d7c7991affe
--- /dev/null
+++ b/drools-kiesession/src/test/java/org/drools/core/positional/VoidFunctions.java
@@ -0,0 +1,28 @@
+package org.drools.core.positional;
+
+public class VoidFunctions {
+
+    interface VoidFunction1  {
+        void apply(A a);
+    }
+
+    interface VoidFunction2  {
+        void apply(A a, B b);
+    }
+
+    interface VoidFunction3  {
+        void apply(A a, B b, C c);
+    }
+
+    interface VoidFunction4  {
+        void apply(A a, B b, C c, D d);
+    }
+
+    interface VoidFunction5  {
+        void apply(A a, B b, C c, D d, E e);
+    }
+
+    interface VoidFunction6  {
+        void apply(A a, B b, C c, D d, E e, F f);
+    }
+}
diff --git a/drools-metric/src/main/java/org/drools/metric/common/DefaultBetaConstraintsMetric.java b/drools-metric/src/main/java/org/drools/metric/common/DefaultBetaConstraintsMetric.java
index 0c336e3639d..55c7d6083bc 100644
--- a/drools-metric/src/main/java/org/drools/metric/common/DefaultBetaConstraintsMetric.java
+++ b/drools-metric/src/main/java/org/drools/metric/common/DefaultBetaConstraintsMetric.java
@@ -18,11 +18,12 @@
  */
 package org.drools.metric.common;
 
+import org.drools.base.reteoo.BaseTuple;
 import org.drools.core.RuleBaseConfiguration;
 import org.drools.core.common.DefaultBetaConstraints;
 import org.drools.base.rule.ContextEntry;
 import org.drools.base.rule.MutableTypeConstraint;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.core.reteoo.Tuple;
 import org.drools.metric.util.MetricLogUtils;
 import org.kie.api.runtime.rule.FactHandle;
@@ -33,13 +34,13 @@ public class DefaultBetaConstraintsMetric extends DefaultBetaConstraints {
 
     public DefaultBetaConstraintsMetric() {}
 
-    public DefaultBetaConstraintsMetric(final BetaNodeFieldConstraint[] constraints,
+    public DefaultBetaConstraintsMetric(final BetaConstraint[] constraints,
                                         final RuleBaseConfiguration conf) {
         super(constraints, conf);
 
     }
 
-    public DefaultBetaConstraintsMetric(final BetaNodeFieldConstraint[] constraints,
+    public DefaultBetaConstraintsMetric(final BetaConstraint[] constraints,
                                         final RuleBaseConfiguration conf,
                                         final boolean disableIndexing) {
         super(constraints, conf, disableIndexing);
@@ -48,7 +49,7 @@ public DefaultBetaConstraintsMetric(final BetaNodeFieldConstraint[] constraints,
     @Override
     public DefaultBetaConstraintsMetric cloneIfInUse() {
         if (constraints[0] instanceof MutableTypeConstraint && ((MutableTypeConstraint) constraints[0]).setInUse()) {
-            BetaNodeFieldConstraint[] clonedConstraints = new BetaNodeFieldConstraint[constraints.length];
+            BetaConstraint[] clonedConstraints = new BetaConstraint[constraints.length];
             for (int i = 0; i < constraints.length; i++) {
                 clonedConstraints[i] = constraints[i].cloneIfInUse();
             }
@@ -70,9 +71,8 @@ public boolean isAllowedCachedLeft(final ContextEntry[] context,
     }
 
     @Override
-    public boolean isAllowedCachedRight(final ContextEntry[] context,
-                                        final Tuple tuple) {
+    public boolean isAllowedCachedRight(final BaseTuple tuple, final ContextEntry[] context) {
         MetricLogUtils.getInstance().incrementEvalCount();
-        return super.isAllowedCachedRight(context, tuple);
+        return super.isAllowedCachedRight(tuple, context);
     }
 }
diff --git a/drools-metric/src/main/java/org/drools/metric/common/DoubleBetaConstraintsMetric.java b/drools-metric/src/main/java/org/drools/metric/common/DoubleBetaConstraintsMetric.java
index 032e845cc54..19d08252756 100644
--- a/drools-metric/src/main/java/org/drools/metric/common/DoubleBetaConstraintsMetric.java
+++ b/drools-metric/src/main/java/org/drools/metric/common/DoubleBetaConstraintsMetric.java
@@ -18,11 +18,12 @@
  */
 package org.drools.metric.common;
 
+import org.drools.base.reteoo.BaseTuple;
 import org.drools.core.RuleBaseConfiguration;
 import org.drools.core.common.DoubleBetaConstraints;
 import org.drools.base.rule.ContextEntry;
 import org.drools.base.rule.MutableTypeConstraint;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.core.reteoo.Tuple;
 import org.drools.metric.util.MetricLogUtils;
 import org.kie.api.runtime.rule.FactHandle;
@@ -34,18 +35,18 @@ public class DoubleBetaConstraintsMetric extends DoubleBetaConstraints {
 
     public DoubleBetaConstraintsMetric() {}
 
-    public DoubleBetaConstraintsMetric(final BetaNodeFieldConstraint[] constraints,
+    public DoubleBetaConstraintsMetric(final BetaConstraint[] constraints,
                                        final RuleBaseConfiguration conf) {
         super(constraints, conf);
     }
 
-    public DoubleBetaConstraintsMetric(final BetaNodeFieldConstraint[] constraints,
+    public DoubleBetaConstraintsMetric(final BetaConstraint[] constraints,
                                        final RuleBaseConfiguration conf,
                                        final boolean disableIndexing) {
         super(constraints, conf, disableIndexing);
     }
 
-    protected DoubleBetaConstraintsMetric(BetaNodeFieldConstraint[] constraints,
+    protected DoubleBetaConstraintsMetric(BetaConstraint[] constraints,
                                           IndexPrecedenceOption indexPrecedenceOption,
                                           boolean disableIndexing) {
         super(constraints, indexPrecedenceOption, disableIndexing);
@@ -54,7 +55,7 @@ protected DoubleBetaConstraintsMetric(BetaNodeFieldConstraint[] constraints,
     @Override
     public DoubleBetaConstraintsMetric cloneIfInUse() {
         if (constraints[0] instanceof MutableTypeConstraint && ((MutableTypeConstraint) constraints[0]).setInUse()) {
-            BetaNodeFieldConstraint[] clonedConstraints = new BetaNodeFieldConstraint[constraints.length];
+            BetaConstraint[] clonedConstraints = new BetaConstraint[constraints.length];
             for (int i = 0; i < constraints.length; i++) {
                 clonedConstraints[i] = constraints[i].cloneIfInUse();
             }
@@ -73,9 +74,9 @@ public boolean isAllowedCachedLeft(final ContextEntry[] context,
     }
 
     @Override
-    public boolean isAllowedCachedRight(final ContextEntry[] context,
-                                        final Tuple tuple) {
+    public boolean isAllowedCachedRight(final BaseTuple tuple,
+                                        final ContextEntry[] context) {
         MetricLogUtils.getInstance().incrementEvalCount();
-        return super.isAllowedCachedRight(context, tuple);
+        return super.isAllowedCachedRight(tuple, context);
     }
 }
diff --git a/drools-metric/src/main/java/org/drools/metric/common/QuadroupleBetaConstraintsMetric.java b/drools-metric/src/main/java/org/drools/metric/common/QuadroupleBetaConstraintsMetric.java
index 61a16e82439..96bba973d84 100644
--- a/drools-metric/src/main/java/org/drools/metric/common/QuadroupleBetaConstraintsMetric.java
+++ b/drools-metric/src/main/java/org/drools/metric/common/QuadroupleBetaConstraintsMetric.java
@@ -18,11 +18,12 @@
  */
 package org.drools.metric.common;
 
+import org.drools.base.reteoo.BaseTuple;
 import org.drools.core.RuleBaseConfiguration;
 import org.drools.core.common.QuadroupleBetaConstraints;
 import org.drools.base.rule.ContextEntry;
 import org.drools.base.rule.MutableTypeConstraint;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.core.reteoo.Tuple;
 import org.drools.metric.util.MetricLogUtils;
 import org.kie.api.runtime.rule.FactHandle;
@@ -34,18 +35,18 @@ public class QuadroupleBetaConstraintsMetric extends QuadroupleBetaConstraints {
 
     public QuadroupleBetaConstraintsMetric() {}
 
-    public QuadroupleBetaConstraintsMetric(final BetaNodeFieldConstraint[] constraints,
+    public QuadroupleBetaConstraintsMetric(final BetaConstraint[] constraints,
                                            final RuleBaseConfiguration conf) {
         super(constraints, conf);
     }
 
-    public QuadroupleBetaConstraintsMetric(final BetaNodeFieldConstraint[] constraints,
+    public QuadroupleBetaConstraintsMetric(final BetaConstraint[] constraints,
                                            final RuleBaseConfiguration conf,
                                            final boolean disableIndexing) {
         super(constraints, conf, disableIndexing);
     }
 
-    protected QuadroupleBetaConstraintsMetric(BetaNodeFieldConstraint[] constraints,
+    protected QuadroupleBetaConstraintsMetric(BetaConstraint[] constraints,
                                               IndexPrecedenceOption indexPrecedenceOption,
                                               boolean disableIndexing) {
         super(constraints, indexPrecedenceOption, disableIndexing);
@@ -54,7 +55,7 @@ protected QuadroupleBetaConstraintsMetric(BetaNodeFieldConstraint[] constraints,
     @Override
     public QuadroupleBetaConstraintsMetric cloneIfInUse() {
         if (constraints[0] instanceof MutableTypeConstraint && ((MutableTypeConstraint) constraints[0]).setInUse()) {
-            BetaNodeFieldConstraint[] clonedConstraints = new BetaNodeFieldConstraint[constraints.length];
+            BetaConstraint[] clonedConstraints = new BetaConstraint[constraints.length];
             for (int i = 0; i < constraints.length; i++) {
                 clonedConstraints[i] = constraints[i].cloneIfInUse();
             }
@@ -73,9 +74,9 @@ public boolean isAllowedCachedLeft(final ContextEntry[] context,
     }
 
     @Override
-    public boolean isAllowedCachedRight(final ContextEntry[] context,
-                                        final Tuple tuple) {
+    public boolean isAllowedCachedRight(final BaseTuple tuple,
+                                        final ContextEntry[] context) {
         MetricLogUtils.getInstance().incrementEvalCount();
-        return super.isAllowedCachedRight(context, tuple);
+        return super.isAllowedCachedRight(tuple, context);
     }
 }
diff --git a/drools-metric/src/main/java/org/drools/metric/common/SingleBetaConstraintsMetric.java b/drools-metric/src/main/java/org/drools/metric/common/SingleBetaConstraintsMetric.java
index 21f6acd77e3..b21943fc9b1 100644
--- a/drools-metric/src/main/java/org/drools/metric/common/SingleBetaConstraintsMetric.java
+++ b/drools-metric/src/main/java/org/drools/metric/common/SingleBetaConstraintsMetric.java
@@ -18,11 +18,12 @@
  */
 package org.drools.metric.common;
 
+import org.drools.base.reteoo.BaseTuple;
 import org.drools.core.RuleBaseConfiguration;
 import org.drools.core.common.SingleBetaConstraints;
 import org.drools.base.rule.ContextEntry;
 import org.drools.base.rule.MutableTypeConstraint;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.core.reteoo.Tuple;
 import org.drools.metric.util.MetricLogUtils;
 import org.kie.api.runtime.rule.FactHandle;
@@ -33,17 +34,17 @@ public class SingleBetaConstraintsMetric extends SingleBetaConstraints {
 
     public SingleBetaConstraintsMetric() {}
 
-    public SingleBetaConstraintsMetric(final BetaNodeFieldConstraint[] constraint,
+    public SingleBetaConstraintsMetric(final BetaConstraint[] constraint,
                                        final RuleBaseConfiguration conf) {
         super(constraint[0], conf);
     }
 
-    public SingleBetaConstraintsMetric(final BetaNodeFieldConstraint constraint,
+    public SingleBetaConstraintsMetric(final BetaConstraint constraint,
                                        final RuleBaseConfiguration conf) {
         super(constraint, conf);
     }
 
-    public SingleBetaConstraintsMetric(final BetaNodeFieldConstraint constraint,
+    public SingleBetaConstraintsMetric(final BetaConstraint constraint,
                                        final RuleBaseConfiguration conf,
                                        final boolean disableIndex) {
         super(constraint, conf, disableIndex);
@@ -60,16 +61,16 @@ public SingleBetaConstraintsMetric cloneIfInUse() {
     }
 
     @Override
-    public boolean isAllowedCachedLeft(final ContextEntry[] context,
+    public boolean isAllowedCachedLeft(final ContextEntry context,
                                        final FactHandle handle) {
         MetricLogUtils.getInstance().incrementEvalCount();
         return super.isAllowedCachedLeft(context, handle);
     }
 
     @Override
-    public boolean isAllowedCachedRight(final ContextEntry[] context,
-                                        final Tuple tuple) {
+    public boolean isAllowedCachedRight(final BaseTuple tuple,
+                                        final ContextEntry context) {
         MetricLogUtils.getInstance().incrementEvalCount();
-        return super.isAllowedCachedRight(context, tuple);
+        return super.isAllowedCachedRight(tuple, context);
     }
 }
diff --git a/drools-metric/src/main/java/org/drools/metric/common/TripleBetaConstraintsMetric.java b/drools-metric/src/main/java/org/drools/metric/common/TripleBetaConstraintsMetric.java
index 6dc2cf63ba1..12acfbba385 100644
--- a/drools-metric/src/main/java/org/drools/metric/common/TripleBetaConstraintsMetric.java
+++ b/drools-metric/src/main/java/org/drools/metric/common/TripleBetaConstraintsMetric.java
@@ -18,11 +18,12 @@
  */
 package org.drools.metric.common;
 
+import org.drools.base.reteoo.BaseTuple;
 import org.drools.core.RuleBaseConfiguration;
 import org.drools.core.common.TripleBetaConstraints;
 import org.drools.base.rule.ContextEntry;
 import org.drools.base.rule.MutableTypeConstraint;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.core.reteoo.Tuple;
 import org.drools.metric.util.MetricLogUtils;
 import org.kie.api.runtime.rule.FactHandle;
@@ -34,18 +35,18 @@ public class TripleBetaConstraintsMetric extends TripleBetaConstraints {
 
     public TripleBetaConstraintsMetric() {}
 
-    public TripleBetaConstraintsMetric(final BetaNodeFieldConstraint[] constraints,
+    public TripleBetaConstraintsMetric(final BetaConstraint[] constraints,
                                        final RuleBaseConfiguration conf) {
         super(constraints, conf);
     }
 
-    public TripleBetaConstraintsMetric(final BetaNodeFieldConstraint[] constraints,
+    public TripleBetaConstraintsMetric(final BetaConstraint[] constraints,
                                        final RuleBaseConfiguration conf,
                                        final boolean disableIndexing) {
         super(constraints, conf, disableIndexing);
     }
 
-    protected TripleBetaConstraintsMetric(BetaNodeFieldConstraint[] constraints,
+    protected TripleBetaConstraintsMetric(BetaConstraint[] constraints,
                                           IndexPrecedenceOption indexPrecedenceOption,
                                           boolean disableIndexing) {
         super(constraints, indexPrecedenceOption, disableIndexing);
@@ -54,7 +55,7 @@ protected TripleBetaConstraintsMetric(BetaNodeFieldConstraint[] constraints,
     @Override
     public TripleBetaConstraintsMetric cloneIfInUse() {
         if (constraints[0] instanceof MutableTypeConstraint && ((MutableTypeConstraint) constraints[0]).setInUse()) {
-            BetaNodeFieldConstraint[] clonedConstraints = new BetaNodeFieldConstraint[constraints.length];
+            BetaConstraint[] clonedConstraints = new BetaConstraint[constraints.length];
             for (int i = 0; i < constraints.length; i++) {
                 clonedConstraints[i] = constraints[i].cloneIfInUse();
             }
@@ -73,9 +74,9 @@ public boolean isAllowedCachedLeft(final ContextEntry[] context,
     }
 
     @Override
-    public boolean isAllowedCachedRight(final ContextEntry[] context,
-                                        final Tuple tuple) {
+    public boolean isAllowedCachedRight(final BaseTuple tuple,
+                                        final ContextEntry[] context) {
         MetricLogUtils.getInstance().incrementEvalCount();
-        return super.isAllowedCachedRight(context, tuple);
+        return super.isAllowedCachedRight(tuple, context);
     }
 }
diff --git a/drools-metric/src/main/java/org/drools/metric/reteoo/builder/MetricBetaNodeConstraintFactoryImpl.java b/drools-metric/src/main/java/org/drools/metric/reteoo/builder/MetricBetaNodeConstraintFactoryImpl.java
index cde7b6577ba..0f48971c85c 100644
--- a/drools-metric/src/main/java/org/drools/metric/reteoo/builder/MetricBetaNodeConstraintFactoryImpl.java
+++ b/drools-metric/src/main/java/org/drools/metric/reteoo/builder/MetricBetaNodeConstraintFactoryImpl.java
@@ -25,7 +25,7 @@
 import org.drools.core.common.SingleBetaConstraints;
 import org.drools.core.common.TripleBetaConstraints;
 import org.drools.core.reteoo.builder.BetaNodeConstraintFactory;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.metric.common.DefaultBetaConstraintsMetric;
 import org.drools.metric.common.DoubleBetaConstraintsMetric;
 import org.drools.metric.common.QuadroupleBetaConstraintsMetric;
@@ -36,7 +36,7 @@
 public class MetricBetaNodeConstraintFactoryImpl implements BetaNodeConstraintFactory {
 
     @Override
-    public SingleBetaConstraints createSingleBetaConstraints(final BetaNodeFieldConstraint constraint,
+    public SingleBetaConstraints createSingleBetaConstraints(final BetaConstraint constraint,
                                                              final RuleBaseConfiguration conf,
                                                              final boolean disableIndex) {
         if (MetricLogUtils.getInstance().isEnabled()) {
@@ -47,7 +47,7 @@ public SingleBetaConstraints createSingleBetaConstraints(final BetaNodeFieldCons
     }
 
     @Override
-    public DoubleBetaConstraints createDoubleBetaConstraints(final BetaNodeFieldConstraint[] constraints,
+    public DoubleBetaConstraints createDoubleBetaConstraints(final BetaConstraint[] constraints,
                                                              final RuleBaseConfiguration conf,
                                                              final boolean disableIndexing) {
         if (MetricLogUtils.getInstance().isEnabled()) {
@@ -58,7 +58,7 @@ public DoubleBetaConstraints createDoubleBetaConstraints(final BetaNodeFieldCons
     }
 
     @Override
-    public TripleBetaConstraints createTripleBetaConstraints(final BetaNodeFieldConstraint[] constraints,
+    public TripleBetaConstraints createTripleBetaConstraints(final BetaConstraint[] constraints,
                                                              final RuleBaseConfiguration conf,
                                                              final boolean disableIndexing) {
         if (MetricLogUtils.getInstance().isEnabled()) {
@@ -69,7 +69,7 @@ public TripleBetaConstraints createTripleBetaConstraints(final BetaNodeFieldCons
     }
 
     @Override
-    public QuadroupleBetaConstraints createQuadroupleBetaConstraints(final BetaNodeFieldConstraint[] constraints,
+    public QuadroupleBetaConstraints createQuadroupleBetaConstraints(final BetaConstraint[] constraints,
                                                                      final RuleBaseConfiguration conf,
                                                                      final boolean disableIndexing) {
         if (MetricLogUtils.getInstance().isEnabled()) {
@@ -80,7 +80,7 @@ public QuadroupleBetaConstraints createQuadroupleBetaConstraints(final BetaNodeF
     }
 
     @Override
-    public DefaultBetaConstraints createDefaultBetaConstraints(final BetaNodeFieldConstraint[] constraints,
+    public DefaultBetaConstraints createDefaultBetaConstraints(final BetaConstraint[] constraints,
                                                                final RuleBaseConfiguration conf,
                                                                final boolean disableIndexing) {
         if (MetricLogUtils.getInstance().isEnabled()) {
diff --git a/drools-model/drools-canonical-model/src/main/java/org/drools/model/AlphaIndex.java b/drools-model/drools-canonical-model/src/main/java/org/drools/model/AlphaIndex.java
index 10f240770ee..2801961ed03 100644
--- a/drools-model/drools-canonical-model/src/main/java/org/drools/model/AlphaIndex.java
+++ b/drools-model/drools-canonical-model/src/main/java/org/drools/model/AlphaIndex.java
@@ -21,4 +21,5 @@
 public interface AlphaIndex extends Index {
 
     V getRightValue();
+
 }
diff --git a/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/IndexTest.java b/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/IndexTest.java
index daf93b0ed47..67b8177bd58 100644
--- a/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/IndexTest.java
+++ b/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/IndexTest.java
@@ -60,7 +60,7 @@ public void testBetaIndexOnDeclaration() {
         ObjectTypeNode otn = getObjectTypeNodeForClass( ksession, Person.class );
         BetaNode beta = (BetaNode) otn.getObjectSinkPropagator().getSinks()[0];
         IndexableConstraint betaConstraint = (IndexableConstraint) beta.getConstraints()[0];
-        assertThat(betaConstraint.getIndexExtractor()).isNotNull();
+        assertThat(betaConstraint.getLeftIndexExtractor()).isNotNull();
 
         ksession.insert( "test" );
         ksession.insert( new Person("Sofia", 4) );
diff --git a/drools-model/drools-model-compiler/src/main/java/org/drools/modelcompiler/constraints/AbstractConstraint.java b/drools-model/drools-model-compiler/src/main/java/org/drools/modelcompiler/constraints/AbstractConstraint.java
index b61d50a693d..598ffb19656 100644
--- a/drools-model/drools-model-compiler/src/main/java/org/drools/modelcompiler/constraints/AbstractConstraint.java
+++ b/drools-model/drools-model-compiler/src/main/java/org/drools/modelcompiler/constraints/AbstractConstraint.java
@@ -18,11 +18,12 @@
  */
 package org.drools.modelcompiler.constraints;
 
+import org.drools.base.rule.ContextEntry;
 import org.drools.base.rule.IndexableConstraint;
 import org.drools.base.rule.IntervalProviderConstraint;
 import org.drools.base.rule.MutableTypeConstraint;
 
-public abstract class AbstractConstraint extends MutableTypeConstraint implements IndexableConstraint, IntervalProviderConstraint {
+public abstract class AbstractConstraint extends MutableTypeConstraint implements IndexableConstraint, IntervalProviderConstraint {
     @Override
     public abstract AbstractConstraint clone();
 }
diff --git a/drools-model/drools-model-compiler/src/main/java/org/drools/modelcompiler/constraints/CombinedConstraint.java b/drools-model/drools-model-compiler/src/main/java/org/drools/modelcompiler/constraints/CombinedConstraint.java
index 55c9e0e0245..cafb93a1da0 100644
--- a/drools-model/drools-model-compiler/src/main/java/org/drools/modelcompiler/constraints/CombinedConstraint.java
+++ b/drools-model/drools-model-compiler/src/main/java/org/drools/modelcompiler/constraints/CombinedConstraint.java
@@ -27,8 +27,9 @@
 import org.drools.base.rule.Declaration;
 import org.drools.base.rule.accessor.FieldValue;
 import org.drools.base.rule.accessor.ReadAccessor;
+import org.drools.base.rule.accessor.TupleValueExtractor;
 import org.drools.base.time.Interval;
-import org.drools.base.util.FieldIndex;
+import org.drools.base.util.IndexedValueReader;
 import org.drools.base.util.index.ConstraintTypeOperator;
 import org.drools.model.Constraint;
 import org.drools.modelcompiler.constraints.LambdaConstraint.LambdaContextEntry;
@@ -70,7 +71,7 @@ public FieldValue getField() {
     }
 
     @Override
-    public FieldIndex getFieldIndex() {
+    public IndexedValueReader getFieldIndex() {
         throw new UnsupportedOperationException();
     }
 
@@ -80,7 +81,12 @@ public ReadAccessor getFieldExtractor() {
     }
 
     @Override
-    public Declaration getIndexExtractor() {
+    public TupleValueExtractor getRightIndexExtractor() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Declaration getLeftIndexExtractor() {
         throw new UnsupportedOperationException();
     }
 
@@ -169,7 +175,7 @@ public boolean isAllowedCachedRight(BaseTuple tuple, ContextEntry context) {
     }
 
     @Override
-    public ContextEntry createContextEntry() {
+    public ContextEntry createContext() {
         return new LambdaContextEntry();
     }
 }
diff --git a/drools-model/drools-model-compiler/src/main/java/org/drools/modelcompiler/constraints/LambdaConstraint.java b/drools-model/drools-model-compiler/src/main/java/org/drools/modelcompiler/constraints/LambdaConstraint.java
index 39266e1fdfa..76cb1036c5a 100644
--- a/drools-model/drools-model-compiler/src/main/java/org/drools/modelcompiler/constraints/LambdaConstraint.java
+++ b/drools-model/drools-model-compiler/src/main/java/org/drools/modelcompiler/constraints/LambdaConstraint.java
@@ -37,7 +37,7 @@
 import org.drools.base.rule.accessor.ReadAccessor;
 import org.drools.base.rule.accessor.TupleValueExtractor;
 import org.drools.base.time.Interval;
-import org.drools.base.util.FieldIndex;
+import org.drools.base.util.IndexedValueReader;
 import org.drools.base.util.index.ConstraintTypeOperator;
 import org.drools.util.bitmask.BitMask;
 import org.drools.model.AlphaIndex;
@@ -66,7 +66,9 @@ public class LambdaConstraint extends AbstractConstraint {
 
     private FieldValue field;
     private ReadAccessor readAccessor;
-    private AbstractIndexValueExtractor indexExtractor;
+
+    private TupleValueExtractor rightIndexExtractor;
+    private AbstractIndexValueExtractor leftIndexExtractor;
 
     public LambdaConstraint(ConstraintEvaluator evaluator,
                             PredicateInformation predicateInformation) {
@@ -83,16 +85,43 @@ public ConstraintEvaluator getEvaluator() {
         return evaluator;
     }
 
+    public static class LambdaRightTupleValueExtractor implements TupleValueExtractor {
+        private ValueType valueType;
+
+        private Function1 extractor;
+
+        public LambdaRightTupleValueExtractor(ValueType valueType, Function1 extractor) {
+            this.valueType  = valueType;
+            this.extractor = extractor;
+        }
+
+        @Override
+        public ValueType getValueType() {
+            return valueType;
+        }
+
+        @Override
+        public Object getValue(ValueResolver valueResolver, BaseTuple tuple) {
+            return extractor.apply(tuple.getFactHandle().getObject());
+        }
+
+        @Override
+        public TupleValueExtractor clone() {
+            return new LambdaRightTupleValueExtractor(valueType, extractor);
+        }
+    }
+
     private void initIndexes() {
         Index index = evaluator.getIndex();
         if (index != null) {
-            this.readAccessor = new LambdaReadAccessor( index.getIndexId(), index.getIndexedClass(), index.getLeftOperandExtractor() );
             switch (index.getIndexType()) {
                 case ALPHA:
                     this.field = new ObjectFieldImpl( ( ( AlphaIndex ) index).getRightValue() );
+                    this.readAccessor = new LambdaReadAccessor(index.getIndexId(), index.getIndexedClass(), index.getLeftOperandExtractor());
                     break;
                 case BETA:
-                    this.indexExtractor = initBetaIndex( ( BetaIndexN ) index );
+                    this.leftIndexExtractor = initBetaIndex( ( BetaIndexN ) index );
+                    this.rightIndexExtractor = new LambdaRightTupleValueExtractor(ValueType.determineValueType(index.getIndexedClass()), index.getLeftOperandExtractor());
                     break;
             }
         }
@@ -129,8 +158,8 @@ public Declaration[] getRequiredDeclarations() {
     @Override
     public void replaceDeclaration(Declaration oldDecl, Declaration newDecl) {
         evaluator.replaceDeclaration( oldDecl, newDecl );
-        if ( indexExtractor != null ) {
-            indexExtractor.replaceDeclaration( oldDecl, newDecl );
+        if ( leftIndexExtractor != null ) {
+            leftIndexExtractor.replaceDeclaration( oldDecl, newDecl );
         }
     }
 
@@ -207,7 +236,7 @@ public boolean isAllowedCachedRight(BaseTuple tuple, ContextEntry context) {
     }
 
     @Override
-    public ContextEntry createContextEntry() {
+    public ContextEntry createContext() {
         return new LambdaContextEntry();
     }
 
@@ -251,8 +280,8 @@ public FieldValue getField() {
     }
 
     @Override
-    public FieldIndex getFieldIndex() {
-        return new FieldIndex(readAccessor, indexExtractor );
+    public IndexedValueReader getFieldIndex() {
+        return new IndexedValueReader(leftIndexExtractor, rightIndexExtractor);
     }
 
     @Override
@@ -261,8 +290,13 @@ public ReadAccessor getFieldExtractor() {
     }
 
     @Override
-    public TupleValueExtractor getIndexExtractor() {
-        return indexExtractor;
+    public TupleValueExtractor getRightIndexExtractor() {
+        return rightIndexExtractor;
+    }
+
+    @Override
+    public TupleValueExtractor getLeftIndexExtractor() {
+        return leftIndexExtractor;
     }
 
     @Override
diff --git a/drools-model/drools-model-compiler/src/main/java/org/drools/modelcompiler/constraints/UnificationConstraint.java b/drools-model/drools-model-compiler/src/main/java/org/drools/modelcompiler/constraints/UnificationConstraint.java
index f20a7a9107f..d9a7f76f36b 100644
--- a/drools-model/drools-model-compiler/src/main/java/org/drools/modelcompiler/constraints/UnificationConstraint.java
+++ b/drools-model/drools-model-compiler/src/main/java/org/drools/modelcompiler/constraints/UnificationConstraint.java
@@ -26,7 +26,9 @@
 import org.drools.base.rule.MutableTypeConstraint;
 import org.drools.base.rule.accessor.FieldValue;
 import org.drools.base.rule.accessor.ReadAccessor;
-import org.drools.base.util.FieldIndex;
+import org.drools.base.rule.accessor.RightTupleValueExtractor;
+import org.drools.base.rule.accessor.TupleValueExtractor;
+import org.drools.base.util.IndexedValueReader;
 import org.drools.base.util.index.ConstraintTypeOperator;
 import org.drools.core.base.DroolsQueryImpl;
 import org.drools.model.Index;
@@ -34,26 +36,26 @@
 import org.kie.api.KieBaseConfiguration;
 import org.kie.api.runtime.rule.FactHandle;
 
-public class UnificationConstraint extends MutableTypeConstraint implements IndexableConstraint {
+public class UnificationConstraint extends MutableTypeConstraint implements IndexableConstraint {
 
-    private Declaration indexingDeclaration;
+    private Declaration        leftIndexingDeclaration;
     private final ReadAccessor readAccessor;
     private final ConstraintEvaluator evaluator;
 
     private boolean unification = true;
 
-    public UnificationConstraint( Declaration indexingDeclaration ) {
-        this( indexingDeclaration, null);
+    public UnificationConstraint( Declaration leftIndexingDeclaration) {
+        this(leftIndexingDeclaration, null);
     }
 
-    public UnificationConstraint( Declaration indexingDeclaration, ConstraintEvaluator evaluator ) {
-        this.indexingDeclaration = indexingDeclaration;
-        this.evaluator = evaluator;
+    public UnificationConstraint(Declaration leftIndexingDeclaration, ConstraintEvaluator evaluator) {
+        this.leftIndexingDeclaration = leftIndexingDeclaration;
+        this.evaluator               = evaluator;
         if (evaluator != null) {
             Index index = evaluator.getIndex();
             this.readAccessor = new LambdaReadAccessor( index.getIndexId(), index.getIndexedClass(), index.getLeftOperandExtractor() );
         } else {
-            this.readAccessor = new LambdaReadAccessor( indexingDeclaration.getDeclarationClass(), x -> x );
+            this.readAccessor = new LambdaReadAccessor(leftIndexingDeclaration.getDeclarationClass(), x -> x );
         }
     }
 
@@ -83,8 +85,8 @@ public FieldValue getField() {
     }
 
     @Override
-    public FieldIndex getFieldIndex() {
-        return new FieldIndex(readAccessor, indexingDeclaration );
+    public IndexedValueReader getFieldIndex() {
+        return new IndexedValueReader(leftIndexingDeclaration, getRightIndexExtractor());
     }
 
     @Override
@@ -93,19 +95,24 @@ public ReadAccessor getFieldExtractor() {
     }
 
     @Override
-    public Declaration getIndexExtractor() {
-        return indexingDeclaration;
+    public TupleValueExtractor getRightIndexExtractor() {
+        return new RightTupleValueExtractor(readAccessor);
+    }
+
+    @Override
+    public Declaration getLeftIndexExtractor() {
+        return leftIndexingDeclaration;
     }
 
     @Override
     public Declaration[] getRequiredDeclarations() {
-        return new Declaration[] { indexingDeclaration };
+        return new Declaration[] {leftIndexingDeclaration};
     }
 
     @Override
     public void replaceDeclaration( Declaration oldDecl, Declaration newDecl ) {
-        if (indexingDeclaration == oldDecl) {
-            indexingDeclaration = newDecl;
+        if (leftIndexingDeclaration == oldDecl) {
+            leftIndexingDeclaration = newDecl;
         }
         if (evaluator != null) {
             evaluator.replaceDeclaration( oldDecl, newDecl );
@@ -114,7 +121,7 @@ public void replaceDeclaration( Declaration oldDecl, Declaration newDecl ) {
 
     @Override
     public MutableTypeConstraint clone() {
-        return new UnificationConstraint( indexingDeclaration, evaluator );
+        return new UnificationConstraint(leftIndexingDeclaration, evaluator );
     }
 
     @Override
@@ -142,18 +149,18 @@ private boolean evaluateUnification(FactHandle handle, BaseTuple tuple, ValueRes
             return evaluator.evaluate(handle, tuple, reteEvaluator);
         }
         DroolsQueryImpl query = (DroolsQueryImpl) tuple.getObject(0);
-        if (query.getVariables()[indexingDeclaration.getExtractor().getIndex()] != null) {
+        if (query.getVariables()[leftIndexingDeclaration.getExtractor().getIndex()] != null) {
             return true;
         }
         if (evaluator != null) {
             return evaluator.evaluate(handle, tuple, reteEvaluator);
         }
-        Object argument = indexingDeclaration.getValue( null, query );
+        Object argument = leftIndexingDeclaration.getValue(null, query);
         return handle.getObject().equals( argument );
     }
 
     @Override
-    public ContextEntry createContextEntry() {
+    public ContextEntry createContext() {
         return new LambdaContextEntry();
     }
 }
diff --git a/drools-mvel/src/main/java/org/drools/mvel/EvaluatorConstraint.java b/drools-mvel/src/main/java/org/drools/mvel/EvaluatorConstraint.java
index f8229d6778e..fa9b36b56ad 100644
--- a/drools-mvel/src/main/java/org/drools/mvel/EvaluatorConstraint.java
+++ b/drools-mvel/src/main/java/org/drools/mvel/EvaluatorConstraint.java
@@ -26,7 +26,6 @@
 import org.drools.base.base.ValueResolver;
 import org.drools.core.common.InternalFactHandle;
 import org.drools.base.reteoo.BaseTuple;
-import org.drools.base.rule.ContextEntry;
 import org.drools.base.rule.Declaration;
 import org.drools.base.rule.IntervalProviderConstraint;
 import org.drools.base.rule.MutableTypeConstraint;
@@ -38,8 +37,9 @@
 import org.drools.mvel.evaluators.VariableRestriction;
 import org.drools.mvel.evaluators.VariableRestriction.VariableContextEntry;
 import org.kie.api.runtime.rule.FactHandle;
+import org.drools.base.rule.ContextEntry;
 
-public class EvaluatorConstraint extends MutableTypeConstraint implements IntervalProviderConstraint {
+public class EvaluatorConstraint extends MutableTypeConstraint implements IntervalProviderConstraint {
 
     protected Declaration[] declarations;
     protected Evaluator evaluator;
@@ -147,7 +147,7 @@ public EvaluatorConstraint clone() {
         return new EvaluatorConstraint(clonedDeclarations, evaluator, rightReadAccessor);
     }
 
-    public ContextEntry createContextEntry() {
+    public ContextEntry createContext() {
         return isLiteral() ? new LiteralContextEntry(rightReadAccessor) : VariableRestriction.createContextEntry(rightReadAccessor, declarations[0], evaluator);
     }
 
diff --git a/drools-mvel/src/main/java/org/drools/mvel/MVELConstraint.java b/drools-mvel/src/main/java/org/drools/mvel/MVELConstraint.java
index 6bc1bc157ad..0071b56617d 100644
--- a/drools-mvel/src/main/java/org/drools/mvel/MVELConstraint.java
+++ b/drools-mvel/src/main/java/org/drools/mvel/MVELConstraint.java
@@ -36,9 +36,10 @@
 import org.drools.base.rule.accessor.AcceptsReadAccessor;
 import org.drools.base.rule.accessor.FieldValue;
 import org.drools.base.rule.accessor.ReadAccessor;
+import org.drools.base.rule.accessor.RightTupleValueExtractor;
 import org.drools.base.rule.accessor.TupleValueExtractor;
 import org.drools.base.rule.constraint.Constraint;
-import org.drools.base.util.FieldIndex;
+import org.drools.base.util.IndexedValueReader;
 import org.drools.base.util.index.ConstraintTypeOperator;
 import org.drools.compiler.rule.builder.EvaluatorWrapper;
 import org.drools.core.impl.KnowledgeBaseImpl;
@@ -99,7 +100,7 @@
 import static org.drools.util.StringUtils.lookAheadIgnoringSpaces;
 import static org.drools.util.StringUtils.skipBlanks;
 
-public class MVELConstraint extends MutableTypeConstraint implements IndexableConstraint, AcceptsReadAccessor {
+public class MVELConstraint extends MutableTypeConstraint implements IndexableConstraint, AcceptsReadAccessor {
     protected static final boolean TEST_JITTING = false;
 
     private static final Logger logger = LoggerFactory.getLogger(MVELConstraint.class);
@@ -111,9 +112,13 @@ public class MVELConstraint extends MutableTypeConstraint implements IndexableCo
     protected String expression;
     private ConstraintTypeOperator constraintType = ConstraintTypeOperator.UNKNOWN;
     private Declaration[] declarations;
-    private EvaluatorWrapper[] operators;
-    private TupleValueExtractor indexingDeclaration;
-    private ReadAccessor extractor;
+    private EvaluatorWrapper[]  operators;
+    private TupleValueExtractor leftIndexingDeclaration;
+
+    private TupleValueExtractor rightIndexingDeclaration;
+    private ReadAccessor        extractor;
+
+
     private boolean isUnification;
     protected boolean isDynamic;
     private FieldValue fieldValue;
@@ -169,17 +174,17 @@ public MVELConstraint(Collection packageNames,
                           EvaluatorWrapper[] operators,
                           MVELCompilationUnit compilationUnit,
                           ConstraintTypeOperator constraintType,
-                          TupleValueExtractor indexingDeclaration,
+                          TupleValueExtractor leftIndexingDeclaration,
                           ReadAccessor extractor,
                           boolean isUnification) {
         this.packageNames = new LinkedHashSet<>(packageNames);
         this.expression = expression;
-        this.compilationUnit = compilationUnit;
-        this.constraintType = indexingDeclaration != null ? constraintType : ConstraintTypeOperator.UNKNOWN;
-        this.declarations = declarations == null ? EMPTY_DECLARATIONS : declarations;
-        this.operators = operators == null ? EMPTY_OPERATORS : operators;
-        this.indexingDeclaration = indexingDeclaration;
-        this.extractor = extractor;
+        this.compilationUnit         = compilationUnit;
+        this.constraintType          = leftIndexingDeclaration != null ? constraintType : ConstraintTypeOperator.UNKNOWN;
+        this.declarations            = declarations == null ? EMPTY_DECLARATIONS : declarations;
+        this.operators               = operators == null ? EMPTY_OPERATORS : operators;
+        this.leftIndexingDeclaration = leftIndexingDeclaration;
+        this.extractor               = extractor;
         this.isUnification = isUnification;
     }
 
@@ -381,7 +386,7 @@ private ConditionEvaluator executeJitting(FactHandle handle, ValueResolver value
         return mvelEvaluator;
     }
 
-    public ContextEntry createContextEntry() {
+    public ContextEntry createContext() {
         if (declarations.length == 0) return null;
         ContextEntry contextEntry = new MvelContextEntry(declarations);
         if (isUnification) {
@@ -390,8 +395,10 @@ public ContextEntry createContextEntry() {
         return contextEntry;
     }
 
-    public FieldIndex getFieldIndex() {
-        return new FieldIndex(extractor, indexingDeclaration);
+
+
+    public IndexedValueReader getFieldIndex() {
+        return new IndexedValueReader(leftIndexingDeclaration, getRightIndexExtractor());
     }
 
     public ReadAccessor getFieldExtractor() {
@@ -399,8 +406,16 @@ public ReadAccessor getFieldExtractor() {
     }
 
     @Override
-    public TupleValueExtractor getIndexExtractor() {
-        return indexingDeclaration;
+    public TupleValueExtractor getRightIndexExtractor() {
+        if (rightIndexingDeclaration == null) {
+            rightIndexingDeclaration = new RightTupleValueExtractor(extractor);
+        }
+        return rightIndexingDeclaration;
+    }
+
+    @Override
+    public TupleValueExtractor getLeftIndexExtractor() {
+        return leftIndexingDeclaration;
     }
 
     public Declaration[] getRequiredDeclarations() {
@@ -419,17 +434,17 @@ public void replaceDeclaration(Declaration oldDecl, Declaration newDecl) {
                 }
                 declarations[i] = newDecl;
 
-                if (indexingDeclaration != null && i == 0) {
+                if (leftIndexingDeclaration != null && i == 0) {
                     // indexed MVELConstraints currently only have a single required declaration.
                     // So this is a hack that works for this limited scenario.
                     // It needs to clone first, due to unification otherwise you
                     // might change the pattern incorrectly for other nodes.
-                    if (!indexingDeclaration.equals(oldDecl)) {
+                    if (!leftIndexingDeclaration.equals(oldDecl)) {
                         // This is true for synthetic declarations
-                        indexingDeclaration = indexingDeclaration.clone();
-                        ((Declaration) indexingDeclaration).setPattern(newDecl.getPattern());
+                        leftIndexingDeclaration = leftIndexingDeclaration.clone();
+                        ((Declaration) leftIndexingDeclaration).setPattern(newDecl.getPattern());
                     } else {
-                        indexingDeclaration = newDecl;
+                        leftIndexingDeclaration = newDecl;
                     }
                 }
                 break;
@@ -668,7 +683,7 @@ public void writeExternal(ObjectOutput out) throws IOException {
             out.writeObject(extractor);
         }
 
-        out.writeObject(indexingDeclaration);
+        out.writeObject(leftIndexingDeclaration);
         out.writeObject(declarations);
         out.writeObject(constraintType);
         out.writeBoolean(isUnification);
@@ -690,8 +705,8 @@ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundExcept
             extractor = (ReadAccessor) in.readObject();
         }
 
-        indexingDeclaration = (Declaration) in.readObject();
-        declarations = (Declaration[]) in.readObject();
+        leftIndexingDeclaration = (Declaration) in.readObject();
+        declarations            = (Declaration[]) in.readObject();
         constraintType = (ConstraintTypeOperator) in.readObject();
         isUnification = in.readBoolean();
         isDynamic = in.readBoolean();
@@ -726,8 +741,8 @@ public MVELConstraint clone() {
         clone.constraintType = constraintType;
         clone.declarations = clonedDeclarations;
         clone.operators = operators;
-        if (indexingDeclaration != null) {
-            clone.indexingDeclaration = indexingDeclaration.clone();
+        if (leftIndexingDeclaration != null) {
+            clone.leftIndexingDeclaration = leftIndexingDeclaration.clone();
         }
         clone.extractor = extractor;
         clone.isUnification = isUnification;
diff --git a/drools-mvel/src/main/java/org/drools/mvel/MVELConstraintBuilder.java b/drools-mvel/src/main/java/org/drools/mvel/MVELConstraintBuilder.java
index 391d5ca6b3b..7d03ed6cb31 100644
--- a/drools-mvel/src/main/java/org/drools/mvel/MVELConstraintBuilder.java
+++ b/drools-mvel/src/main/java/org/drools/mvel/MVELConstraintBuilder.java
@@ -527,7 +527,7 @@ private boolean equalEnumConstants(final Object[] aa,
 
         @Override
         public boolean areComparisonCompatible(Class c1, Class c2) {
-            return super.areEqualityCompatible(c1, c2);
+            return areEqualityCompatible(c1, c2);
         }
     }
 
diff --git a/drools-retediagram/src/main/java/org/drools/retediagram/ReteDiagram.java b/drools-retediagram/src/main/java/org/drools/retediagram/ReteDiagram.java
index 7c4fd922589..105723ce0ce 100644
--- a/drools-retediagram/src/main/java/org/drools/retediagram/ReteDiagram.java
+++ b/drools-retediagram/src/main/java/org/drools/retediagram/ReteDiagram.java
@@ -56,7 +56,7 @@
 import org.drools.core.reteoo.RightInputAdapterNode;
 import org.drools.core.reteoo.RuleTerminalNode;
 import org.drools.core.reteoo.Sink;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.base.base.ObjectType;
 import org.kie.api.KieBase;
 import org.kie.api.runtime.KieRuntime;
@@ -453,9 +453,9 @@ private static String printNodeAttributes(BaseNode node) {
         } else if (node instanceof RightInputAdapterNode ) {
             return "[shape=house orientation=90]";
         } else if (node instanceof JoinNode ) {
-            BetaNode n = (BetaNode) node;
-            BetaNodeFieldConstraint[] constraints = n.getConstraints();
-            String label = "\u22C8";
+            BetaNode         n           = (BetaNode) node;
+            BetaConstraint[] constraints = n.getConstraints();
+            String           label       = "\u22C8";
             if (constraints.length > 0) {
                 label = strObjectType(n.getObjectType(), false);
                 label = label + "( "+ Arrays.stream(constraints).map(Object::toString).collect(joining(", ")) + " )";
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/IndexingTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/IndexingTest.java
index 67794b1f1ab..3cdcb749b11 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/IndexingTest.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/IndexingTest.java
@@ -50,6 +50,7 @@
 import org.drools.core.util.FastIterator;
 import org.drools.core.util.index.TupleIndexHashTable;
 import org.drools.kiesession.session.StatefulKnowledgeSessionImpl;
+import org.drools.testcoverage.common.model.Address;
 import org.drools.testcoverage.common.model.Cheese;
 import org.drools.testcoverage.common.model.Person;
 import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
@@ -925,6 +926,44 @@ public void testAlphaIndexWithBigDecimalCoercion() {
         }
     }
 
+    @Test
+    public void testBeta() {
+
+        final String drl =
+                "package org.drools.compiler.test\n" +
+                "import " + Person.class.getCanonicalName() + "\n" +
+                "import " + Address.class.getCanonicalName() + "\n" +
+                "global java.util.List list\n" +
+                "rule R1\n" +
+                "    when\n" +
+                "        a : Address()\n" +
+                "        Person( name == a.street )\n" +
+                "    then\n" +
+                "        list.add(\"R1\");\n" +
+                "end\n";
+
+        final KieBase kbase = KieBaseUtil.getKieBaseFromKieModuleFromDrl("indexing-test", kieBaseTestConfiguration, drl);
+        KieSession ksession = kbase.newKieSession();
+
+        try {
+            // BigDecimal Index is disabled
+            //assertAlphaIndex(kbase, Person.class, 0);
+
+            List list = new ArrayList<>();
+            ksession.setGlobal("list", list);
+            Person person = new Person("London");
+            Address address = new Address("London");
+
+            ksession.insert(person);
+            ksession.insert(address);
+            ksession.fireAllRules();
+
+            assertThat(list).containsExactly("R1");
+        } finally {
+            ksession.dispose();
+        }
+    }
+
     private void assertAlphaIndex(KieBase kbase, Class clazz, int hashedSize) {
         final ObjectTypeNode otn = KieUtil.getObjectTypeNode(kbase, clazz);
         assertThat(otn).isNotNull();
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/JoinNodeRangeIndexingTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/JoinNodeRangeIndexingTest.java
index 243727f1728..d1616208a80 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/JoinNodeRangeIndexingTest.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/JoinNodeRangeIndexingTest.java
@@ -468,7 +468,6 @@ public void testBoxed2() {
 
         final KieSession ksession = kbase.newKieSession();
         try {
-
             ksession.insert(new IntegerHolder(30));
             ksession.insert(new Person("Paul", 20));
             assertThat(ksession.fireAllRules()).isEqualTo(1);
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/AbstractTupleIndexHashTableIteratorTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/AbstractTupleIndexHashTableIteratorTest.java
index 6c1bb2ff202..7e130f97426 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/AbstractTupleIndexHashTableIteratorTest.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/AbstractTupleIndexHashTableIteratorTest.java
@@ -28,7 +28,7 @@
 import org.drools.base.rule.Declaration;
 import org.drools.base.rule.Pattern;
 import org.drools.base.rule.accessor.ReadAccessor;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.core.util.Entry;
 import org.drools.core.util.index.IndexMemory;
 import org.drools.core.util.index.TupleIndexHashTable;
@@ -81,7 +81,7 @@ public static Collection getParameters() {
         return parameters;
     }
 
-    protected static BetaNodeFieldConstraint createFooThisEqualsDBetaConstraint(boolean useLambdaConstraint) {
+    protected static BetaConstraint createFooThisEqualsDBetaConstraint(boolean useLambdaConstraint) {
         if (useLambdaConstraint) {
             return createFooThisEqualsDBetaConstraintWithLambdaConstraint();
         } else {
@@ -89,7 +89,7 @@ protected static BetaNodeFieldConstraint createFooThisEqualsDBetaConstraint(bool
         }
     }
 
-    private static BetaNodeFieldConstraint createFooThisEqualsDBetaConstraintWithLambdaConstraint() {
+    private static BetaConstraint createFooThisEqualsDBetaConstraintWithLambdaConstraint() {
         Pattern pattern = new Pattern(0, new ClassObjectType(Foo.class));
         Pattern varPattern = new Pattern(1, new ClassObjectType(Foo.class));
         Predicate2 predicate = new Predicate2.Impl((_this, d) -> EvaluationUtil.areNullSafeEquals(_this, d));
@@ -97,7 +97,7 @@ private static BetaNodeFieldConstraint createFooThisEqualsDBetaConstraintWithLam
         return LambdaConstraintTestUtil.createLambdaConstraint2(Foo.class, Foo.class, pattern, varPattern, "d", predicate, index);
     }
 
-    private static BetaNodeFieldConstraint createFooThisEqualsDBetaConstraintWithMvelConstraint() {
+    private static BetaConstraint createFooThisEqualsDBetaConstraintWithMvelConstraint() {
         ClassFieldAccessorStore store = new ClassFieldAccessorStore();
         store.setClassFieldAccessorCache(new ClassFieldAccessorCache(Thread.currentThread().getContextClassLoader()));
         store.setEagerWire(true);
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/BaseBetaConstraintsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/BaseBetaConstraintsTest.java
index dff4da37ce2..e65446a0c12 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/BaseBetaConstraintsTest.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/BaseBetaConstraintsTest.java
@@ -36,9 +36,9 @@
 import org.drools.base.rule.Declaration;
 import org.drools.base.rule.IndexableConstraint;
 import org.drools.base.rule.Pattern;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.base.rule.accessor.ReadAccessor;
-import org.drools.base.util.FieldIndex;
+import org.drools.base.util.IndexedValueReader;
 import org.drools.core.util.AbstractHashTable.Index;
 import org.drools.core.util.LinkedList;
 import org.drools.core.util.LinkedListEntry;
@@ -67,8 +67,8 @@ public static Collection getParameters() {
         return parameters;
     }
 
-    protected BetaNodeFieldConstraint getCheeseTypeConstraint(final String identifier,
-                                                    Operator operator) {
+    protected BetaConstraint getCheeseTypeConstraint(final String identifier,
+                                                     Operator operator) {
         if (useLambdaConstraint) {
             Pattern pattern = new Pattern(0, new ClassObjectType(Cheese.class));
 
@@ -107,12 +107,12 @@ protected BetaNodeFieldConstraint getCheeseTypeConstraint(final String identifie
         }
     }
 
-    protected void checkBetaConstraints(BetaNodeFieldConstraint[] constraints,
+    protected void checkBetaConstraints(BetaConstraint[] constraints,
                                         Class cls) {
         checkBetaConstraints(constraints, cls, NodeTypeEnums.JoinNode);
     }
 
-    protected void checkBetaConstraints(BetaNodeFieldConstraint[] constraints,
+    protected void checkBetaConstraints(BetaConstraint[] constraints,
                                         Class cls,
                                         short betaNodeType) {
         RuleBaseConfiguration config = RuleBaseFactory.newKnowledgeBaseConfiguration().as(RuleBaseConfiguration.KEY);
@@ -121,7 +121,7 @@ protected void checkBetaConstraints(BetaNodeFieldConstraint[] constraints,
         BetaConstraints betaConstraints;
 
         try {
-            betaConstraints = (BetaConstraints) cls.getConstructor( new Class[]{BetaNodeFieldConstraint[].class, RuleBaseConfiguration.class} ).newInstance( constraints, config );
+            betaConstraints = (BetaConstraints) cls.getConstructor( new Class[]{BetaConstraint[].class, RuleBaseConfiguration.class}).newInstance(constraints, config);
         } catch ( Exception e ) {
             throw new RuntimeException( "could not invoke constructor for " + cls.getName() );
         }
@@ -183,16 +183,16 @@ protected void checkBetaConstraints(BetaNodeFieldConstraint[] constraints,
     }
 
     protected void checkSameConstraintForIndex(IndexableConstraint constraint,
-                                               FieldIndex fieldIndex) {
+                                               IndexedValueReader fieldIndex) {
         assertThat(fieldIndex.getLeftExtractor()).isSameAs(constraint.getRequiredDeclarations()[0]);
-        assertThat(fieldIndex.getRightExtractor()).isSameAs(constraint.getFieldExtractor());
+        assertThat(fieldIndex.getRightExtractor()).isSameAs(constraint.getRightIndexExtractor());
     }
 
-    protected BetaNodeFieldConstraint[] convertToConstraints(LinkedList list) {
-        final BetaNodeFieldConstraint[] array = new BetaNodeFieldConstraint[list.size()];
-        int i = 0;
+    protected BetaConstraint[] convertToConstraints(LinkedList list) {
+        final BetaConstraint[] array = new BetaConstraint[list.size()];
+        int                    i     = 0;
         for ( LinkedListEntry entry = (LinkedListEntry) list.getFirst(); entry != null; entry = (LinkedListEntry) entry.getNext() ) {
-            array[i++] = (BetaNodeFieldConstraint) entry.getObject();
+            array[i++] = (BetaConstraint) entry.getObject();
         }
         return array;
     }
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/DefaultBetaConstraintsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/DefaultBetaConstraintsTest.java
index 14f164d401a..3965eb1737b 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/DefaultBetaConstraintsTest.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/DefaultBetaConstraintsTest.java
@@ -20,7 +20,7 @@
 
 import org.drools.drl.parser.impl.Operator;
 import org.drools.core.common.DefaultBetaConstraints;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.junit.Test;
 
 public class DefaultBetaConstraintsTest extends BaseBetaConstraintsTest {
@@ -31,114 +31,114 @@ public DefaultBetaConstraintsTest(boolean useLambdaConstraint) {
 
     @Test
     public void testNoIndexConstraints() {
-        BetaNodeFieldConstraint constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[] { constraint0 };
+        BetaConstraint   constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0 };
         checkBetaConstraints( constraints, DefaultBetaConstraints.class );
 
-        BetaNodeFieldConstraint constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1 };
+        BetaConstraint constraint1 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        constraints = new BetaConstraint[] {constraint0, constraint1 };
         checkBetaConstraints( constraints, DefaultBetaConstraints.class );
 
-        BetaNodeFieldConstraint constraint2 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint2 };
+        BetaConstraint constraint2 = getCheeseTypeConstraint("cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint2 };
         checkBetaConstraints( constraints, DefaultBetaConstraints.class );
 
-        BetaNodeFieldConstraint constraint3 = getCheeseTypeConstraint( "cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint2, constraint3 };
+        BetaConstraint constraint3 = getCheeseTypeConstraint("cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint2, constraint3 };
         checkBetaConstraints( constraints, DefaultBetaConstraints.class );
 
-        BetaNodeFieldConstraint constraint4 = getCheeseTypeConstraint( "cheeseType4", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint2, constraint3, constraint4 };
+        BetaConstraint constraint4 = getCheeseTypeConstraint("cheeseType4", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint2, constraint3, constraint4 };
         checkBetaConstraints( constraints, DefaultBetaConstraints.class );
 
-        BetaNodeFieldConstraint constraint5 = getCheeseTypeConstraint( "cheeseType5", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint2, constraint3,constraint5 };
+        BetaConstraint constraint5 = getCheeseTypeConstraint("cheeseType5", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint2, constraint3, constraint5 };
         checkBetaConstraints( constraints, DefaultBetaConstraints.class );
 
-        BetaNodeFieldConstraint constraint6 = getCheeseTypeConstraint( "cheeseType6", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint2, constraint3, constraint4, constraint5, constraint6 };
+        BetaConstraint constraint6 = getCheeseTypeConstraint("cheeseType6", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint2, constraint3, constraint4, constraint5, constraint6 };
         checkBetaConstraints( constraints, DefaultBetaConstraints.class );
     }
     
     @Test
     public void testIndexedConstraint() {
-        BetaNodeFieldConstraint constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[] { constraint0 };
+        BetaConstraint   constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0 };
         checkBetaConstraints( constraints, DefaultBetaConstraints.class );
         
-        BetaNodeFieldConstraint constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1 };
+        BetaConstraint constraint1 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator());
+        constraints = new BetaConstraint[] {constraint0, constraint1 };
         checkBetaConstraints( constraints, DefaultBetaConstraints.class );
         
-        BetaNodeFieldConstraint constraint2 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint2 };
+        BetaConstraint constraint2 = getCheeseTypeConstraint("cheeseType2", Operator.BuiltInOperator.EQUAL.getOperator());
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint2 };
         checkBetaConstraints( constraints, DefaultBetaConstraints.class );
         
-        BetaNodeFieldConstraint constraint3 = getCheeseTypeConstraint( "cheeseType3", Operator.BuiltInOperator.EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint2, constraint3 };
+        BetaConstraint constraint3 = getCheeseTypeConstraint("cheeseType3", Operator.BuiltInOperator.EQUAL.getOperator());
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint2, constraint3 };
         checkBetaConstraints( constraints, DefaultBetaConstraints.class );
         
-        BetaNodeFieldConstraint constraint4 = getCheeseTypeConstraint( "cheeseType4", Operator.BuiltInOperator.EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint2, constraint3, constraint4 };
+        BetaConstraint constraint4 = getCheeseTypeConstraint("cheeseType4", Operator.BuiltInOperator.EQUAL.getOperator());
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint2, constraint3, constraint4 };
         checkBetaConstraints( constraints, DefaultBetaConstraints.class );
         
-        BetaNodeFieldConstraint constraint5 = getCheeseTypeConstraint( "cheeseType5", Operator.BuiltInOperator.EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint2, constraint3, constraint4, constraint5 };
+        BetaConstraint constraint5 = getCheeseTypeConstraint("cheeseType5", Operator.BuiltInOperator.EQUAL.getOperator());
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint2, constraint3, constraint4, constraint5 };
         checkBetaConstraints( constraints, DefaultBetaConstraints.class );
         
-        BetaNodeFieldConstraint constraint6 = getCheeseTypeConstraint( "cheeseType6", Operator.BuiltInOperator.EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint2, constraint3, constraint4, constraint5, constraint6 };
+        BetaConstraint constraint6 = getCheeseTypeConstraint("cheeseType6", Operator.BuiltInOperator.EQUAL.getOperator());
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint2, constraint3, constraint4, constraint5, constraint6 };
         checkBetaConstraints( constraints, DefaultBetaConstraints.class );
     }
     
     
     @Test
     public void testSingleIndex() {
-        BetaNodeFieldConstraint constraint0 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint1 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint2 = getCheeseTypeConstraint( "cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint3 = getCheeseTypeConstraint( "cheeseType4", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint4 = getCheeseTypeConstraint( "cheeseType5", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
+        BetaConstraint constraint0 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint constraint1 = getCheeseTypeConstraint("cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint constraint2 = getCheeseTypeConstraint("cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint constraint3 = getCheeseTypeConstraint("cheeseType4", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint constraint4 = getCheeseTypeConstraint("cheeseType5", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
         
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint2, constraint3, constraint4 };
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0, constraint1, constraint2, constraint3, constraint4 };
         checkBetaConstraints( constraints, DefaultBetaConstraints.class );
     }
     
     @Test
     public void testSingleIndexNotFirst() {
-        BetaNodeFieldConstraint constraint0 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint1 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint2 = getCheeseTypeConstraint( "cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint3 = getCheeseTypeConstraint( "cheeseType4", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint4 = getCheeseTypeConstraint( "cheeseType5", Operator.BuiltInOperator.EQUAL.getOperator() );
+        BetaConstraint constraint0 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint constraint1 = getCheeseTypeConstraint("cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint constraint2 = getCheeseTypeConstraint("cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint constraint3 = getCheeseTypeConstraint("cheeseType4", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint constraint4 = getCheeseTypeConstraint("cheeseType5", Operator.BuiltInOperator.EQUAL.getOperator());
         
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint2, constraint3, constraint4 };
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0, constraint1, constraint2, constraint3, constraint4 };
         
         checkBetaConstraints( constraints, DefaultBetaConstraints.class );
     }
     
     @Test
     public void testDoubleIndex() {
-        BetaNodeFieldConstraint constraint0 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint1 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint2 = getCheeseTypeConstraint( "cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint3 = getCheeseTypeConstraint( "cheeseType4", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint4 = getCheeseTypeConstraint( "cheeseType5", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
+        BetaConstraint constraint0 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint constraint1 = getCheeseTypeConstraint("cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint constraint2 = getCheeseTypeConstraint("cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint constraint3 = getCheeseTypeConstraint("cheeseType4", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint constraint4 = getCheeseTypeConstraint("cheeseType5", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
         
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint2, constraint3, constraint4 };
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0, constraint1, constraint2, constraint3, constraint4 };
         
         checkBetaConstraints( constraints, DefaultBetaConstraints.class );
     }
     
     @Test
     public void testDoubleIndexNotFirst() {
-        BetaNodeFieldConstraint constraint0 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint1 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint2 = getCheeseTypeConstraint( "cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint3 = getCheeseTypeConstraint( "cheeseType4", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint4 = getCheeseTypeConstraint( "cheeseType5", Operator.BuiltInOperator.EQUAL.getOperator() );
+        BetaConstraint constraint0 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint constraint1 = getCheeseTypeConstraint("cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint constraint2 = getCheeseTypeConstraint("cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint constraint3 = getCheeseTypeConstraint("cheeseType4", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint constraint4 = getCheeseTypeConstraint("cheeseType5", Operator.BuiltInOperator.EQUAL.getOperator());
         
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint2, constraint3, constraint4 };
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0, constraint1, constraint2, constraint3, constraint4 };
         
         checkBetaConstraints( constraints, DefaultBetaConstraints.class );
     }
@@ -146,26 +146,26 @@ public void testDoubleIndexNotFirst() {
     
     @Test
     public void testTripleIndex() {
-        BetaNodeFieldConstraint constraint0 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint1 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint2 = getCheeseTypeConstraint( "cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint3 = getCheeseTypeConstraint( "cheeseType4", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint4 = getCheeseTypeConstraint( "cheeseType5", Operator.BuiltInOperator.EQUAL.getOperator() );
+        BetaConstraint constraint0 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint constraint1 = getCheeseTypeConstraint("cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint constraint2 = getCheeseTypeConstraint("cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint constraint3 = getCheeseTypeConstraint("cheeseType4", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint constraint4 = getCheeseTypeConstraint("cheeseType5", Operator.BuiltInOperator.EQUAL.getOperator());
         
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint2, constraint3, constraint4 };
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0, constraint1, constraint2, constraint3, constraint4 };
         
         checkBetaConstraints( constraints, DefaultBetaConstraints.class );
     }
     
     @Test
     public void testTripleIndexNotFirst() {
-        BetaNodeFieldConstraint constraint0 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint1 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint2 = getCheeseTypeConstraint( "cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint3 = getCheeseTypeConstraint( "cheeseType4", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint4 = getCheeseTypeConstraint( "cheeseType5", Operator.BuiltInOperator.EQUAL.getOperator() );
+        BetaConstraint constraint0 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint constraint1 = getCheeseTypeConstraint("cheeseType2", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint constraint2 = getCheeseTypeConstraint("cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint constraint3 = getCheeseTypeConstraint("cheeseType4", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint constraint4 = getCheeseTypeConstraint("cheeseType5", Operator.BuiltInOperator.EQUAL.getOperator());
         
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint2, constraint3, constraint4 };
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0, constraint1, constraint2, constraint3, constraint4 };
         
         checkBetaConstraints( constraints, DefaultBetaConstraints.class );
     }
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/DoubleBetaConstraintsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/DoubleBetaConstraintsTest.java
index a832af70f39..24eb084b4e5 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/DoubleBetaConstraintsTest.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/DoubleBetaConstraintsTest.java
@@ -21,7 +21,7 @@
 import org.drools.drl.parser.impl.Operator;
 import org.drools.core.common.DoubleBetaConstraints;
 import org.drools.base.reteoo.NodeTypeEnums;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.junit.Test;
 
 public class DoubleBetaConstraintsTest extends BaseBetaConstraintsTest {
@@ -32,43 +32,43 @@ public DoubleBetaConstraintsTest(boolean useLambdaConstraint) {
 
     @Test
     public void testAllNoneIndexed() {
-        BetaNodeFieldConstraint constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1 };
+        BetaConstraint   constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint   constraint1 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0, constraint1 };
         checkBetaConstraints( constraints, DoubleBetaConstraints.class );
     }
     
     @Test
     public void testOneIndexed() {
-        BetaNodeFieldConstraint constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1 };
+        BetaConstraint   constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint   constraint1 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0, constraint1 };
         checkBetaConstraints( constraints, DoubleBetaConstraints.class );
         
         constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
         constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1 };
+        constraints = new BetaConstraint[] {constraint0, constraint1 };
         checkBetaConstraints( constraints, DoubleBetaConstraints.class );
     }
 
     @Test
     public void testOneIndexedForComparison() {
-        BetaNodeFieldConstraint constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.GREATER.getOperator() );
-        BetaNodeFieldConstraint constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1 };
+        BetaConstraint   constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.GREATER.getOperator());
+        BetaConstraint   constraint1 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0, constraint1 };
         checkBetaConstraints( constraints, DoubleBetaConstraints.class, NodeTypeEnums.ExistsNode );
 
         constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
         constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.GREATER.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1 };
+        constraints = new BetaConstraint[] {constraint0, constraint1 };
         checkBetaConstraints( constraints, DoubleBetaConstraints.class, NodeTypeEnums.ExistsNode );
     }
 
     @Test
     public void testTwoIndexed() {
-        BetaNodeFieldConstraint constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1 };
+        BetaConstraint   constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint   constraint1 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0, constraint1 };
         checkBetaConstraints( constraints, DoubleBetaConstraints.class );
     }
     
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/FieldConstraintTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/FieldConstraintTest.java
index 75c6e9f9c97..3529c40ce07 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/FieldConstraintTest.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/FieldConstraintTest.java
@@ -18,6 +18,9 @@
  */
 package org.drools.mvel;
 
+import org.drools.base.rule.Declaration;
+import org.drools.base.rule.Pattern;
+import org.drools.base.rule.accessor.ReadAccessor;
 import org.drools.base.rule.constraint.AlphaNodeFieldConstraint;
 import org.drools.core.base.ClassFieldAccessorCache;
 import org.drools.core.common.InternalFactHandle;
@@ -36,6 +39,7 @@
 import java.util.Collection;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.drools.base.base.AccessorKey.AccessorType.ClassObjectType;
 
 @RunWith(Parameterized.class)
 public class FieldConstraintTest {
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/LeftTupleIndexHashTableIteratorTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/LeftTupleIndexHashTableIteratorTest.java
index a37d884228d..6e83e0e2076 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/LeftTupleIndexHashTableIteratorTest.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/LeftTupleIndexHashTableIteratorTest.java
@@ -29,7 +29,7 @@
 import org.drools.core.reteoo.BetaMemory;
 import org.drools.core.reteoo.JoinNodeLeftTuple;
 import org.drools.base.reteoo.NodeTypeEnums;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.core.util.AbstractHashTable;
 import org.drools.core.util.Iterator;
 import org.drools.core.util.index.TupleIndexHashTable;
@@ -52,9 +52,9 @@ public LeftTupleIndexHashTableIteratorTest(boolean useLambdaConstraint) {
 
     @Test
     public void test1() {
-        BetaNodeFieldConstraint constraint0 = createFooThisEqualsDBetaConstraint(useLambdaConstraint);
+        BetaConstraint constraint0 = createFooThisEqualsDBetaConstraint(useLambdaConstraint);
 
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[]{constraint0};
+        BetaConstraint[] constraints = new BetaConstraint[]{constraint0};
 
         RuleBaseConfiguration config = RuleBaseFactory.newKnowledgeBaseConfiguration().as(RuleBaseConfiguration.KEY);
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/QuadroupleBetaConstraintsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/QuadroupleBetaConstraintsTest.java
index 6db9899ef25..f1f64ae4d46 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/QuadroupleBetaConstraintsTest.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/QuadroupleBetaConstraintsTest.java
@@ -20,7 +20,7 @@
 
 import org.drools.drl.parser.impl.Operator;
 import org.drools.core.common.QuadroupleBetaConstraints;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.junit.Test;
 
 public class QuadroupleBetaConstraintsTest extends BaseBetaConstraintsTest {
@@ -32,128 +32,128 @@ public QuadroupleBetaConstraintsTest(boolean useLambdaConstraint) {
 
     @Test
     public void testNoneIndxed() {
-        BetaNodeFieldConstraint constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint3 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint4 = getCheeseTypeConstraint( "cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3, constraint4  };
+        BetaConstraint   constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint   constraint1 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint   constraint3 = getCheeseTypeConstraint("cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint   constraint4 = getCheeseTypeConstraint("cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0, constraint1, constraint3, constraint4  };
         checkBetaConstraints( constraints, QuadroupleBetaConstraints.class );
     }
     
     @Test
     public void testOneIndxed() {
-        BetaNodeFieldConstraint constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint3 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint4 = getCheeseTypeConstraint( "cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3, constraint4 };
+        BetaConstraint   constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint   constraint1 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint   constraint3 = getCheeseTypeConstraint("cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint   constraint4 = getCheeseTypeConstraint("cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0, constraint1, constraint3, constraint4 };
         checkBetaConstraints( constraints, QuadroupleBetaConstraints.class );
         
         constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
         constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator() );
         constraint3 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
         constraint4 = getCheeseTypeConstraint( "cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3, constraint4 };
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint3, constraint4 };
         checkBetaConstraints( constraints, QuadroupleBetaConstraints.class );
         
         constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
         constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
         constraint3 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.EQUAL.getOperator() );
         constraint4 = getCheeseTypeConstraint( "cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3, constraint4 };
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint3, constraint4 };
         checkBetaConstraints( constraints, QuadroupleBetaConstraints.class );
         
         constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
         constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
         constraint3 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
         constraint4 = getCheeseTypeConstraint( "cheeseType3", Operator.BuiltInOperator.EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3, constraint4 };
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint3, constraint4 };
         checkBetaConstraints( constraints, QuadroupleBetaConstraints.class );
     }
 
     @Test
     public void testTwoIndxed() {
-        BetaNodeFieldConstraint constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint3 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint4 = getCheeseTypeConstraint( "cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3, constraint4 };
+        BetaConstraint   constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint   constraint1 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint   constraint3 = getCheeseTypeConstraint("cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint   constraint4 = getCheeseTypeConstraint("cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0, constraint1, constraint3, constraint4 };
         checkBetaConstraints( constraints, QuadroupleBetaConstraints.class );
         
         constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator());
         constraint1 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
         constraint3 = getCheeseTypeConstraint("cheeseType2", Operator.BuiltInOperator.EQUAL.getOperator());
         constraint4 = getCheeseTypeConstraint("cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3, constraint4 };
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint3, constraint4 };
         checkBetaConstraints( constraints, QuadroupleBetaConstraints.class );
         
         constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator());
         constraint1 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
         constraint3 = getCheeseTypeConstraint("cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
         constraint4 = getCheeseTypeConstraint("cheeseType3", Operator.BuiltInOperator.EQUAL.getOperator());
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3, constraint4 };
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint3, constraint4 };
         checkBetaConstraints( constraints, QuadroupleBetaConstraints.class );
         
         constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
         constraint1 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator());
         constraint3 = getCheeseTypeConstraint("cheeseType2", Operator.BuiltInOperator.EQUAL.getOperator());
         constraint4 = getCheeseTypeConstraint("cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3, constraint4 };
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint3, constraint4 };
         checkBetaConstraints( constraints, QuadroupleBetaConstraints.class );
         
         constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
         constraint1 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator());
         constraint3 = getCheeseTypeConstraint("cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
         constraint4 = getCheeseTypeConstraint("cheeseType3", Operator.BuiltInOperator.EQUAL.getOperator());
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3, constraint4 };
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint3, constraint4 };
         checkBetaConstraints( constraints, QuadroupleBetaConstraints.class );
         
         constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
         constraint1 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
         constraint3 = getCheeseTypeConstraint("cheeseType2", Operator.BuiltInOperator.EQUAL.getOperator());
         constraint4 = getCheeseTypeConstraint("cheeseType3", Operator.BuiltInOperator.EQUAL.getOperator());
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3, constraint4 };
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint3, constraint4 };
         checkBetaConstraints( constraints, QuadroupleBetaConstraints.class );
     }
 
     @Test
     public void testThreeIndxed() {
-        BetaNodeFieldConstraint constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint3 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint4 = getCheeseTypeConstraint( "cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3, constraint4 };
+        BetaConstraint   constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint   constraint1 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint   constraint3 = getCheeseTypeConstraint("cheeseType2", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint   constraint4 = getCheeseTypeConstraint("cheeseType3", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0, constraint1, constraint3, constraint4 };
         checkBetaConstraints( constraints, QuadroupleBetaConstraints.class );
         
         constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator() );
         constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator() );
         constraint3 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
         constraint4 = getCheeseTypeConstraint( "cheeseType3", Operator.BuiltInOperator.EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3, constraint4 };
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint3, constraint4 };
         checkBetaConstraints( constraints, QuadroupleBetaConstraints.class );
         
         constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator() );
         constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
         constraint3 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.EQUAL.getOperator() );
         constraint4 = getCheeseTypeConstraint( "cheeseType3", Operator.BuiltInOperator.EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3, constraint4 };
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint3, constraint4 };
         checkBetaConstraints( constraints, QuadroupleBetaConstraints.class );
         
         constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
         constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator() );
         constraint3 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.EQUAL.getOperator() );
         constraint4 = getCheeseTypeConstraint( "cheeseType3", Operator.BuiltInOperator.EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3, constraint4 };
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint3, constraint4 };
         checkBetaConstraints( constraints, QuadroupleBetaConstraints.class );
     }
     
     @Test
     public void testFourIndxed() {
-        BetaNodeFieldConstraint constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint3 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint4 = getCheeseTypeConstraint( "cheeseType3", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3, constraint4 };
+        BetaConstraint   constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint   constraint1 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint   constraint3 = getCheeseTypeConstraint("cheeseType2", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint   constraint4 = getCheeseTypeConstraint("cheeseType3", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0, constraint1, constraint3, constraint4 };
         checkBetaConstraints( constraints, QuadroupleBetaConstraints.class );
     }
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/RightTupleIndexHashTableIteratorTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/RightTupleIndexHashTableIteratorTest.java
index 0cd374e3428..09390a9f1d0 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/RightTupleIndexHashTableIteratorTest.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/RightTupleIndexHashTableIteratorTest.java
@@ -31,7 +31,7 @@
 import org.drools.base.reteoo.NodeTypeEnums;
 import org.drools.core.reteoo.RightTuple;
 import org.drools.core.reteoo.RightTupleImpl;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.core.util.AbstractHashTable;
 import org.drools.core.util.Iterator;
 import org.drools.core.util.index.TupleIndexHashTable;
@@ -54,9 +54,9 @@ public RightTupleIndexHashTableIteratorTest(boolean useLambdaConstraint) {
 
     @Test
     public void test1() {
-        BetaNodeFieldConstraint constraint0 = createFooThisEqualsDBetaConstraint(useLambdaConstraint);
+        BetaConstraint constraint0 = createFooThisEqualsDBetaConstraint(useLambdaConstraint);
 
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[]{constraint0};
+        BetaConstraint[] constraints = new BetaConstraint[]{constraint0};
 
         RuleBaseConfiguration config = RuleBaseFactory.newKnowledgeBaseConfiguration().as(RuleBaseConfiguration.KEY);
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/SingleBetaConstraintsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/SingleBetaConstraintsTest.java
index 0b16fc53ea6..5bb3c17c4b0 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/SingleBetaConstraintsTest.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/SingleBetaConstraintsTest.java
@@ -21,7 +21,7 @@
 import org.drools.drl.parser.impl.Operator;
 import org.drools.core.common.SingleBetaConstraints;
 import org.drools.base.reteoo.NodeTypeEnums;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.junit.Test;
 
 public class SingleBetaConstraintsTest extends BaseBetaConstraintsTest {
@@ -32,29 +32,29 @@ public SingleBetaConstraintsTest(boolean useLambdaConstraint) {
 
     @Test
     public void testIndexed() {
-        BetaNodeFieldConstraint constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint [] constraints = new BetaNodeFieldConstraint [] { constraint0 };
+        BetaConstraint   constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0 };
         checkBetaConstraints( constraints, SingleBetaConstraints.class );
     }
 
     @Test
     public void testNotIndexed() {
-        BetaNodeFieldConstraint  constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint [] constraints = new BetaNodeFieldConstraint [] { constraint0 };
+        BetaConstraint   constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0 };
         checkBetaConstraints( constraints, SingleBetaConstraints.class );
     }
 
     @Test
     public void testIndexedForComparison() {
-        BetaNodeFieldConstraint  constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.LESS.getOperator() );
-        BetaNodeFieldConstraint [] constraints = new BetaNodeFieldConstraint [] { constraint0 };
+        BetaConstraint   constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.LESS.getOperator());
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0 };
         checkBetaConstraints( constraints, SingleBetaConstraints.class, NodeTypeEnums.ExistsNode );
     }
 
     @Test
     public void testNotIndexedForComparison() {
-        BetaNodeFieldConstraint  constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.LESS.getOperator() );
-        BetaNodeFieldConstraint [] constraints = new BetaNodeFieldConstraint [] { constraint0 };
+        BetaConstraint   constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.LESS.getOperator());
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0 };
         checkBetaConstraints( constraints, SingleBetaConstraints.class, NodeTypeEnums.JoinNode );
     }
 }
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/TripleBetaConstraintsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/TripleBetaConstraintsTest.java
index 479c1d2a79c..af763994258 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/TripleBetaConstraintsTest.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/TripleBetaConstraintsTest.java
@@ -20,7 +20,7 @@
 
 import org.drools.drl.parser.impl.Operator;
 import org.drools.core.common.TripleBetaConstraints;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.junit.Test;
 
 public class TripleBetaConstraintsTest extends BaseBetaConstraintsTest {
@@ -31,61 +31,61 @@ public TripleBetaConstraintsTest(boolean useLambdaConstraint) {
 
     @Test
     public void testNoneIndxed() {
-        BetaNodeFieldConstraint constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint3 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3 };
+        BetaConstraint   constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint   constraint1 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint   constraint3 = getCheeseTypeConstraint("cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0, constraint1, constraint3 };
         checkBetaConstraints( constraints, TripleBetaConstraints.class );
     }
     
     @Test
     public void testOneIndxed() {
-        BetaNodeFieldConstraint constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint3 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3 };
+        BetaConstraint   constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint   constraint1 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint   constraint3 = getCheeseTypeConstraint("cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0, constraint1, constraint3 };
         checkBetaConstraints( constraints, TripleBetaConstraints.class );
         
         constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
         constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator() );
         constraint3 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3 };
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint3 };
         checkBetaConstraints( constraints, TripleBetaConstraints.class );
         
         constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
         constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
         constraint3 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3 };
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint3 };
         checkBetaConstraints( constraints, TripleBetaConstraints.class );
     }
 
     @Test
     public void testTwoIndxed() {
-        BetaNodeFieldConstraint constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint3 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3 };
+        BetaConstraint   constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint   constraint1 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint   constraint3 = getCheeseTypeConstraint("cheeseType2", Operator.BuiltInOperator.NOT_EQUAL.getOperator());
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0, constraint1, constraint3 };
         checkBetaConstraints( constraints, TripleBetaConstraints.class );
         
         constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator() );
         constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
         constraint3 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3 };
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint3 };
         checkBetaConstraints( constraints, TripleBetaConstraints.class );
         
         constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.NOT_EQUAL.getOperator() );
         constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator() );
         constraint3 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.EQUAL.getOperator() );
-        constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3 };
+        constraints = new BetaConstraint[] {constraint0, constraint1, constraint3 };
         checkBetaConstraints( constraints, TripleBetaConstraints.class );
     }
     
     @Test
     public void testThreeIndxed() {
-        BetaNodeFieldConstraint constraint0 = getCheeseTypeConstraint( "cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint1 = getCheeseTypeConstraint( "cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint constraint3 = getCheeseTypeConstraint( "cheeseType2", Operator.BuiltInOperator.EQUAL.getOperator() );
-        BetaNodeFieldConstraint[] constraints = new BetaNodeFieldConstraint[] { constraint0, constraint1, constraint3 };
+        BetaConstraint   constraint0 = getCheeseTypeConstraint("cheeseType0", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint   constraint1 = getCheeseTypeConstraint("cheeseType1", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint   constraint3 = getCheeseTypeConstraint("cheeseType2", Operator.BuiltInOperator.EQUAL.getOperator());
+        BetaConstraint[] constraints = new BetaConstraint[] {constraint0, constraint1, constraint3 };
         checkBetaConstraints( constraints, TripleBetaConstraints.class );
     }
 }
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/extractors/FieldIndexEntryTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/extractors/FieldIndexEntryTest.java
index 9127af56477..66e70baa05d 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/extractors/FieldIndexEntryTest.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/extractors/FieldIndexEntryTest.java
@@ -18,6 +18,7 @@
  */
 package org.drools.mvel.extractors;
 
+import org.drools.base.rule.accessor.RightTupleValueExtractor;
 import org.drools.core.base.ClassFieldAccessorCache;
 import org.drools.mvel.accessors.ClassFieldAccessorStore;
 import org.drools.mvel.accessors.ClassFieldReader;
@@ -29,7 +30,7 @@
 import org.drools.core.reteoo.Tuple;
 import org.drools.core.test.model.Cheese;
 import org.drools.core.util.AbstractHashTable;
-import org.drools.base.util.FieldIndex;
+import org.drools.base.util.IndexedValueReader;
 import org.drools.core.util.AbstractHashTable.SingleIndex;
 import org.drools.core.util.index.TupleList;
 import org.junit.Before;
@@ -52,9 +53,8 @@ public void testSingleEntry() {
         final ClassFieldReader extractor = store.getReader( Cheese.class,
                                                                   "type" );
 
-        final FieldIndex fieldIndex = new FieldIndex( extractor,
-                                                      new Declaration("id", extractor, null) );
-        final SingleIndex singleIndex = new SingleIndex( new FieldIndex[]{fieldIndex},
+        final IndexedValueReader fieldIndex = new IndexedValueReader(new Declaration("id", extractor, null), new RightTupleValueExtractor(extractor));
+        final SingleIndex singleIndex = new SingleIndex( new IndexedValueReader[]{fieldIndex},
                                                          1 );
 
         Tuple tuple = new RightTupleImpl( new DefaultFactHandle( 1, new Cheese("stilton", 10) ) );
@@ -90,9 +90,8 @@ public void testSingleEntry() {
     public void testTwoEntries() {
         final ClassFieldReader extractor = store.getReader( Cheese.class,
                                                                   "type" );
-        final FieldIndex fieldIndex = new FieldIndex( extractor,
-                                                      new Declaration("id", extractor, null) );
-        final SingleIndex singleIndex = new SingleIndex( new FieldIndex[]{fieldIndex},
+        final IndexedValueReader fieldIndex = new IndexedValueReader(new Declaration("id", extractor, null), new RightTupleValueExtractor(extractor));
+        final SingleIndex singleIndex = new SingleIndex( new IndexedValueReader[]{fieldIndex},
                                                          1 );
 
         Tuple tuple = new RightTupleImpl( new DefaultFactHandle( 1, new Cheese("stilton", 10) ) );
@@ -138,9 +137,8 @@ public void testTwoEntries() {
     public void testThreeEntries() {
         final ClassFieldReader extractor = store.getReader( Cheese.class,
                                                                   "type" );
-        final FieldIndex fieldIndex = new FieldIndex( extractor,
-                                                      new Declaration("id", extractor, null) );
-        final SingleIndex singleIndex = new SingleIndex( new FieldIndex[]{fieldIndex},
+        final IndexedValueReader fieldIndex = new IndexedValueReader(new Declaration("id", extractor, null), new RightTupleValueExtractor(extractor));
+        final SingleIndex singleIndex = new SingleIndex( new IndexedValueReader[]{fieldIndex},
                                                          1 );
 
         Tuple tuple = new RightTupleImpl( new DefaultFactHandle( 1, new Cheese("stilton", 10) ) );
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/phreak/FakeBetaNodeFieldConstraint.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/phreak/FakeBetaNodeFieldConstraint.java
index 9918a20452d..a3e482d5762 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/phreak/FakeBetaNodeFieldConstraint.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/phreak/FakeBetaNodeFieldConstraint.java
@@ -28,13 +28,13 @@
 import org.drools.drl.parser.impl.Operator;
 import org.drools.base.rule.ContextEntry;
 import org.drools.base.rule.Declaration;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.base.rule.constraint.Constraint;
 import org.drools.core.reteoo.Tuple;
 import org.drools.util.ClassUtils;
 import org.kie.api.runtime.rule.FactHandle;
 
-public class FakeBetaNodeFieldConstraint implements BetaNodeFieldConstraint {
+public class FakeBetaNodeFieldConstraint implements BetaConstraint {
 
     private Class clazz;
     private String fieldName;
@@ -122,12 +122,12 @@ private boolean evaluate(Object fact, BaseTuple tuple, ContextEntry context) {
     }
 
     @Override
-    public ContextEntry createContextEntry() {
+    public ContextEntry createContext() {
         return new FakeContextEntry();
     }
 
     @Override
-    public BetaNodeFieldConstraint cloneIfInUse() {
+    public BetaConstraint cloneIfInUse() {
         throw new UnsupportedOperationException();
     }
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/phreak/ReteTesterHelper.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/phreak/ReteTesterHelper.java
index 5d11efe57b5..920abd06405 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/phreak/ReteTesterHelper.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/phreak/ReteTesterHelper.java
@@ -21,7 +21,7 @@
 import org.drools.core.base.ClassFieldAccessorCache;
 import org.drools.base.definitions.InternalKnowledgePackage;
 import org.drools.base.rule.Declaration;
-import org.drools.base.rule.constraint.BetaNodeFieldConstraint;
+import org.drools.base.rule.constraint.BetaConstraint;
 import org.drools.mvel.MVELKnowledgePackageImpl;
 
 public class ReteTesterHelper {
@@ -37,10 +37,10 @@ public InternalKnowledgePackage getPkg() {
         return pkg;
     }
 
-    public BetaNodeFieldConstraint getBoundVariableConstraint(final Class clazz,
-                                                              final String fieldName,
-                                                              final Declaration declaration,
-                                                              final String evaluatorString) {
+    public BetaConstraint getBoundVariableConstraint(final Class clazz,
+                                                     final String fieldName,
+                                                     final Declaration declaration,
+                                                     final String evaluatorString) {
         return new FakeBetaNodeFieldConstraint(clazz, fieldName, declaration, evaluatorString);
     }
 
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/util/RightTupleIndexHashTableTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/util/RightTupleIndexHashTableTest.java
index 24c3bb866a3..313c2b4d61a 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/util/RightTupleIndexHashTableTest.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/util/RightTupleIndexHashTableTest.java
@@ -21,8 +21,11 @@
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Supplier;
 
+import org.drools.base.rule.accessor.RightTupleValueExtractor;
 import org.drools.core.base.ClassFieldAccessorCache;
+import org.drools.core.util.index.IndexSpec;
 import org.drools.mvel.accessors.ClassFieldAccessorStore;
 import org.drools.base.base.ClassObjectType;
 import org.drools.core.common.DefaultFactHandle;
@@ -36,7 +39,7 @@
 import org.drools.core.reteoo.Tuple;
 import org.drools.core.test.model.Cheese;
 import org.drools.core.util.AbstractHashTable;
-import org.drools.base.util.FieldIndex;
+import org.drools.base.util.IndexedValueReader;
 import org.drools.core.util.Entry;
 import org.drools.core.util.index.TupleIndexHashTable;
 import org.drools.core.util.index.TupleList;
@@ -54,6 +57,9 @@ public void setUp() throws Exception {
         store.setClassFieldAccessorCache( new ClassFieldAccessorCache( Thread.currentThread().getContextClassLoader() ) );
         store.setEagerWire( true );
     }
+    public AbstractHashTable.Index getIndexSupplier(IndexedValueReader fieldIndex) {
+        return new IndexSpec(new IndexedValueReader[] {fieldIndex}).getIndex();
+    }
 
     @Test
     public void testSingleEntry() throws Exception {
@@ -67,10 +73,9 @@ public void testSingleEntry() throws Exception {
                                                          extractor,
                                                          pattern );
 
-        final FieldIndex fieldIndex = new FieldIndex( extractor,
-                                                      declaration );
+        final IndexedValueReader fieldIndex = new IndexedValueReader(declaration, new RightTupleValueExtractor(extractor));
 
-        final TupleIndexHashTable map = new TupleIndexHashTable( new FieldIndex[]{fieldIndex}, false );
+        final TupleIndexHashTable map = new TupleIndexHashTable(new IndexSpec(new IndexedValueReader[]{fieldIndex}).getIndex(), false );
 
         final Cheese cheddar = new Cheese( "cheddar",
                                            10 );
@@ -117,10 +122,9 @@ public void testTwoDifferentEntries() throws Exception {
                                                          extractor,
                                                          pattern );
 
-        final FieldIndex fieldIndex = new FieldIndex( extractor,
-                                                      declaration );
+        final IndexedValueReader fieldIndex = new IndexedValueReader(declaration, new RightTupleValueExtractor(extractor));
 
-        final TupleIndexHashTable map = new TupleIndexHashTable( new FieldIndex[]{fieldIndex}, false );
+        final TupleIndexHashTable map = new TupleIndexHashTable( getIndexSupplier(fieldIndex), false );
 
         assertThat(map.size()).isEqualTo(0);
 
@@ -174,10 +178,9 @@ public void testTwoEqualEntries() throws Exception {
                                                          extractor,
                                                          pattern );
 
-        final FieldIndex fieldIndex = new FieldIndex( extractor,
-                                                      declaration );
+        final IndexedValueReader fieldIndex = new IndexedValueReader(declaration, new RightTupleValueExtractor(extractor));
 
-        final TupleIndexHashTable map = new TupleIndexHashTable( new FieldIndex[]{fieldIndex}, false );
+        final TupleIndexHashTable map = new TupleIndexHashTable( getIndexSupplier(fieldIndex), false );
 
         assertThat(map.size()).isEqualTo(0);
 
@@ -230,10 +233,9 @@ public void testTwoDifferentEntriesSameHashCode() throws Exception {
                                                          extractor,
                                                          pattern );
 
-        final FieldIndex fieldIndex = new FieldIndex( extractor,
-                                                      declaration );
+        final IndexedValueReader fieldIndex = new IndexedValueReader(declaration, new RightTupleValueExtractor(extractor));
 
-        final TupleIndexHashTable map = new TupleIndexHashTable( new FieldIndex[]{fieldIndex}, false );
+        final TupleIndexHashTable map = new TupleIndexHashTable(getIndexSupplier(fieldIndex), false );
 
         final TestClass c1 = new TestClass( 0,
                                             new TestClass( 20,
@@ -283,10 +285,9 @@ public void testRemove() throws Exception {
                                                          extractor,
                                                          pattern );
 
-        final FieldIndex fieldIndex = new FieldIndex( extractor,
-                                                      declaration );
+        final IndexedValueReader fieldIndex = new IndexedValueReader(declaration, new RightTupleValueExtractor(extractor));
 
-        final TupleIndexHashTable map = new TupleIndexHashTable( new FieldIndex[]{fieldIndex}, false );
+        final TupleIndexHashTable map = new TupleIndexHashTable( getIndexSupplier(fieldIndex), false );
 
         assertThat(map.size()).isEqualTo(0);
 
@@ -346,10 +347,9 @@ public void testResize() throws Exception {
                                                          extractor,
                                                          pattern );
 
-        final FieldIndex fieldIndex = new FieldIndex( extractor,
-                                                      declaration );
+        final IndexedValueReader fieldIndex = new IndexedValueReader(declaration, new RightTupleValueExtractor(extractor));
 
-        final TupleIndexHashTable map = new TupleIndexHashTable( 16, 0.75f, new FieldIndex[]{fieldIndex}, false );
+        final TupleIndexHashTable map = new TupleIndexHashTable( 16, 0.75f, getIndexSupplier(fieldIndex), false );
 
         assertThat(map.size()).isEqualTo(0);
 
@@ -565,10 +565,9 @@ public void testEmptyIterator() {
                                                          extractor,
                                                          pattern );
 
-        final FieldIndex fieldIndex = new FieldIndex( extractor,
-                                                      declaration );
+        final IndexedValueReader fieldIndex = new IndexedValueReader(declaration, new RightTupleValueExtractor(extractor));
 
-        final TupleIndexHashTable map = new TupleIndexHashTable( new FieldIndex[]{fieldIndex}, false );
+        final TupleIndexHashTable map = new TupleIndexHashTable(getIndexSupplier(fieldIndex), false );
 
         final Cheese stilton = new Cheese( "stilton",
                                            55 );

From 911af6f8fea9ed513a72ccbb42948a0e52ec6b8b Mon Sep 17 00:00:00 2001
From: Mario Fusco 
Date: Wed, 20 Dec 2023 17:53:54 +0100
Subject: [PATCH 18/29] bump java to 17 + use new java feature in drools-base
 (#5638)

* bump java to 17 + use new java feature in drools-base

* wip
---
 build-parent/pom.xml                          |   2 +-
 .../BaseObjectClassFieldReader.java           | 136 +++++++-----------
 .../base/common/DroolsObjectInputStream.java  |  10 +-
 .../base/common/RuleBasePartitionId.java      |   2 +-
 .../impl/KnowledgePackageImpl.java            |   4 +-
 .../base/definitions/rule/impl/RuleImpl.java  |  11 +-
 .../facttemplates/FactTemplateObjectType.java |   4 +-
 .../drools/base/rule/LogicTransformer.java    |  31 ++--
 .../java/org/drools/base/rule/Pattern.java    |   6 +-
 .../org/drools/base/rule/QueryArgument.java   |   4 +-
 .../drools/base/rule/SingleAccumulate.java    |   6 +-
 .../accessor/DeclarationScopeResolver.java    |  14 +-
 .../base/rule/accessor/GlobalExtractor.java   |   8 +-
 .../base/rule/accessor/PatternExtractor.java  |   4 +-
 .../rule/constraint/QueryNameConstraint.java  |   2 +-
 .../base/rule/constraint/XpathConstraint.java |  16 +--
 .../drools/base/util/TimeIntervalParser.java  |  24 ++--
 .../util/index/ConstraintTypeOperator.java    |   2 +-
 .../efesto-compilation-manager-core/pom.xml   |  12 --
 19 files changed, 124 insertions(+), 174 deletions(-)

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 49ac0008763..1a9c8d4d3fb 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -35,7 +35,7 @@
 
 
   
-    11
+    17
     ${maven.compiler.release}
     ${maven.compiler.release}
     
diff --git a/drools-base/src/main/java/org/drools/base/base/extractors/BaseObjectClassFieldReader.java b/drools-base/src/main/java/org/drools/base/base/extractors/BaseObjectClassFieldReader.java
index a57546787d3..a23083ef849 100755
--- a/drools-base/src/main/java/org/drools/base/base/extractors/BaseObjectClassFieldReader.java
+++ b/drools-base/src/main/java/org/drools/base/base/extractors/BaseObjectClassFieldReader.java
@@ -41,134 +41,109 @@ protected BaseObjectClassFieldReader(final int index,
                valueType );
     }
 
-    public abstract Object getValue(ValueResolver valueResolver,
-                                    Object object);
+    public abstract Object getValue(ValueResolver valueResolver, Object object);
 
-    public boolean getBooleanValue(ValueResolver valueResolver,
-                                   final Object object) {
-        final Object value = getValue( valueResolver,
-                                       object );
+    public boolean getBooleanValue(ValueResolver valueResolver, Object object) {
+        final Object value = getValue( valueResolver, object );
 
-        if ( value instanceof Boolean ) {
-            return ((Boolean) value).booleanValue();
+        if ( value instanceof Boolean b ) {
+            return b.booleanValue();
         }
         
         throw new RuntimeException( "Conversion to boolean not supported from " + getExtractToClass().getName() );
     }
 
-    public byte getByteValue(ValueResolver valueResolver,
-                             final Object object) {
-        final Object value = getValue( valueResolver,
-                                       object );
+    public byte getByteValue(ValueResolver valueResolver, Object object) {
+        final Object value = getValue( valueResolver, object );
 
-        if ( value instanceof Character ) {
-            return (byte) ((Character) value).charValue();
+        if ( value instanceof Character c ) {
+            return (byte) c.charValue();
         } 
         
         throw new RuntimeException( "Conversion to byte not supported from " +  getExtractToClass().getName());
     }
 
-    public char getCharValue(ValueResolver valueResolver,
-                             final Object object) {
-        final Object value = getValue( valueResolver,
-                                       object );
+    public char getCharValue(ValueResolver valueResolver, Object object) {
+        final Object value = getValue( valueResolver, object );
 
-        if ( value instanceof Character ) {
-            return ((Character) value).charValue();
+        if ( value instanceof Character c ) {
+            return c.charValue();
         } 
         
         throw new RuntimeException( "Conversion to char not supported from " +  getExtractToClass().getName() );
     }
 
-    public double getDoubleValue(ValueResolver valueResolver,
-                                 final Object object) {
-        final Object value = getValue( valueResolver,
-                                       object );
+    public double getDoubleValue(ValueResolver valueResolver, Object object) {
+        final Object value = getValue( valueResolver, object );
 
-        if( value instanceof Character ) {
-            return ((Character) value).charValue();
-        } else if ( value instanceof Number ) {
-            return ((Number) value).doubleValue();
+        if( value instanceof Character c ) {
+            return c.charValue();
+        } else if ( value instanceof Number n ) {
+            return n.doubleValue();
         }
         
         throw new RuntimeException( "Conversion to double not supported from " +  getExtractToClass().getName() );
     }
 
-    public float getFloatValue(ValueResolver valueResolver,
-                               final Object object) {
-        final Object value = getValue( valueResolver,
-                                       object );
+    public float getFloatValue(ValueResolver valueResolver, Object object) {
+        final Object value = getValue( valueResolver, object );
 
-        if( value instanceof Character ) {
-            return ((Character) value).charValue();
-        } else if ( value instanceof Number ) {
-            return ((Number) value).floatValue();
+        if( value instanceof Character c ) {
+            return c.charValue();
+        } else if ( value instanceof Number n ) {
+            return n.floatValue();
         }
         
         throw new RuntimeException( "Conversion to float not supported from " +  getExtractToClass().getName() );
     }
 
-    public int getIntValue(ValueResolver valueResolver,
-                           final Object object) {
-        final Object value = getValue( valueResolver,
-                                       object );
+    public int getIntValue(ValueResolver valueResolver, Object object) {
+        final Object value = getValue( valueResolver, object );
 
-        if( value instanceof Character ) {
-            return ((Character) value).charValue();
-        } else if ( value instanceof Number ) {
-            return ((Number) value).intValue();
+        if( value instanceof Character c ) {
+            return c.charValue();
+        } else if ( value instanceof Number n ) {
+            return n.intValue();
         }
         
         throw new RuntimeException( "Conversion to int not supported from " +  getExtractToClass().getName() );
     }
 
-    public long getLongValue(ValueResolver valueResolver,
-                             final Object object) {
-        final Object value = getValue( valueResolver,
-                                       object );
-
-        if( value instanceof Character ) {
-            return ((Character) value).charValue();
-        } else if ( value instanceof Number ) {
-            return ((Number) value).longValue();
-        } else if ( value instanceof Date ) {
-            return ((Date) value).getTime();
+    public long getLongValue(ValueResolver valueResolver, Object object) {
+        final Object value = getValue( valueResolver, object );
+
+        if( value instanceof Character c ) {
+            return c.charValue();
+        } else if ( value instanceof Number n ) {
+            return n.longValue();
+        } else if ( value instanceof Date d ) {
+            return d.getTime();
         }
         
         throw new RuntimeException( "Conversion to long not supported from " +  getExtractToClass().getName() );
     }
 
-    public short getShortValue(ValueResolver valueResolver,
-                               final Object object) {
-        final Object value = getValue( valueResolver,
-                                       object );
+    public boolean isNullValue(ValueResolver valueResolver, Object object) {
+        return object == null || getValue( valueResolver, object ) == null;
+    }
+
+    public short getShortValue(ValueResolver valueResolver, Object object) {
+        final Object value = getValue( valueResolver, object );
 
-        if( value instanceof Character ) {
-            return (short) ((Character) value).charValue();
-        } else if ( value instanceof Number ) {
-            return ((Number) value).shortValue();
+        if( value instanceof Character c ) {
+            return (short) c.charValue();
+        } else if ( value instanceof Number n ) {
+            return n.shortValue();
         }
 
         throw new RuntimeException( "Conversion to short not supported from " +  getExtractToClass().getName() );
     }
 
-    public boolean isNullValue(ValueResolver valueResolver,
-                               final Object object) {
-        if ( object == null ) {
-            return true;
-        } else {
-            return getValue( valueResolver,
-                             object ) == null;
-        }
-    }
-
     public Method getNativeReadMethod() {
         try {
-            return this.getClass().getMethod(getNativeReadMethodName(),
-                                             ValueResolver.class, Object.class);
+            return this.getClass().getMethod(getNativeReadMethodName(), ValueResolver.class, Object.class);
         } catch ( final Exception e ) {
-            throw new RuntimeException( "This is a bug. Please report to development team: " + e.getMessage(),
-                                        e );
+            throw new RuntimeException( "This is a bug. Please report to development team: " + e.getMessage(), e );
         }
     }
 
@@ -180,11 +155,8 @@ public String getNativeReadMethodName() {
         return "get" + type.getName().substring(0, 1).toUpperCase() + type.getName().substring(1) + "Value";
     }
 
-    public int getHashCode(ValueResolver valueResolver,
-                           final Object object) {
-        final Object value = getValue( valueResolver,
-                                       object );
+    public int getHashCode(ValueResolver valueResolver, Object object) {
+        final Object value = getValue( valueResolver, object );
         return (value != null) ? value.hashCode() : 0;
     }
-
 }
diff --git a/drools-base/src/main/java/org/drools/base/common/DroolsObjectInputStream.java b/drools-base/src/main/java/org/drools/base/common/DroolsObjectInputStream.java
index dbadff5b4fb..2763557b95f 100644
--- a/drools-base/src/main/java/org/drools/base/common/DroolsObjectInputStream.java
+++ b/drools-base/src/main/java/org/drools/base/common/DroolsObjectInputStream.java
@@ -44,9 +44,9 @@ public class DroolsObjectInputStream extends ObjectInputStream
     private Package pkg;
     private ReadAccessorSupplier store;
 
-    private Map>> extractorBinders = new HashMap<>();
+    private final Map>> extractorBinders = new HashMap<>();
     
-    private Map customExtensions = new HashMap<>();
+    private final Map customExtensions = new HashMap<>();
 
     private final Map clonedByIdentity;
 
@@ -131,12 +131,12 @@ public void setStore( ReadAccessorSupplier store ) {
 
     public void readExtractor( Consumer binder ) throws ClassNotFoundException, IOException {
         Object accessor = readObject();
-        if (accessor instanceof AccessorKey ) {
-            ReadAccessor reader = store != null ? store.getReader((AccessorKey) accessor) : null;
+        if (accessor instanceof AccessorKey key) {
+            ReadAccessor reader = store != null ? store.getReader(key) : null;
             if (reader == null) {
                 // when an accessor is used in a query it may have been defined in a different package and that package
                 // couldn't have been deserialized yet, so delay this binding at the end of the deserialization process
-                extractorBinders.computeIfAbsent( (AccessorKey) accessor, k -> new ArrayList<>() ).add( binder );
+                extractorBinders.computeIfAbsent( key, k -> new ArrayList<>() ).add( binder );
             } else {
                 binder.accept( reader );
             }
diff --git a/drools-base/src/main/java/org/drools/base/common/RuleBasePartitionId.java b/drools-base/src/main/java/org/drools/base/common/RuleBasePartitionId.java
index 92c1c51c0ce..a4678819106 100644
--- a/drools-base/src/main/java/org/drools/base/common/RuleBasePartitionId.java
+++ b/drools-base/src/main/java/org/drools/base/common/RuleBasePartitionId.java
@@ -49,7 +49,7 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object obj) {
-        return this == obj || (obj instanceof RuleBasePartitionId && id == ((RuleBasePartitionId)obj).id);
+        return this == obj || (obj instanceof RuleBasePartitionId o && id == o.id);
     }
 
     @Override
diff --git a/drools-base/src/main/java/org/drools/base/definitions/impl/KnowledgePackageImpl.java b/drools-base/src/main/java/org/drools/base/definitions/impl/KnowledgePackageImpl.java
index e8b9004e0bc..f2dc9e3b3f7 100644
--- a/drools-base/src/main/java/org/drools/base/definitions/impl/KnowledgePackageImpl.java
+++ b/drools-base/src/main/java/org/drools/base/definitions/impl/KnowledgePackageImpl.java
@@ -809,8 +809,8 @@ public KnowledgePackageImpl deepCloneIfAlreadyInUse(ClassLoader classLoader) {
                 // if the classloader isn't changed there's no need for a clone
                 return this;
             }
-            if (originalClassLoader instanceof ProjectClassLoader) {
-                ((ProjectClassLoader) classLoader).initFrom((ProjectClassLoader) originalClassLoader);
+            if (originalClassLoader instanceof ProjectClassLoader ocl) {
+                ocl.initFrom((ProjectClassLoader) originalClassLoader);
             }
         }
 
diff --git a/drools-base/src/main/java/org/drools/base/definitions/rule/impl/RuleImpl.java b/drools-base/src/main/java/org/drools/base/definitions/rule/impl/RuleImpl.java
index 4cef19022b5..1a2add11c0a 100644
--- a/drools-base/src/main/java/org/drools/base/definitions/rule/impl/RuleImpl.java
+++ b/drools-base/src/main/java/org/drools/base/definitions/rule/impl/RuleImpl.java
@@ -596,17 +596,16 @@ public GroupElement[] getTransformedLhs(LogicTransformer transformer, Mapfalse.
      */
     public boolean matches(final Object object) {
-        if ( object instanceof Fact ) {
-            return this.factTemplate.equals( ((Fact) object).getFactTemplate() );
+        if ( object instanceof Fact f ) {
+            return this.factTemplate.equals( f.getFactTemplate() );
         } else {
             return false;
         }
diff --git a/drools-base/src/main/java/org/drools/base/rule/LogicTransformer.java b/drools-base/src/main/java/org/drools/base/rule/LogicTransformer.java
index 86607a8ca30..245ba320097 100644
--- a/drools-base/src/main/java/org/drools/base/rule/LogicTransformer.java
+++ b/drools-base/src/main/java/org/drools/base/rule/LogicTransformer.java
@@ -160,8 +160,7 @@ protected void fixClonedDeclarations( GroupElement and, Map global
     private void processElement(final DeclarationScopeResolver resolver,
                                 final Deque contextList,
                                 final RuleConditionElement element) {
-        if ( element instanceof Pattern ) {
-            Pattern pattern = (Pattern) element;
+        if ( element instanceof Pattern pattern ) {
             for ( RuleConditionElement ruleConditionElement : pattern.getNestedElements() ) {
                 processElement( resolver,
                                 contextList,
@@ -174,18 +173,17 @@ private void processElement(final DeclarationScopeResolver resolver,
                 replaceDeclarations( resolver, pattern, constraint );
             }
 
-        } else if ( element instanceof EvalCondition ) {
-            processEvalCondition(resolver, (EvalCondition) element);
+        } else if ( element instanceof EvalCondition eval ) {
+            processEvalCondition(resolver, eval);
 
-        } else if ( element instanceof Accumulate ) {
+        } else if ( element instanceof Accumulate accumulate ) {
             for ( RuleConditionElement rce : element.getNestedElements() ) {
                 processElement( resolver, contextList, rce );
             }
-            Accumulate accumulate = (Accumulate)element;
             replaceDeclarations( resolver, accumulate );
 
-        } else if ( element instanceof From ) {
-            DataProvider provider = ((From) element).getDataProvider();
+        } else if ( element instanceof From from ) {
+            DataProvider provider = from.getDataProvider();
             Declaration[] decl = provider.getRequiredDeclarations();
             for (Declaration aDecl : decl) {
                 Declaration resolved = resolver.getDeclaration(aDecl.getIdentifier());
@@ -202,8 +200,7 @@ private void processElement(final DeclarationScopeResolver resolver,
                 }
             }
 
-        } else if ( element instanceof QueryElement ) {
-            QueryElement qe = ( QueryElement ) element;
+        } else if ( element instanceof QueryElement qe ) {
             Pattern pattern = qe.getResultPattern();
 
             for ( Entry entry : pattern.getInnerDeclarations().entrySet() ) {
@@ -239,8 +236,8 @@ private void processElement(final DeclarationScopeResolver resolver,
             }
             qe.setVariableIndexes( toIntArray( varIndexes ) );
 
-        }  else if ( element instanceof ConditionalBranch ) {
-            processBranch( resolver, (ConditionalBranch) element );
+        }  else if ( element instanceof ConditionalBranch cb ) {
+            processBranch( resolver, cb );
 
         } else {
             contextList.push( element );
@@ -359,9 +356,7 @@ private void processTree(final GroupElement ce, boolean[] result) throws Invalid
         ce.pack();
 
         for (Object child : ce.getChildren().toArray()) {
-            if (child instanceof GroupElement) {
-                final GroupElement group = (GroupElement) child;
-
+            if (child instanceof GroupElement group) {
                 processTree(group, result);
                 if ((group.isOr() || group.isAnd()) && group.getType() == ce.getType()) {
                     group.pack(ce);
@@ -433,9 +428,9 @@ public void transform(final GroupElement parent) throws InvalidPatternException
             int permutations = 1;
             int index = 0;
             for (final RuleConditionElement child : parent.getChildren()) {
-                if ((child instanceof GroupElement) && ((GroupElement) child).isOr()) {
-                    permutations *= ((GroupElement) child).getChildren().size();
-                    orsList.add((GroupElement)child);
+                if ( child instanceof GroupElement ge && ge.isOr()) {
+                    permutations *= ge.getChildren().size();
+                    orsList.add(ge);
                 } else {
                     others[index] = child;
                 }
diff --git a/drools-base/src/main/java/org/drools/base/rule/Pattern.java b/drools-base/src/main/java/org/drools/base/rule/Pattern.java
index 4425cc29ba9..98aef78ff6e 100644
--- a/drools-base/src/main/java/org/drools/base/rule/Pattern.java
+++ b/drools-base/src/main/java/org/drools/base/rule/Pattern.java
@@ -127,8 +127,8 @@ public void readExternal(ObjectInput in) throws IOException,
         tupleIndex = in.readInt();
         objectIndex = in.readInt();
         listenedProperties = (Collection) in.readObject();
-        if ( source instanceof From ) {
-            ((From)source).setResultPattern( this );
+        if ( source instanceof From from ) {
+            from.setResultPattern( this );
         }
         annotations = (Map) in.readObject();
         passive = in.readBoolean();
@@ -558,7 +558,7 @@ public static boolean isCompatibleWithFromReturnType( Class patternType, Clas
     }
 
     private Class getPatternType() {
-        return objectType instanceof ClassObjectType ? ((ClassObjectType)objectType).getClassType() : null;
+        return objectType instanceof ClassObjectType cot ? cot.getClassType() : null;
     }
 
     private static boolean isIterable(Class clazz) {
diff --git a/drools-base/src/main/java/org/drools/base/rule/QueryArgument.java b/drools-base/src/main/java/org/drools/base/rule/QueryArgument.java
index 0b7007ba123..74722c21482 100644
--- a/drools-base/src/main/java/org/drools/base/rule/QueryArgument.java
+++ b/drools-base/src/main/java/org/drools/base/rule/QueryArgument.java
@@ -36,8 +36,8 @@ public interface QueryArgument extends Externalizable {
 
     static Object evaluateDeclaration( ValueResolver valueResolver, BaseTuple tuple, Declaration declaration ) {
         Object tupleObject = tuple.get( declaration ).getObject();
-        if (tupleObject instanceof DroolsQuery && declaration.getExtractor().getIndex() >= 0 &&
-                ( (DroolsQuery) tupleObject ).getVariables()[declaration.getExtractor().getIndex()] != null ) {
+        if (tupleObject instanceof DroolsQuery query && declaration.getExtractor().getIndex() >= 0 &&
+                query.getVariables()[declaration.getExtractor().getIndex()] != null ) {
             return Variable.v;
         }
         return declaration.getValue( valueResolver, tupleObject );
diff --git a/drools-base/src/main/java/org/drools/base/rule/SingleAccumulate.java b/drools-base/src/main/java/org/drools/base/rule/SingleAccumulate.java
index 26c67aee8c9..68fe4f1c69f 100644
--- a/drools-base/src/main/java/org/drools/base/rule/SingleAccumulate.java
+++ b/drools-base/src/main/java/org/drools/base/rule/SingleAccumulate.java
@@ -140,10 +140,8 @@ public Object getResult(final Object workingMemoryContext,
     }
 
     public SingleAccumulate clone() {
-        RuleConditionElement clonedSource = source instanceof GroupElement ? ((GroupElement) source).cloneOnlyGroup() : source.clone();
-        SingleAccumulate clone = new SingleAccumulate( clonedSource,
-                                                       this.requiredDeclarations,
-                                                       this.accumulator );
+        RuleConditionElement clonedSource = source instanceof GroupElement ge ? ge.cloneOnlyGroup() : source.clone();
+        SingleAccumulate clone = new SingleAccumulate( clonedSource, this.requiredDeclarations, this.accumulator );
         registerClone(clone);
         return clone;
     }
diff --git a/drools-base/src/main/java/org/drools/base/rule/accessor/DeclarationScopeResolver.java b/drools-base/src/main/java/org/drools/base/rule/accessor/DeclarationScopeResolver.java
index 65a573a6f42..7bd22b64cbf 100644
--- a/drools-base/src/main/java/org/drools/base/rule/accessor/DeclarationScopeResolver.java
+++ b/drools-base/src/main/java/org/drools/base/rule/accessor/DeclarationScopeResolver.java
@@ -205,7 +205,7 @@ public boolean isDuplicated(RuleImpl rule,
             if ( declaration != null ) {
                 // if it is an OR and it is duplicated, we can stop looking for duplication now
                 // as it is a separate logical branch
-                boolean inOr = ((rce instanceof GroupElement) && ((GroupElement) rce).isOr());
+                boolean inOr = (rce instanceof GroupElement ge && ge.isOr());
                 if ( ! inOr || type == null ) {
                     return ! inOr;
                 }
@@ -216,8 +216,7 @@ public boolean isDuplicated(RuleImpl rule,
         if ( rule != null && rule.getParent() != null ) {
             // recursive algorithm for each parent
             //     -> lhs.getInnerDeclarations()
-            Declaration parentDeclaration = getExtendedDeclaration( rule.getParent(),
-                                                                    name );
+            Declaration parentDeclaration = getExtendedDeclaration( rule.getParent(), name );
             return null != parentDeclaration;
         }
         return false;
@@ -235,14 +234,14 @@ public Map getDeclarations(RuleImpl rule, String consequenc
         Map declarations = new HashMap<>();
         for (RuleConditionElement aBuildList : this.buildList) {
             // if we are inside of an OR we don't want each previous stack entry added because we can't see those variables
-            if (aBuildList instanceof GroupElement && ((GroupElement)aBuildList).getType() == GroupElement.Type.OR) {
+            if (aBuildList instanceof GroupElement ge && ge.getType() == GroupElement.Type.OR) {
                 continue;
             }
 
             // this may be optimized in the future to only re-add elements at
             // scope breaks, like "NOT" and "EXISTS"
-            Map innerDeclarations = aBuildList instanceof GroupElement ?
-                    ((GroupElement)aBuildList).getInnerDeclarations(consequenceName) :
+            Map innerDeclarations = aBuildList instanceof GroupElement ge ?
+                    ge.getInnerDeclarations(consequenceName) :
                     aBuildList.getInnerDeclarations();
             declarations.putAll(innerDeclarations);
         }
@@ -279,8 +278,7 @@ public Pattern findPatternById(int id) {
     private Pattern findPatternInNestedElements(final int id,
                                                 final RuleConditionElement rce) {
         for ( RuleConditionElement element : rce.getNestedElements() ) {
-            if ( element instanceof Pattern ) {
-                Pattern p = (Pattern) element;
+            if ( element instanceof Pattern p ) {
                 if (p.getPatternId() == id ) {
                     return p;
                 }
diff --git a/drools-base/src/main/java/org/drools/base/rule/accessor/GlobalExtractor.java b/drools-base/src/main/java/org/drools/base/rule/accessor/GlobalExtractor.java
index 58005d255bb..fb4808e5fd7 100755
--- a/drools-base/src/main/java/org/drools/base/rule/accessor/GlobalExtractor.java
+++ b/drools-base/src/main/java/org/drools/base/rule/accessor/GlobalExtractor.java
@@ -88,8 +88,8 @@ public ObjectType getObjectType() {
 
     public Class< ? > getExtractToClass() {
         // @todo : this is a bit nasty, but does the trick
-        if ( this.objectType instanceof ClassObjectType ) {
-            return ((ClassObjectType) this.objectType).getClassType();
+        if ( this.objectType instanceof ClassObjectType cot ) {
+            return cot.getClassType();
         } else {
             return Fact.class;
         }
@@ -98,8 +98,8 @@ public ObjectType getObjectType() {
     public String getExtractToClassName() {
         Class< ? > clazz;
         // @todo : this is a bit nasty, but does the trick
-        if ( this.objectType instanceof ClassObjectType ) {
-            clazz = ((ClassObjectType) this.objectType).getClassType();
+        if ( this.objectType instanceof ClassObjectType cot ) {
+            clazz = cot.getClassType();
         } else {
             clazz = Fact.class;
         }
diff --git a/drools-base/src/main/java/org/drools/base/rule/accessor/PatternExtractor.java b/drools-base/src/main/java/org/drools/base/rule/accessor/PatternExtractor.java
index e6f07b3a614..5981010738f 100644
--- a/drools-base/src/main/java/org/drools/base/rule/accessor/PatternExtractor.java
+++ b/drools-base/src/main/java/org/drools/base/rule/accessor/PatternExtractor.java
@@ -46,8 +46,8 @@ public PatternExtractor() {
 
     public PatternExtractor(final ObjectType objectType) {
         this.objectType = objectType;
-        if (objectType instanceof ClassObjectType) {
-            setClassObjectType((ClassObjectType) objectType);
+        if (objectType instanceof ClassObjectType cot) {
+            setClassObjectType(cot);
         }
     }
 
diff --git a/drools-base/src/main/java/org/drools/base/rule/constraint/QueryNameConstraint.java b/drools-base/src/main/java/org/drools/base/rule/constraint/QueryNameConstraint.java
index 401d152164e..8880f8e8187 100644
--- a/drools-base/src/main/java/org/drools/base/rule/constraint/QueryNameConstraint.java
+++ b/drools-base/src/main/java/org/drools/base/rule/constraint/QueryNameConstraint.java
@@ -143,7 +143,7 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object obj) {
-        return obj instanceof QueryNameConstraint && queryName.equals(((QueryNameConstraint)obj).queryName);
+        return obj instanceof QueryNameConstraint qnc && queryName.equals(qnc.queryName);
     }
 
     @Override
diff --git a/drools-base/src/main/java/org/drools/base/rule/constraint/XpathConstraint.java b/drools-base/src/main/java/org/drools/base/rule/constraint/XpathConstraint.java
index 519baa71d7b..0fd570f73d4 100644
--- a/drools-base/src/main/java/org/drools/base/rule/constraint/XpathConstraint.java
+++ b/drools-base/src/main/java/org/drools/base/rule/constraint/XpathConstraint.java
@@ -195,13 +195,13 @@ public Iterable evaluate(ValueResolver valueResolver, BaseTuple leftBaseTuple
 
         private List evaluateObject(ValueResolver valueResolver, BaseTuple leftBaseTuple, XpathChunk chunk, List list, Object object) {
             Object result = chunk.evaluate(object);
-            if (!chunk.lazy && result instanceof ReactiveObject) {
-                ((ReactiveObject) result).addTuple(leftBaseTuple);
+            if (!chunk.lazy && result instanceof ReactiveObject ro) {
+                ro.addTuple(leftBaseTuple);
             }
-            if (chunk.iterate && result instanceof Iterable) {
-                for (Object value : (Iterable) result) {
-                    if (!chunk.lazy && value instanceof ReactiveObject) {
-                        ((ReactiveObject) value).addTuple(leftBaseTuple);
+            if (chunk.iterate && result instanceof Iterable i) {
+                for (Object value : i) {
+                    if (!chunk.lazy && value instanceof ReactiveObject ro) {
+                        ro.addTuple(leftBaseTuple);
                     }
                     if (value != null) {
                         list.add(value);
@@ -380,8 +380,8 @@ private Class getItemClass(Method accessor) {
 
         private Class getParametricType(Method accessor) {
             Type returnedType = accessor.getGenericReturnType();
-            if (returnedType instanceof ParameterizedType) {
-                Type[] parametricType = ((ParameterizedType) returnedType).getActualTypeArguments();
+            if (returnedType instanceof ParameterizedType pt) {
+                Type[] parametricType = pt.getActualTypeArguments();
                 if (parametricType.length > 0) {
                     return parametricType[0] instanceof Class ?
                            (Class) parametricType[0] :
diff --git a/drools-base/src/main/java/org/drools/base/util/TimeIntervalParser.java b/drools-base/src/main/java/org/drools/base/util/TimeIntervalParser.java
index 8d89d95af1b..a10add59881 100644
--- a/drools-base/src/main/java/org/drools/base/util/TimeIntervalParser.java
+++ b/drools-base/src/main/java/org/drools/base/util/TimeIntervalParser.java
@@ -54,24 +54,24 @@ public static long parseSingle(String param) {
     }
 
     public static long getTimestampFromDate( Object obj ) {
-        if (obj instanceof Long ) {
-            return ( Long ) obj;
+        if (obj instanceof Long l ) {
+            return l;
         }
-        if (obj instanceof Date) {
-            return ( (Date) obj ).getTime();
+        if (obj instanceof Date d) {
+            return d.getTime();
         }
         try {
-            if (obj instanceof LocalDate) {
-                return ((LocalDate) obj).atStartOfDay().atZone(java.time.ZoneId.systemDefault()).toInstant().toEpochMilli();
+            if (obj instanceof LocalDate ld) {
+                return ld.atStartOfDay().atZone(java.time.ZoneId.systemDefault()).toInstant().toEpochMilli();
             }
-            if (obj instanceof LocalDateTime) {
-                return ((LocalDateTime) obj).atZone(java.time.ZoneId.systemDefault()).toInstant().toEpochMilli();
+            if (obj instanceof LocalDateTime ldt) {
+                return ldt.atZone(java.time.ZoneId.systemDefault()).toInstant().toEpochMilli();
             }
-            if (obj instanceof ZonedDateTime) {
-                return ((ZonedDateTime) obj).toInstant().toEpochMilli();
+            if (obj instanceof ZonedDateTime zdt) {
+                return zdt.toInstant().toEpochMilli();
             }
-            if (obj instanceof Instant) {
-                return ((Instant) obj).toEpochMilli();
+            if (obj instanceof Instant i) {
+                return i.toEpochMilli();
             }
         } catch (ArithmeticException ae) {
             throw new RuntimeException("Cannot convert " + obj.getClass().getSimpleName() + " '" + obj + "' into a long value");
diff --git a/drools-base/src/main/java/org/drools/base/util/index/ConstraintTypeOperator.java b/drools-base/src/main/java/org/drools/base/util/index/ConstraintTypeOperator.java
index 51e88d6c8b1..66322da4d31 100644
--- a/drools-base/src/main/java/org/drools/base/util/index/ConstraintTypeOperator.java
+++ b/drools-base/src/main/java/org/drools/base/util/index/ConstraintTypeOperator.java
@@ -142,6 +142,6 @@ public static ConstraintTypeOperator decode(String operator, boolean negated) {
     }
 
     public static ConstraintTypeOperator getType(Constraint constraint) {
-        return constraint instanceof IndexableConstraint ? ((IndexableConstraint) constraint).getConstraintType() : UNKNOWN;
+        return constraint instanceof IndexableConstraint ic ? ic.getConstraintType() : UNKNOWN;
     }
 }
diff --git a/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-core/pom.xml b/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-core/pom.xml
index c7924cb8ebb..fc8e91fd7c8 100644
--- a/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-core/pom.xml
+++ b/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-core/pom.xml
@@ -23,18 +23,6 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
-  
-    
-      
-        org.apache.maven.plugins
-        maven-compiler-plugin
-        
-          11
-          11
-        
-      
-    
-  
 
   
     org.kie

From 7e58810d192d899163a92ab6ec25897b67ca88e6 Mon Sep 17 00:00:00 2001
From: Enrique 
Date: Wed, 27 Dec 2023 15:09:39 +0100
Subject: [PATCH 19/29] [incubator-kie-issues-576] add tests for data audit
 (#5571)

---
 .../java/org/kie/api/event/usertask/UserTaskStateEvent.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kie-api/src/main/java/org/kie/api/event/usertask/UserTaskStateEvent.java b/kie-api/src/main/java/org/kie/api/event/usertask/UserTaskStateEvent.java
index 41c2ecf021c..7ed47cc4d37 100644
--- a/kie-api/src/main/java/org/kie/api/event/usertask/UserTaskStateEvent.java
+++ b/kie-api/src/main/java/org/kie/api/event/usertask/UserTaskStateEvent.java
@@ -21,6 +21,10 @@
 
 public interface UserTaskStateEvent extends UserTaskEvent {
 
+    String getNewStatus();
+
+    String getOldStatus();
+
 
 
 }

From b8e3d2d24793f34a2d98f0af86c8a9a60d4f0228 Mon Sep 17 00:00:00 2001
From: Toshiya Kobayashi 
Date: Mon, 8 Jan 2024 20:06:28 +0900
Subject: [PATCH 20/29] [KIE-790]  Build error on RuleUnit multiple OOPath
 lines (#5640)

* [KIE-790] Build error on RuleUnit OOPath syntax with multiple DataSources
- Test case

* - generate grammer
- comment out unused antlr gen
---
 drools-drl/drools-drl-parser/pom.xml          |   54 +-
 .../drl/parser/lang/DRL6Expressions.java      | 2168 +++++++++--------
 .../org/drools/drl/parser/lang/DRL6Lexer.java |  723 +++---
 .../org/drools/drl/parser/DRL6Expressions.g   |   23 +-
 .../org/drools/drl/parser/DRL6Lexer.g         |    4 +-
 .../impl/MultipleDataSourceUnit.java          |   58 +
 .../impl/RuleUnitProviderImplTest.java        |   14 +
 .../ruleunits/impl/domain/Measurement.java    |   53 +
 .../drools/ruleunits/impl/domain/Sensor.java  |   37 +
 .../ruleunits/impl/MultipleDataSource.drl     |   28 +
 10 files changed, 1674 insertions(+), 1488 deletions(-)
 create mode 100644 drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/MultipleDataSourceUnit.java
 create mode 100644 drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/domain/Measurement.java
 create mode 100644 drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/domain/Sensor.java
 create mode 100644 drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/MultipleDataSource.drl

diff --git a/drools-drl/drools-drl-parser/pom.xml b/drools-drl/drools-drl-parser/pom.xml
index da1b10925f9..545625e5ad4 100644
--- a/drools-drl/drools-drl-parser/pom.xml
+++ b/drools-drl/drools-drl-parser/pom.xml
@@ -127,47 +127,47 @@
                                             
                                         
                                         
+
+
+
+
+
                                         
-                                            
-                                            
-                                            
-                                        
-                                        
-                                            
-                                            
+                                            
+                                            
                                             
                                         
                                         
+
+
+
+
+
                                         
-                                            
-                                            
-                                            
-                                        
-                                        
-                                            
-                                            
-                                            
-                                        
-                                        
-                                            
-                                                
-                                            
-                                        
-                                        
-                                        
-                                            
+                                            
+                                            
                                             
                                         
-                                        
-                                            
+                                        
+                                            
                                                 
                                             
                                         
+
+
+
+
+
+
+
+
+
+
                                         
                                             
                                                 
                                             
-                                            
+                                            
                                                 
                                                 
                                                 
diff --git a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/lang/DRL6Expressions.java b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/lang/DRL6Expressions.java
index 2c82b558882..36d202ee96c 100644
--- a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/lang/DRL6Expressions.java
+++ b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/lang/DRL6Expressions.java
@@ -1,32 +1,18 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-// $ANTLR 3.5.2 src/main/resources/org/drools/compiler/lang/DRL6Expressions.g 2020-01-07 16:38:43
+// $ANTLR 3.5.2 src/main/resources/org/drools/drl/parser/DRL6Expressions.g 2024-01-03 11:41:51
 
     package org.drools.drl.parser.lang;
 
     import java.util.LinkedList;
     import org.drools.drl.parser.DroolsParserException;
+    import org.drools.drl.parser.lang.ParserHelper;
+    import org.drools.drl.parser.lang.DroolsParserExceptionFactory;
+    import org.drools.drl.parser.lang.Location;
 
-	import org.drools.drl.ast.dsl.AnnotatedDescrBuilder;
+    import org.drools.drl.ast.dsl.AnnotatedDescrBuilder;
     import org.drools.drl.ast.dsl.AnnotationDescrBuilder;
 
     import org.drools.drl.ast.descr.AtomicExprDescr;
+    import org.drools.drl.ast.descr.AnnotatedBaseDescr;
     import org.drools.drl.ast.descr.AnnotationDescr;
     import org.drools.drl.ast.descr.BaseDescr;
     import org.drools.drl.ast.descr.ConstraintConnectiveDescr;
@@ -37,6 +23,9 @@
 import org.antlr.runtime.*;
 import java.util.Stack;
 import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
 
 @SuppressWarnings("all")
 public class DRL6Expressions extends DRLExpressions {
@@ -141,7 +130,7 @@ public DRL6Expressions(TokenStream input, RecognizerSharedState state) {
 	}
 
 	@Override public String[] getTokenNames() { return DRL6Expressions.tokenNames; }
-	@Override public String getGrammarFileName() { return "src/main/resources/org/drools/compiler/lang/DRL6Expressions.g"; }
+	@Override public String getGrammarFileName() { return "src/main/resources/org/drools/drl/parser/DRL6Expressions.g"; }
 
 
 	    private ParserHelper helper;
@@ -190,13 +179,20 @@ private boolean isNotEOF() {
 	        return input.get( input.index() ).getType() != DRL6Lexer.EOF;
 	    }
 
+	    private boolean notStartWithNewline() {
+	        int currentTokenIndex = input.index(); // current position in input stream
+	        Token previousHiddenToken = input.get(currentTokenIndex - 1);
+	        String previousHiddenTokenText = previousHiddenToken.getText();
+	        return !previousHiddenTokenText.contains("\n");
+	    }
+
 
 	public static class literal_return extends ParserRuleReturnScope {
 	};
 
 
 	// $ANTLR start "literal"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:89:1: literal : ( STRING | DECIMAL | HEX | FLOAT | BOOL | NULL | TIME_INTERVAL | STAR );
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:96:1: literal : ( STRING | DECIMAL | HEX | FLOAT | BOOL | NULL | TIME_INTERVAL | STAR );
 	public final DRL6Expressions.literal_return literal() throws RecognitionException {
 		DRL6Expressions.literal_return retval = new DRL6Expressions.literal_return();
 		retval.start = input.LT(1);
@@ -211,7 +207,7 @@ public final DRL6Expressions.literal_return literal() throws RecognitionExceptio
 		Token STAR8=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:90:5: ( STRING | DECIMAL | HEX | FLOAT | BOOL | NULL | TIME_INTERVAL | STAR )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:97:5: ( STRING | DECIMAL | HEX | FLOAT | BOOL | NULL | TIME_INTERVAL | STAR )
 			int alt1=8;
 			switch ( input.LA(1) ) {
 			case STRING:
@@ -262,56 +258,56 @@ public final DRL6Expressions.literal_return literal() throws RecognitionExceptio
 			}
 			switch (alt1) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:90:7: STRING
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:97:7: STRING
 					{
 					STRING1=(Token)match(input,STRING,FOLLOW_STRING_in_literal92); if (state.failed) return retval;
 					if ( state.backtracking==0 ) {	helper.emit(STRING1, DroolsEditorType.STRING_CONST);	}
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:91:7: DECIMAL
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:98:7: DECIMAL
 					{
 					DECIMAL2=(Token)match(input,DECIMAL,FOLLOW_DECIMAL_in_literal109); if (state.failed) return retval;
 					if ( state.backtracking==0 ) {	helper.emit(DECIMAL2, DroolsEditorType.NUMERIC_CONST);	}
 					}
 					break;
 				case 3 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:92:7: HEX
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:99:7: HEX
 					{
 					HEX3=(Token)match(input,HEX,FOLLOW_HEX_in_literal125); if (state.failed) return retval;
 					if ( state.backtracking==0 ) {	helper.emit(HEX3, DroolsEditorType.NUMERIC_CONST);	}
 					}
 					break;
 				case 4 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:93:7: FLOAT
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:100:7: FLOAT
 					{
 					FLOAT4=(Token)match(input,FLOAT,FOLLOW_FLOAT_in_literal145); if (state.failed) return retval;
 					if ( state.backtracking==0 ) {	helper.emit(FLOAT4, DroolsEditorType.NUMERIC_CONST);	}
 					}
 					break;
 				case 5 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:94:7: BOOL
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:101:7: BOOL
 					{
 					BOOL5=(Token)match(input,BOOL,FOLLOW_BOOL_in_literal163); if (state.failed) return retval;
 					if ( state.backtracking==0 ) {	helper.emit(BOOL5, DroolsEditorType.BOOLEAN_CONST);	}
 					}
 					break;
 				case 6 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:95:7: NULL
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:102:7: NULL
 					{
 					NULL6=(Token)match(input,NULL,FOLLOW_NULL_in_literal182); if (state.failed) return retval;
 					if ( state.backtracking==0 ) {	helper.emit(NULL6, DroolsEditorType.NULL_CONST);	}
 					}
 					break;
 				case 7 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:96:9: TIME_INTERVAL
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:103:9: TIME_INTERVAL
 					{
 					TIME_INTERVAL7=(Token)match(input,TIME_INTERVAL,FOLLOW_TIME_INTERVAL_in_literal203); if (state.failed) return retval;
 					if ( state.backtracking==0 ) {	helper.emit(TIME_INTERVAL7, DroolsEditorType.NULL_CONST); }
 					}
 					break;
 				case 8 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:97:9: STAR
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:104:9: STAR
 					{
 					STAR8=(Token)match(input,STAR,FOLLOW_STAR_in_literal215); if (state.failed) return retval;
 					if ( state.backtracking==0 ) { helper.emit(STAR8, DroolsEditorType.NUMERIC_CONST); }
@@ -342,7 +338,7 @@ public static class operator_return extends ParserRuleReturnScope {
 
 
 	// $ANTLR start "operator"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:100:1: operator returns [boolean negated, String opr] : (x= TILDE )? (op= EQUALS |op= NOT_EQUALS |rop= relationalOp ) ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:107:1: operator returns [boolean negated, String opr] : (x= TILDE )? (op= EQUALS |op= NOT_EQUALS |rop= relationalOp ) ;
 	public final DRL6Expressions.operator_return operator() throws RecognitionException {
 		DRL6Expressions.operator_return retval = new DRL6Expressions.operator_return();
 		retval.start = input.LT(1);
@@ -353,10 +349,10 @@ public final DRL6Expressions.operator_return operator() throws RecognitionExcept
 
 		 if ( isNotEOF() ) helper.emit( Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR ); helper.setHasOperator( true ); 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:103:3: ( (x= TILDE )? (op= EQUALS |op= NOT_EQUALS |rop= relationalOp ) )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:103:5: (x= TILDE )? (op= EQUALS |op= NOT_EQUALS |rop= relationalOp )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:110:3: ( (x= TILDE )? (op= EQUALS |op= NOT_EQUALS |rop= relationalOp ) )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:110:5: (x= TILDE )? (op= EQUALS |op= NOT_EQUALS |rop= relationalOp )
 			{
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:103:6: (x= TILDE )?
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:110:6: (x= TILDE )?
 			int alt2=2;
 			int LA2_0 = input.LA(1);
 			if ( (LA2_0==TILDE) ) {
@@ -367,7 +363,7 @@ public final DRL6Expressions.operator_return operator() throws RecognitionExcept
 			}
 			switch (alt2) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:103:6: x= TILDE
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:110:6: x= TILDE
 					{
 					x=(Token)match(input,TILDE,FOLLOW_TILDE_in_operator256); if (state.failed) return retval;
 					}
@@ -375,7 +371,7 @@ public final DRL6Expressions.operator_return operator() throws RecognitionExcept
 
 			}
 
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:104:5: (op= EQUALS |op= NOT_EQUALS |rop= relationalOp )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:111:5: (op= EQUALS |op= NOT_EQUALS |rop= relationalOp )
 			int alt3=3;
 			int LA3_0 = input.LA(1);
 			if ( (LA3_0==EQUALS) ) {
@@ -393,21 +389,21 @@ else if ( (LA3_0==ID) && ((((helper.validateIdentifierKey(DroolsSoftKeywords.NOT
 
 			switch (alt3) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:104:7: op= EQUALS
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:111:7: op= EQUALS
 					{
 					op=(Token)match(input,EQUALS,FOLLOW_EQUALS_in_operator267); if (state.failed) return retval;
 					if ( state.backtracking==0 ) { retval.negated = false; retval.opr =(x != null ? (x!=null?x.getText():null) : "")+(op!=null?op.getText():null); helper.emit(op, DroolsEditorType.SYMBOL); }
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:105:7: op= NOT_EQUALS
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:112:7: op= NOT_EQUALS
 					{
 					op=(Token)match(input,NOT_EQUALS,FOLLOW_NOT_EQUALS_in_operator286); if (state.failed) return retval;
 					if ( state.backtracking==0 ) { retval.negated = false; retval.opr =(x != null ? (x!=null?x.getText():null) : "")+(op!=null?op.getText():null); helper.emit(op, DroolsEditorType.SYMBOL); }
 					}
 					break;
 				case 3 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:106:7: rop= relationalOp
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:113:7: rop= relationalOp
 					{
 					pushFollow(FOLLOW_relationalOp_in_operator301);
 					rop=relationalOp();
@@ -446,7 +442,7 @@ public static class relationalOp_return extends ParserRuleReturnScope {
 
 
 	// $ANTLR start "relationalOp"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:112:1: relationalOp returns [boolean negated, String opr, java.util.List params] : (op= LESS_EQUALS |op= GREATER_EQUALS |op= LESS |op= GREATER |xop= complexOp | not_key nop= neg_operator_key |cop= operator_key ) ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:119:1: relationalOp returns [boolean negated, String opr, java.util.List params] : (op= LESS_EQUALS |op= GREATER_EQUALS |op= LESS |op= GREATER |xop= complexOp | not_key nop= neg_operator_key |cop= operator_key ) ;
 	public final DRL6Expressions.relationalOp_return relationalOp() throws RecognitionException {
 		DRL6Expressions.relationalOp_return retval = new DRL6Expressions.relationalOp_return();
 		retval.start = input.LT(1);
@@ -458,10 +454,10 @@ public final DRL6Expressions.relationalOp_return relationalOp() throws Recogniti
 
 		 if ( isNotEOF() ) helper.emit( Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR ); helper.setHasOperator( true ); 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:115:3: ( (op= LESS_EQUALS |op= GREATER_EQUALS |op= LESS |op= GREATER |xop= complexOp | not_key nop= neg_operator_key |cop= operator_key ) )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:115:5: (op= LESS_EQUALS |op= GREATER_EQUALS |op= LESS |op= GREATER |xop= complexOp | not_key nop= neg_operator_key |cop= operator_key )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:122:3: ( (op= LESS_EQUALS |op= GREATER_EQUALS |op= LESS |op= GREATER |xop= complexOp | not_key nop= neg_operator_key |cop= operator_key ) )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:122:5: (op= LESS_EQUALS |op= GREATER_EQUALS |op= LESS |op= GREATER |xop= complexOp | not_key nop= neg_operator_key |cop= operator_key )
 			{
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:115:5: (op= LESS_EQUALS |op= GREATER_EQUALS |op= LESS |op= GREATER |xop= complexOp | not_key nop= neg_operator_key |cop= operator_key )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:122:5: (op= LESS_EQUALS |op= GREATER_EQUALS |op= LESS |op= GREATER |xop= complexOp | not_key nop= neg_operator_key |cop= operator_key )
 			int alt4=7;
 			int LA4_0 = input.LA(1);
 			if ( (LA4_0==LESS_EQUALS) ) {
@@ -505,35 +501,35 @@ else if ( (((helper.isPluggableEvaluator(false)))) ) {
 
 			switch (alt4) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:115:7: op= LESS_EQUALS
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:122:7: op= LESS_EQUALS
 					{
 					op=(Token)match(input,LESS_EQUALS,FOLLOW_LESS_EQUALS_in_relationalOp342); if (state.failed) return retval;
 					if ( state.backtracking==0 ) { retval.negated = false; retval.opr =(op!=null?op.getText():null); retval.params = null; helper.emit(op, DroolsEditorType.SYMBOL);}
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:116:7: op= GREATER_EQUALS
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:123:7: op= GREATER_EQUALS
 					{
 					op=(Token)match(input,GREATER_EQUALS,FOLLOW_GREATER_EQUALS_in_relationalOp358); if (state.failed) return retval;
 					if ( state.backtracking==0 ) { retval.negated = false; retval.opr =(op!=null?op.getText():null); retval.params = null; helper.emit(op, DroolsEditorType.SYMBOL);}
 					}
 					break;
 				case 3 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:117:7: op= LESS
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:124:7: op= LESS
 					{
 					op=(Token)match(input,LESS,FOLLOW_LESS_in_relationalOp371); if (state.failed) return retval;
 					if ( state.backtracking==0 ) { retval.negated = false; retval.opr =(op!=null?op.getText():null); retval.params = null; helper.emit(op, DroolsEditorType.SYMBOL);}
 					}
 					break;
 				case 4 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:118:7: op= GREATER
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:125:7: op= GREATER
 					{
 					op=(Token)match(input,GREATER,FOLLOW_GREATER_in_relationalOp394); if (state.failed) return retval;
 					if ( state.backtracking==0 ) { retval.negated = false; retval.opr =(op!=null?op.getText():null); retval.params = null; helper.emit(op, DroolsEditorType.SYMBOL);}
 					}
 					break;
 				case 5 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:119:7: xop= complexOp
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:126:7: xop= complexOp
 					{
 					pushFollow(FOLLOW_complexOp_in_relationalOp414);
 					xop=complexOp();
@@ -543,7 +539,7 @@ else if ( (((helper.isPluggableEvaluator(false)))) ) {
 					}
 					break;
 				case 6 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:120:7: not_key nop= neg_operator_key
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:127:7: not_key nop= neg_operator_key
 					{
 					pushFollow(FOLLOW_not_key_in_relationalOp429);
 					not_key();
@@ -557,7 +553,7 @@ else if ( (((helper.isPluggableEvaluator(false)))) ) {
 					}
 					break;
 				case 7 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:121:7: cop= operator_key
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:128:7: cop= operator_key
 					{
 					pushFollow(FOLLOW_operator_key_in_relationalOp445);
 					cop=operator_key();
@@ -590,7 +586,7 @@ else if ( (((helper.isPluggableEvaluator(false)))) ) {
 
 
 	// $ANTLR start "complexOp"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:125:1: complexOp returns [String opr] : t= TILDE e= EQUALS_ASSIGN ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:132:1: complexOp returns [String opr] : t= TILDE e= EQUALS_ASSIGN ;
 	public final String complexOp() throws RecognitionException {
 		String opr = null;
 
@@ -599,8 +595,8 @@ public final String complexOp() throws RecognitionException {
 		Token e=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:126:5: (t= TILDE e= EQUALS_ASSIGN )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:126:7: t= TILDE e= EQUALS_ASSIGN
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:133:5: (t= TILDE e= EQUALS_ASSIGN )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:133:7: t= TILDE e= EQUALS_ASSIGN
 			{
 			t=(Token)match(input,TILDE,FOLLOW_TILDE_in_complexOp477); if (state.failed) return opr;
 			e=(Token)match(input,EQUALS_ASSIGN,FOLLOW_EQUALS_ASSIGN_in_complexOp481); if (state.failed) return opr;
@@ -623,17 +619,17 @@ public final String complexOp() throws RecognitionException {
 
 
 	// $ANTLR start "typeList"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:129:1: typeList : type ( COMMA type )* ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:136:1: typeList : type ( COMMA type )* ;
 	public final void typeList() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:130:5: ( type ( COMMA type )* )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:130:7: type ( COMMA type )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:137:5: ( type ( COMMA type )* )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:137:7: type ( COMMA type )*
 			{
 			pushFollow(FOLLOW_type_in_typeList502);
 			type();
 			state._fsp--;
 			if (state.failed) return;
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:130:12: ( COMMA type )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:137:12: ( COMMA type )*
 			loop5:
 			while (true) {
 				int alt5=2;
@@ -644,7 +640,7 @@ public final void typeList() throws RecognitionException {
 
 				switch (alt5) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:130:13: COMMA type
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:137:13: COMMA type
 					{
 					match(input,COMMA,FOLLOW_COMMA_in_typeList505); if (state.failed) return;
 					pushFollow(FOLLOW_type_in_typeList507);
@@ -679,14 +675,14 @@ public static class type_return extends ParserRuleReturnScope {
 
 
 	// $ANTLR start "type"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:133:1: type : tm= typeMatch ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:140:1: type : tm= typeMatch ;
 	public final DRL6Expressions.type_return type() throws RecognitionException {
 		DRL6Expressions.type_return retval = new DRL6Expressions.type_return();
 		retval.start = input.LT(1);
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:134:5: (tm= typeMatch )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:134:8: tm= typeMatch
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:141:5: (tm= typeMatch )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:141:8: tm= typeMatch
 			{
 			pushFollow(FOLLOW_typeMatch_in_type529);
 			typeMatch();
@@ -712,10 +708,10 @@ public final DRL6Expressions.type_return type() throws RecognitionException {
 
 
 	// $ANTLR start "typeMatch"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:137:1: typeMatch : ( ( primitiveType )=> ( primitiveType ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* ) | ( ID ( ( typeArguments )=> typeArguments )? ( DOT ID ( ( typeArguments )=> typeArguments )? )* ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* ) );
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:144:1: typeMatch : ( ( primitiveType )=> ( primitiveType ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* ) | ( ID ( ( typeArguments )=> typeArguments )? ( DOT ID ( ( typeArguments )=> typeArguments )? )* ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* ) );
 	public final void typeMatch() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:138:5: ( ( primitiveType )=> ( primitiveType ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* ) | ( ID ( ( typeArguments )=> typeArguments )? ( DOT ID ( ( typeArguments )=> typeArguments )? )* ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* ) )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:145:5: ( ( primitiveType )=> ( primitiveType ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* ) | ( ID ( ( typeArguments )=> typeArguments )? ( DOT ID ( ( typeArguments )=> typeArguments )? )* ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* ) )
 			int alt11=2;
 			int LA11_0 = input.LA(1);
 			if ( (LA11_0==ID) ) {
@@ -738,16 +734,16 @@ else if ( (true) ) {
 
 			switch (alt11) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:138:8: ( primitiveType )=> ( primitiveType ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* )
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:145:8: ( primitiveType )=> ( primitiveType ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* )
 					{
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:138:27: ( primitiveType ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* )
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:138:29: primitiveType ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )*
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:145:27: ( primitiveType ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* )
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:145:29: primitiveType ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )*
 					{
 					pushFollow(FOLLOW_primitiveType_in_typeMatch555);
 					primitiveType();
 					state._fsp--;
 					if (state.failed) return;
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:138:43: ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )*
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:145:43: ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )*
 					loop6:
 					while (true) {
 						int alt6=2;
@@ -758,7 +754,7 @@ else if ( (true) ) {
 
 						switch (alt6) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:138:44: ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:145:44: ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE
 							{
 							match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_typeMatch565); if (state.failed) return;
 							match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_typeMatch567); if (state.failed) return;
@@ -775,13 +771,13 @@ else if ( (true) ) {
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:139:7: ( ID ( ( typeArguments )=> typeArguments )? ( DOT ID ( ( typeArguments )=> typeArguments )? )* ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* )
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:146:7: ( ID ( ( typeArguments )=> typeArguments )? ( DOT ID ( ( typeArguments )=> typeArguments )? )* ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* )
 					{
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:139:7: ( ID ( ( typeArguments )=> typeArguments )? ( DOT ID ( ( typeArguments )=> typeArguments )? )* ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* )
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:139:9: ID ( ( typeArguments )=> typeArguments )? ( DOT ID ( ( typeArguments )=> typeArguments )? )* ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )*
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:146:7: ( ID ( ( typeArguments )=> typeArguments )? ( DOT ID ( ( typeArguments )=> typeArguments )? )* ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* )
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:146:9: ID ( ( typeArguments )=> typeArguments )? ( DOT ID ( ( typeArguments )=> typeArguments )? )* ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )*
 					{
 					match(input,ID,FOLLOW_ID_in_typeMatch581); if (state.failed) return;
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:139:12: ( ( typeArguments )=> typeArguments )?
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:146:12: ( ( typeArguments )=> typeArguments )?
 					int alt7=2;
 					int LA7_0 = input.LA(1);
 					if ( (LA7_0==LESS) ) {
@@ -795,7 +791,7 @@ else if ( (LA7_1==QUESTION) && (synpred3_DRL6Expressions())) {
 					}
 					switch (alt7) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:139:13: ( typeArguments )=> typeArguments
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:146:13: ( typeArguments )=> typeArguments
 							{
 							pushFollow(FOLLOW_typeArguments_in_typeMatch588);
 							typeArguments();
@@ -806,7 +802,7 @@ else if ( (LA7_1==QUESTION) && (synpred3_DRL6Expressions())) {
 
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:139:46: ( DOT ID ( ( typeArguments )=> typeArguments )? )*
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:146:46: ( DOT ID ( ( typeArguments )=> typeArguments )? )*
 					loop9:
 					while (true) {
 						int alt9=2;
@@ -817,11 +813,11 @@ else if ( (LA7_1==QUESTION) && (synpred3_DRL6Expressions())) {
 
 						switch (alt9) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:139:47: DOT ID ( ( typeArguments )=> typeArguments )?
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:146:47: DOT ID ( ( typeArguments )=> typeArguments )?
 							{
 							match(input,DOT,FOLLOW_DOT_in_typeMatch593); if (state.failed) return;
 							match(input,ID,FOLLOW_ID_in_typeMatch595); if (state.failed) return;
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:139:54: ( ( typeArguments )=> typeArguments )?
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:146:54: ( ( typeArguments )=> typeArguments )?
 							int alt8=2;
 							int LA8_0 = input.LA(1);
 							if ( (LA8_0==LESS) ) {
@@ -835,7 +831,7 @@ else if ( (LA8_1==QUESTION) && (synpred4_DRL6Expressions())) {
 							}
 							switch (alt8) {
 								case 1 :
-									// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:139:55: ( typeArguments )=> typeArguments
+									// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:146:55: ( typeArguments )=> typeArguments
 									{
 									pushFollow(FOLLOW_typeArguments_in_typeMatch602);
 									typeArguments();
@@ -854,7 +850,7 @@ else if ( (LA8_1==QUESTION) && (synpred4_DRL6Expressions())) {
 						}
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:139:91: ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )*
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:146:91: ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )*
 					loop10:
 					while (true) {
 						int alt10=2;
@@ -865,7 +861,7 @@ else if ( (LA8_1==QUESTION) && (synpred4_DRL6Expressions())) {
 
 						switch (alt10) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:139:92: ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:146:92: ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE
 							{
 							match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_typeMatch617); if (state.failed) return;
 							match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_typeMatch619); if (state.failed) return;
@@ -898,18 +894,18 @@ else if ( (LA8_1==QUESTION) && (synpred4_DRL6Expressions())) {
 
 
 	// $ANTLR start "typeArguments"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:142:1: typeArguments : LESS typeArgument ( COMMA typeArgument )* GREATER ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:149:1: typeArguments : LESS typeArgument ( COMMA typeArgument )* GREATER ;
 	public final void typeArguments() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:143:5: ( LESS typeArgument ( COMMA typeArgument )* GREATER )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:143:7: LESS typeArgument ( COMMA typeArgument )* GREATER
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:150:5: ( LESS typeArgument ( COMMA typeArgument )* GREATER )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:150:7: LESS typeArgument ( COMMA typeArgument )* GREATER
 			{
 			match(input,LESS,FOLLOW_LESS_in_typeArguments640); if (state.failed) return;
 			pushFollow(FOLLOW_typeArgument_in_typeArguments642);
 			typeArgument();
 			state._fsp--;
 			if (state.failed) return;
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:143:25: ( COMMA typeArgument )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:150:25: ( COMMA typeArgument )*
 			loop12:
 			while (true) {
 				int alt12=2;
@@ -920,7 +916,7 @@ public final void typeArguments() throws RecognitionException {
 
 				switch (alt12) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:143:26: COMMA typeArgument
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:150:26: COMMA typeArgument
 					{
 					match(input,COMMA,FOLLOW_COMMA_in_typeArguments645); if (state.failed) return;
 					pushFollow(FOLLOW_typeArgument_in_typeArguments647);
@@ -953,10 +949,10 @@ public final void typeArguments() throws RecognitionException {
 
 
 	// $ANTLR start "typeArgument"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:146:1: typeArgument : ( type | QUESTION ( ( extends_key | super_key ) type )? );
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:153:1: typeArgument : ( type | QUESTION ( ( extends_key | super_key ) type )? );
 	public final void typeArgument() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:147:5: ( type | QUESTION ( ( extends_key | super_key ) type )? )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:154:5: ( type | QUESTION ( ( extends_key | super_key ) type )? )
 			int alt15=2;
 			int LA15_0 = input.LA(1);
 			if ( (LA15_0==ID) ) {
@@ -975,7 +971,7 @@ else if ( (LA15_0==QUESTION) ) {
 
 			switch (alt15) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:147:7: type
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:154:7: type
 					{
 					pushFollow(FOLLOW_type_in_typeArgument668);
 					type();
@@ -984,10 +980,10 @@ else if ( (LA15_0==QUESTION) ) {
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:148:7: QUESTION ( ( extends_key | super_key ) type )?
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:155:7: QUESTION ( ( extends_key | super_key ) type )?
 					{
 					match(input,QUESTION,FOLLOW_QUESTION_in_typeArgument676); if (state.failed) return;
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:148:16: ( ( extends_key | super_key ) type )?
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:155:16: ( ( extends_key | super_key ) type )?
 					int alt14=2;
 					int LA14_0 = input.LA(1);
 					if ( (LA14_0==ID) && ((((helper.validateIdentifierKey(DroolsSoftKeywords.EXTENDS)))||((helper.validateIdentifierKey(DroolsSoftKeywords.SUPER)))))) {
@@ -995,9 +991,9 @@ else if ( (LA15_0==QUESTION) ) {
 					}
 					switch (alt14) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:148:17: ( extends_key | super_key ) type
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:155:17: ( extends_key | super_key ) type
 							{
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:148:17: ( extends_key | super_key )
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:155:17: ( extends_key | super_key )
 							int alt13=2;
 							int LA13_0 = input.LA(1);
 							if ( (LA13_0==ID) && ((((helper.validateIdentifierKey(DroolsSoftKeywords.EXTENDS)))||((helper.validateIdentifierKey(DroolsSoftKeywords.SUPER)))))) {
@@ -1026,7 +1022,7 @@ else if ( (((helper.validateIdentifierKey(DroolsSoftKeywords.SUPER)))) ) {
 
 							switch (alt13) {
 								case 1 :
-									// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:148:18: extends_key
+									// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:155:18: extends_key
 									{
 									pushFollow(FOLLOW_extends_key_in_typeArgument680);
 									extends_key();
@@ -1035,7 +1031,7 @@ else if ( (((helper.validateIdentifierKey(DroolsSoftKeywords.SUPER)))) ) {
 									}
 									break;
 								case 2 :
-									// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:148:32: super_key
+									// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:155:32: super_key
 									{
 									pushFollow(FOLLOW_super_key_in_typeArgument684);
 									super_key();
@@ -1074,11 +1070,11 @@ else if ( (((helper.validateIdentifierKey(DroolsSoftKeywords.SUPER)))) ) {
 
 
 	// $ANTLR start "dummy"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:156:1: dummy : expression ( AT | SEMICOLON | EOF | ID | RIGHT_PAREN ) ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:163:1: dummy : expression ( AT | SEMICOLON | EOF | ID | RIGHT_PAREN ) ;
 	public final void dummy() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:157:5: ( expression ( AT | SEMICOLON | EOF | ID | RIGHT_PAREN ) )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:157:7: expression ( AT | SEMICOLON | EOF | ID | RIGHT_PAREN )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:164:5: ( expression ( AT | SEMICOLON | EOF | ID | RIGHT_PAREN ) )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:164:7: expression ( AT | SEMICOLON | EOF | ID | RIGHT_PAREN )
 			{
 			pushFollow(FOLLOW_expression_in_dummy711);
 			expression();
@@ -1111,11 +1107,11 @@ public final void dummy() throws RecognitionException {
 
 
 	// $ANTLR start "dummy2"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:159:1: dummy2 : relationalExpression EOF ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:166:1: dummy2 : relationalExpression EOF ;
 	public final void dummy2() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:160:5: ( relationalExpression EOF )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:160:8: relationalExpression EOF
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:167:5: ( relationalExpression EOF )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:167:8: relationalExpression EOF
 			{
 			pushFollow(FOLLOW_relationalExpression_in_dummy2747);
 			relationalExpression();
@@ -1143,7 +1139,7 @@ public static class expression_return extends ParserRuleReturnScope {
 
 
 	// $ANTLR start "expression"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:163:1: expression returns [BaseDescr result] : left= conditionalExpression ( ( assignmentOperator )=>op= assignmentOperator right= expression )? ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:170:1: expression returns [BaseDescr result] : left= conditionalExpression ( ( assignmentOperator )=>op= assignmentOperator right= expression )? ;
 	public final DRL6Expressions.expression_return expression() throws RecognitionException {
 		DRL6Expressions.expression_return retval = new DRL6Expressions.expression_return();
 		retval.start = input.LT(1);
@@ -1152,15 +1148,15 @@ public final DRL6Expressions.expression_return expression() throws RecognitionEx
 		ParserRuleReturnScope right =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:164:5: (left= conditionalExpression ( ( assignmentOperator )=>op= assignmentOperator right= expression )? )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:164:7: left= conditionalExpression ( ( assignmentOperator )=>op= assignmentOperator right= expression )?
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:171:5: (left= conditionalExpression ( ( assignmentOperator )=>op= assignmentOperator right= expression )? )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:171:7: left= conditionalExpression ( ( assignmentOperator )=>op= assignmentOperator right= expression )?
 			{
 			pushFollow(FOLLOW_conditionalExpression_in_expression768);
 			left=conditionalExpression();
 			state._fsp--;
 			if (state.failed) return retval;
 			if ( state.backtracking==0 ) { if( buildDescr  ) { retval.result = left; } }
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:165:9: ( ( assignmentOperator )=>op= assignmentOperator right= expression )?
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:172:9: ( ( assignmentOperator )=>op= assignmentOperator right= expression )?
 			int alt16=2;
 			switch ( input.LA(1) ) {
 				case EQUALS_ASSIGN:
@@ -1254,7 +1250,7 @@ public final DRL6Expressions.expression_return expression() throws RecognitionEx
 			}
 			switch (alt16) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:165:10: ( assignmentOperator )=>op= assignmentOperator right= expression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:172:10: ( assignmentOperator )=>op= assignmentOperator right= expression
 					{
 					pushFollow(FOLLOW_assignmentOperator_in_expression789);
 					assignmentOperator();
@@ -1289,7 +1285,7 @@ public final DRL6Expressions.expression_return expression() throws RecognitionEx
 
 
 	// $ANTLR start "conditionalExpression"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:168:1: conditionalExpression returns [BaseDescr result] : left= conditionalOrExpression ( ternaryExpression )? ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:175:1: conditionalExpression returns [BaseDescr result] : left= conditionalOrExpression ( ternaryExpression )? ;
 	public final BaseDescr conditionalExpression() throws RecognitionException {
 		BaseDescr result = null;
 
@@ -1297,15 +1293,15 @@ public final BaseDescr conditionalExpression() throws RecognitionException {
 		BaseDescr left =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:169:5: (left= conditionalOrExpression ( ternaryExpression )? )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:169:9: left= conditionalOrExpression ( ternaryExpression )?
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:176:5: (left= conditionalOrExpression ( ternaryExpression )? )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:176:9: left= conditionalOrExpression ( ternaryExpression )?
 			{
 			pushFollow(FOLLOW_conditionalOrExpression_in_conditionalExpression820);
 			left=conditionalOrExpression();
 			state._fsp--;
 			if (state.failed) return result;
 			if ( state.backtracking==0 ) { if( buildDescr  ) { result = left; } }
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:170:9: ( ternaryExpression )?
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:177:9: ( ternaryExpression )?
 			int alt17=2;
 			int LA17_0 = input.LA(1);
 			if ( (LA17_0==QUESTION) ) {
@@ -1313,7 +1309,7 @@ public final BaseDescr conditionalExpression() throws RecognitionException {
 			}
 			switch (alt17) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:170:9: ternaryExpression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:177:9: ternaryExpression
 					{
 					pushFollow(FOLLOW_ternaryExpression_in_conditionalExpression832);
 					ternaryExpression();
@@ -1342,15 +1338,15 @@ public final BaseDescr conditionalExpression() throws RecognitionException {
 
 
 	// $ANTLR start "ternaryExpression"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:173:1: ternaryExpression : QUESTION ts= expression COLON fs= expression ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:180:1: ternaryExpression : QUESTION ts= expression COLON fs= expression ;
 	public final void ternaryExpression() throws RecognitionException {
 		ParserRuleReturnScope ts =null;
 		ParserRuleReturnScope fs =null;
 
 		 ternOp++; 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:175:5: ( QUESTION ts= expression COLON fs= expression )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:175:7: QUESTION ts= expression COLON fs= expression
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:182:5: ( QUESTION ts= expression COLON fs= expression )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:182:7: QUESTION ts= expression COLON fs= expression
 			{
 			match(input,QUESTION,FOLLOW_QUESTION_in_ternaryExpression854); if (state.failed) return;
 			pushFollow(FOLLOW_expression_in_ternaryExpression858);
@@ -1380,7 +1376,7 @@ public final void ternaryExpression() throws RecognitionException {
 
 
 	// $ANTLR start "fullAnnotation"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:180:1: fullAnnotation[AnnotatedDescrBuilder inDescrBuilder] returns [AnnotationDescr result] : AT name= ID ( DOT x= ID )* annotationArgs[result, annoBuilder] ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:187:1: fullAnnotation[AnnotatedDescrBuilder inDescrBuilder] returns [AnnotationDescr result] : AT name= ID ( DOT x= ID )* annotationArgs[result, annoBuilder] ;
 	public final AnnotationDescr fullAnnotation(AnnotatedDescrBuilder inDescrBuilder) throws RecognitionException {
 		AnnotationDescr result = null;
 
@@ -1390,13 +1386,13 @@ public final AnnotationDescr fullAnnotation(AnnotatedDescrBuilder inDescrBuilder
 
 		 String n = ""; AnnotationDescrBuilder annoBuilder = null; 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:182:3: ( AT name= ID ( DOT x= ID )* annotationArgs[result, annoBuilder] )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:182:5: AT name= ID ( DOT x= ID )* annotationArgs[result, annoBuilder]
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:189:3: ( AT name= ID ( DOT x= ID )* annotationArgs[result, annoBuilder] )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:189:5: AT name= ID ( DOT x= ID )* annotationArgs[result, annoBuilder]
 			{
 			match(input,AT,FOLLOW_AT_in_fullAnnotation894); if (state.failed) return result;
 			name=(Token)match(input,ID,FOLLOW_ID_in_fullAnnotation898); if (state.failed) return result;
 			if ( state.backtracking==0 ) { n = (name!=null?name.getText():null); }
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:182:36: ( DOT x= ID )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:189:36: ( DOT x= ID )*
 			loop18:
 			while (true) {
 				int alt18=2;
@@ -1407,7 +1403,7 @@ public final AnnotationDescr fullAnnotation(AnnotatedDescrBuilder inDescrBuilder
 
 				switch (alt18) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:182:38: DOT x= ID
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:189:38: DOT x= ID
 					{
 					match(input,DOT,FOLLOW_DOT_in_fullAnnotation904); if (state.failed) return result;
 					x=(Token)match(input,ID,FOLLOW_ID_in_fullAnnotation908); if (state.failed) return result;
@@ -1452,16 +1448,16 @@ public final AnnotationDescr fullAnnotation(AnnotatedDescrBuilder inDescrBuilder
 
 
 	// $ANTLR start "annotationArgs"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:196:1: annotationArgs[AnnotationDescr descr, AnnotatedDescrBuilder inDescrBuilder] : LEFT_PAREN ( ( ID EQUALS_ASSIGN )=> annotationElementValuePairs[descr, inDescrBuilder] |value= annotationValue[inDescrBuilder] )? RIGHT_PAREN ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:203:1: annotationArgs[AnnotationDescr descr, AnnotatedDescrBuilder inDescrBuilder] : LEFT_PAREN ( ( ID EQUALS_ASSIGN )=> annotationElementValuePairs[descr, inDescrBuilder] |value= annotationValue[inDescrBuilder] )? RIGHT_PAREN ;
 	public final void annotationArgs(AnnotationDescr descr, AnnotatedDescrBuilder inDescrBuilder) throws RecognitionException {
 		Object value =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:197:3: ( LEFT_PAREN ( ( ID EQUALS_ASSIGN )=> annotationElementValuePairs[descr, inDescrBuilder] |value= annotationValue[inDescrBuilder] )? RIGHT_PAREN )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:197:5: LEFT_PAREN ( ( ID EQUALS_ASSIGN )=> annotationElementValuePairs[descr, inDescrBuilder] |value= annotationValue[inDescrBuilder] )? RIGHT_PAREN
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:204:3: ( LEFT_PAREN ( ( ID EQUALS_ASSIGN )=> annotationElementValuePairs[descr, inDescrBuilder] |value= annotationValue[inDescrBuilder] )? RIGHT_PAREN )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:204:5: LEFT_PAREN ( ( ID EQUALS_ASSIGN )=> annotationElementValuePairs[descr, inDescrBuilder] |value= annotationValue[inDescrBuilder] )? RIGHT_PAREN
 			{
 			match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_annotationArgs945); if (state.failed) return;
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:198:5: ( ( ID EQUALS_ASSIGN )=> annotationElementValuePairs[descr, inDescrBuilder] |value= annotationValue[inDescrBuilder] )?
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:205:5: ( ( ID EQUALS_ASSIGN )=> annotationElementValuePairs[descr, inDescrBuilder] |value= annotationValue[inDescrBuilder] )?
 			int alt19=3;
 			int LA19_0 = input.LA(1);
 			if ( (LA19_0==ID) ) {
@@ -1478,7 +1474,7 @@ else if ( ((LA19_0 >= AT && LA19_0 <= BOOL)||(LA19_0 >= DECIMAL && LA19_0 <= DIV
 			}
 			switch (alt19) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:199:8: ( ID EQUALS_ASSIGN )=> annotationElementValuePairs[descr, inDescrBuilder]
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:206:8: ( ID EQUALS_ASSIGN )=> annotationElementValuePairs[descr, inDescrBuilder]
 					{
 					pushFollow(FOLLOW_annotationElementValuePairs_in_annotationArgs968);
 					annotationElementValuePairs(descr, inDescrBuilder);
@@ -1487,7 +1483,7 @@ else if ( ((LA19_0 >= AT && LA19_0 <= BOOL)||(LA19_0 >= DECIMAL && LA19_0 <= DIV
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:200:10: value= annotationValue[inDescrBuilder]
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:207:10: value= annotationValue[inDescrBuilder]
 					{
 					pushFollow(FOLLOW_annotationValue_in_annotationArgs982);
 					value=annotationValue(inDescrBuilder);
@@ -1517,17 +1513,17 @@ else if ( ((LA19_0 >= AT && LA19_0 <= BOOL)||(LA19_0 >= DECIMAL && LA19_0 <= DIV
 
 
 	// $ANTLR start "annotationElementValuePairs"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:205:1: annotationElementValuePairs[AnnotationDescr descr, AnnotatedDescrBuilder inDescrBuilder] : annotationElementValuePair[descr, inDescrBuilder] ( COMMA annotationElementValuePair[descr, inDescrBuilder] )* ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:212:1: annotationElementValuePairs[AnnotationDescr descr, AnnotatedDescrBuilder inDescrBuilder] : annotationElementValuePair[descr, inDescrBuilder] ( COMMA annotationElementValuePair[descr, inDescrBuilder] )* ;
 	public final void annotationElementValuePairs(AnnotationDescr descr, AnnotatedDescrBuilder inDescrBuilder) throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:206:3: ( annotationElementValuePair[descr, inDescrBuilder] ( COMMA annotationElementValuePair[descr, inDescrBuilder] )* )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:206:5: annotationElementValuePair[descr, inDescrBuilder] ( COMMA annotationElementValuePair[descr, inDescrBuilder] )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:213:3: ( annotationElementValuePair[descr, inDescrBuilder] ( COMMA annotationElementValuePair[descr, inDescrBuilder] )* )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:213:5: annotationElementValuePair[descr, inDescrBuilder] ( COMMA annotationElementValuePair[descr, inDescrBuilder] )*
 			{
 			pushFollow(FOLLOW_annotationElementValuePair_in_annotationElementValuePairs1013);
 			annotationElementValuePair(descr, inDescrBuilder);
 			state._fsp--;
 			if (state.failed) return;
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:206:55: ( COMMA annotationElementValuePair[descr, inDescrBuilder] )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:213:55: ( COMMA annotationElementValuePair[descr, inDescrBuilder] )*
 			loop20:
 			while (true) {
 				int alt20=2;
@@ -1538,7 +1534,7 @@ public final void annotationElementValuePairs(AnnotationDescr descr, AnnotatedDe
 
 				switch (alt20) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:206:57: COMMA annotationElementValuePair[descr, inDescrBuilder]
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:213:57: COMMA annotationElementValuePair[descr, inDescrBuilder]
 					{
 					match(input,COMMA,FOLLOW_COMMA_in_annotationElementValuePairs1018); if (state.failed) return;
 					pushFollow(FOLLOW_annotationElementValuePair_in_annotationElementValuePairs1020);
@@ -1570,14 +1566,14 @@ public final void annotationElementValuePairs(AnnotationDescr descr, AnnotatedDe
 
 
 	// $ANTLR start "annotationElementValuePair"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:209:1: annotationElementValuePair[AnnotationDescr descr, AnnotatedDescrBuilder inDescrBuilder] : key= ID EQUALS_ASSIGN val= annotationValue[inDescrBuilder] ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:216:1: annotationElementValuePair[AnnotationDescr descr, AnnotatedDescrBuilder inDescrBuilder] : key= ID EQUALS_ASSIGN val= annotationValue[inDescrBuilder] ;
 	public final void annotationElementValuePair(AnnotationDescr descr, AnnotatedDescrBuilder inDescrBuilder) throws RecognitionException {
 		Token key=null;
 		Object val =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:210:3: (key= ID EQUALS_ASSIGN val= annotationValue[inDescrBuilder] )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:210:5: key= ID EQUALS_ASSIGN val= annotationValue[inDescrBuilder]
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:217:3: (key= ID EQUALS_ASSIGN val= annotationValue[inDescrBuilder] )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:217:5: key= ID EQUALS_ASSIGN val= annotationValue[inDescrBuilder]
 			{
 			key=(Token)match(input,ID,FOLLOW_ID_in_annotationElementValuePair1041); if (state.failed) return;
 			match(input,EQUALS_ASSIGN,FOLLOW_EQUALS_ASSIGN_in_annotationElementValuePair1043); if (state.failed) return;
@@ -1603,7 +1599,7 @@ public final void annotationElementValuePair(AnnotationDescr descr, AnnotatedDes
 
 
 	// $ANTLR start "annotationValue"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:213:1: annotationValue[AnnotatedDescrBuilder inDescrBuilder] returns [Object result] : (exp= expression |annos= annotationArray[inDescrBuilder] |anno= fullAnnotation[inDescrBuilder] );
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:220:1: annotationValue[AnnotatedDescrBuilder inDescrBuilder] returns [Object result] : (exp= expression |annos= annotationArray[inDescrBuilder] |anno= fullAnnotation[inDescrBuilder] );
 	public final Object annotationValue(AnnotatedDescrBuilder inDescrBuilder) throws RecognitionException {
 		Object result = null;
 
@@ -1613,7 +1609,7 @@ public final Object annotationValue(AnnotatedDescrBuilder inDescrBuilder) throws
 		AnnotationDescr anno =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:214:3: (exp= expression |annos= annotationArray[inDescrBuilder] |anno= fullAnnotation[inDescrBuilder] )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:221:3: (exp= expression |annos= annotationArray[inDescrBuilder] |anno= fullAnnotation[inDescrBuilder] )
 			int alt21=3;
 			switch ( input.LA(1) ) {
 			case BOOL:
@@ -1659,7 +1655,7 @@ public final Object annotationValue(AnnotatedDescrBuilder inDescrBuilder) throws
 			}
 			switch (alt21) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:214:5: exp= expression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:221:5: exp= expression
 					{
 					pushFollow(FOLLOW_expression_in_annotationValue1070);
 					exp=expression();
@@ -1669,7 +1665,7 @@ public final Object annotationValue(AnnotatedDescrBuilder inDescrBuilder) throws
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:215:7: annos= annotationArray[inDescrBuilder]
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:222:7: annos= annotationArray[inDescrBuilder]
 					{
 					pushFollow(FOLLOW_annotationArray_in_annotationValue1082);
 					annos=annotationArray(inDescrBuilder);
@@ -1679,7 +1675,7 @@ public final Object annotationValue(AnnotatedDescrBuilder inDescrBuilder) throws
 					}
 					break;
 				case 3 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:216:7: anno= fullAnnotation[inDescrBuilder]
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:223:7: anno= fullAnnotation[inDescrBuilder]
 					{
 					pushFollow(FOLLOW_fullAnnotation_in_annotationValue1095);
 					anno=fullAnnotation(inDescrBuilder);
@@ -1706,7 +1702,7 @@ public final Object annotationValue(AnnotatedDescrBuilder inDescrBuilder) throws
 
 
 	// $ANTLR start "annotationArray"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:219:1: annotationArray[AnnotatedDescrBuilder inDescrBuilder] returns [java.util.List result] : LEFT_CURLY (anno= annotationValue[inDescrBuilder] ( COMMA anno= annotationValue[inDescrBuilder] )* )? RIGHT_CURLY ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:226:1: annotationArray[AnnotatedDescrBuilder inDescrBuilder] returns [java.util.List result] : LEFT_CURLY (anno= annotationValue[inDescrBuilder] ( COMMA anno= annotationValue[inDescrBuilder] )* )? RIGHT_CURLY ;
 	public final java.util.List annotationArray(AnnotatedDescrBuilder inDescrBuilder) throws RecognitionException {
 		java.util.List result = null;
 
@@ -1715,11 +1711,11 @@ public final java.util.List annotationArray(AnnotatedDescrBuilder inDescrBuilder
 
 		 result = new java.util.ArrayList();
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:221:3: ( LEFT_CURLY (anno= annotationValue[inDescrBuilder] ( COMMA anno= annotationValue[inDescrBuilder] )* )? RIGHT_CURLY )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:221:6: LEFT_CURLY (anno= annotationValue[inDescrBuilder] ( COMMA anno= annotationValue[inDescrBuilder] )* )? RIGHT_CURLY
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:228:3: ( LEFT_CURLY (anno= annotationValue[inDescrBuilder] ( COMMA anno= annotationValue[inDescrBuilder] )* )? RIGHT_CURLY )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:228:6: LEFT_CURLY (anno= annotationValue[inDescrBuilder] ( COMMA anno= annotationValue[inDescrBuilder] )* )? RIGHT_CURLY
 			{
 			match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_annotationArray1122); if (state.failed) return result;
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:221:17: (anno= annotationValue[inDescrBuilder] ( COMMA anno= annotationValue[inDescrBuilder] )* )?
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:228:17: (anno= annotationValue[inDescrBuilder] ( COMMA anno= annotationValue[inDescrBuilder] )* )?
 			int alt23=2;
 			int LA23_0 = input.LA(1);
 			if ( ((LA23_0 >= AT && LA23_0 <= BOOL)||(LA23_0 >= DECIMAL && LA23_0 <= DIV)||LA23_0==DOT||LA23_0==FLOAT||LA23_0==HEX||(LA23_0 >= ID && LA23_0 <= INCR)||(LA23_0 >= LEFT_CURLY && LA23_0 <= LESS)||LA23_0==MINUS||LA23_0==NEGATION||LA23_0==NULL||LA23_0==PLUS||LA23_0==QUESTION_DIV||(LA23_0 >= STAR && LA23_0 <= TIME_INTERVAL)) ) {
@@ -1727,14 +1723,14 @@ public final java.util.List annotationArray(AnnotatedDescrBuilder inDescrBuilder
 			}
 			switch (alt23) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:221:19: anno= annotationValue[inDescrBuilder] ( COMMA anno= annotationValue[inDescrBuilder] )*
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:228:19: anno= annotationValue[inDescrBuilder] ( COMMA anno= annotationValue[inDescrBuilder] )*
 					{
 					pushFollow(FOLLOW_annotationValue_in_annotationArray1128);
 					anno=annotationValue(inDescrBuilder);
 					state._fsp--;
 					if (state.failed) return result;
 					if ( state.backtracking==0 ) { result.add( anno ); }
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:222:17: ( COMMA anno= annotationValue[inDescrBuilder] )*
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:229:17: ( COMMA anno= annotationValue[inDescrBuilder] )*
 					loop22:
 					while (true) {
 						int alt22=2;
@@ -1745,7 +1741,7 @@ public final java.util.List annotationArray(AnnotatedDescrBuilder inDescrBuilder
 
 						switch (alt22) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:222:19: COMMA anno= annotationValue[inDescrBuilder]
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:229:19: COMMA anno= annotationValue[inDescrBuilder]
 							{
 							match(input,COMMA,FOLLOW_COMMA_in_annotationArray1151); if (state.failed) return result;
 							pushFollow(FOLLOW_annotationValue_in_annotationArray1155);
@@ -1785,7 +1781,7 @@ public final java.util.List annotationArray(AnnotatedDescrBuilder inDescrBuilder
 
 
 	// $ANTLR start "conditionalOrExpression"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:228:1: conditionalOrExpression returns [BaseDescr result] : left= conditionalAndExpression ( DOUBLE_PIPE (args= fullAnnotation[null] )? right= conditionalAndExpression )* ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:235:1: conditionalOrExpression returns [BaseDescr result] : left= conditionalAndExpression ( DOUBLE_PIPE (args= fullAnnotation[null] )? right= conditionalAndExpression )* ;
 	public final BaseDescr conditionalOrExpression() throws RecognitionException {
 		BaseDescr result = null;
 
@@ -1795,15 +1791,15 @@ public final BaseDescr conditionalOrExpression() throws RecognitionException {
 		BaseDescr right =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:229:3: (left= conditionalAndExpression ( DOUBLE_PIPE (args= fullAnnotation[null] )? right= conditionalAndExpression )* )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:229:5: left= conditionalAndExpression ( DOUBLE_PIPE (args= fullAnnotation[null] )? right= conditionalAndExpression )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:236:3: (left= conditionalAndExpression ( DOUBLE_PIPE (args= fullAnnotation[null] )? right= conditionalAndExpression )* )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:236:5: left= conditionalAndExpression ( DOUBLE_PIPE (args= fullAnnotation[null] )? right= conditionalAndExpression )*
 			{
 			pushFollow(FOLLOW_conditionalAndExpression_in_conditionalOrExpression1192);
 			left=conditionalAndExpression();
 			state._fsp--;
 			if (state.failed) return result;
 			if ( state.backtracking==0 ) { if( buildDescr ) { result = left; } }
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:230:3: ( DOUBLE_PIPE (args= fullAnnotation[null] )? right= conditionalAndExpression )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:237:3: ( DOUBLE_PIPE (args= fullAnnotation[null] )? right= conditionalAndExpression )*
 			loop25:
 			while (true) {
 				int alt25=2;
@@ -1814,11 +1810,11 @@ public final BaseDescr conditionalOrExpression() throws RecognitionException {
 
 				switch (alt25) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:230:5: DOUBLE_PIPE (args= fullAnnotation[null] )? right= conditionalAndExpression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:237:5: DOUBLE_PIPE (args= fullAnnotation[null] )? right= conditionalAndExpression
 					{
 					match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_conditionalOrExpression1201); if (state.failed) return result;
 					if ( state.backtracking==0 ) {  if ( isNotEOF() ) helper.emit( Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR );  }
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:232:13: (args= fullAnnotation[null] )?
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:239:13: (args= fullAnnotation[null] )?
 					int alt24=2;
 					int LA24_0 = input.LA(1);
 					if ( (LA24_0==AT) ) {
@@ -1826,7 +1822,7 @@ public final BaseDescr conditionalOrExpression() throws RecognitionException {
 					}
 					switch (alt24) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:232:13: args= fullAnnotation[null]
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:239:13: args= fullAnnotation[null]
 							{
 							pushFollow(FOLLOW_fullAnnotation_in_conditionalOrExpression1223);
 							args=fullAnnotation(null);
@@ -1875,7 +1871,7 @@ public final BaseDescr conditionalOrExpression() throws RecognitionException {
 
 
 	// $ANTLR start "conditionalAndExpression"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:244:1: conditionalAndExpression returns [BaseDescr result] : left= inclusiveOrExpression ( DOUBLE_AMPER (args= fullAnnotation[null] )? right= inclusiveOrExpression )* ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:251:1: conditionalAndExpression returns [BaseDescr result] : left= inclusiveOrExpression ( DOUBLE_AMPER (args= fullAnnotation[null] )? right= inclusiveOrExpression )* ;
 	public final BaseDescr conditionalAndExpression() throws RecognitionException {
 		BaseDescr result = null;
 
@@ -1885,15 +1881,15 @@ public final BaseDescr conditionalAndExpression() throws RecognitionException {
 		BaseDescr right =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:245:3: (left= inclusiveOrExpression ( DOUBLE_AMPER (args= fullAnnotation[null] )? right= inclusiveOrExpression )* )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:245:5: left= inclusiveOrExpression ( DOUBLE_AMPER (args= fullAnnotation[null] )? right= inclusiveOrExpression )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:252:3: (left= inclusiveOrExpression ( DOUBLE_AMPER (args= fullAnnotation[null] )? right= inclusiveOrExpression )* )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:252:5: left= inclusiveOrExpression ( DOUBLE_AMPER (args= fullAnnotation[null] )? right= inclusiveOrExpression )*
 			{
 			pushFollow(FOLLOW_inclusiveOrExpression_in_conditionalAndExpression1264);
 			left=inclusiveOrExpression();
 			state._fsp--;
 			if (state.failed) return result;
 			if ( state.backtracking==0 ) { if( buildDescr  ) { result = left; } }
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:246:3: ( DOUBLE_AMPER (args= fullAnnotation[null] )? right= inclusiveOrExpression )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:253:3: ( DOUBLE_AMPER (args= fullAnnotation[null] )? right= inclusiveOrExpression )*
 			loop27:
 			while (true) {
 				int alt27=2;
@@ -1904,11 +1900,11 @@ public final BaseDescr conditionalAndExpression() throws RecognitionException {
 
 				switch (alt27) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:246:5: DOUBLE_AMPER (args= fullAnnotation[null] )? right= inclusiveOrExpression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:253:5: DOUBLE_AMPER (args= fullAnnotation[null] )? right= inclusiveOrExpression
 					{
 					match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_conditionalAndExpression1272); if (state.failed) return result;
 					if ( state.backtracking==0 ) { if ( isNotEOF() ) helper.emit( Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR ); }
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:248:13: (args= fullAnnotation[null] )?
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:255:13: (args= fullAnnotation[null] )?
 					int alt26=2;
 					int LA26_0 = input.LA(1);
 					if ( (LA26_0==AT) ) {
@@ -1916,7 +1912,7 @@ public final BaseDescr conditionalAndExpression() throws RecognitionException {
 					}
 					switch (alt26) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:248:13: args= fullAnnotation[null]
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:255:13: args= fullAnnotation[null]
 							{
 							pushFollow(FOLLOW_fullAnnotation_in_conditionalAndExpression1295);
 							args=fullAnnotation(null);
@@ -1965,7 +1961,7 @@ public final BaseDescr conditionalAndExpression() throws RecognitionException {
 
 
 	// $ANTLR start "inclusiveOrExpression"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:260:1: inclusiveOrExpression returns [BaseDescr result] : left= exclusiveOrExpression ( PIPE right= exclusiveOrExpression )* ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:267:1: inclusiveOrExpression returns [BaseDescr result] : left= exclusiveOrExpression ( PIPE right= exclusiveOrExpression )* ;
 	public final BaseDescr inclusiveOrExpression() throws RecognitionException {
 		BaseDescr result = null;
 
@@ -1974,15 +1970,15 @@ public final BaseDescr inclusiveOrExpression() throws RecognitionException {
 		BaseDescr right =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:261:3: (left= exclusiveOrExpression ( PIPE right= exclusiveOrExpression )* )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:261:5: left= exclusiveOrExpression ( PIPE right= exclusiveOrExpression )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:268:3: (left= exclusiveOrExpression ( PIPE right= exclusiveOrExpression )* )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:268:5: left= exclusiveOrExpression ( PIPE right= exclusiveOrExpression )*
 			{
 			pushFollow(FOLLOW_exclusiveOrExpression_in_inclusiveOrExpression1336);
 			left=exclusiveOrExpression();
 			state._fsp--;
 			if (state.failed) return result;
 			if ( state.backtracking==0 ) { if( buildDescr  ) { result = left; } }
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:262:3: ( PIPE right= exclusiveOrExpression )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:269:3: ( PIPE right= exclusiveOrExpression )*
 			loop28:
 			while (true) {
 				int alt28=2;
@@ -1993,7 +1989,7 @@ public final BaseDescr inclusiveOrExpression() throws RecognitionException {
 
 				switch (alt28) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:262:5: PIPE right= exclusiveOrExpression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:269:5: PIPE right= exclusiveOrExpression
 					{
 					match(input,PIPE,FOLLOW_PIPE_in_inclusiveOrExpression1344); if (state.failed) return result;
 					pushFollow(FOLLOW_exclusiveOrExpression_in_inclusiveOrExpression1348);
@@ -2033,7 +2029,7 @@ public final BaseDescr inclusiveOrExpression() throws RecognitionException {
 
 
 	// $ANTLR start "exclusiveOrExpression"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:273:1: exclusiveOrExpression returns [BaseDescr result] : left= andExpression ( XOR right= andExpression )* ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:280:1: exclusiveOrExpression returns [BaseDescr result] : left= andExpression ( XOR right= andExpression )* ;
 	public final BaseDescr exclusiveOrExpression() throws RecognitionException {
 		BaseDescr result = null;
 
@@ -2042,15 +2038,15 @@ public final BaseDescr exclusiveOrExpression() throws RecognitionException {
 		BaseDescr right =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:274:3: (left= andExpression ( XOR right= andExpression )* )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:274:5: left= andExpression ( XOR right= andExpression )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:281:3: (left= andExpression ( XOR right= andExpression )* )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:281:5: left= andExpression ( XOR right= andExpression )*
 			{
 			pushFollow(FOLLOW_andExpression_in_exclusiveOrExpression1383);
 			left=andExpression();
 			state._fsp--;
 			if (state.failed) return result;
 			if ( state.backtracking==0 ) { if( buildDescr  ) { result = left; } }
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:275:3: ( XOR right= andExpression )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:282:3: ( XOR right= andExpression )*
 			loop29:
 			while (true) {
 				int alt29=2;
@@ -2061,7 +2057,7 @@ public final BaseDescr exclusiveOrExpression() throws RecognitionException {
 
 				switch (alt29) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:275:5: XOR right= andExpression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:282:5: XOR right= andExpression
 					{
 					match(input,XOR,FOLLOW_XOR_in_exclusiveOrExpression1391); if (state.failed) return result;
 					pushFollow(FOLLOW_andExpression_in_exclusiveOrExpression1395);
@@ -2101,7 +2097,7 @@ public final BaseDescr exclusiveOrExpression() throws RecognitionException {
 
 
 	// $ANTLR start "andExpression"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:286:1: andExpression returns [BaseDescr result] : left= equalityExpression ( AMPER right= equalityExpression )* ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:293:1: andExpression returns [BaseDescr result] : left= equalityExpression ( AMPER right= equalityExpression )* ;
 	public final BaseDescr andExpression() throws RecognitionException {
 		BaseDescr result = null;
 
@@ -2110,15 +2106,15 @@ public final BaseDescr andExpression() throws RecognitionException {
 		BaseDescr right =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:287:3: (left= equalityExpression ( AMPER right= equalityExpression )* )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:287:5: left= equalityExpression ( AMPER right= equalityExpression )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:294:3: (left= equalityExpression ( AMPER right= equalityExpression )* )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:294:5: left= equalityExpression ( AMPER right= equalityExpression )*
 			{
 			pushFollow(FOLLOW_equalityExpression_in_andExpression1430);
 			left=equalityExpression();
 			state._fsp--;
 			if (state.failed) return result;
 			if ( state.backtracking==0 ) { if( buildDescr  ) { result = left; } }
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:288:3: ( AMPER right= equalityExpression )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:295:3: ( AMPER right= equalityExpression )*
 			loop30:
 			while (true) {
 				int alt30=2;
@@ -2129,7 +2125,7 @@ public final BaseDescr andExpression() throws RecognitionException {
 
 				switch (alt30) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:288:5: AMPER right= equalityExpression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:295:5: AMPER right= equalityExpression
 					{
 					match(input,AMPER,FOLLOW_AMPER_in_andExpression1438); if (state.failed) return result;
 					pushFollow(FOLLOW_equalityExpression_in_andExpression1442);
@@ -2169,7 +2165,7 @@ public final BaseDescr andExpression() throws RecognitionException {
 
 
 	// $ANTLR start "equalityExpression"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:299:1: equalityExpression returns [BaseDescr result] : left= instanceOfExpression ( (op= EQUALS |op= NOT_EQUALS ) right= instanceOfExpression )* ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:306:1: equalityExpression returns [BaseDescr result] : left= instanceOfExpression ( (op= EQUALS |op= NOT_EQUALS ) right= instanceOfExpression )* ;
 	public final BaseDescr equalityExpression() throws RecognitionException {
 		BaseDescr result = null;
 
@@ -2179,15 +2175,15 @@ public final BaseDescr equalityExpression() throws RecognitionException {
 		BaseDescr right =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:300:3: (left= instanceOfExpression ( (op= EQUALS |op= NOT_EQUALS ) right= instanceOfExpression )* )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:300:5: left= instanceOfExpression ( (op= EQUALS |op= NOT_EQUALS ) right= instanceOfExpression )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:307:3: (left= instanceOfExpression ( (op= EQUALS |op= NOT_EQUALS ) right= instanceOfExpression )* )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:307:5: left= instanceOfExpression ( (op= EQUALS |op= NOT_EQUALS ) right= instanceOfExpression )*
 			{
 			pushFollow(FOLLOW_instanceOfExpression_in_equalityExpression1477);
 			left=instanceOfExpression();
 			state._fsp--;
 			if (state.failed) return result;
 			if ( state.backtracking==0 ) { if( buildDescr  ) { result = left; } }
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:301:3: ( (op= EQUALS |op= NOT_EQUALS ) right= instanceOfExpression )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:308:3: ( (op= EQUALS |op= NOT_EQUALS ) right= instanceOfExpression )*
 			loop32:
 			while (true) {
 				int alt32=2;
@@ -2198,9 +2194,9 @@ public final BaseDescr equalityExpression() throws RecognitionException {
 
 				switch (alt32) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:301:5: (op= EQUALS |op= NOT_EQUALS ) right= instanceOfExpression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:308:5: (op= EQUALS |op= NOT_EQUALS ) right= instanceOfExpression
 					{
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:301:5: (op= EQUALS |op= NOT_EQUALS )
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:308:5: (op= EQUALS |op= NOT_EQUALS )
 					int alt31=2;
 					int LA31_0 = input.LA(1);
 					if ( (LA31_0==EQUALS) ) {
@@ -2219,13 +2215,13 @@ else if ( (LA31_0==NOT_EQUALS) ) {
 
 					switch (alt31) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:301:7: op= EQUALS
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:308:7: op= EQUALS
 							{
 							op=(Token)match(input,EQUALS,FOLLOW_EQUALS_in_equalityExpression1489); if (state.failed) return result;
 							}
 							break;
 						case 2 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:301:19: op= NOT_EQUALS
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:308:19: op= NOT_EQUALS
 							{
 							op=(Token)match(input,NOT_EQUALS,FOLLOW_NOT_EQUALS_in_equalityExpression1495); if (state.failed) return result;
 							}
@@ -2269,7 +2265,7 @@ else if ( (LA31_0==NOT_EQUALS) ) {
 
 
 	// $ANTLR start "instanceOfExpression"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:312:1: instanceOfExpression returns [BaseDescr result] : left= inExpression (op= instanceof_key right= type )? ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:319:1: instanceOfExpression returns [BaseDescr result] : left= inExpression (op= instanceof_key right= type )? ;
 	public final BaseDescr instanceOfExpression() throws RecognitionException {
 		BaseDescr result = null;
 
@@ -2279,15 +2275,15 @@ public final BaseDescr instanceOfExpression() throws RecognitionException {
 		ParserRuleReturnScope right =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:313:3: (left= inExpression (op= instanceof_key right= type )? )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:313:5: left= inExpression (op= instanceof_key right= type )?
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:320:3: (left= inExpression (op= instanceof_key right= type )? )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:320:5: left= inExpression (op= instanceof_key right= type )?
 			{
 			pushFollow(FOLLOW_inExpression_in_instanceOfExpression1546);
 			left=inExpression();
 			state._fsp--;
 			if (state.failed) return result;
 			if ( state.backtracking==0 ) { if( buildDescr  ) { result = left; } }
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:314:3: (op= instanceof_key right= type )?
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:321:3: (op= instanceof_key right= type )?
 			int alt33=2;
 			int LA33_0 = input.LA(1);
 			if ( (LA33_0==ID) ) {
@@ -2298,7 +2294,7 @@ public final BaseDescr instanceOfExpression() throws RecognitionException {
 			}
 			switch (alt33) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:314:5: op= instanceof_key right= type
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:321:5: op= instanceof_key right= type
 					{
 					pushFollow(FOLLOW_instanceof_key_in_instanceOfExpression1556);
 					op=instanceof_key();
@@ -2337,7 +2333,7 @@ public final BaseDescr instanceOfExpression() throws RecognitionException {
 
 
 	// $ANTLR start "inExpression"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:325:1: inExpression returns [BaseDescr result] : left= relationalExpression ( ( not_key in_key )=> not_key in= in_key LEFT_PAREN e1= expression ( COMMA e2= expression )* RIGHT_PAREN |in= in_key LEFT_PAREN e1= expression ( COMMA e2= expression )* RIGHT_PAREN )? ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:332:1: inExpression returns [BaseDescr result] : left= relationalExpression ( ( not_key in_key )=> not_key in= in_key LEFT_PAREN e1= expression ( COMMA e2= expression )* RIGHT_PAREN |in= in_key LEFT_PAREN e1= expression ( COMMA e2= expression )* RIGHT_PAREN )? ;
 	public final BaseDescr inExpression() throws RecognitionException {
 		BaseDescr result = null;
 
@@ -2348,8 +2344,8 @@ public final BaseDescr inExpression() throws RecognitionException {
 
 		 ConstraintConnectiveDescr descr = null; BaseDescr leftDescr = null; BindingDescr binding = null; 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:328:3: (left= relationalExpression ( ( not_key in_key )=> not_key in= in_key LEFT_PAREN e1= expression ( COMMA e2= expression )* RIGHT_PAREN |in= in_key LEFT_PAREN e1= expression ( COMMA e2= expression )* RIGHT_PAREN )? )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:328:5: left= relationalExpression ( ( not_key in_key )=> not_key in= in_key LEFT_PAREN e1= expression ( COMMA e2= expression )* RIGHT_PAREN |in= in_key LEFT_PAREN e1= expression ( COMMA e2= expression )* RIGHT_PAREN )?
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:335:3: (left= relationalExpression ( ( not_key in_key )=> not_key in= in_key LEFT_PAREN e1= expression ( COMMA e2= expression )* RIGHT_PAREN |in= in_key LEFT_PAREN e1= expression ( COMMA e2= expression )* RIGHT_PAREN )? )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:335:5: left= relationalExpression ( ( not_key in_key )=> not_key in= in_key LEFT_PAREN e1= expression ( COMMA e2= expression )* RIGHT_PAREN |in= in_key LEFT_PAREN e1= expression ( COMMA e2= expression )* RIGHT_PAREN )?
 			{
 			pushFollow(FOLLOW_relationalExpression_in_inExpression1615);
 			left=relationalExpression();
@@ -2363,7 +2359,7 @@ public final BaseDescr inExpression() throws RecognitionException {
 			          leftDescr = left;
 			      }
 			    }
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:337:5: ( ( not_key in_key )=> not_key in= in_key LEFT_PAREN e1= expression ( COMMA e2= expression )* RIGHT_PAREN |in= in_key LEFT_PAREN e1= expression ( COMMA e2= expression )* RIGHT_PAREN )?
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:344:5: ( ( not_key in_key )=> not_key in= in_key LEFT_PAREN e1= expression ( COMMA e2= expression )* RIGHT_PAREN |in= in_key LEFT_PAREN e1= expression ( COMMA e2= expression )* RIGHT_PAREN )?
 			int alt36=3;
 			int LA36_0 = input.LA(1);
 			if ( (LA36_0==ID) ) {
@@ -2380,7 +2376,7 @@ else if ( (LA36_1==LEFT_PAREN) && (((helper.validateIdentifierKey(DroolsSoftKeyw
 			}
 			switch (alt36) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:337:6: ( not_key in_key )=> not_key in= in_key LEFT_PAREN e1= expression ( COMMA e2= expression )* RIGHT_PAREN
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:344:6: ( not_key in_key )=> not_key in= in_key LEFT_PAREN e1= expression ( COMMA e2= expression )* RIGHT_PAREN
 					{
 					pushFollow(FOLLOW_not_key_in_inExpression1635);
 					not_key();
@@ -2401,7 +2397,7 @@ else if ( (LA36_1==LEFT_PAREN) && (((helper.validateIdentifierKey(DroolsSoftKeyw
 					            descr.addOrMerge( rel );
 					            result = descr;
 					        }
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:345:7: ( COMMA e2= expression )*
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:352:7: ( COMMA e2= expression )*
 					loop34:
 					while (true) {
 						int alt34=2;
@@ -2412,7 +2408,7 @@ else if ( (LA36_1==LEFT_PAREN) && (((helper.validateIdentifierKey(DroolsSoftKeyw
 
 						switch (alt34) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:345:8: COMMA e2= expression
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:352:8: COMMA e2= expression
 							{
 							match(input,COMMA,FOLLOW_COMMA_in_inExpression1682); if (state.failed) return result;
 							pushFollow(FOLLOW_expression_in_inExpression1686);
@@ -2435,7 +2431,7 @@ else if ( (LA36_1==LEFT_PAREN) && (((helper.validateIdentifierKey(DroolsSoftKeyw
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:351:7: in= in_key LEFT_PAREN e1= expression ( COMMA e2= expression )* RIGHT_PAREN
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:358:7: in= in_key LEFT_PAREN e1= expression ( COMMA e2= expression )* RIGHT_PAREN
 					{
 					pushFollow(FOLLOW_in_key_in_inExpression1723);
 					in_key();
@@ -2452,7 +2448,7 @@ else if ( (LA36_1==LEFT_PAREN) && (((helper.validateIdentifierKey(DroolsSoftKeyw
 					            descr.addOrMerge( rel );
 					            result = descr;
 					        }
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:359:7: ( COMMA e2= expression )*
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:366:7: ( COMMA e2= expression )*
 					loop35:
 					while (true) {
 						int alt35=2;
@@ -2463,7 +2459,7 @@ else if ( (LA36_1==LEFT_PAREN) && (((helper.validateIdentifierKey(DroolsSoftKeyw
 
 						switch (alt35) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:359:8: COMMA e2= expression
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:366:8: COMMA e2= expression
 							{
 							match(input,COMMA,FOLLOW_COMMA_in_inExpression1766); if (state.failed) return result;
 							pushFollow(FOLLOW_expression_in_inExpression1770);
@@ -2512,7 +2508,7 @@ protected static class relationalExpression_scope {
 
 
 	// $ANTLR start "relationalExpression"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:368:1: relationalExpression returns [BaseDescr result] : left= shiftExpression ( ( operator | LEFT_PAREN )=>right= orRestriction )* ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:375:1: relationalExpression returns [BaseDescr result] : left= shiftExpression ( ( operator | LEFT_PAREN )=>right= orRestriction )* ;
 	public final BaseDescr relationalExpression() throws RecognitionException {
 		relationalExpression_stack.push(new relationalExpression_scope());
 		BaseDescr result = null;
@@ -2523,8 +2519,8 @@ public final BaseDescr relationalExpression() throws RecognitionException {
 
 		 relationalExpression_stack.peek().lsd = null; 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:371:3: (left= shiftExpression ( ( operator | LEFT_PAREN )=>right= orRestriction )* )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:371:5: left= shiftExpression ( ( operator | LEFT_PAREN )=>right= orRestriction )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:378:3: (left= shiftExpression ( ( operator | LEFT_PAREN )=>right= orRestriction )* )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:378:5: left= shiftExpression ( ( operator | LEFT_PAREN )=>right= orRestriction )*
 			{
 			pushFollow(FOLLOW_shiftExpression_in_relationalExpression1832);
 			left=shiftExpression();
@@ -2552,9 +2548,9 @@ public final BaseDescr relationalExpression() throws RecognitionException {
 			              result = (left!=null?((DRL6Expressions.shiftExpression_return)left).result:null);
 			          }
 			          relationalExpression_stack.peek().lsd = result;
-			      } 
+			      }
 			    }
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:396:3: ( ( operator | LEFT_PAREN )=>right= orRestriction )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:403:3: ( ( operator | LEFT_PAREN )=>right= orRestriction )*
 			loop37:
 			while (true) {
 				int alt37=2;
@@ -2609,7 +2605,7 @@ else if ( (LA37_0==LEFT_PAREN) && (synpred9_DRL6Expressions())) {
 
 				switch (alt37) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:396:5: ( operator | LEFT_PAREN )=>right= orRestriction
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:403:5: ( operator | LEFT_PAREN )=>right= orRestriction
 					{
 					pushFollow(FOLLOW_orRestriction_in_relationalExpression1857);
 					right=orRestriction();
@@ -2647,7 +2643,7 @@ else if ( (LA37_0==LEFT_PAREN) && (synpred9_DRL6Expressions())) {
 
 
 	// $ANTLR start "orRestriction"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:405:1: orRestriction returns [BaseDescr result] : left= andRestriction ( ( DOUBLE_PIPE ( fullAnnotation[null] )? andRestriction )=>lop= DOUBLE_PIPE (args= fullAnnotation[null] )? right= andRestriction )* ( EOF )? ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:412:1: orRestriction returns [BaseDescr result] : left= andRestriction ( ( DOUBLE_PIPE ( fullAnnotation[null] )? andRestriction )=>lop= DOUBLE_PIPE (args= fullAnnotation[null] )? right= andRestriction )* ( EOF )? ;
 	public final BaseDescr orRestriction() throws RecognitionException {
 		BaseDescr result = null;
 
@@ -2658,15 +2654,15 @@ public final BaseDescr orRestriction() throws RecognitionException {
 		BaseDescr right =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:406:3: (left= andRestriction ( ( DOUBLE_PIPE ( fullAnnotation[null] )? andRestriction )=>lop= DOUBLE_PIPE (args= fullAnnotation[null] )? right= andRestriction )* ( EOF )? )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:406:5: left= andRestriction ( ( DOUBLE_PIPE ( fullAnnotation[null] )? andRestriction )=>lop= DOUBLE_PIPE (args= fullAnnotation[null] )? right= andRestriction )* ( EOF )?
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:413:3: (left= andRestriction ( ( DOUBLE_PIPE ( fullAnnotation[null] )? andRestriction )=>lop= DOUBLE_PIPE (args= fullAnnotation[null] )? right= andRestriction )* ( EOF )? )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:413:5: left= andRestriction ( ( DOUBLE_PIPE ( fullAnnotation[null] )? andRestriction )=>lop= DOUBLE_PIPE (args= fullAnnotation[null] )? right= andRestriction )* ( EOF )?
 			{
 			pushFollow(FOLLOW_andRestriction_in_orRestriction1892);
 			left=andRestriction();
 			state._fsp--;
 			if (state.failed) return result;
 			if ( state.backtracking==0 ) { if( buildDescr  ) { result = left; } }
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:407:5: ( ( DOUBLE_PIPE ( fullAnnotation[null] )? andRestriction )=>lop= DOUBLE_PIPE (args= fullAnnotation[null] )? right= andRestriction )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:414:5: ( ( DOUBLE_PIPE ( fullAnnotation[null] )? andRestriction )=>lop= DOUBLE_PIPE (args= fullAnnotation[null] )? right= andRestriction )*
 			loop39:
 			while (true) {
 				int alt39=2;
@@ -2681,10 +2677,10 @@ public final BaseDescr orRestriction() throws RecognitionException {
 
 				switch (alt39) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:407:7: ( DOUBLE_PIPE ( fullAnnotation[null] )? andRestriction )=>lop= DOUBLE_PIPE (args= fullAnnotation[null] )? right= andRestriction
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:414:7: ( DOUBLE_PIPE ( fullAnnotation[null] )? andRestriction )=>lop= DOUBLE_PIPE (args= fullAnnotation[null] )? right= andRestriction
 					{
 					lop=(Token)match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_orRestriction1914); if (state.failed) return result;
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:407:79: (args= fullAnnotation[null] )?
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:414:79: (args= fullAnnotation[null] )?
 					int alt38=2;
 					int LA38_0 = input.LA(1);
 					if ( (LA38_0==AT) ) {
@@ -2692,7 +2688,7 @@ public final BaseDescr orRestriction() throws RecognitionException {
 					}
 					switch (alt38) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:407:79: args= fullAnnotation[null]
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:414:79: args= fullAnnotation[null]
 							{
 							pushFollow(FOLLOW_fullAnnotation_in_orRestriction1918);
 							args=fullAnnotation(null);
@@ -2723,7 +2719,7 @@ public final BaseDescr orRestriction() throws RecognitionException {
 				}
 			}
 
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:416:7: ( EOF )?
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:423:7: ( EOF )?
 			int alt40=2;
 			int LA40_0 = input.LA(1);
 			if ( (LA40_0==EOF) ) {
@@ -2740,7 +2736,7 @@ else if ( ((LA40_1 >= AMPER && LA40_1 <= AND_ASSIGN)||LA40_1==AT||(LA40_1 >= COL
 			}
 			switch (alt40) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:416:7: EOF
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:423:7: EOF
 					{
 					match(input,EOF,FOLLOW_EOF_in_orRestriction1943); if (state.failed) return result;
 					}
@@ -2766,7 +2762,7 @@ else if ( ((LA40_1 >= AMPER && LA40_1 <= AND_ASSIGN)||LA40_1==AT||(LA40_1 >= COL
 
 
 	// $ANTLR start "andRestriction"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:419:1: andRestriction returns [BaseDescr result] : left= singleRestriction ( ( DOUBLE_AMPER ( fullAnnotation[null] )? operator )=>lop= DOUBLE_AMPER (args= fullAnnotation[null] )? right= singleRestriction )* ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:426:1: andRestriction returns [BaseDescr result] : left= singleRestriction ( ( DOUBLE_AMPER ( fullAnnotation[null] )? operator )=>lop= DOUBLE_AMPER (args= fullAnnotation[null] )? right= singleRestriction )* ;
 	public final BaseDescr andRestriction() throws RecognitionException {
 		BaseDescr result = null;
 
@@ -2777,15 +2773,15 @@ public final BaseDescr andRestriction() throws RecognitionException {
 		BaseDescr right =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:420:3: (left= singleRestriction ( ( DOUBLE_AMPER ( fullAnnotation[null] )? operator )=>lop= DOUBLE_AMPER (args= fullAnnotation[null] )? right= singleRestriction )* )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:420:5: left= singleRestriction ( ( DOUBLE_AMPER ( fullAnnotation[null] )? operator )=>lop= DOUBLE_AMPER (args= fullAnnotation[null] )? right= singleRestriction )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:427:3: (left= singleRestriction ( ( DOUBLE_AMPER ( fullAnnotation[null] )? operator )=>lop= DOUBLE_AMPER (args= fullAnnotation[null] )? right= singleRestriction )* )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:427:5: left= singleRestriction ( ( DOUBLE_AMPER ( fullAnnotation[null] )? operator )=>lop= DOUBLE_AMPER (args= fullAnnotation[null] )? right= singleRestriction )*
 			{
 			pushFollow(FOLLOW_singleRestriction_in_andRestriction1963);
 			left=singleRestriction();
 			state._fsp--;
 			if (state.failed) return result;
 			if ( state.backtracking==0 ) { if( buildDescr  ) { result = left; } }
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:421:3: ( ( DOUBLE_AMPER ( fullAnnotation[null] )? operator )=>lop= DOUBLE_AMPER (args= fullAnnotation[null] )? right= singleRestriction )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:428:3: ( ( DOUBLE_AMPER ( fullAnnotation[null] )? operator )=>lop= DOUBLE_AMPER (args= fullAnnotation[null] )? right= singleRestriction )*
 			loop42:
 			while (true) {
 				int alt42=2;
@@ -2800,11 +2796,11 @@ public final BaseDescr andRestriction() throws RecognitionException {
 
 				switch (alt42) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:421:5: ( DOUBLE_AMPER ( fullAnnotation[null] )? operator )=>lop= DOUBLE_AMPER (args= fullAnnotation[null] )? right= singleRestriction
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:428:5: ( DOUBLE_AMPER ( fullAnnotation[null] )? operator )=>lop= DOUBLE_AMPER (args= fullAnnotation[null] )? right= singleRestriction
 					{
 					lop=(Token)match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_andRestriction1983); if (state.failed) return result;
 					if ( state.backtracking==0 ) { if ( isNotEOF() ) helper.emit( Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR ); }
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:423:13: (args= fullAnnotation[null] )?
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:430:13: (args= fullAnnotation[null] )?
 					int alt41=2;
 					int LA41_0 = input.LA(1);
 					if ( (LA41_0==AT) ) {
@@ -2812,7 +2808,7 @@ public final BaseDescr andRestriction() throws RecognitionException {
 					}
 					switch (alt41) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:423:13: args= fullAnnotation[null]
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:430:13: args= fullAnnotation[null]
 							{
 							pushFollow(FOLLOW_fullAnnotation_in_andRestriction2004);
 							args=fullAnnotation(null);
@@ -2861,7 +2857,7 @@ public final BaseDescr andRestriction() throws RecognitionException {
 
 
 	// $ANTLR start "singleRestriction"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:435:1: singleRestriction returns [BaseDescr result] : (op= operator ( ( squareArguments shiftExpression )=>sa= squareArguments value= shiftExpression |value= shiftExpression ) | LEFT_PAREN or= orRestriction RIGHT_PAREN );
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:442:1: singleRestriction returns [BaseDescr result] : (op= operator ( ( squareArguments shiftExpression )=>sa= squareArguments value= shiftExpression |value= shiftExpression ) | LEFT_PAREN or= orRestriction RIGHT_PAREN );
 	public final BaseDescr singleRestriction() throws RecognitionException {
 		BaseDescr result = null;
 
@@ -2872,7 +2868,7 @@ public final BaseDescr singleRestriction() throws RecognitionException {
 		BaseDescr or =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:436:3: (op= operator ( ( squareArguments shiftExpression )=>sa= squareArguments value= shiftExpression |value= shiftExpression ) | LEFT_PAREN or= orRestriction RIGHT_PAREN )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:443:3: (op= operator ( ( squareArguments shiftExpression )=>sa= squareArguments value= shiftExpression |value= shiftExpression ) | LEFT_PAREN or= orRestriction RIGHT_PAREN )
 			int alt44=2;
 			int LA44_0 = input.LA(1);
 			if ( (LA44_0==EQUALS||(LA44_0 >= GREATER && LA44_0 <= GREATER_EQUALS)||(LA44_0 >= LESS && LA44_0 <= LESS_EQUALS)||LA44_0==NOT_EQUALS||LA44_0==TILDE) ) {
@@ -2894,14 +2890,14 @@ else if ( (LA44_0==LEFT_PAREN) ) {
 
 			switch (alt44) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:436:6: op= operator ( ( squareArguments shiftExpression )=>sa= squareArguments value= shiftExpression |value= shiftExpression )
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:443:6: op= operator ( ( squareArguments shiftExpression )=>sa= squareArguments value= shiftExpression |value= shiftExpression )
 					{
 					pushFollow(FOLLOW_operator_in_singleRestriction2045);
 					op=operator();
 					state._fsp--;
 					if (state.failed) return result;
 					if ( state.backtracking==0 ) { helper.emit( Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT ); }
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:438:6: ( ( squareArguments shiftExpression )=>sa= squareArguments value= shiftExpression |value= shiftExpression )
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:445:6: ( ( squareArguments shiftExpression )=>sa= squareArguments value= shiftExpression |value= shiftExpression )
 					int alt43=2;
 					int LA43_0 = input.LA(1);
 					if ( (LA43_0==LEFT_SQUARE) ) {
@@ -2927,7 +2923,7 @@ else if ( (LA43_0==BOOL||(LA43_0 >= DECIMAL && LA43_0 <= DIV)||LA43_0==DOT||LA43
 
 					switch (alt43) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:438:8: ( squareArguments shiftExpression )=>sa= squareArguments value= shiftExpression
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:445:8: ( squareArguments shiftExpression )=>sa= squareArguments value= shiftExpression
 							{
 							pushFollow(FOLLOW_squareArguments_in_singleRestriction2074);
 							sa=squareArguments();
@@ -2940,7 +2936,7 @@ else if ( (LA43_0==BOOL||(LA43_0 >= DECIMAL && LA43_0 <= DIV)||LA43_0==DOT||LA43
 							}
 							break;
 						case 2 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:439:10: value= shiftExpression
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:446:10: value= shiftExpression
 							{
 							pushFollow(FOLLOW_shiftExpression_in_singleRestriction2091);
 							value=shiftExpression();
@@ -2967,7 +2963,7 @@ else if ( (LA43_0==BOOL||(LA43_0 >= DECIMAL && LA43_0 <= DIV)||LA43_0==DOT||LA43
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:454:6: LEFT_PAREN or= orRestriction RIGHT_PAREN
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:461:6: LEFT_PAREN or= orRestriction RIGHT_PAREN
 					{
 					match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_singleRestriction2116); if (state.failed) return result;
 					pushFollow(FOLLOW_orRestriction_in_singleRestriction2120);
@@ -3000,7 +2996,7 @@ public static class shiftExpression_return extends ParserRuleReturnScope {
 
 
 	// $ANTLR start "shiftExpression"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:459:1: shiftExpression returns [BaseDescr result] : left= additiveExpression ( ( shiftOp )=> shiftOp additiveExpression )* ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:466:1: shiftExpression returns [BaseDescr result] : left= additiveExpression ( ( shiftOp )=> shiftOp additiveExpression )* ;
 	public final DRL6Expressions.shiftExpression_return shiftExpression() throws RecognitionException {
 		DRL6Expressions.shiftExpression_return retval = new DRL6Expressions.shiftExpression_return();
 		retval.start = input.LT(1);
@@ -3008,15 +3004,15 @@ public final DRL6Expressions.shiftExpression_return shiftExpression() throws Rec
 		BaseDescr left =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:460:3: (left= additiveExpression ( ( shiftOp )=> shiftOp additiveExpression )* )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:460:5: left= additiveExpression ( ( shiftOp )=> shiftOp additiveExpression )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:467:3: (left= additiveExpression ( ( shiftOp )=> shiftOp additiveExpression )* )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:467:5: left= additiveExpression ( ( shiftOp )=> shiftOp additiveExpression )*
 			{
 			pushFollow(FOLLOW_additiveExpression_in_shiftExpression2146);
 			left=additiveExpression();
 			state._fsp--;
 			if (state.failed) return retval;
 			if ( state.backtracking==0 ) { if( buildDescr  ) { retval.result = left; } }
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:461:5: ( ( shiftOp )=> shiftOp additiveExpression )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:468:5: ( ( shiftOp )=> shiftOp additiveExpression )*
 			loop45:
 			while (true) {
 				int alt45=2;
@@ -3038,7 +3034,7 @@ else if ( (LA45_0==GREATER) ) {
 
 				switch (alt45) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:461:7: ( shiftOp )=> shiftOp additiveExpression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:468:7: ( shiftOp )=> shiftOp additiveExpression
 					{
 					pushFollow(FOLLOW_shiftOp_in_shiftExpression2160);
 					shiftOp();
@@ -3076,13 +3072,13 @@ else if ( (LA45_0==GREATER) ) {
 
 
 	// $ANTLR start "shiftOp"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:464:1: shiftOp : ( LESS LESS | GREATER GREATER GREATER | GREATER GREATER ) ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:471:1: shiftOp : ( LESS LESS | GREATER GREATER GREATER | GREATER GREATER ) ;
 	public final void shiftOp() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:465:5: ( ( LESS LESS | GREATER GREATER GREATER | GREATER GREATER ) )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:465:7: ( LESS LESS | GREATER GREATER GREATER | GREATER GREATER )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:472:5: ( ( LESS LESS | GREATER GREATER GREATER | GREATER GREATER ) )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:472:7: ( LESS LESS | GREATER GREATER GREATER | GREATER GREATER )
 			{
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:465:7: ( LESS LESS | GREATER GREATER GREATER | GREATER GREATER )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:472:7: ( LESS LESS | GREATER GREATER GREATER | GREATER GREATER )
 			int alt46=3;
 			int LA46_0 = input.LA(1);
 			if ( (LA46_0==LESS) ) {
@@ -3140,14 +3136,14 @@ else if ( (LA46_3==EOF||LA46_3==BOOL||(LA46_3 >= DECIMAL && LA46_3 <= DIV)||LA46
 
 			switch (alt46) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:465:9: LESS LESS
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:472:9: LESS LESS
 					{
 					match(input,LESS,FOLLOW_LESS_in_shiftOp2182); if (state.failed) return;
 					match(input,LESS,FOLLOW_LESS_in_shiftOp2184); if (state.failed) return;
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:466:11: GREATER GREATER GREATER
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:473:11: GREATER GREATER GREATER
 					{
 					match(input,GREATER,FOLLOW_GREATER_in_shiftOp2196); if (state.failed) return;
 					match(input,GREATER,FOLLOW_GREATER_in_shiftOp2198); if (state.failed) return;
@@ -3155,7 +3151,7 @@ else if ( (LA46_3==EOF||LA46_3==BOOL||(LA46_3 >= DECIMAL && LA46_3 <= DIV)||LA46
 					}
 					break;
 				case 3 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:467:11: GREATER GREATER
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:474:11: GREATER GREATER
 					{
 					match(input,GREATER,FOLLOW_GREATER_in_shiftOp2212); if (state.failed) return;
 					match(input,GREATER,FOLLOW_GREATER_in_shiftOp2214); if (state.failed) return;
@@ -3181,7 +3177,7 @@ else if ( (LA46_3==EOF||LA46_3==BOOL||(LA46_3 >= DECIMAL && LA46_3 <= DIV)||LA46
 
 
 	// $ANTLR start "additiveExpression"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:470:1: additiveExpression returns [BaseDescr result] : left= multiplicativeExpression ( ( PLUS | MINUS )=> ( PLUS | MINUS ) multiplicativeExpression )* ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:477:1: additiveExpression returns [BaseDescr result] : left= multiplicativeExpression ( ( PLUS | MINUS )=> ( PLUS | MINUS ) multiplicativeExpression )* ;
 	public final BaseDescr additiveExpression() throws RecognitionException {
 		BaseDescr result = null;
 
@@ -3189,15 +3185,15 @@ public final BaseDescr additiveExpression() throws RecognitionException {
 		BaseDescr left =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:471:5: (left= multiplicativeExpression ( ( PLUS | MINUS )=> ( PLUS | MINUS ) multiplicativeExpression )* )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:471:9: left= multiplicativeExpression ( ( PLUS | MINUS )=> ( PLUS | MINUS ) multiplicativeExpression )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:478:5: (left= multiplicativeExpression ( ( PLUS | MINUS )=> ( PLUS | MINUS ) multiplicativeExpression )* )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:478:9: left= multiplicativeExpression ( ( PLUS | MINUS )=> ( PLUS | MINUS ) multiplicativeExpression )*
 			{
 			pushFollow(FOLLOW_multiplicativeExpression_in_additiveExpression2242);
 			left=multiplicativeExpression();
 			state._fsp--;
 			if (state.failed) return result;
 			if ( state.backtracking==0 ) { if( buildDescr  ) { result = left; } }
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:472:9: ( ( PLUS | MINUS )=> ( PLUS | MINUS ) multiplicativeExpression )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:479:9: ( ( PLUS | MINUS )=> ( PLUS | MINUS ) multiplicativeExpression )*
 			loop47:
 			while (true) {
 				int alt47=2;
@@ -3208,7 +3204,7 @@ public final BaseDescr additiveExpression() throws RecognitionException {
 
 				switch (alt47) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:472:11: ( PLUS | MINUS )=> ( PLUS | MINUS ) multiplicativeExpression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:479:11: ( PLUS | MINUS )=> ( PLUS | MINUS ) multiplicativeExpression
 					{
 					if ( input.LA(1)==MINUS||input.LA(1)==PLUS ) {
 						input.consume();
@@ -3250,7 +3246,7 @@ public final BaseDescr additiveExpression() throws RecognitionException {
 
 
 	// $ANTLR start "multiplicativeExpression"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:475:1: multiplicativeExpression returns [BaseDescr result] : left= unaryExpression ( ( STAR | DIV | MOD ) unaryExpression )* ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:482:1: multiplicativeExpression returns [BaseDescr result] : left= unaryExpression ( ( STAR | DIV | MOD ) unaryExpression )* ;
 	public final BaseDescr multiplicativeExpression() throws RecognitionException {
 		BaseDescr result = null;
 
@@ -3258,15 +3254,15 @@ public final BaseDescr multiplicativeExpression() throws RecognitionException {
 		BaseDescr left =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:476:5: (left= unaryExpression ( ( STAR | DIV | MOD ) unaryExpression )* )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:476:9: left= unaryExpression ( ( STAR | DIV | MOD ) unaryExpression )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:483:5: (left= unaryExpression ( ( STAR | DIV | MOD ) unaryExpression )* )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:483:9: left= unaryExpression ( ( STAR | DIV | MOD ) unaryExpression )*
 			{
 			pushFollow(FOLLOW_unaryExpression_in_multiplicativeExpression2299);
 			left=unaryExpression();
 			state._fsp--;
 			if (state.failed) return result;
 			if ( state.backtracking==0 ) { if( buildDescr  ) { result = left; } }
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:477:7: ( ( STAR | DIV | MOD ) unaryExpression )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:484:7: ( ( STAR | DIV | MOD ) unaryExpression )*
 			loop48:
 			while (true) {
 				int alt48=2;
@@ -3277,7 +3273,7 @@ public final BaseDescr multiplicativeExpression() throws RecognitionException {
 
 				switch (alt48) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:477:9: ( STAR | DIV | MOD ) unaryExpression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:484:9: ( STAR | DIV | MOD ) unaryExpression
 					{
 					if ( input.LA(1)==DIV||input.LA(1)==MOD||input.LA(1)==STAR ) {
 						input.consume();
@@ -3319,7 +3315,7 @@ public final BaseDescr multiplicativeExpression() throws RecognitionException {
 
 
 	// $ANTLR start "unaryExpression"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:480:1: unaryExpression returns [BaseDescr result] : ( PLUS ue= unaryExpression | MINUS ue= unaryExpression | INCR primary | DECR primary |left= unaryExpressionNotPlusMinus );
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:487:1: unaryExpression returns [BaseDescr result] : ( PLUS ue= unaryExpression | MINUS ue= unaryExpression | INCR primary | DECR primary |left= unaryExpressionNotPlusMinus );
 	public final BaseDescr unaryExpression() throws RecognitionException {
 		BaseDescr result = null;
 
@@ -3328,7 +3324,7 @@ public final BaseDescr unaryExpression() throws RecognitionException {
 		ParserRuleReturnScope left =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:481:5: ( PLUS ue= unaryExpression | MINUS ue= unaryExpression | INCR primary | DECR primary |left= unaryExpressionNotPlusMinus )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:488:5: ( PLUS ue= unaryExpression | MINUS ue= unaryExpression | INCR primary | DECR primary |left= unaryExpressionNotPlusMinus )
 			int alt49=5;
 			switch ( input.LA(1) ) {
 			case PLUS:
@@ -3380,7 +3376,7 @@ public final BaseDescr unaryExpression() throws RecognitionException {
 			}
 			switch (alt49) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:481:9: PLUS ue= unaryExpression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:488:9: PLUS ue= unaryExpression
 					{
 					match(input,PLUS,FOLLOW_PLUS_in_unaryExpression2351); if (state.failed) return result;
 					pushFollow(FOLLOW_unaryExpression_in_unaryExpression2355);
@@ -3396,7 +3392,7 @@ public final BaseDescr unaryExpression() throws RecognitionException {
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:488:7: MINUS ue= unaryExpression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:495:7: MINUS ue= unaryExpression
 					{
 					match(input,MINUS,FOLLOW_MINUS_in_unaryExpression2373); if (state.failed) return result;
 					pushFollow(FOLLOW_unaryExpression_in_unaryExpression2377);
@@ -3412,7 +3408,7 @@ public final BaseDescr unaryExpression() throws RecognitionException {
 					}
 					break;
 				case 3 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:495:9: INCR primary
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:502:9: INCR primary
 					{
 					match(input,INCR,FOLLOW_INCR_in_unaryExpression2397); if (state.failed) return result;
 					pushFollow(FOLLOW_primary_in_unaryExpression2399);
@@ -3422,7 +3418,7 @@ public final BaseDescr unaryExpression() throws RecognitionException {
 					}
 					break;
 				case 4 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:496:9: DECR primary
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:503:9: DECR primary
 					{
 					match(input,DECR,FOLLOW_DECR_in_unaryExpression2409); if (state.failed) return result;
 					pushFollow(FOLLOW_primary_in_unaryExpression2411);
@@ -3432,7 +3428,7 @@ public final BaseDescr unaryExpression() throws RecognitionException {
 					}
 					break;
 				case 5 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:497:9: left= unaryExpressionNotPlusMinus
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:504:9: left= unaryExpressionNotPlusMinus
 					{
 					pushFollow(FOLLOW_unaryExpressionNotPlusMinus_in_unaryExpression2423);
 					left=unaryExpressionNotPlusMinus();
@@ -3463,7 +3459,7 @@ public static class unaryExpressionNotPlusMinus_return extends ParserRuleReturnS
 
 
 	// $ANTLR start "unaryExpressionNotPlusMinus"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:500:1: unaryExpressionNotPlusMinus returns [BaseDescr result] : ( TILDE unaryExpression | NEGATION ue= unaryExpression | ( castExpression )=> castExpression | ( backReferenceExpression )=> backReferenceExpression | ( ({...}? (var= ID COLON ) ) | ({...}? (var= ID UNIFY ) ) )? ( ( xpathSeparator ID )=>left2= xpathPrimary |left1= primary ) ( ( selector )=> selector )* ( ( INCR | DECR )=> ( INCR | DECR ) )? );
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:507:1: unaryExpressionNotPlusMinus returns [BaseDescr result] : ( TILDE unaryExpression | NEGATION ue= unaryExpression | ( castExpression )=> castExpression | ( backReferenceExpression )=> backReferenceExpression | ( ({...}? (var= ID COLON ) ) | ({...}? (var= ID UNIFY ) ) )? ( ( xpathSeparator ID )=>left2= xpathPrimary |left1= primary ) ( ( selector )=> selector )* ( ( INCR | DECR )=> ( INCR | DECR ) )? );
 	public final DRL6Expressions.unaryExpressionNotPlusMinus_return unaryExpressionNotPlusMinus() throws RecognitionException {
 		DRL6Expressions.unaryExpressionNotPlusMinus_return retval = new DRL6Expressions.unaryExpressionNotPlusMinus_return();
 		retval.start = input.LT(1);
@@ -3477,7 +3473,7 @@ public final DRL6Expressions.unaryExpressionNotPlusMinus_return unaryExpressionN
 
 		 boolean isLeft = false; BindingDescr bind = null;
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:502:5: ( TILDE unaryExpression | NEGATION ue= unaryExpression | ( castExpression )=> castExpression | ( backReferenceExpression )=> backReferenceExpression | ( ({...}? (var= ID COLON ) ) | ({...}? (var= ID UNIFY ) ) )? ( ( xpathSeparator ID )=>left2= xpathPrimary |left1= primary ) ( ( selector )=> selector )* ( ( INCR | DECR )=> ( INCR | DECR ) )? )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:509:5: ( TILDE unaryExpression | NEGATION ue= unaryExpression | ( castExpression )=> castExpression | ( backReferenceExpression )=> backReferenceExpression | ( ({...}? (var= ID COLON ) ) | ({...}? (var= ID UNIFY ) ) )? ( ( xpathSeparator ID )=>left2= xpathPrimary |left1= primary ) ( ( selector )=> selector )* ( ( INCR | DECR )=> ( INCR | DECR ) )? )
 			int alt54=5;
 			int LA54_0 = input.LA(1);
 			if ( (LA54_0==TILDE) ) {
@@ -3512,7 +3508,7 @@ else if ( (LA54_0==BOOL||LA54_0==DECIMAL||LA54_0==DIV||LA54_0==FLOAT||LA54_0==HE
 
 			switch (alt54) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:502:9: TILDE unaryExpression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:509:9: TILDE unaryExpression
 					{
 					match(input,TILDE,FOLLOW_TILDE_in_unaryExpressionNotPlusMinus2453); if (state.failed) return retval;
 					pushFollow(FOLLOW_unaryExpression_in_unaryExpressionNotPlusMinus2455);
@@ -3522,7 +3518,7 @@ else if ( (LA54_0==BOOL||LA54_0==DECIMAL||LA54_0==DIV||LA54_0==FLOAT||LA54_0==HE
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:503:8: NEGATION ue= unaryExpression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:510:8: NEGATION ue= unaryExpression
 					{
 					match(input,NEGATION,FOLLOW_NEGATION_in_unaryExpressionNotPlusMinus2464); if (state.failed) return retval;
 					pushFollow(FOLLOW_unaryExpression_in_unaryExpressionNotPlusMinus2468);
@@ -3537,7 +3533,7 @@ else if ( (LA54_0==BOOL||LA54_0==DECIMAL||LA54_0==DIV||LA54_0==FLOAT||LA54_0==HE
 					}
 					break;
 				case 3 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:509:9: ( castExpression )=> castExpression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:516:9: ( castExpression )=> castExpression
 					{
 					pushFollow(FOLLOW_castExpression_in_unaryExpressionNotPlusMinus2492);
 					castExpression();
@@ -3546,7 +3542,7 @@ else if ( (LA54_0==BOOL||LA54_0==DECIMAL||LA54_0==DIV||LA54_0==FLOAT||LA54_0==HE
 					}
 					break;
 				case 4 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:510:9: ( backReferenceExpression )=> backReferenceExpression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:517:9: ( backReferenceExpression )=> backReferenceExpression
 					{
 					pushFollow(FOLLOW_backReferenceExpression_in_unaryExpressionNotPlusMinus2506);
 					backReferenceExpression();
@@ -3555,10 +3551,10 @@ else if ( (LA54_0==BOOL||LA54_0==DECIMAL||LA54_0==DIV||LA54_0==FLOAT||LA54_0==HE
 					}
 					break;
 				case 5 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:511:9: ( ({...}? (var= ID COLON ) ) | ({...}? (var= ID UNIFY ) ) )? ( ( xpathSeparator ID )=>left2= xpathPrimary |left1= primary ) ( ( selector )=> selector )* ( ( INCR | DECR )=> ( INCR | DECR ) )?
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:518:9: ( ({...}? (var= ID COLON ) ) | ({...}? (var= ID UNIFY ) ) )? ( ( xpathSeparator ID )=>left2= xpathPrimary |left1= primary ) ( ( selector )=> selector )* ( ( INCR | DECR )=> ( INCR | DECR ) )?
 					{
 					if ( state.backtracking==0 ) { isLeft = helper.getLeftMostExpr() == null;}
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:512:9: ( ({...}? (var= ID COLON ) ) | ({...}? (var= ID UNIFY ) ) )?
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:519:9: ( ({...}? (var= ID COLON ) ) | ({...}? (var= ID UNIFY ) ) )?
 					int alt50=3;
 					int LA50_0 = input.LA(1);
 					if ( (LA50_0==ID) ) {
@@ -3575,17 +3571,17 @@ else if ( (LA50_1==UNIFY) ) {
 					}
 					switch (alt50) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:512:11: ({...}? (var= ID COLON ) )
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:519:11: ({...}? (var= ID COLON ) )
 							{
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:512:11: ({...}? (var= ID COLON ) )
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:512:12: {...}? (var= ID COLON )
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:519:11: ({...}? (var= ID COLON ) )
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:519:12: {...}? (var= ID COLON )
 							{
 							if ( !((inMap == 0 && ternOp == 0 && input.LA(2) == DRL6Lexer.COLON)) ) {
 								if (state.backtracking>0) {state.failed=true; return retval;}
 								throw new FailedPredicateException(input, "unaryExpressionNotPlusMinus", "inMap == 0 && ternOp == 0 && input.LA(2) == DRL6Lexer.COLON");
 							}
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:512:75: (var= ID COLON )
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:512:76: var= ID COLON
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:519:75: (var= ID COLON )
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:519:76: var= ID COLON
 							{
 							var=(Token)match(input,ID,FOLLOW_ID_in_unaryExpressionNotPlusMinus2534); if (state.failed) return retval;
 							COLON9=(Token)match(input,COLON,FOLLOW_COLON_in_unaryExpressionNotPlusMinus2536); if (state.failed) return retval;
@@ -3597,17 +3593,17 @@ else if ( (LA50_1==UNIFY) ) {
 							}
 							break;
 						case 2 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:514:11: ({...}? (var= ID UNIFY ) )
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:521:11: ({...}? (var= ID UNIFY ) )
 							{
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:514:11: ({...}? (var= ID UNIFY ) )
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:514:12: {...}? (var= ID UNIFY )
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:521:11: ({...}? (var= ID UNIFY ) )
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:521:12: {...}? (var= ID UNIFY )
 							{
 							if ( !((inMap == 0 && ternOp == 0 && input.LA(2) == DRL6Lexer.UNIFY)) ) {
 								if (state.backtracking>0) {state.failed=true; return retval;}
 								throw new FailedPredicateException(input, "unaryExpressionNotPlusMinus", "inMap == 0 && ternOp == 0 && input.LA(2) == DRL6Lexer.UNIFY");
 							}
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:514:75: (var= ID UNIFY )
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:514:76: var= ID UNIFY
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:521:75: (var= ID UNIFY )
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:521:76: var= ID UNIFY
 							{
 							var=(Token)match(input,ID,FOLLOW_ID_in_unaryExpressionNotPlusMinus2575); if (state.failed) return retval;
 							UNIFY10=(Token)match(input,UNIFY,FOLLOW_UNIFY_in_unaryExpressionNotPlusMinus2577); if (state.failed) return retval;
@@ -3621,7 +3617,7 @@ else if ( (LA50_1==UNIFY) ) {
 
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:518:9: ( ( xpathSeparator ID )=>left2= xpathPrimary |left1= primary )
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:525:9: ( ( xpathSeparator ID )=>left2= xpathPrimary |left1= primary )
 					int alt51=2;
 					int LA51_0 = input.LA(1);
 					if ( (LA51_0==DIV||LA51_0==QUESTION_DIV) && (synpred17_DRL6Expressions())) {
@@ -3640,7 +3636,7 @@ else if ( (LA51_0==BOOL||LA51_0==DECIMAL||LA51_0==FLOAT||LA51_0==HEX||LA51_0==ID
 
 					switch (alt51) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:518:11: ( xpathSeparator ID )=>left2= xpathPrimary
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:525:11: ( xpathSeparator ID )=>left2= xpathPrimary
 							{
 							pushFollow(FOLLOW_xpathPrimary_in_unaryExpressionNotPlusMinus2631);
 							left2=xpathPrimary();
@@ -3650,7 +3646,7 @@ else if ( (LA51_0==BOOL||LA51_0==DECIMAL||LA51_0==FLOAT||LA51_0==HEX||LA51_0==ID
 							}
 							break;
 						case 2 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:519:13: left1= primary
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:526:13: left1= primary
 							{
 							pushFollow(FOLLOW_primary_in_unaryExpressionNotPlusMinus2649);
 							left1=primary();
@@ -3662,7 +3658,7 @@ else if ( (LA51_0==BOOL||LA51_0==DECIMAL||LA51_0==FLOAT||LA51_0==HEX||LA51_0==ID
 
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:522:9: ( ( selector )=> selector )*
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:529:9: ( ( selector )=> selector )*
 					loop52:
 					while (true) {
 						int alt52=2;
@@ -3679,7 +3675,7 @@ else if ( (LA52_0==LEFT_SQUARE) && (synpred18_DRL6Expressions())) {
 
 						switch (alt52) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:522:10: ( selector )=> selector
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:529:10: ( selector )=> selector
 							{
 							pushFollow(FOLLOW_selector_in_unaryExpressionNotPlusMinus2677);
 							selector();
@@ -3711,7 +3707,7 @@ else if ( (LA52_0==LEFT_SQUARE) && (synpred18_DRL6Expressions())) {
 					                }
 					            }
 					        }
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:541:9: ( ( INCR | DECR )=> ( INCR | DECR ) )?
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:548:9: ( ( INCR | DECR )=> ( INCR | DECR ) )?
 					int alt53=2;
 					int LA53_0 = input.LA(1);
 					if ( (LA53_0==DECR||LA53_0==INCR) && (synpred19_DRL6Expressions())) {
@@ -3719,7 +3715,7 @@ else if ( (LA52_0==LEFT_SQUARE) && (synpred18_DRL6Expressions())) {
 					}
 					switch (alt53) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:541:10: ( INCR | DECR )=> ( INCR | DECR )
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:548:10: ( INCR | DECR )=> ( INCR | DECR )
 							{
 							if ( input.LA(1)==DECR||input.LA(1)==INCR ) {
 								input.consume();
@@ -3758,12 +3754,12 @@ else if ( (LA52_0==LEFT_SQUARE) && (synpred18_DRL6Expressions())) {
 
 
 	// $ANTLR start "castExpression"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:544:1: castExpression : ( ( LEFT_PAREN primitiveType )=> LEFT_PAREN primitiveType RIGHT_PAREN expr= unaryExpression | ( LEFT_PAREN type )=> LEFT_PAREN type RIGHT_PAREN unaryExpressionNotPlusMinus );
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:551:1: castExpression : ( ( LEFT_PAREN primitiveType )=> LEFT_PAREN primitiveType RIGHT_PAREN expr= unaryExpression | ( LEFT_PAREN type )=> LEFT_PAREN type RIGHT_PAREN unaryExpressionNotPlusMinus );
 	public final void castExpression() throws RecognitionException {
 		BaseDescr expr =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:545:5: ( ( LEFT_PAREN primitiveType )=> LEFT_PAREN primitiveType RIGHT_PAREN expr= unaryExpression | ( LEFT_PAREN type )=> LEFT_PAREN type RIGHT_PAREN unaryExpressionNotPlusMinus )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:552:5: ( ( LEFT_PAREN primitiveType )=> LEFT_PAREN primitiveType RIGHT_PAREN expr= unaryExpression | ( LEFT_PAREN type )=> LEFT_PAREN type RIGHT_PAREN unaryExpressionNotPlusMinus )
 			int alt55=2;
 			int LA55_0 = input.LA(1);
 			if ( (LA55_0==LEFT_PAREN) ) {
@@ -3799,7 +3795,7 @@ else if ( (synpred21_DRL6Expressions()) ) {
 
 			switch (alt55) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:545:8: ( LEFT_PAREN primitiveType )=> LEFT_PAREN primitiveType RIGHT_PAREN expr= unaryExpression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:552:8: ( LEFT_PAREN primitiveType )=> LEFT_PAREN primitiveType RIGHT_PAREN expr= unaryExpression
 					{
 					match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_castExpression2739); if (state.failed) return;
 					pushFollow(FOLLOW_primitiveType_in_castExpression2741);
@@ -3814,7 +3810,7 @@ else if ( (synpred21_DRL6Expressions()) ) {
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:546:8: ( LEFT_PAREN type )=> LEFT_PAREN type RIGHT_PAREN unaryExpressionNotPlusMinus
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:553:8: ( LEFT_PAREN type )=> LEFT_PAREN type RIGHT_PAREN unaryExpressionNotPlusMinus
 					{
 					match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_castExpression2764); if (state.failed) return;
 					pushFollow(FOLLOW_type_in_castExpression2766);
@@ -3845,13 +3841,13 @@ else if ( (synpred21_DRL6Expressions()) ) {
 
 
 	// $ANTLR start "backReferenceExpression"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:549:1: backReferenceExpression : ( DOT DOT DIV )=> ( DOT DOT DIV )+ unaryExpressionNotPlusMinus ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:556:1: backReferenceExpression : ( DOT DOT DIV )=> ( DOT DOT DIV )+ unaryExpressionNotPlusMinus ;
 	public final void backReferenceExpression() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:550:5: ( ( DOT DOT DIV )=> ( DOT DOT DIV )+ unaryExpressionNotPlusMinus )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:550:8: ( DOT DOT DIV )=> ( DOT DOT DIV )+ unaryExpressionNotPlusMinus
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:557:5: ( ( DOT DOT DIV )=> ( DOT DOT DIV )+ unaryExpressionNotPlusMinus )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:557:8: ( DOT DOT DIV )=> ( DOT DOT DIV )+ unaryExpressionNotPlusMinus
 			{
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:550:25: ( DOT DOT DIV )+
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:557:25: ( DOT DOT DIV )+
 			int cnt56=0;
 			loop56:
 			while (true) {
@@ -3863,7 +3859,7 @@ public final void backReferenceExpression() throws RecognitionException {
 
 				switch (alt56) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:550:26: DOT DOT DIV
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:557:26: DOT DOT DIV
 					{
 					match(input,DOT,FOLLOW_DOT_in_backReferenceExpression2799); if (state.failed) return;
 					match(input,DOT,FOLLOW_DOT_in_backReferenceExpression2801); if (state.failed) return;
@@ -3901,10 +3897,10 @@ public final void backReferenceExpression() throws RecognitionException {
 
 
 	// $ANTLR start "primitiveType"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:553:1: primitiveType : ( boolean_key | char_key | byte_key | short_key | int_key | long_key | float_key | double_key );
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:560:1: primitiveType : ( boolean_key | char_key | byte_key | short_key | int_key | long_key | float_key | double_key );
 	public final void primitiveType() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:554:5: ( boolean_key | char_key | byte_key | short_key | int_key | long_key | float_key | double_key )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:561:5: ( boolean_key | char_key | byte_key | short_key | int_key | long_key | float_key | double_key )
 			int alt57=8;
 			int LA57_0 = input.LA(1);
 			if ( (LA57_0==ID) && ((((helper.validateIdentifierKey(DroolsSoftKeywords.SHORT)))||((helper.validateIdentifierKey(DroolsSoftKeywords.LONG)))||((helper.validateIdentifierKey(DroolsSoftKeywords.CHAR)))||((helper.validateIdentifierKey(DroolsSoftKeywords.INT)))||((helper.validateIdentifierKey(DroolsSoftKeywords.FLOAT)))||((helper.validateIdentifierKey(DroolsSoftKeywords.BOOLEAN)))||((helper.validateIdentifierKey(DroolsSoftKeywords.DOUBLE)))||((helper.validateIdentifierKey(DroolsSoftKeywords.BYTE)))))) {
@@ -3951,7 +3947,7 @@ else if ( (((helper.validateIdentifierKey(DroolsSoftKeywords.DOUBLE)))) ) {
 
 			switch (alt57) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:554:9: boolean_key
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:561:9: boolean_key
 					{
 					pushFollow(FOLLOW_boolean_key_in_primitiveType2826);
 					boolean_key();
@@ -3960,7 +3956,7 @@ else if ( (((helper.validateIdentifierKey(DroolsSoftKeywords.DOUBLE)))) ) {
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:555:7: char_key
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:562:7: char_key
 					{
 					pushFollow(FOLLOW_char_key_in_primitiveType2834);
 					char_key();
@@ -3969,7 +3965,7 @@ else if ( (((helper.validateIdentifierKey(DroolsSoftKeywords.DOUBLE)))) ) {
 					}
 					break;
 				case 3 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:556:7: byte_key
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:563:7: byte_key
 					{
 					pushFollow(FOLLOW_byte_key_in_primitiveType2842);
 					byte_key();
@@ -3978,7 +3974,7 @@ else if ( (((helper.validateIdentifierKey(DroolsSoftKeywords.DOUBLE)))) ) {
 					}
 					break;
 				case 4 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:557:7: short_key
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:564:7: short_key
 					{
 					pushFollow(FOLLOW_short_key_in_primitiveType2850);
 					short_key();
@@ -3987,7 +3983,7 @@ else if ( (((helper.validateIdentifierKey(DroolsSoftKeywords.DOUBLE)))) ) {
 					}
 					break;
 				case 5 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:558:7: int_key
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:565:7: int_key
 					{
 					pushFollow(FOLLOW_int_key_in_primitiveType2858);
 					int_key();
@@ -3996,7 +3992,7 @@ else if ( (((helper.validateIdentifierKey(DroolsSoftKeywords.DOUBLE)))) ) {
 					}
 					break;
 				case 6 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:559:7: long_key
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:566:7: long_key
 					{
 					pushFollow(FOLLOW_long_key_in_primitiveType2866);
 					long_key();
@@ -4005,7 +4001,7 @@ else if ( (((helper.validateIdentifierKey(DroolsSoftKeywords.DOUBLE)))) ) {
 					}
 					break;
 				case 7 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:560:7: float_key
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:567:7: float_key
 					{
 					pushFollow(FOLLOW_float_key_in_primitiveType2874);
 					float_key();
@@ -4014,7 +4010,7 @@ else if ( (((helper.validateIdentifierKey(DroolsSoftKeywords.DOUBLE)))) ) {
 					}
 					break;
 				case 8 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:561:7: double_key
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:568:7: double_key
 					{
 					pushFollow(FOLLOW_double_key_in_primitiveType2882);
 					double_key();
@@ -4039,11 +4035,11 @@ else if ( (((helper.validateIdentifierKey(DroolsSoftKeywords.DOUBLE)))) ) {
 
 
 	// $ANTLR start "xpathSeparator"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:564:1: xpathSeparator : ( DIV | QUESTION_DIV );
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:571:1: xpathSeparator : ( DIV | QUESTION_DIV );
 	public final void xpathSeparator() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:565:5: ( DIV | QUESTION_DIV )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:572:5: ( DIV | QUESTION_DIV )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:
 			{
 			if ( input.LA(1)==DIV||input.LA(1)==QUESTION_DIV ) {
 				input.consume();
@@ -4072,17 +4068,20 @@ public final void xpathSeparator() throws RecognitionException {
 
 
 	// $ANTLR start "xpathPrimary"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:569:1: xpathPrimary returns [BaseDescr result] : ( xpathChunk )+ ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:576:1: xpathPrimary returns [BaseDescr result] : xpathChunk ({...}? xpathChunk )* ;
 	public final BaseDescr xpathPrimary() throws RecognitionException {
 		BaseDescr result = null;
 
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:570:5: ( ( xpathChunk )+ )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:570:7: ( xpathChunk )+
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:577:5: ( xpathChunk ({...}? xpathChunk )* )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:577:7: xpathChunk ({...}? xpathChunk )*
 			{
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:570:7: ( xpathChunk )+
-			int cnt58=0;
+			pushFollow(FOLLOW_xpathChunk_in_xpathPrimary2930);
+			xpathChunk();
+			state._fsp--;
+			if (state.failed) return result;
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:577:18: ({...}? xpathChunk )*
 			loop58:
 			while (true) {
 				int alt58=2;
@@ -4090,7 +4089,11 @@ public final BaseDescr xpathPrimary() throws RecognitionException {
 				if ( (LA58_0==DIV) ) {
 					int LA58_2 = input.LA(2);
 					if ( (LA58_2==ID) ) {
-						alt58=1;
+						int LA58_4 = input.LA(3);
+						if ( ((notStartWithNewline())) ) {
+							alt58=1;
+						}
+
 					}
 
 				}
@@ -4100,9 +4103,13 @@ else if ( (LA58_0==QUESTION_DIV) ) {
 
 				switch (alt58) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:570:7: xpathChunk
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:577:19: {...}? xpathChunk
 					{
-					pushFollow(FOLLOW_xpathChunk_in_xpathPrimary2930);
+					if ( !((notStartWithNewline())) ) {
+						if (state.backtracking>0) {state.failed=true; return result;}
+						throw new FailedPredicateException(input, "xpathPrimary", "notStartWithNewline()");
+					}
+					pushFollow(FOLLOW_xpathChunk_in_xpathPrimary2935);
 					xpathChunk();
 					state._fsp--;
 					if (state.failed) return result;
@@ -4110,12 +4117,8 @@ else if ( (LA58_0==QUESTION_DIV) ) {
 					break;
 
 				default :
-					if ( cnt58 >= 1 ) break loop58;
-					if (state.backtracking>0) {state.failed=true; return result;}
-					EarlyExitException eee = new EarlyExitException(58, input);
-					throw eee;
+					break loop58;
 				}
-				cnt58++;
 			}
 
 			}
@@ -4136,21 +4139,21 @@ else if ( (LA58_0==QUESTION_DIV) ) {
 
 
 	// $ANTLR start "xpathChunk"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:573:1: xpathChunk returns [BaseDescr result] : ( xpathSeparator ID )=> xpathSeparator ID ( DOT ID )* ( HASH ID )? ( LEFT_SQUARE xpathExpressionList RIGHT_SQUARE )? ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:580:1: xpathChunk returns [BaseDescr result] : ( xpathSeparator ID )=> xpathSeparator ID ( DOT ID )* ( HASH ID )? ( LEFT_SQUARE xpathExpressionList RIGHT_SQUARE )? ;
 	public final BaseDescr xpathChunk() throws RecognitionException {
 		BaseDescr result = null;
 
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:574:5: ( ( xpathSeparator ID )=> xpathSeparator ID ( DOT ID )* ( HASH ID )? ( LEFT_SQUARE xpathExpressionList RIGHT_SQUARE )? )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:574:7: ( xpathSeparator ID )=> xpathSeparator ID ( DOT ID )* ( HASH ID )? ( LEFT_SQUARE xpathExpressionList RIGHT_SQUARE )?
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:581:5: ( ( xpathSeparator ID )=> xpathSeparator ID ( DOT ID )* ( HASH ID )? ( LEFT_SQUARE xpathExpressionList RIGHT_SQUARE )? )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:581:7: ( xpathSeparator ID )=> xpathSeparator ID ( DOT ID )* ( HASH ID )? ( LEFT_SQUARE xpathExpressionList RIGHT_SQUARE )?
 			{
-			pushFollow(FOLLOW_xpathSeparator_in_xpathChunk2959);
+			pushFollow(FOLLOW_xpathSeparator_in_xpathChunk2965);
 			xpathSeparator();
 			state._fsp--;
 			if (state.failed) return result;
-			match(input,ID,FOLLOW_ID_in_xpathChunk2961); if (state.failed) return result;
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:574:47: ( DOT ID )*
+			match(input,ID,FOLLOW_ID_in_xpathChunk2967); if (state.failed) return result;
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:581:47: ( DOT ID )*
 			loop59:
 			while (true) {
 				int alt59=2;
@@ -4165,10 +4168,10 @@ public final BaseDescr xpathChunk() throws RecognitionException {
 
 				switch (alt59) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:574:48: DOT ID
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:581:48: DOT ID
 					{
-					match(input,DOT,FOLLOW_DOT_in_xpathChunk2964); if (state.failed) return result;
-					match(input,ID,FOLLOW_ID_in_xpathChunk2966); if (state.failed) return result;
+					match(input,DOT,FOLLOW_DOT_in_xpathChunk2970); if (state.failed) return result;
+					match(input,ID,FOLLOW_ID_in_xpathChunk2972); if (state.failed) return result;
 					}
 					break;
 
@@ -4177,7 +4180,7 @@ public final BaseDescr xpathChunk() throws RecognitionException {
 				}
 			}
 
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:574:57: ( HASH ID )?
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:581:57: ( HASH ID )?
 			int alt60=2;
 			int LA60_0 = input.LA(1);
 			if ( (LA60_0==HASH) ) {
@@ -4185,16 +4188,16 @@ public final BaseDescr xpathChunk() throws RecognitionException {
 			}
 			switch (alt60) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:574:58: HASH ID
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:581:58: HASH ID
 					{
-					match(input,HASH,FOLLOW_HASH_in_xpathChunk2971); if (state.failed) return result;
-					match(input,ID,FOLLOW_ID_in_xpathChunk2973); if (state.failed) return result;
+					match(input,HASH,FOLLOW_HASH_in_xpathChunk2977); if (state.failed) return result;
+					match(input,ID,FOLLOW_ID_in_xpathChunk2979); if (state.failed) return result;
 					}
 					break;
 
 			}
 
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:574:68: ( LEFT_SQUARE xpathExpressionList RIGHT_SQUARE )?
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:581:68: ( LEFT_SQUARE xpathExpressionList RIGHT_SQUARE )?
 			int alt61=2;
 			int LA61_0 = input.LA(1);
 			if ( (LA61_0==LEFT_SQUARE) ) {
@@ -4202,14 +4205,14 @@ public final BaseDescr xpathChunk() throws RecognitionException {
 			}
 			switch (alt61) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:574:69: LEFT_SQUARE xpathExpressionList RIGHT_SQUARE
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:581:69: LEFT_SQUARE xpathExpressionList RIGHT_SQUARE
 					{
-					match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_xpathChunk2978); if (state.failed) return result;
-					pushFollow(FOLLOW_xpathExpressionList_in_xpathChunk2980);
+					match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_xpathChunk2984); if (state.failed) return result;
+					pushFollow(FOLLOW_xpathExpressionList_in_xpathChunk2986);
 					xpathExpressionList();
 					state._fsp--;
 					if (state.failed) return result;
-					match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_xpathChunk2982); if (state.failed) return result;
+					match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_xpathChunk2988); if (state.failed) return result;
 					}
 					break;
 
@@ -4233,7 +4236,7 @@ public final BaseDescr xpathChunk() throws RecognitionException {
 
 
 	// $ANTLR start "xpathExpressionList"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:577:1: xpathExpressionList returns [java.util.List exprs] : f= expression ( COMMA s= expression )* ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:584:1: xpathExpressionList returns [java.util.List exprs] : f= expression ( COMMA s= expression )* ;
 	public final java.util.List xpathExpressionList() throws RecognitionException {
 		java.util.List exprs = null;
 
@@ -4243,15 +4246,15 @@ public final java.util.List xpathExpressionList() throws RecognitionExce
 
 		 exprs = new java.util.ArrayList();
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:579:3: (f= expression ( COMMA s= expression )* )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:579:7: f= expression ( COMMA s= expression )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:586:3: (f= expression ( COMMA s= expression )* )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:586:7: f= expression ( COMMA s= expression )*
 			{
-			pushFollow(FOLLOW_expression_in_xpathExpressionList3012);
+			pushFollow(FOLLOW_expression_in_xpathExpressionList3018);
 			f=expression();
 			state._fsp--;
 			if (state.failed) return exprs;
 			if ( state.backtracking==0 ) { exprs.add( (f!=null?input.toString(f.start,f.stop):null) ); }
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:580:7: ( COMMA s= expression )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:587:7: ( COMMA s= expression )*
 			loop62:
 			while (true) {
 				int alt62=2;
@@ -4262,10 +4265,10 @@ public final java.util.List xpathExpressionList() throws RecognitionExce
 
 				switch (alt62) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:580:8: COMMA s= expression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:587:8: COMMA s= expression
 					{
-					match(input,COMMA,FOLLOW_COMMA_in_xpathExpressionList3023); if (state.failed) return exprs;
-					pushFollow(FOLLOW_expression_in_xpathExpressionList3027);
+					match(input,COMMA,FOLLOW_COMMA_in_xpathExpressionList3029); if (state.failed) return exprs;
+					pushFollow(FOLLOW_expression_in_xpathExpressionList3033);
 					s=expression();
 					state._fsp--;
 					if (state.failed) return exprs;
@@ -4296,7 +4299,7 @@ public final java.util.List xpathExpressionList() throws RecognitionExce
 
 
 	// $ANTLR start "primary"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:583:1: primary returns [BaseDescr result] : ( ( LEFT_PAREN )=>expr= parExpression | ( nonWildcardTypeArguments )=> nonWildcardTypeArguments ( explicitGenericInvocationSuffix | this_key arguments ) | ( literal )=> literal | ( super_key )=> super_key superSuffix | ( new_key )=> new_key creator | ( primitiveType )=> primitiveType ( LEFT_SQUARE RIGHT_SQUARE )* DOT class_key | ( inlineMapExpression )=> inlineMapExpression | ( inlineListExpression )=> inlineListExpression | ( ID )=>i1= ID ( ( ( DOT ID )=>d= DOT i2= ID ) | ( ( ( DOT | NULL_SAFE_DOT ) LEFT_PAREN )=>d= ( DOT | NULL_SAFE_DOT ) LEFT_PAREN expression ( COMMA expression )* RIGHT_PAREN ) | ( ( HASH ID )=>h= HASH i2= ID ) | ( ( NULL_SAFE_DOT ID )=>n= NULL_SAFE_DOT i2= ID ) )* ( ( identifierSuffix )=> identifierSuffix )? );
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:590:1: primary returns [BaseDescr result] : ( ( LEFT_PAREN )=>expr= parExpression | ( nonWildcardTypeArguments )=> nonWildcardTypeArguments ( explicitGenericInvocationSuffix | this_key arguments ) | ( literal )=> literal | ( super_key )=> super_key superSuffix | ( new_key )=> new_key creator | ( primitiveType )=> primitiveType ( LEFT_SQUARE RIGHT_SQUARE )* DOT class_key | ( inlineMapExpression )=> inlineMapExpression | ( inlineListExpression )=> inlineListExpression | ( ID )=>i1= ID ( ( ( DOT ID )=>d= DOT i2= ID ) | ( ( ( DOT | NULL_SAFE_DOT ) LEFT_PAREN )=>d= ( DOT | NULL_SAFE_DOT ) LEFT_PAREN expression ( COMMA expression )* RIGHT_PAREN ) | ( ( HASH ID )=>h= HASH i2= ID ) | ( ( NULL_SAFE_DOT ID )=>n= NULL_SAFE_DOT i2= ID ) )* ( ( identifierSuffix )=> identifierSuffix )? );
 	public final BaseDescr primary() throws RecognitionException {
 		BaseDescr result = null;
 
@@ -4313,7 +4316,7 @@ public final BaseDescr primary() throws RecognitionException {
 		ParserRuleReturnScope literal11 =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:584:5: ( ( LEFT_PAREN )=>expr= parExpression | ( nonWildcardTypeArguments )=> nonWildcardTypeArguments ( explicitGenericInvocationSuffix | this_key arguments ) | ( literal )=> literal | ( super_key )=> super_key superSuffix | ( new_key )=> new_key creator | ( primitiveType )=> primitiveType ( LEFT_SQUARE RIGHT_SQUARE )* DOT class_key | ( inlineMapExpression )=> inlineMapExpression | ( inlineListExpression )=> inlineListExpression | ( ID )=>i1= ID ( ( ( DOT ID )=>d= DOT i2= ID ) | ( ( ( DOT | NULL_SAFE_DOT ) LEFT_PAREN )=>d= ( DOT | NULL_SAFE_DOT ) LEFT_PAREN expression ( COMMA expression )* RIGHT_PAREN ) | ( ( HASH ID )=>h= HASH i2= ID ) | ( ( NULL_SAFE_DOT ID )=>n= NULL_SAFE_DOT i2= ID ) )* ( ( identifierSuffix )=> identifierSuffix )? )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:591:5: ( ( LEFT_PAREN )=>expr= parExpression | ( nonWildcardTypeArguments )=> nonWildcardTypeArguments ( explicitGenericInvocationSuffix | this_key arguments ) | ( literal )=> literal | ( super_key )=> super_key superSuffix | ( new_key )=> new_key creator | ( primitiveType )=> primitiveType ( LEFT_SQUARE RIGHT_SQUARE )* DOT class_key | ( inlineMapExpression )=> inlineMapExpression | ( inlineListExpression )=> inlineListExpression | ( ID )=>i1= ID ( ( ( DOT ID )=>d= DOT i2= ID ) | ( ( ( DOT | NULL_SAFE_DOT ) LEFT_PAREN )=>d= ( DOT | NULL_SAFE_DOT ) LEFT_PAREN expression ( COMMA expression )* RIGHT_PAREN ) | ( ( HASH ID )=>h= HASH i2= ID ) | ( ( NULL_SAFE_DOT ID )=>n= NULL_SAFE_DOT i2= ID ) )* ( ( identifierSuffix )=> identifierSuffix )? )
 			int alt68=9;
 			int LA68_0 = input.LA(1);
 			if ( (LA68_0==LEFT_PAREN) && (synpred24_DRL6Expressions())) {
@@ -4408,9 +4411,9 @@ else if ( (synpred31_DRL6Expressions()) ) {
 
 			switch (alt68) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:584:7: ( LEFT_PAREN )=>expr= parExpression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:591:7: ( LEFT_PAREN )=>expr= parExpression
 					{
-					pushFollow(FOLLOW_parExpression_in_primary3057);
+					pushFollow(FOLLOW_parExpression_in_primary3063);
 					expr=parExpression();
 					state._fsp--;
 					if (state.failed) return result;
@@ -4418,13 +4421,13 @@ else if ( (synpred31_DRL6Expressions()) ) {
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:585:9: ( nonWildcardTypeArguments )=> nonWildcardTypeArguments ( explicitGenericInvocationSuffix | this_key arguments )
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:592:9: ( nonWildcardTypeArguments )=> nonWildcardTypeArguments ( explicitGenericInvocationSuffix | this_key arguments )
 					{
-					pushFollow(FOLLOW_nonWildcardTypeArguments_in_primary3074);
+					pushFollow(FOLLOW_nonWildcardTypeArguments_in_primary3080);
 					nonWildcardTypeArguments();
 					state._fsp--;
 					if (state.failed) return result;
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:585:63: ( explicitGenericInvocationSuffix | this_key arguments )
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:592:63: ( explicitGenericInvocationSuffix | this_key arguments )
 					int alt63=2;
 					int LA63_0 = input.LA(1);
 					if ( (LA63_0==ID) ) {
@@ -4460,22 +4463,22 @@ else if ( (((helper.validateIdentifierKey(DroolsSoftKeywords.THIS)))) ) {
 
 					switch (alt63) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:585:64: explicitGenericInvocationSuffix
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:592:64: explicitGenericInvocationSuffix
 							{
-							pushFollow(FOLLOW_explicitGenericInvocationSuffix_in_primary3077);
+							pushFollow(FOLLOW_explicitGenericInvocationSuffix_in_primary3083);
 							explicitGenericInvocationSuffix();
 							state._fsp--;
 							if (state.failed) return result;
 							}
 							break;
 						case 2 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:585:98: this_key arguments
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:592:98: this_key arguments
 							{
-							pushFollow(FOLLOW_this_key_in_primary3081);
+							pushFollow(FOLLOW_this_key_in_primary3087);
 							this_key();
 							state._fsp--;
 							if (state.failed) return result;
-							pushFollow(FOLLOW_arguments_in_primary3083);
+							pushFollow(FOLLOW_arguments_in_primary3089);
 							arguments();
 							state._fsp--;
 							if (state.failed) return result;
@@ -4487,9 +4490,9 @@ else if ( (((helper.validateIdentifierKey(DroolsSoftKeywords.THIS)))) ) {
 					}
 					break;
 				case 3 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:586:9: ( literal )=> literal
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:593:9: ( literal )=> literal
 					{
-					pushFollow(FOLLOW_literal_in_primary3099);
+					pushFollow(FOLLOW_literal_in_primary3105);
 					literal11=literal();
 					state._fsp--;
 					if (state.failed) return result;
@@ -4497,39 +4500,39 @@ else if ( (((helper.validateIdentifierKey(DroolsSoftKeywords.THIS)))) ) {
 					}
 					break;
 				case 4 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:588:9: ( super_key )=> super_key superSuffix
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:595:9: ( super_key )=> super_key superSuffix
 					{
-					pushFollow(FOLLOW_super_key_in_primary3121);
+					pushFollow(FOLLOW_super_key_in_primary3127);
 					super_key();
 					state._fsp--;
 					if (state.failed) return result;
-					pushFollow(FOLLOW_superSuffix_in_primary3123);
+					pushFollow(FOLLOW_superSuffix_in_primary3129);
 					superSuffix();
 					state._fsp--;
 					if (state.failed) return result;
 					}
 					break;
 				case 5 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:589:9: ( new_key )=> new_key creator
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:596:9: ( new_key )=> new_key creator
 					{
-					pushFollow(FOLLOW_new_key_in_primary3138);
+					pushFollow(FOLLOW_new_key_in_primary3144);
 					new_key();
 					state._fsp--;
 					if (state.failed) return result;
-					pushFollow(FOLLOW_creator_in_primary3140);
+					pushFollow(FOLLOW_creator_in_primary3146);
 					creator();
 					state._fsp--;
 					if (state.failed) return result;
 					}
 					break;
 				case 6 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:590:9: ( primitiveType )=> primitiveType ( LEFT_SQUARE RIGHT_SQUARE )* DOT class_key
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:597:9: ( primitiveType )=> primitiveType ( LEFT_SQUARE RIGHT_SQUARE )* DOT class_key
 					{
-					pushFollow(FOLLOW_primitiveType_in_primary3155);
+					pushFollow(FOLLOW_primitiveType_in_primary3161);
 					primitiveType();
 					state._fsp--;
 					if (state.failed) return result;
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:590:41: ( LEFT_SQUARE RIGHT_SQUARE )*
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:597:41: ( LEFT_SQUARE RIGHT_SQUARE )*
 					loop64:
 					while (true) {
 						int alt64=2;
@@ -4540,10 +4543,10 @@ else if ( (((helper.validateIdentifierKey(DroolsSoftKeywords.THIS)))) ) {
 
 						switch (alt64) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:590:42: LEFT_SQUARE RIGHT_SQUARE
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:597:42: LEFT_SQUARE RIGHT_SQUARE
 							{
-							match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_primary3158); if (state.failed) return result;
-							match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_primary3160); if (state.failed) return result;
+							match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_primary3164); if (state.failed) return result;
+							match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_primary3166); if (state.failed) return result;
 							}
 							break;
 
@@ -4552,37 +4555,37 @@ else if ( (((helper.validateIdentifierKey(DroolsSoftKeywords.THIS)))) ) {
 						}
 					}
 
-					match(input,DOT,FOLLOW_DOT_in_primary3164); if (state.failed) return result;
-					pushFollow(FOLLOW_class_key_in_primary3166);
+					match(input,DOT,FOLLOW_DOT_in_primary3170); if (state.failed) return result;
+					pushFollow(FOLLOW_class_key_in_primary3172);
 					class_key();
 					state._fsp--;
 					if (state.failed) return result;
 					}
 					break;
 				case 7 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:592:9: ( inlineMapExpression )=> inlineMapExpression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:599:9: ( inlineMapExpression )=> inlineMapExpression
 					{
-					pushFollow(FOLLOW_inlineMapExpression_in_primary3186);
+					pushFollow(FOLLOW_inlineMapExpression_in_primary3192);
 					inlineMapExpression();
 					state._fsp--;
 					if (state.failed) return result;
 					}
 					break;
 				case 8 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:593:9: ( inlineListExpression )=> inlineListExpression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:600:9: ( inlineListExpression )=> inlineListExpression
 					{
-					pushFollow(FOLLOW_inlineListExpression_in_primary3201);
+					pushFollow(FOLLOW_inlineListExpression_in_primary3207);
 					inlineListExpression();
 					state._fsp--;
 					if (state.failed) return result;
 					}
 					break;
 				case 9 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:594:9: ( ID )=>i1= ID ( ( ( DOT ID )=>d= DOT i2= ID ) | ( ( ( DOT | NULL_SAFE_DOT ) LEFT_PAREN )=>d= ( DOT | NULL_SAFE_DOT ) LEFT_PAREN expression ( COMMA expression )* RIGHT_PAREN ) | ( ( HASH ID )=>h= HASH i2= ID ) | ( ( NULL_SAFE_DOT ID )=>n= NULL_SAFE_DOT i2= ID ) )* ( ( identifierSuffix )=> identifierSuffix )?
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:601:9: ( ID )=>i1= ID ( ( ( DOT ID )=>d= DOT i2= ID ) | ( ( ( DOT | NULL_SAFE_DOT ) LEFT_PAREN )=>d= ( DOT | NULL_SAFE_DOT ) LEFT_PAREN expression ( COMMA expression )* RIGHT_PAREN ) | ( ( HASH ID )=>h= HASH i2= ID ) | ( ( NULL_SAFE_DOT ID )=>n= NULL_SAFE_DOT i2= ID ) )* ( ( identifierSuffix )=> identifierSuffix )?
 					{
-					i1=(Token)match(input,ID,FOLLOW_ID_in_primary3217); if (state.failed) return result;
+					i1=(Token)match(input,ID,FOLLOW_ID_in_primary3223); if (state.failed) return result;
 					if ( state.backtracking==0 ) { helper.emit(i1, DroolsEditorType.IDENTIFIER); }
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:595:9: ( ( ( DOT ID )=>d= DOT i2= ID ) | ( ( ( DOT | NULL_SAFE_DOT ) LEFT_PAREN )=>d= ( DOT | NULL_SAFE_DOT ) LEFT_PAREN expression ( COMMA expression )* RIGHT_PAREN ) | ( ( HASH ID )=>h= HASH i2= ID ) | ( ( NULL_SAFE_DOT ID )=>n= NULL_SAFE_DOT i2= ID ) )*
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:602:9: ( ( ( DOT ID )=>d= DOT i2= ID ) | ( ( ( DOT | NULL_SAFE_DOT ) LEFT_PAREN )=>d= ( DOT | NULL_SAFE_DOT ) LEFT_PAREN expression ( COMMA expression )* RIGHT_PAREN ) | ( ( HASH ID )=>h= HASH i2= ID ) | ( ( NULL_SAFE_DOT ID )=>n= NULL_SAFE_DOT i2= ID ) )*
 					loop66:
 					while (true) {
 						int alt66=5;
@@ -4621,23 +4624,23 @@ else if ( (LA66_0==HASH) && (synpred35_DRL6Expressions())) {
 
 						switch (alt66) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:596:13: ( ( DOT ID )=>d= DOT i2= ID )
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:603:13: ( ( DOT ID )=>d= DOT i2= ID )
 							{
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:596:13: ( ( DOT ID )=>d= DOT i2= ID )
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:596:15: ( DOT ID )=>d= DOT i2= ID
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:603:13: ( ( DOT ID )=>d= DOT i2= ID )
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:603:15: ( DOT ID )=>d= DOT i2= ID
 							{
-							d=(Token)match(input,DOT,FOLLOW_DOT_in_primary3253); if (state.failed) return result;
-							i2=(Token)match(input,ID,FOLLOW_ID_in_primary3257); if (state.failed) return result;
+							d=(Token)match(input,DOT,FOLLOW_DOT_in_primary3259); if (state.failed) return result;
+							i2=(Token)match(input,ID,FOLLOW_ID_in_primary3263); if (state.failed) return result;
 							if ( state.backtracking==0 ) { helper.emit(d, DroolsEditorType.SYMBOL); helper.emit(i2, DroolsEditorType.IDENTIFIER); }
 							}
 
 							}
 							break;
 						case 2 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:598:13: ( ( ( DOT | NULL_SAFE_DOT ) LEFT_PAREN )=>d= ( DOT | NULL_SAFE_DOT ) LEFT_PAREN expression ( COMMA expression )* RIGHT_PAREN )
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:605:13: ( ( ( DOT | NULL_SAFE_DOT ) LEFT_PAREN )=>d= ( DOT | NULL_SAFE_DOT ) LEFT_PAREN expression ( COMMA expression )* RIGHT_PAREN )
 							{
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:598:13: ( ( ( DOT | NULL_SAFE_DOT ) LEFT_PAREN )=>d= ( DOT | NULL_SAFE_DOT ) LEFT_PAREN expression ( COMMA expression )* RIGHT_PAREN )
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:598:15: ( ( DOT | NULL_SAFE_DOT ) LEFT_PAREN )=>d= ( DOT | NULL_SAFE_DOT ) LEFT_PAREN expression ( COMMA expression )* RIGHT_PAREN
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:605:13: ( ( ( DOT | NULL_SAFE_DOT ) LEFT_PAREN )=>d= ( DOT | NULL_SAFE_DOT ) LEFT_PAREN expression ( COMMA expression )* RIGHT_PAREN )
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:605:15: ( ( DOT | NULL_SAFE_DOT ) LEFT_PAREN )=>d= ( DOT | NULL_SAFE_DOT ) LEFT_PAREN expression ( COMMA expression )* RIGHT_PAREN
 							{
 							d=input.LT(1);
 							if ( input.LA(1)==DOT||input.LA(1)==NULL_SAFE_DOT ) {
@@ -4650,13 +4653,13 @@ else if ( (LA66_0==HASH) && (synpred35_DRL6Expressions())) {
 								MismatchedSetException mse = new MismatchedSetException(null,input);
 								throw mse;
 							}
-							LEFT_PAREN12=(Token)match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_primary3309); if (state.failed) return result;
+							LEFT_PAREN12=(Token)match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_primary3315); if (state.failed) return result;
 							if ( state.backtracking==0 ) { helper.emit(d, DroolsEditorType.SYMBOL); helper.emit(LEFT_PAREN12, DroolsEditorType.SYMBOL); }
-							pushFollow(FOLLOW_expression_in_primary3349);
+							pushFollow(FOLLOW_expression_in_primary3355);
 							expression();
 							state._fsp--;
 							if (state.failed) return result;
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:599:48: ( COMMA expression )*
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:606:48: ( COMMA expression )*
 							loop65:
 							while (true) {
 								int alt65=2;
@@ -4667,11 +4670,11 @@ else if ( (LA66_0==HASH) && (synpred35_DRL6Expressions())) {
 
 								switch (alt65) {
 								case 1 :
-									// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:599:49: COMMA expression
+									// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:606:49: COMMA expression
 									{
-									COMMA13=(Token)match(input,COMMA,FOLLOW_COMMA_in_primary3352); if (state.failed) return result;
+									COMMA13=(Token)match(input,COMMA,FOLLOW_COMMA_in_primary3358); if (state.failed) return result;
 									if ( state.backtracking==0 ) { helper.emit(COMMA13, DroolsEditorType.SYMBOL); }
-									pushFollow(FOLLOW_expression_in_primary3356);
+									pushFollow(FOLLOW_expression_in_primary3362);
 									expression();
 									state._fsp--;
 									if (state.failed) return result;
@@ -4683,33 +4686,33 @@ else if ( (LA66_0==HASH) && (synpred35_DRL6Expressions())) {
 								}
 							}
 
-							RIGHT_PAREN14=(Token)match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_primary3396); if (state.failed) return result;
+							RIGHT_PAREN14=(Token)match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_primary3402); if (state.failed) return result;
 							if ( state.backtracking==0 ) { helper.emit(RIGHT_PAREN14, DroolsEditorType.SYMBOL); }
 							}
 
 							}
 							break;
 						case 3 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:603:13: ( ( HASH ID )=>h= HASH i2= ID )
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:610:13: ( ( HASH ID )=>h= HASH i2= ID )
 							{
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:603:13: ( ( HASH ID )=>h= HASH i2= ID )
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:603:15: ( HASH ID )=>h= HASH i2= ID
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:610:13: ( ( HASH ID )=>h= HASH i2= ID )
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:610:15: ( HASH ID )=>h= HASH i2= ID
 							{
-							h=(Token)match(input,HASH,FOLLOW_HASH_in_primary3450); if (state.failed) return result;
-							i2=(Token)match(input,ID,FOLLOW_ID_in_primary3454); if (state.failed) return result;
+							h=(Token)match(input,HASH,FOLLOW_HASH_in_primary3456); if (state.failed) return result;
+							i2=(Token)match(input,ID,FOLLOW_ID_in_primary3460); if (state.failed) return result;
 							if ( state.backtracking==0 ) { helper.emit(h, DroolsEditorType.SYMBOL); helper.emit(i2, DroolsEditorType.IDENTIFIER); }
 							}
 
 							}
 							break;
 						case 4 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:605:13: ( ( NULL_SAFE_DOT ID )=>n= NULL_SAFE_DOT i2= ID )
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:612:13: ( ( NULL_SAFE_DOT ID )=>n= NULL_SAFE_DOT i2= ID )
 							{
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:605:13: ( ( NULL_SAFE_DOT ID )=>n= NULL_SAFE_DOT i2= ID )
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:605:15: ( NULL_SAFE_DOT ID )=>n= NULL_SAFE_DOT i2= ID
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:612:13: ( ( NULL_SAFE_DOT ID )=>n= NULL_SAFE_DOT i2= ID )
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:612:15: ( NULL_SAFE_DOT ID )=>n= NULL_SAFE_DOT i2= ID
 							{
-							n=(Token)match(input,NULL_SAFE_DOT,FOLLOW_NULL_SAFE_DOT_in_primary3496); if (state.failed) return result;
-							i2=(Token)match(input,ID,FOLLOW_ID_in_primary3500); if (state.failed) return result;
+							n=(Token)match(input,NULL_SAFE_DOT,FOLLOW_NULL_SAFE_DOT_in_primary3502); if (state.failed) return result;
+							i2=(Token)match(input,ID,FOLLOW_ID_in_primary3506); if (state.failed) return result;
 							if ( state.backtracking==0 ) { helper.emit(n, DroolsEditorType.SYMBOL); helper.emit(i2, DroolsEditorType.IDENTIFIER); }
 							}
 
@@ -4721,7 +4724,7 @@ else if ( (LA66_0==HASH) && (synpred35_DRL6Expressions())) {
 						}
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:606:12: ( ( identifierSuffix )=> identifierSuffix )?
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:613:12: ( ( identifierSuffix )=> identifierSuffix )?
 					int alt67=2;
 					int LA67_0 = input.LA(1);
 					if ( (LA67_0==LEFT_SQUARE) ) {
@@ -4738,9 +4741,9 @@ else if ( (LA67_0==LEFT_PAREN) ) {
 					}
 					switch (alt67) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:606:13: ( identifierSuffix )=> identifierSuffix
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:613:13: ( identifierSuffix )=> identifierSuffix
 							{
-							pushFollow(FOLLOW_identifierSuffix_in_primary3522);
+							pushFollow(FOLLOW_identifierSuffix_in_primary3528);
 							identifierSuffix();
 							state._fsp--;
 							if (state.failed) return result;
@@ -4769,14 +4772,14 @@ else if ( (LA67_0==LEFT_PAREN) ) {
 
 
 	// $ANTLR start "inlineListExpression"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:609:1: inlineListExpression : LEFT_SQUARE ( expressionList )? RIGHT_SQUARE ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:616:1: inlineListExpression : LEFT_SQUARE ( expressionList )? RIGHT_SQUARE ;
 	public final void inlineListExpression() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:610:5: ( LEFT_SQUARE ( expressionList )? RIGHT_SQUARE )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:610:9: LEFT_SQUARE ( expressionList )? RIGHT_SQUARE
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:617:5: ( LEFT_SQUARE ( expressionList )? RIGHT_SQUARE )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:617:9: LEFT_SQUARE ( expressionList )? RIGHT_SQUARE
 			{
-			match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_inlineListExpression3543); if (state.failed) return;
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:610:21: ( expressionList )?
+			match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_inlineListExpression3549); if (state.failed) return;
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:617:21: ( expressionList )?
 			int alt69=2;
 			int LA69_0 = input.LA(1);
 			if ( (LA69_0==BOOL||(LA69_0 >= DECIMAL && LA69_0 <= DIV)||LA69_0==DOT||LA69_0==FLOAT||LA69_0==HEX||(LA69_0 >= ID && LA69_0 <= INCR)||(LA69_0 >= LEFT_PAREN && LA69_0 <= LESS)||LA69_0==MINUS||LA69_0==NEGATION||LA69_0==NULL||LA69_0==PLUS||LA69_0==QUESTION_DIV||(LA69_0 >= STAR && LA69_0 <= TIME_INTERVAL)) ) {
@@ -4784,9 +4787,9 @@ public final void inlineListExpression() throws RecognitionException {
 			}
 			switch (alt69) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:610:21: expressionList
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:617:21: expressionList
 					{
-					pushFollow(FOLLOW_expressionList_in_inlineListExpression3545);
+					pushFollow(FOLLOW_expressionList_in_inlineListExpression3551);
 					expressionList();
 					state._fsp--;
 					if (state.failed) return;
@@ -4795,7 +4798,7 @@ public final void inlineListExpression() throws RecognitionException {
 
 			}
 
-			match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_inlineListExpression3548); if (state.failed) return;
+			match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_inlineListExpression3554); if (state.failed) return;
 			}
 
 		}
@@ -4813,19 +4816,19 @@ public final void inlineListExpression() throws RecognitionException {
 
 
 	// $ANTLR start "inlineMapExpression"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:613:1: inlineMapExpression : LEFT_SQUARE mapExpressionList RIGHT_SQUARE ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:620:1: inlineMapExpression : LEFT_SQUARE mapExpressionList RIGHT_SQUARE ;
 	public final void inlineMapExpression() throws RecognitionException {
 		 inMap++; 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:615:5: ( LEFT_SQUARE mapExpressionList RIGHT_SQUARE )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:615:7: LEFT_SQUARE mapExpressionList RIGHT_SQUARE
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:622:5: ( LEFT_SQUARE mapExpressionList RIGHT_SQUARE )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:622:7: LEFT_SQUARE mapExpressionList RIGHT_SQUARE
 			{
-			match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_inlineMapExpression3569); if (state.failed) return;
-			pushFollow(FOLLOW_mapExpressionList_in_inlineMapExpression3571);
+			match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_inlineMapExpression3575); if (state.failed) return;
+			pushFollow(FOLLOW_mapExpressionList_in_inlineMapExpression3577);
 			mapExpressionList();
 			state._fsp--;
 			if (state.failed) return;
-			match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_inlineMapExpression3573); if (state.failed) return;
+			match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_inlineMapExpression3579); if (state.failed) return;
 			}
 
 		}
@@ -4844,17 +4847,17 @@ public final void inlineMapExpression() throws RecognitionException {
 
 
 	// $ANTLR start "mapExpressionList"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:619:1: mapExpressionList : mapEntry ( COMMA mapEntry )* ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:626:1: mapExpressionList : mapEntry ( COMMA mapEntry )* ;
 	public final void mapExpressionList() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:620:5: ( mapEntry ( COMMA mapEntry )* )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:620:7: mapEntry ( COMMA mapEntry )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:627:5: ( mapEntry ( COMMA mapEntry )* )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:627:7: mapEntry ( COMMA mapEntry )*
 			{
-			pushFollow(FOLLOW_mapEntry_in_mapExpressionList3594);
+			pushFollow(FOLLOW_mapEntry_in_mapExpressionList3600);
 			mapEntry();
 			state._fsp--;
 			if (state.failed) return;
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:620:16: ( COMMA mapEntry )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:627:16: ( COMMA mapEntry )*
 			loop70:
 			while (true) {
 				int alt70=2;
@@ -4865,10 +4868,10 @@ public final void mapExpressionList() throws RecognitionException {
 
 				switch (alt70) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:620:17: COMMA mapEntry
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:627:17: COMMA mapEntry
 					{
-					match(input,COMMA,FOLLOW_COMMA_in_mapExpressionList3597); if (state.failed) return;
-					pushFollow(FOLLOW_mapEntry_in_mapExpressionList3599);
+					match(input,COMMA,FOLLOW_COMMA_in_mapExpressionList3603); if (state.failed) return;
+					pushFollow(FOLLOW_mapEntry_in_mapExpressionList3605);
 					mapEntry();
 					state._fsp--;
 					if (state.failed) return;
@@ -4897,18 +4900,18 @@ public final void mapExpressionList() throws RecognitionException {
 
 
 	// $ANTLR start "mapEntry"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:623:1: mapEntry : expression COLON expression ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:630:1: mapEntry : expression COLON expression ;
 	public final void mapEntry() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:624:5: ( expression COLON expression )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:624:7: expression COLON expression
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:631:5: ( expression COLON expression )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:631:7: expression COLON expression
 			{
-			pushFollow(FOLLOW_expression_in_mapEntry3618);
+			pushFollow(FOLLOW_expression_in_mapEntry3624);
 			expression();
 			state._fsp--;
 			if (state.failed) return;
-			match(input,COLON,FOLLOW_COLON_in_mapEntry3620); if (state.failed) return;
-			pushFollow(FOLLOW_expression_in_mapEntry3622);
+			match(input,COLON,FOLLOW_COLON_in_mapEntry3626); if (state.failed) return;
+			pushFollow(FOLLOW_expression_in_mapEntry3628);
 			expression();
 			state._fsp--;
 			if (state.failed) return;
@@ -4929,7 +4932,7 @@ public final void mapEntry() throws RecognitionException {
 
 
 	// $ANTLR start "parExpression"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:627:1: parExpression returns [BaseDescr result] : LEFT_PAREN expr= expression RIGHT_PAREN ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:634:1: parExpression returns [BaseDescr result] : LEFT_PAREN expr= expression RIGHT_PAREN ;
 	public final BaseDescr parExpression() throws RecognitionException {
 		BaseDescr result = null;
 
@@ -4937,15 +4940,15 @@ public final BaseDescr parExpression() throws RecognitionException {
 		ParserRuleReturnScope expr =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:628:5: ( LEFT_PAREN expr= expression RIGHT_PAREN )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:628:7: LEFT_PAREN expr= expression RIGHT_PAREN
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:635:5: ( LEFT_PAREN expr= expression RIGHT_PAREN )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:635:7: LEFT_PAREN expr= expression RIGHT_PAREN
 			{
-			match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_parExpression3643); if (state.failed) return result;
-			pushFollow(FOLLOW_expression_in_parExpression3647);
+			match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_parExpression3649); if (state.failed) return result;
+			pushFollow(FOLLOW_expression_in_parExpression3653);
 			expr=expression();
 			state._fsp--;
 			if (state.failed) return result;
-			match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_parExpression3649); if (state.failed) return result;
+			match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_parExpression3655); if (state.failed) return result;
 			if ( state.backtracking==0 ) {  if( buildDescr  ) {
 			               result = (expr!=null?((DRL6Expressions.expression_return)expr).result:null);
 			               if( result instanceof AtomicExprDescr ) {
@@ -4971,7 +4974,7 @@ public final BaseDescr parExpression() throws RecognitionException {
 
 
 	// $ANTLR start "identifierSuffix"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:638:1: identifierSuffix : ( ( LEFT_SQUARE RIGHT_SQUARE )=> ( LEFT_SQUARE RIGHT_SQUARE )+ DOT class_key | ( ( LEFT_SQUARE )=> LEFT_SQUARE expression RIGHT_SQUARE )+ | arguments );
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:645:1: identifierSuffix : ( ( LEFT_SQUARE RIGHT_SQUARE )=> ( LEFT_SQUARE RIGHT_SQUARE )+ DOT class_key | ( ( LEFT_SQUARE )=> LEFT_SQUARE expression RIGHT_SQUARE )+ | arguments );
 	public final void identifierSuffix() throws RecognitionException {
 		Token LEFT_SQUARE15=null;
 		Token RIGHT_SQUARE16=null;
@@ -4980,7 +4983,7 @@ public final void identifierSuffix() throws RecognitionException {
 		Token RIGHT_SQUARE19=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:639:5: ( ( LEFT_SQUARE RIGHT_SQUARE )=> ( LEFT_SQUARE RIGHT_SQUARE )+ DOT class_key | ( ( LEFT_SQUARE )=> LEFT_SQUARE expression RIGHT_SQUARE )+ | arguments )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:646:5: ( ( LEFT_SQUARE RIGHT_SQUARE )=> ( LEFT_SQUARE RIGHT_SQUARE )+ DOT class_key | ( ( LEFT_SQUARE )=> LEFT_SQUARE expression RIGHT_SQUARE )+ | arguments )
 			int alt73=3;
 			int LA73_0 = input.LA(1);
 			if ( (LA73_0==LEFT_SQUARE) ) {
@@ -5019,9 +5022,9 @@ else if ( (LA73_0==LEFT_PAREN) ) {
 
 			switch (alt73) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:639:7: ( LEFT_SQUARE RIGHT_SQUARE )=> ( LEFT_SQUARE RIGHT_SQUARE )+ DOT class_key
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:646:7: ( LEFT_SQUARE RIGHT_SQUARE )=> ( LEFT_SQUARE RIGHT_SQUARE )+ DOT class_key
 					{
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:639:35: ( LEFT_SQUARE RIGHT_SQUARE )+
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:646:35: ( LEFT_SQUARE RIGHT_SQUARE )+
 					int cnt71=0;
 					loop71:
 					while (true) {
@@ -5033,11 +5036,11 @@ else if ( (LA73_0==LEFT_PAREN) ) {
 
 						switch (alt71) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:639:36: LEFT_SQUARE RIGHT_SQUARE
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:646:36: LEFT_SQUARE RIGHT_SQUARE
 							{
-							LEFT_SQUARE15=(Token)match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_identifierSuffix3683); if (state.failed) return;
+							LEFT_SQUARE15=(Token)match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_identifierSuffix3689); if (state.failed) return;
 							if ( state.backtracking==0 ) { helper.emit(LEFT_SQUARE15, DroolsEditorType.SYMBOL); }
-							RIGHT_SQUARE16=(Token)match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_identifierSuffix3724); if (state.failed) return;
+							RIGHT_SQUARE16=(Token)match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_identifierSuffix3730); if (state.failed) return;
 							if ( state.backtracking==0 ) { helper.emit(RIGHT_SQUARE16, DroolsEditorType.SYMBOL); }
 							}
 							break;
@@ -5051,18 +5054,18 @@ else if ( (LA73_0==LEFT_PAREN) ) {
 						cnt71++;
 					}
 
-					DOT17=(Token)match(input,DOT,FOLLOW_DOT_in_identifierSuffix3768); if (state.failed) return;
+					DOT17=(Token)match(input,DOT,FOLLOW_DOT_in_identifierSuffix3774); if (state.failed) return;
 					if ( state.backtracking==0 ) { helper.emit(DOT17, DroolsEditorType.SYMBOL); }
-					pushFollow(FOLLOW_class_key_in_identifierSuffix3772);
+					pushFollow(FOLLOW_class_key_in_identifierSuffix3778);
 					class_key();
 					state._fsp--;
 					if (state.failed) return;
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:642:7: ( ( LEFT_SQUARE )=> LEFT_SQUARE expression RIGHT_SQUARE )+
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:649:7: ( ( LEFT_SQUARE )=> LEFT_SQUARE expression RIGHT_SQUARE )+
 					{
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:642:7: ( ( LEFT_SQUARE )=> LEFT_SQUARE expression RIGHT_SQUARE )+
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:649:7: ( ( LEFT_SQUARE )=> LEFT_SQUARE expression RIGHT_SQUARE )+
 					int cnt72=0;
 					loop72:
 					while (true) {
@@ -5078,15 +5081,15 @@ else if ( (LA73_0==LEFT_PAREN) ) {
 
 						switch (alt72) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:642:8: ( LEFT_SQUARE )=> LEFT_SQUARE expression RIGHT_SQUARE
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:649:8: ( LEFT_SQUARE )=> LEFT_SQUARE expression RIGHT_SQUARE
 							{
-							LEFT_SQUARE18=(Token)match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_identifierSuffix3787); if (state.failed) return;
+							LEFT_SQUARE18=(Token)match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_identifierSuffix3793); if (state.failed) return;
 							if ( state.backtracking==0 ) { helper.emit(LEFT_SQUARE18, DroolsEditorType.SYMBOL); }
-							pushFollow(FOLLOW_expression_in_identifierSuffix3817);
+							pushFollow(FOLLOW_expression_in_identifierSuffix3823);
 							expression();
 							state._fsp--;
 							if (state.failed) return;
-							RIGHT_SQUARE19=(Token)match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_identifierSuffix3845); if (state.failed) return;
+							RIGHT_SQUARE19=(Token)match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_identifierSuffix3851); if (state.failed) return;
 							if ( state.backtracking==0 ) { helper.emit(RIGHT_SQUARE19, DroolsEditorType.SYMBOL); }
 							}
 							break;
@@ -5103,9 +5106,9 @@ else if ( (LA73_0==LEFT_PAREN) ) {
 					}
 					break;
 				case 3 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:645:9: arguments
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:652:9: arguments
 					{
-					pushFollow(FOLLOW_arguments_in_identifierSuffix3861);
+					pushFollow(FOLLOW_arguments_in_identifierSuffix3867);
 					arguments();
 					state._fsp--;
 					if (state.failed) return;
@@ -5128,13 +5131,13 @@ else if ( (LA73_0==LEFT_PAREN) ) {
 
 
 	// $ANTLR start "creator"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:653:1: creator : ( nonWildcardTypeArguments )? createdName ( arrayCreatorRest | classCreatorRest ) ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:660:1: creator : ( nonWildcardTypeArguments )? createdName ( arrayCreatorRest | classCreatorRest ) ;
 	public final void creator() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:654:5: ( ( nonWildcardTypeArguments )? createdName ( arrayCreatorRest | classCreatorRest ) )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:654:7: ( nonWildcardTypeArguments )? createdName ( arrayCreatorRest | classCreatorRest )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:661:5: ( ( nonWildcardTypeArguments )? createdName ( arrayCreatorRest | classCreatorRest ) )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:661:7: ( nonWildcardTypeArguments )? createdName ( arrayCreatorRest | classCreatorRest )
 			{
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:654:7: ( nonWildcardTypeArguments )?
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:661:7: ( nonWildcardTypeArguments )?
 			int alt74=2;
 			int LA74_0 = input.LA(1);
 			if ( (LA74_0==LESS) ) {
@@ -5142,9 +5145,9 @@ public final void creator() throws RecognitionException {
 			}
 			switch (alt74) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:654:7: nonWildcardTypeArguments
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:661:7: nonWildcardTypeArguments
 					{
-					pushFollow(FOLLOW_nonWildcardTypeArguments_in_creator3883);
+					pushFollow(FOLLOW_nonWildcardTypeArguments_in_creator3889);
 					nonWildcardTypeArguments();
 					state._fsp--;
 					if (state.failed) return;
@@ -5153,11 +5156,11 @@ public final void creator() throws RecognitionException {
 
 			}
 
-			pushFollow(FOLLOW_createdName_in_creator3886);
+			pushFollow(FOLLOW_createdName_in_creator3892);
 			createdName();
 			state._fsp--;
 			if (state.failed) return;
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:655:9: ( arrayCreatorRest | classCreatorRest )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:662:9: ( arrayCreatorRest | classCreatorRest )
 			int alt75=2;
 			int LA75_0 = input.LA(1);
 			if ( (LA75_0==LEFT_SQUARE) ) {
@@ -5176,18 +5179,18 @@ else if ( (LA75_0==LEFT_PAREN) ) {
 
 			switch (alt75) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:655:10: arrayCreatorRest
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:662:10: arrayCreatorRest
 					{
-					pushFollow(FOLLOW_arrayCreatorRest_in_creator3897);
+					pushFollow(FOLLOW_arrayCreatorRest_in_creator3903);
 					arrayCreatorRest();
 					state._fsp--;
 					if (state.failed) return;
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:655:29: classCreatorRest
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:662:29: classCreatorRest
 					{
-					pushFollow(FOLLOW_classCreatorRest_in_creator3901);
+					pushFollow(FOLLOW_classCreatorRest_in_creator3907);
 					classCreatorRest();
 					state._fsp--;
 					if (state.failed) return;
@@ -5213,10 +5216,10 @@ else if ( (LA75_0==LEFT_PAREN) ) {
 
 
 	// $ANTLR start "createdName"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:658:1: createdName : ( ID ( typeArguments )? ( DOT ID ( typeArguments )? )* | primitiveType );
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:665:1: createdName : ( ID ( typeArguments )? ( DOT ID ( typeArguments )? )* | primitiveType );
 	public final void createdName() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:659:5: ( ID ( typeArguments )? ( DOT ID ( typeArguments )? )* | primitiveType )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:666:5: ( ID ( typeArguments )? ( DOT ID ( typeArguments )? )* | primitiveType )
 			int alt79=2;
 			int LA79_0 = input.LA(1);
 			if ( (LA79_0==ID) ) {
@@ -5252,10 +5255,10 @@ else if ( ((((helper.validateIdentifierKey(DroolsSoftKeywords.SHORT)))||((helper
 
 			switch (alt79) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:659:7: ID ( typeArguments )? ( DOT ID ( typeArguments )? )*
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:666:7: ID ( typeArguments )? ( DOT ID ( typeArguments )? )*
 					{
-					match(input,ID,FOLLOW_ID_in_createdName3919); if (state.failed) return;
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:659:10: ( typeArguments )?
+					match(input,ID,FOLLOW_ID_in_createdName3925); if (state.failed) return;
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:666:10: ( typeArguments )?
 					int alt76=2;
 					int LA76_0 = input.LA(1);
 					if ( (LA76_0==LESS) ) {
@@ -5263,9 +5266,9 @@ else if ( ((((helper.validateIdentifierKey(DroolsSoftKeywords.SHORT)))||((helper
 					}
 					switch (alt76) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:659:10: typeArguments
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:666:10: typeArguments
 							{
-							pushFollow(FOLLOW_typeArguments_in_createdName3921);
+							pushFollow(FOLLOW_typeArguments_in_createdName3927);
 							typeArguments();
 							state._fsp--;
 							if (state.failed) return;
@@ -5274,7 +5277,7 @@ else if ( ((((helper.validateIdentifierKey(DroolsSoftKeywords.SHORT)))||((helper
 
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:660:9: ( DOT ID ( typeArguments )? )*
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:667:9: ( DOT ID ( typeArguments )? )*
 					loop78:
 					while (true) {
 						int alt78=2;
@@ -5285,11 +5288,11 @@ else if ( ((((helper.validateIdentifierKey(DroolsSoftKeywords.SHORT)))||((helper
 
 						switch (alt78) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:660:11: DOT ID ( typeArguments )?
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:667:11: DOT ID ( typeArguments )?
 							{
-							match(input,DOT,FOLLOW_DOT_in_createdName3934); if (state.failed) return;
-							match(input,ID,FOLLOW_ID_in_createdName3936); if (state.failed) return;
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:660:18: ( typeArguments )?
+							match(input,DOT,FOLLOW_DOT_in_createdName3940); if (state.failed) return;
+							match(input,ID,FOLLOW_ID_in_createdName3942); if (state.failed) return;
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:667:18: ( typeArguments )?
 							int alt77=2;
 							int LA77_0 = input.LA(1);
 							if ( (LA77_0==LESS) ) {
@@ -5297,9 +5300,9 @@ else if ( ((((helper.validateIdentifierKey(DroolsSoftKeywords.SHORT)))||((helper
 							}
 							switch (alt77) {
 								case 1 :
-									// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:660:18: typeArguments
+									// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:667:18: typeArguments
 									{
-									pushFollow(FOLLOW_typeArguments_in_createdName3938);
+									pushFollow(FOLLOW_typeArguments_in_createdName3944);
 									typeArguments();
 									state._fsp--;
 									if (state.failed) return;
@@ -5319,9 +5322,9 @@ else if ( ((((helper.validateIdentifierKey(DroolsSoftKeywords.SHORT)))||((helper
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:661:11: primitiveType
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:668:11: primitiveType
 					{
-					pushFollow(FOLLOW_primitiveType_in_createdName3953);
+					pushFollow(FOLLOW_primitiveType_in_createdName3959);
 					primitiveType();
 					state._fsp--;
 					if (state.failed) return;
@@ -5344,18 +5347,18 @@ else if ( ((((helper.validateIdentifierKey(DroolsSoftKeywords.SHORT)))||((helper
 
 
 	// $ANTLR start "innerCreator"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:664:1: innerCreator :{...}? => ID classCreatorRest ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:671:1: innerCreator :{...}? => ID classCreatorRest ;
 	public final void innerCreator() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:665:5: ({...}? => ID classCreatorRest )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:665:7: {...}? => ID classCreatorRest
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:672:5: ({...}? => ID classCreatorRest )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:672:7: {...}? => ID classCreatorRest
 			{
 			if ( !((!(helper.validateIdentifierKey(DroolsSoftKeywords.INSTANCEOF)))) ) {
 				if (state.backtracking>0) {state.failed=true; return;}
 				throw new FailedPredicateException(input, "innerCreator", "!(helper.validateIdentifierKey(DroolsSoftKeywords.INSTANCEOF))");
 			}
-			match(input,ID,FOLLOW_ID_in_innerCreator3973); if (state.failed) return;
-			pushFollow(FOLLOW_classCreatorRest_in_innerCreator3975);
+			match(input,ID,FOLLOW_ID_in_innerCreator3979); if (state.failed) return;
+			pushFollow(FOLLOW_classCreatorRest_in_innerCreator3981);
 			classCreatorRest();
 			state._fsp--;
 			if (state.failed) return;
@@ -5376,14 +5379,14 @@ public final void innerCreator() throws RecognitionException {
 
 
 	// $ANTLR start "arrayCreatorRest"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:668:1: arrayCreatorRest : LEFT_SQUARE ( RIGHT_SQUARE ( LEFT_SQUARE RIGHT_SQUARE )* arrayInitializer | expression RIGHT_SQUARE ({...}? => LEFT_SQUARE expression RIGHT_SQUARE )* ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* ) ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:675:1: arrayCreatorRest : LEFT_SQUARE ( RIGHT_SQUARE ( LEFT_SQUARE RIGHT_SQUARE )* arrayInitializer | expression RIGHT_SQUARE ({...}? => LEFT_SQUARE expression RIGHT_SQUARE )* ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* ) ;
 	public final void arrayCreatorRest() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:669:5: ( LEFT_SQUARE ( RIGHT_SQUARE ( LEFT_SQUARE RIGHT_SQUARE )* arrayInitializer | expression RIGHT_SQUARE ({...}? => LEFT_SQUARE expression RIGHT_SQUARE )* ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* ) )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:669:9: LEFT_SQUARE ( RIGHT_SQUARE ( LEFT_SQUARE RIGHT_SQUARE )* arrayInitializer | expression RIGHT_SQUARE ({...}? => LEFT_SQUARE expression RIGHT_SQUARE )* ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:676:5: ( LEFT_SQUARE ( RIGHT_SQUARE ( LEFT_SQUARE RIGHT_SQUARE )* arrayInitializer | expression RIGHT_SQUARE ({...}? => LEFT_SQUARE expression RIGHT_SQUARE )* ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* ) )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:676:9: LEFT_SQUARE ( RIGHT_SQUARE ( LEFT_SQUARE RIGHT_SQUARE )* arrayInitializer | expression RIGHT_SQUARE ({...}? => LEFT_SQUARE expression RIGHT_SQUARE )* ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* )
 			{
-			match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_arrayCreatorRest3994); if (state.failed) return;
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:670:5: ( RIGHT_SQUARE ( LEFT_SQUARE RIGHT_SQUARE )* arrayInitializer | expression RIGHT_SQUARE ({...}? => LEFT_SQUARE expression RIGHT_SQUARE )* ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* )
+			match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_arrayCreatorRest4000); if (state.failed) return;
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:677:5: ( RIGHT_SQUARE ( LEFT_SQUARE RIGHT_SQUARE )* arrayInitializer | expression RIGHT_SQUARE ({...}? => LEFT_SQUARE expression RIGHT_SQUARE )* ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )* )
 			int alt83=2;
 			int LA83_0 = input.LA(1);
 			if ( (LA83_0==RIGHT_SQUARE) ) {
@@ -5402,10 +5405,10 @@ else if ( (LA83_0==BOOL||(LA83_0 >= DECIMAL && LA83_0 <= DIV)||LA83_0==DOT||LA83
 
 			switch (alt83) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:670:9: RIGHT_SQUARE ( LEFT_SQUARE RIGHT_SQUARE )* arrayInitializer
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:677:9: RIGHT_SQUARE ( LEFT_SQUARE RIGHT_SQUARE )* arrayInitializer
 					{
-					match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_arrayCreatorRest4004); if (state.failed) return;
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:670:22: ( LEFT_SQUARE RIGHT_SQUARE )*
+					match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_arrayCreatorRest4010); if (state.failed) return;
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:677:22: ( LEFT_SQUARE RIGHT_SQUARE )*
 					loop80:
 					while (true) {
 						int alt80=2;
@@ -5416,10 +5419,10 @@ else if ( (LA83_0==BOOL||(LA83_0 >= DECIMAL && LA83_0 <= DIV)||LA83_0==DOT||LA83
 
 						switch (alt80) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:670:23: LEFT_SQUARE RIGHT_SQUARE
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:677:23: LEFT_SQUARE RIGHT_SQUARE
 							{
-							match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_arrayCreatorRest4007); if (state.failed) return;
-							match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_arrayCreatorRest4009); if (state.failed) return;
+							match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_arrayCreatorRest4013); if (state.failed) return;
+							match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_arrayCreatorRest4015); if (state.failed) return;
 							}
 							break;
 
@@ -5428,21 +5431,21 @@ else if ( (LA83_0==BOOL||(LA83_0 >= DECIMAL && LA83_0 <= DIV)||LA83_0==DOT||LA83
 						}
 					}
 
-					pushFollow(FOLLOW_arrayInitializer_in_arrayCreatorRest4013);
+					pushFollow(FOLLOW_arrayInitializer_in_arrayCreatorRest4019);
 					arrayInitializer();
 					state._fsp--;
 					if (state.failed) return;
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:671:13: expression RIGHT_SQUARE ({...}? => LEFT_SQUARE expression RIGHT_SQUARE )* ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )*
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:678:13: expression RIGHT_SQUARE ({...}? => LEFT_SQUARE expression RIGHT_SQUARE )* ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )*
 					{
-					pushFollow(FOLLOW_expression_in_arrayCreatorRest4027);
+					pushFollow(FOLLOW_expression_in_arrayCreatorRest4033);
 					expression();
 					state._fsp--;
 					if (state.failed) return;
-					match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_arrayCreatorRest4029); if (state.failed) return;
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:671:37: ({...}? => LEFT_SQUARE expression RIGHT_SQUARE )*
+					match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_arrayCreatorRest4035); if (state.failed) return;
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:678:37: ({...}? => LEFT_SQUARE expression RIGHT_SQUARE )*
 					loop81:
 					while (true) {
 						int alt81=2;
@@ -5457,18 +5460,18 @@ else if ( (LA83_0==BOOL||(LA83_0 >= DECIMAL && LA83_0 <= DIV)||LA83_0==DOT||LA83
 
 						switch (alt81) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:671:38: {...}? => LEFT_SQUARE expression RIGHT_SQUARE
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:678:38: {...}? => LEFT_SQUARE expression RIGHT_SQUARE
 							{
 							if ( !((!helper.validateLT(2,"]"))) ) {
 								if (state.backtracking>0) {state.failed=true; return;}
 								throw new FailedPredicateException(input, "arrayCreatorRest", "!helper.validateLT(2,\"]\")");
 							}
-							match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_arrayCreatorRest4034); if (state.failed) return;
-							pushFollow(FOLLOW_expression_in_arrayCreatorRest4036);
+							match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_arrayCreatorRest4040); if (state.failed) return;
+							pushFollow(FOLLOW_expression_in_arrayCreatorRest4042);
 							expression();
 							state._fsp--;
 							if (state.failed) return;
-							match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_arrayCreatorRest4038); if (state.failed) return;
+							match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_arrayCreatorRest4044); if (state.failed) return;
 							}
 							break;
 
@@ -5477,7 +5480,7 @@ else if ( (LA83_0==BOOL||(LA83_0 >= DECIMAL && LA83_0 <= DIV)||LA83_0==DOT||LA83
 						}
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:671:106: ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )*
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:678:106: ( ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE )*
 					loop82:
 					while (true) {
 						int alt82=2;
@@ -5492,10 +5495,10 @@ else if ( (LA83_0==BOOL||(LA83_0 >= DECIMAL && LA83_0 <= DIV)||LA83_0==DOT||LA83
 
 						switch (alt82) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:671:107: ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:678:107: ( LEFT_SQUARE RIGHT_SQUARE )=> LEFT_SQUARE RIGHT_SQUARE
 							{
-							match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_arrayCreatorRest4050); if (state.failed) return;
-							match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_arrayCreatorRest4052); if (state.failed) return;
+							match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_arrayCreatorRest4056); if (state.failed) return;
+							match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_arrayCreatorRest4058); if (state.failed) return;
 							}
 							break;
 
@@ -5526,10 +5529,10 @@ else if ( (LA83_0==BOOL||(LA83_0 >= DECIMAL && LA83_0 <= DIV)||LA83_0==DOT||LA83
 
 
 	// $ANTLR start "variableInitializer"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:675:1: variableInitializer : ( arrayInitializer | expression );
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:682:1: variableInitializer : ( arrayInitializer | expression );
 	public final void variableInitializer() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:676:5: ( arrayInitializer | expression )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:683:5: ( arrayInitializer | expression )
 			int alt84=2;
 			int LA84_0 = input.LA(1);
 			if ( (LA84_0==LEFT_CURLY) ) {
@@ -5548,18 +5551,18 @@ else if ( (LA84_0==BOOL||(LA84_0 >= DECIMAL && LA84_0 <= DIV)||LA84_0==DOT||LA84
 
 			switch (alt84) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:676:7: arrayInitializer
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:683:7: arrayInitializer
 					{
-					pushFollow(FOLLOW_arrayInitializer_in_variableInitializer4081);
+					pushFollow(FOLLOW_arrayInitializer_in_variableInitializer4087);
 					arrayInitializer();
 					state._fsp--;
 					if (state.failed) return;
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:677:13: expression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:684:13: expression
 					{
-					pushFollow(FOLLOW_expression_in_variableInitializer4095);
+					pushFollow(FOLLOW_expression_in_variableInitializer4101);
 					expression();
 					state._fsp--;
 					if (state.failed) return;
@@ -5582,14 +5585,14 @@ else if ( (LA84_0==BOOL||(LA84_0 >= DECIMAL && LA84_0 <= DIV)||LA84_0==DOT||LA84
 
 
 	// $ANTLR start "arrayInitializer"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:680:1: arrayInitializer : LEFT_CURLY ( variableInitializer ( COMMA variableInitializer )* ( COMMA )? )? RIGHT_CURLY ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:687:1: arrayInitializer : LEFT_CURLY ( variableInitializer ( COMMA variableInitializer )* ( COMMA )? )? RIGHT_CURLY ;
 	public final void arrayInitializer() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:681:5: ( LEFT_CURLY ( variableInitializer ( COMMA variableInitializer )* ( COMMA )? )? RIGHT_CURLY )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:681:7: LEFT_CURLY ( variableInitializer ( COMMA variableInitializer )* ( COMMA )? )? RIGHT_CURLY
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:688:5: ( LEFT_CURLY ( variableInitializer ( COMMA variableInitializer )* ( COMMA )? )? RIGHT_CURLY )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:688:7: LEFT_CURLY ( variableInitializer ( COMMA variableInitializer )* ( COMMA )? )? RIGHT_CURLY
 			{
-			match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_arrayInitializer4112); if (state.failed) return;
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:681:18: ( variableInitializer ( COMMA variableInitializer )* ( COMMA )? )?
+			match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_arrayInitializer4118); if (state.failed) return;
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:688:18: ( variableInitializer ( COMMA variableInitializer )* ( COMMA )? )?
 			int alt87=2;
 			int LA87_0 = input.LA(1);
 			if ( (LA87_0==BOOL||(LA87_0 >= DECIMAL && LA87_0 <= DIV)||LA87_0==DOT||LA87_0==FLOAT||LA87_0==HEX||(LA87_0 >= ID && LA87_0 <= INCR)||(LA87_0 >= LEFT_CURLY && LA87_0 <= LESS)||LA87_0==MINUS||LA87_0==NEGATION||LA87_0==NULL||LA87_0==PLUS||LA87_0==QUESTION_DIV||(LA87_0 >= STAR && LA87_0 <= TIME_INTERVAL)) ) {
@@ -5597,13 +5600,13 @@ public final void arrayInitializer() throws RecognitionException {
 			}
 			switch (alt87) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:681:19: variableInitializer ( COMMA variableInitializer )* ( COMMA )?
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:688:19: variableInitializer ( COMMA variableInitializer )* ( COMMA )?
 					{
-					pushFollow(FOLLOW_variableInitializer_in_arrayInitializer4115);
+					pushFollow(FOLLOW_variableInitializer_in_arrayInitializer4121);
 					variableInitializer();
 					state._fsp--;
 					if (state.failed) return;
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:681:39: ( COMMA variableInitializer )*
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:688:39: ( COMMA variableInitializer )*
 					loop85:
 					while (true) {
 						int alt85=2;
@@ -5618,10 +5621,10 @@ public final void arrayInitializer() throws RecognitionException {
 
 						switch (alt85) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:681:40: COMMA variableInitializer
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:688:40: COMMA variableInitializer
 							{
-							match(input,COMMA,FOLLOW_COMMA_in_arrayInitializer4118); if (state.failed) return;
-							pushFollow(FOLLOW_variableInitializer_in_arrayInitializer4120);
+							match(input,COMMA,FOLLOW_COMMA_in_arrayInitializer4124); if (state.failed) return;
+							pushFollow(FOLLOW_variableInitializer_in_arrayInitializer4126);
 							variableInitializer();
 							state._fsp--;
 							if (state.failed) return;
@@ -5633,7 +5636,7 @@ public final void arrayInitializer() throws RecognitionException {
 						}
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:681:68: ( COMMA )?
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:688:68: ( COMMA )?
 					int alt86=2;
 					int LA86_0 = input.LA(1);
 					if ( (LA86_0==COMMA) ) {
@@ -5641,9 +5644,9 @@ public final void arrayInitializer() throws RecognitionException {
 					}
 					switch (alt86) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:681:69: COMMA
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:688:69: COMMA
 							{
-							match(input,COMMA,FOLLOW_COMMA_in_arrayInitializer4125); if (state.failed) return;
+							match(input,COMMA,FOLLOW_COMMA_in_arrayInitializer4131); if (state.failed) return;
 							}
 							break;
 
@@ -5654,7 +5657,7 @@ public final void arrayInitializer() throws RecognitionException {
 
 			}
 
-			match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_arrayInitializer4132); if (state.failed) return;
+			match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_arrayInitializer4138); if (state.failed) return;
 			}
 
 		}
@@ -5672,13 +5675,13 @@ public final void arrayInitializer() throws RecognitionException {
 
 
 	// $ANTLR start "classCreatorRest"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:684:1: classCreatorRest : arguments ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:691:1: classCreatorRest : arguments ;
 	public final void classCreatorRest() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:685:5: ( arguments )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:685:7: arguments
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:692:5: ( arguments )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:692:7: arguments
 			{
-			pushFollow(FOLLOW_arguments_in_classCreatorRest4149);
+			pushFollow(FOLLOW_arguments_in_classCreatorRest4155);
 			arguments();
 			state._fsp--;
 			if (state.failed) return;
@@ -5699,17 +5702,17 @@ public final void classCreatorRest() throws RecognitionException {
 
 
 	// $ANTLR start "explicitGenericInvocation"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:688:1: explicitGenericInvocation : nonWildcardTypeArguments arguments ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:695:1: explicitGenericInvocation : nonWildcardTypeArguments arguments ;
 	public final void explicitGenericInvocation() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:689:5: ( nonWildcardTypeArguments arguments )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:689:7: nonWildcardTypeArguments arguments
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:696:5: ( nonWildcardTypeArguments arguments )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:696:7: nonWildcardTypeArguments arguments
 			{
-			pushFollow(FOLLOW_nonWildcardTypeArguments_in_explicitGenericInvocation4167);
+			pushFollow(FOLLOW_nonWildcardTypeArguments_in_explicitGenericInvocation4173);
 			nonWildcardTypeArguments();
 			state._fsp--;
 			if (state.failed) return;
-			pushFollow(FOLLOW_arguments_in_explicitGenericInvocation4169);
+			pushFollow(FOLLOW_arguments_in_explicitGenericInvocation4175);
 			arguments();
 			state._fsp--;
 			if (state.failed) return;
@@ -5730,18 +5733,18 @@ public final void explicitGenericInvocation() throws RecognitionException {
 
 
 	// $ANTLR start "nonWildcardTypeArguments"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:692:1: nonWildcardTypeArguments : LESS typeList GREATER ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:699:1: nonWildcardTypeArguments : LESS typeList GREATER ;
 	public final void nonWildcardTypeArguments() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:693:5: ( LESS typeList GREATER )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:693:7: LESS typeList GREATER
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:700:5: ( LESS typeList GREATER )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:700:7: LESS typeList GREATER
 			{
-			match(input,LESS,FOLLOW_LESS_in_nonWildcardTypeArguments4186); if (state.failed) return;
-			pushFollow(FOLLOW_typeList_in_nonWildcardTypeArguments4188);
+			match(input,LESS,FOLLOW_LESS_in_nonWildcardTypeArguments4192); if (state.failed) return;
+			pushFollow(FOLLOW_typeList_in_nonWildcardTypeArguments4194);
 			typeList();
 			state._fsp--;
 			if (state.failed) return;
-			match(input,GREATER,FOLLOW_GREATER_in_nonWildcardTypeArguments4190); if (state.failed) return;
+			match(input,GREATER,FOLLOW_GREATER_in_nonWildcardTypeArguments4196); if (state.failed) return;
 			}
 
 		}
@@ -5759,10 +5762,10 @@ public final void nonWildcardTypeArguments() throws RecognitionException {
 
 
 	// $ANTLR start "explicitGenericInvocationSuffix"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:696:1: explicitGenericInvocationSuffix : ( super_key superSuffix | ID arguments );
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:703:1: explicitGenericInvocationSuffix : ( super_key superSuffix | ID arguments );
 	public final void explicitGenericInvocationSuffix() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:697:5: ( super_key superSuffix | ID arguments )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:704:5: ( super_key superSuffix | ID arguments )
 			int alt88=2;
 			int LA88_0 = input.LA(1);
 			if ( (LA88_0==ID) ) {
@@ -5785,23 +5788,23 @@ else if ( (true) ) {
 
 			switch (alt88) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:697:7: super_key superSuffix
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:704:7: super_key superSuffix
 					{
-					pushFollow(FOLLOW_super_key_in_explicitGenericInvocationSuffix4207);
+					pushFollow(FOLLOW_super_key_in_explicitGenericInvocationSuffix4213);
 					super_key();
 					state._fsp--;
 					if (state.failed) return;
-					pushFollow(FOLLOW_superSuffix_in_explicitGenericInvocationSuffix4209);
+					pushFollow(FOLLOW_superSuffix_in_explicitGenericInvocationSuffix4215);
 					superSuffix();
 					state._fsp--;
 					if (state.failed) return;
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:698:10: ID arguments
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:705:10: ID arguments
 					{
-					match(input,ID,FOLLOW_ID_in_explicitGenericInvocationSuffix4220); if (state.failed) return;
-					pushFollow(FOLLOW_arguments_in_explicitGenericInvocationSuffix4222);
+					match(input,ID,FOLLOW_ID_in_explicitGenericInvocationSuffix4226); if (state.failed) return;
+					pushFollow(FOLLOW_arguments_in_explicitGenericInvocationSuffix4228);
 					arguments();
 					state._fsp--;
 					if (state.failed) return;
@@ -5824,7 +5827,7 @@ else if ( (true) ) {
 
 
 	// $ANTLR start "selector"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:701:1: selector : ( ( DOT super_key )=> DOT super_key superSuffix | ( DOT new_key )=> DOT new_key ( nonWildcardTypeArguments )? innerCreator | ( DOT ID )=> DOT ID ( ( LEFT_PAREN )=> arguments )? | ( NULL_SAFE_DOT ID )=> NULL_SAFE_DOT ID ( ( LEFT_PAREN )=> arguments )? | ( LEFT_SQUARE )=> LEFT_SQUARE expression RIGHT_SQUARE );
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:708:1: selector : ( ( DOT super_key )=> DOT super_key superSuffix | ( DOT new_key )=> DOT new_key ( nonWildcardTypeArguments )? innerCreator | ( DOT ID )=> DOT ID ( ( LEFT_PAREN )=> arguments )? | ( NULL_SAFE_DOT ID )=> NULL_SAFE_DOT ID ( ( LEFT_PAREN )=> arguments )? | ( LEFT_SQUARE )=> LEFT_SQUARE expression RIGHT_SQUARE );
 	public final void selector() throws RecognitionException {
 		Token DOT20=null;
 		Token DOT21=null;
@@ -5836,7 +5839,7 @@ public final void selector() throws RecognitionException {
 		Token RIGHT_SQUARE27=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:702:5: ( ( DOT super_key )=> DOT super_key superSuffix | ( DOT new_key )=> DOT new_key ( nonWildcardTypeArguments )? innerCreator | ( DOT ID )=> DOT ID ( ( LEFT_PAREN )=> arguments )? | ( NULL_SAFE_DOT ID )=> NULL_SAFE_DOT ID ( ( LEFT_PAREN )=> arguments )? | ( LEFT_SQUARE )=> LEFT_SQUARE expression RIGHT_SQUARE )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:709:5: ( ( DOT super_key )=> DOT super_key superSuffix | ( DOT new_key )=> DOT new_key ( nonWildcardTypeArguments )? innerCreator | ( DOT ID )=> DOT ID ( ( LEFT_PAREN )=> arguments )? | ( NULL_SAFE_DOT ID )=> NULL_SAFE_DOT ID ( ( LEFT_PAREN )=> arguments )? | ( LEFT_SQUARE )=> LEFT_SQUARE expression RIGHT_SQUARE )
 			int alt92=5;
 			int LA92_0 = input.LA(1);
 			if ( (LA92_0==DOT) ) {
@@ -5874,30 +5877,30 @@ else if ( (LA92_0==LEFT_SQUARE) && (synpred47_DRL6Expressions())) {
 
 			switch (alt92) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:702:9: ( DOT super_key )=> DOT super_key superSuffix
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:709:9: ( DOT super_key )=> DOT super_key superSuffix
 					{
-					DOT20=(Token)match(input,DOT,FOLLOW_DOT_in_selector4247); if (state.failed) return;
+					DOT20=(Token)match(input,DOT,FOLLOW_DOT_in_selector4253); if (state.failed) return;
 					if ( state.backtracking==0 ) { helper.emit(DOT20, DroolsEditorType.SYMBOL); }
-					pushFollow(FOLLOW_super_key_in_selector4251);
+					pushFollow(FOLLOW_super_key_in_selector4257);
 					super_key();
 					state._fsp--;
 					if (state.failed) return;
-					pushFollow(FOLLOW_superSuffix_in_selector4253);
+					pushFollow(FOLLOW_superSuffix_in_selector4259);
 					superSuffix();
 					state._fsp--;
 					if (state.failed) return;
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:703:9: ( DOT new_key )=> DOT new_key ( nonWildcardTypeArguments )? innerCreator
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:710:9: ( DOT new_key )=> DOT new_key ( nonWildcardTypeArguments )? innerCreator
 					{
-					DOT21=(Token)match(input,DOT,FOLLOW_DOT_in_selector4269); if (state.failed) return;
+					DOT21=(Token)match(input,DOT,FOLLOW_DOT_in_selector4275); if (state.failed) return;
 					if ( state.backtracking==0 ) { helper.emit(DOT21, DroolsEditorType.SYMBOL); }
-					pushFollow(FOLLOW_new_key_in_selector4273);
+					pushFollow(FOLLOW_new_key_in_selector4279);
 					new_key();
 					state._fsp--;
 					if (state.failed) return;
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:703:84: ( nonWildcardTypeArguments )?
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:710:84: ( nonWildcardTypeArguments )?
 					int alt89=2;
 					int LA89_0 = input.LA(1);
 					if ( (LA89_0==LESS) ) {
@@ -5905,9 +5908,9 @@ else if ( (LA92_0==LEFT_SQUARE) && (synpred47_DRL6Expressions())) {
 					}
 					switch (alt89) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:703:85: nonWildcardTypeArguments
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:710:85: nonWildcardTypeArguments
 							{
-							pushFollow(FOLLOW_nonWildcardTypeArguments_in_selector4276);
+							pushFollow(FOLLOW_nonWildcardTypeArguments_in_selector4282);
 							nonWildcardTypeArguments();
 							state._fsp--;
 							if (state.failed) return;
@@ -5916,20 +5919,20 @@ else if ( (LA92_0==LEFT_SQUARE) && (synpred47_DRL6Expressions())) {
 
 					}
 
-					pushFollow(FOLLOW_innerCreator_in_selector4280);
+					pushFollow(FOLLOW_innerCreator_in_selector4286);
 					innerCreator();
 					state._fsp--;
 					if (state.failed) return;
 					}
 					break;
 				case 3 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:704:9: ( DOT ID )=> DOT ID ( ( LEFT_PAREN )=> arguments )?
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:711:9: ( DOT ID )=> DOT ID ( ( LEFT_PAREN )=> arguments )?
 					{
-					DOT22=(Token)match(input,DOT,FOLLOW_DOT_in_selector4296); if (state.failed) return;
+					DOT22=(Token)match(input,DOT,FOLLOW_DOT_in_selector4302); if (state.failed) return;
 					if ( state.backtracking==0 ) { helper.emit(DOT22, DroolsEditorType.SYMBOL); }
-					ID23=(Token)match(input,ID,FOLLOW_ID_in_selector4318); if (state.failed) return;
+					ID23=(Token)match(input,ID,FOLLOW_ID_in_selector4324); if (state.failed) return;
 					if ( state.backtracking==0 ) { helper.emit(ID23, DroolsEditorType.IDENTIFIER); }
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:706:19: ( ( LEFT_PAREN )=> arguments )?
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:713:19: ( ( LEFT_PAREN )=> arguments )?
 					int alt90=2;
 					int LA90_0 = input.LA(1);
 					if ( (LA90_0==LEFT_PAREN) ) {
@@ -5940,9 +5943,9 @@ else if ( (LA92_0==LEFT_SQUARE) && (synpred47_DRL6Expressions())) {
 					}
 					switch (alt90) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:706:20: ( LEFT_PAREN )=> arguments
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:713:20: ( LEFT_PAREN )=> arguments
 							{
-							pushFollow(FOLLOW_arguments_in_selector4347);
+							pushFollow(FOLLOW_arguments_in_selector4353);
 							arguments();
 							state._fsp--;
 							if (state.failed) return;
@@ -5954,13 +5957,13 @@ else if ( (LA92_0==LEFT_SQUARE) && (synpred47_DRL6Expressions())) {
 					}
 					break;
 				case 4 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:707:9: ( NULL_SAFE_DOT ID )=> NULL_SAFE_DOT ID ( ( LEFT_PAREN )=> arguments )?
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:714:9: ( NULL_SAFE_DOT ID )=> NULL_SAFE_DOT ID ( ( LEFT_PAREN )=> arguments )?
 					{
-					NULL_SAFE_DOT24=(Token)match(input,NULL_SAFE_DOT,FOLLOW_NULL_SAFE_DOT_in_selector4365); if (state.failed) return;
+					NULL_SAFE_DOT24=(Token)match(input,NULL_SAFE_DOT,FOLLOW_NULL_SAFE_DOT_in_selector4371); if (state.failed) return;
 					if ( state.backtracking==0 ) { helper.emit(NULL_SAFE_DOT24, DroolsEditorType.SYMBOL); }
-					ID25=(Token)match(input,ID,FOLLOW_ID_in_selector4387); if (state.failed) return;
+					ID25=(Token)match(input,ID,FOLLOW_ID_in_selector4393); if (state.failed) return;
 					if ( state.backtracking==0 ) { helper.emit(ID25, DroolsEditorType.IDENTIFIER); }
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:709:19: ( ( LEFT_PAREN )=> arguments )?
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:716:19: ( ( LEFT_PAREN )=> arguments )?
 					int alt91=2;
 					int LA91_0 = input.LA(1);
 					if ( (LA91_0==LEFT_PAREN) ) {
@@ -5971,9 +5974,9 @@ else if ( (LA92_0==LEFT_SQUARE) && (synpred47_DRL6Expressions())) {
 					}
 					switch (alt91) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:709:20: ( LEFT_PAREN )=> arguments
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:716:20: ( LEFT_PAREN )=> arguments
 							{
-							pushFollow(FOLLOW_arguments_in_selector4416);
+							pushFollow(FOLLOW_arguments_in_selector4422);
 							arguments();
 							state._fsp--;
 							if (state.failed) return;
@@ -5985,15 +5988,15 @@ else if ( (LA92_0==LEFT_SQUARE) && (synpred47_DRL6Expressions())) {
 					}
 					break;
 				case 5 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:711:9: ( LEFT_SQUARE )=> LEFT_SQUARE expression RIGHT_SQUARE
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:718:9: ( LEFT_SQUARE )=> LEFT_SQUARE expression RIGHT_SQUARE
 					{
-					LEFT_SQUARE26=(Token)match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_selector4437); if (state.failed) return;
+					LEFT_SQUARE26=(Token)match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_selector4443); if (state.failed) return;
 					if ( state.backtracking==0 ) { helper.emit(LEFT_SQUARE26, DroolsEditorType.SYMBOL); }
-					pushFollow(FOLLOW_expression_in_selector4464);
+					pushFollow(FOLLOW_expression_in_selector4470);
 					expression();
 					state._fsp--;
 					if (state.failed) return;
-					RIGHT_SQUARE27=(Token)match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_selector4489); if (state.failed) return;
+					RIGHT_SQUARE27=(Token)match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_selector4495); if (state.failed) return;
 					if ( state.backtracking==0 ) { helper.emit(RIGHT_SQUARE27, DroolsEditorType.SYMBOL); }
 					}
 					break;
@@ -6014,10 +6017,10 @@ else if ( (LA92_0==LEFT_SQUARE) && (synpred47_DRL6Expressions())) {
 
 
 	// $ANTLR start "superSuffix"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:716:1: superSuffix : ( arguments | DOT ID ( ( LEFT_PAREN )=> arguments )? );
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:723:1: superSuffix : ( arguments | DOT ID ( ( LEFT_PAREN )=> arguments )? );
 	public final void superSuffix() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:717:5: ( arguments | DOT ID ( ( LEFT_PAREN )=> arguments )? )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:724:5: ( arguments | DOT ID ( ( LEFT_PAREN )=> arguments )? )
 			int alt94=2;
 			int LA94_0 = input.LA(1);
 			if ( (LA94_0==LEFT_PAREN) ) {
@@ -6036,20 +6039,20 @@ else if ( (LA94_0==DOT) ) {
 
 			switch (alt94) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:717:7: arguments
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:724:7: arguments
 					{
-					pushFollow(FOLLOW_arguments_in_superSuffix4508);
+					pushFollow(FOLLOW_arguments_in_superSuffix4514);
 					arguments();
 					state._fsp--;
 					if (state.failed) return;
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:718:10: DOT ID ( ( LEFT_PAREN )=> arguments )?
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:725:10: DOT ID ( ( LEFT_PAREN )=> arguments )?
 					{
-					match(input,DOT,FOLLOW_DOT_in_superSuffix4519); if (state.failed) return;
-					match(input,ID,FOLLOW_ID_in_superSuffix4521); if (state.failed) return;
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:718:17: ( ( LEFT_PAREN )=> arguments )?
+					match(input,DOT,FOLLOW_DOT_in_superSuffix4525); if (state.failed) return;
+					match(input,ID,FOLLOW_ID_in_superSuffix4527); if (state.failed) return;
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:725:17: ( ( LEFT_PAREN )=> arguments )?
 					int alt93=2;
 					int LA93_0 = input.LA(1);
 					if ( (LA93_0==LEFT_PAREN) ) {
@@ -6060,9 +6063,9 @@ else if ( (LA94_0==DOT) ) {
 					}
 					switch (alt93) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:718:18: ( LEFT_PAREN )=> arguments
+							// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:725:18: ( LEFT_PAREN )=> arguments
 							{
-							pushFollow(FOLLOW_arguments_in_superSuffix4530);
+							pushFollow(FOLLOW_arguments_in_superSuffix4536);
 							arguments();
 							state._fsp--;
 							if (state.failed) return;
@@ -6090,7 +6093,7 @@ else if ( (LA94_0==DOT) ) {
 
 
 	// $ANTLR start "squareArguments"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:721:1: squareArguments returns [java.util.List args] : LEFT_SQUARE (el= expressionList )? RIGHT_SQUARE ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:728:1: squareArguments returns [java.util.List args] : LEFT_SQUARE (el= expressionList )? RIGHT_SQUARE ;
 	public final java.util.List squareArguments() throws RecognitionException {
 		java.util.List args = null;
 
@@ -6098,11 +6101,11 @@ public final java.util.List squareArguments() throws RecognitionExceptio
 		java.util.List el =null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:722:5: ( LEFT_SQUARE (el= expressionList )? RIGHT_SQUARE )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:722:7: LEFT_SQUARE (el= expressionList )? RIGHT_SQUARE
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:729:5: ( LEFT_SQUARE (el= expressionList )? RIGHT_SQUARE )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:729:7: LEFT_SQUARE (el= expressionList )? RIGHT_SQUARE
 			{
-			match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_squareArguments4553); if (state.failed) return args;
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:722:19: (el= expressionList )?
+			match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_squareArguments4559); if (state.failed) return args;
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:729:19: (el= expressionList )?
 			int alt95=2;
 			int LA95_0 = input.LA(1);
 			if ( (LA95_0==BOOL||(LA95_0 >= DECIMAL && LA95_0 <= DIV)||LA95_0==DOT||LA95_0==FLOAT||LA95_0==HEX||(LA95_0 >= ID && LA95_0 <= INCR)||(LA95_0 >= LEFT_PAREN && LA95_0 <= LESS)||LA95_0==MINUS||LA95_0==NEGATION||LA95_0==NULL||LA95_0==PLUS||LA95_0==QUESTION_DIV||(LA95_0 >= STAR && LA95_0 <= TIME_INTERVAL)) ) {
@@ -6110,9 +6113,9 @@ public final java.util.List squareArguments() throws RecognitionExceptio
 			}
 			switch (alt95) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:722:20: el= expressionList
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:729:20: el= expressionList
 					{
-					pushFollow(FOLLOW_expressionList_in_squareArguments4558);
+					pushFollow(FOLLOW_expressionList_in_squareArguments4564);
 					el=expressionList();
 					state._fsp--;
 					if (state.failed) return args;
@@ -6122,7 +6125,7 @@ public final java.util.List squareArguments() throws RecognitionExceptio
 
 			}
 
-			match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_squareArguments4564); if (state.failed) return args;
+			match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_squareArguments4570); if (state.failed) return args;
 			}
 
 		}
@@ -6141,18 +6144,18 @@ public final java.util.List squareArguments() throws RecognitionExceptio
 
 
 	// $ANTLR start "arguments"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:725:1: arguments : LEFT_PAREN ( expressionList )? RIGHT_PAREN ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:732:1: arguments : LEFT_PAREN ( expressionList )? RIGHT_PAREN ;
 	public final void arguments() throws RecognitionException {
 		Token LEFT_PAREN28=null;
 		Token RIGHT_PAREN29=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:726:5: ( LEFT_PAREN ( expressionList )? RIGHT_PAREN )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:726:7: LEFT_PAREN ( expressionList )? RIGHT_PAREN
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:733:5: ( LEFT_PAREN ( expressionList )? RIGHT_PAREN )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:733:7: LEFT_PAREN ( expressionList )? RIGHT_PAREN
 			{
-			LEFT_PAREN28=(Token)match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_arguments4581); if (state.failed) return;
+			LEFT_PAREN28=(Token)match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_arguments4587); if (state.failed) return;
 			if ( state.backtracking==0 ) { helper.emit(LEFT_PAREN28, DroolsEditorType.SYMBOL); }
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:727:9: ( expressionList )?
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:734:9: ( expressionList )?
 			int alt96=2;
 			int LA96_0 = input.LA(1);
 			if ( (LA96_0==BOOL||(LA96_0 >= DECIMAL && LA96_0 <= DIV)||LA96_0==DOT||LA96_0==FLOAT||LA96_0==HEX||(LA96_0 >= ID && LA96_0 <= INCR)||(LA96_0 >= LEFT_PAREN && LA96_0 <= LESS)||LA96_0==MINUS||LA96_0==NEGATION||LA96_0==NULL||LA96_0==PLUS||LA96_0==QUESTION_DIV||(LA96_0 >= STAR && LA96_0 <= TIME_INTERVAL)) ) {
@@ -6160,9 +6163,9 @@ public final void arguments() throws RecognitionException {
 			}
 			switch (alt96) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:727:9: expressionList
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:734:9: expressionList
 					{
-					pushFollow(FOLLOW_expressionList_in_arguments4593);
+					pushFollow(FOLLOW_expressionList_in_arguments4599);
 					expressionList();
 					state._fsp--;
 					if (state.failed) return;
@@ -6171,7 +6174,7 @@ public final void arguments() throws RecognitionException {
 
 			}
 
-			RIGHT_PAREN29=(Token)match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_arguments4604); if (state.failed) return;
+			RIGHT_PAREN29=(Token)match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_arguments4610); if (state.failed) return;
 			if ( state.backtracking==0 ) { helper.emit(RIGHT_PAREN29, DroolsEditorType.SYMBOL); }
 			}
 
@@ -6190,7 +6193,7 @@ public final void arguments() throws RecognitionException {
 
 
 	// $ANTLR start "expressionList"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:731:1: expressionList returns [java.util.List exprs] : f= expression ( COMMA s= expression )* ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:738:1: expressionList returns [java.util.List exprs] : f= expression ( COMMA s= expression )* ;
 	public final java.util.List expressionList() throws RecognitionException {
 		java.util.List exprs = null;
 
@@ -6200,15 +6203,15 @@ public final java.util.List expressionList() throws RecognitionException
 
 		 exprs = new java.util.ArrayList();
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:733:3: (f= expression ( COMMA s= expression )* )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:733:7: f= expression ( COMMA s= expression )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:740:3: (f= expression ( COMMA s= expression )* )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:740:7: f= expression ( COMMA s= expression )*
 			{
-			pushFollow(FOLLOW_expression_in_expressionList4634);
+			pushFollow(FOLLOW_expression_in_expressionList4640);
 			f=expression();
 			state._fsp--;
 			if (state.failed) return exprs;
 			if ( state.backtracking==0 ) { exprs.add( (f!=null?input.toString(f.start,f.stop):null) ); }
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:734:7: ( COMMA s= expression )*
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:741:7: ( COMMA s= expression )*
 			loop97:
 			while (true) {
 				int alt97=2;
@@ -6219,10 +6222,10 @@ public final java.util.List expressionList() throws RecognitionException
 
 				switch (alt97) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:734:8: COMMA s= expression
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:741:8: COMMA s= expression
 					{
-					match(input,COMMA,FOLLOW_COMMA_in_expressionList4645); if (state.failed) return exprs;
-					pushFollow(FOLLOW_expression_in_expressionList4649);
+					match(input,COMMA,FOLLOW_COMMA_in_expressionList4651); if (state.failed) return exprs;
+					pushFollow(FOLLOW_expression_in_expressionList4655);
 					s=expression();
 					state._fsp--;
 					if (state.failed) return exprs;
@@ -6253,10 +6256,10 @@ public final java.util.List expressionList() throws RecognitionException
 
 
 	// $ANTLR start "assignmentOperator"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:737:1: assignmentOperator : ( EQUALS_ASSIGN | PLUS_ASSIGN | MINUS_ASSIGN | MULT_ASSIGN | DIV_ASSIGN | AND_ASSIGN | OR_ASSIGN | XOR_ASSIGN | MOD_ASSIGN | LESS LESS EQUALS_ASSIGN | ( GREATER GREATER GREATER )=> GREATER GREATER GREATER EQUALS_ASSIGN | ( GREATER GREATER )=> GREATER GREATER EQUALS_ASSIGN );
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:744:1: assignmentOperator : ( EQUALS_ASSIGN | PLUS_ASSIGN | MINUS_ASSIGN | MULT_ASSIGN | DIV_ASSIGN | AND_ASSIGN | OR_ASSIGN | XOR_ASSIGN | MOD_ASSIGN | LESS LESS EQUALS_ASSIGN | ( GREATER GREATER GREATER )=> GREATER GREATER GREATER EQUALS_ASSIGN | ( GREATER GREATER )=> GREATER GREATER EQUALS_ASSIGN );
 	public final void assignmentOperator() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:738:5: ( EQUALS_ASSIGN | PLUS_ASSIGN | MINUS_ASSIGN | MULT_ASSIGN | DIV_ASSIGN | AND_ASSIGN | OR_ASSIGN | XOR_ASSIGN | MOD_ASSIGN | LESS LESS EQUALS_ASSIGN | ( GREATER GREATER GREATER )=> GREATER GREATER GREATER EQUALS_ASSIGN | ( GREATER GREATER )=> GREATER GREATER EQUALS_ASSIGN )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:745:5: ( EQUALS_ASSIGN | PLUS_ASSIGN | MINUS_ASSIGN | MULT_ASSIGN | DIV_ASSIGN | AND_ASSIGN | OR_ASSIGN | XOR_ASSIGN | MOD_ASSIGN | LESS LESS EQUALS_ASSIGN | ( GREATER GREATER GREATER )=> GREATER GREATER GREATER EQUALS_ASSIGN | ( GREATER GREATER )=> GREATER GREATER EQUALS_ASSIGN )
 			int alt98=12;
 			switch ( input.LA(1) ) {
 			case EQUALS_ASSIGN:
@@ -6346,82 +6349,82 @@ else if ( (LA98_12==EQUALS_ASSIGN) && (synpred50_DRL6Expressions())) {
 			}
 			switch (alt98) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:738:9: EQUALS_ASSIGN
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:745:9: EQUALS_ASSIGN
 					{
-					match(input,EQUALS_ASSIGN,FOLLOW_EQUALS_ASSIGN_in_assignmentOperator4670); if (state.failed) return;
+					match(input,EQUALS_ASSIGN,FOLLOW_EQUALS_ASSIGN_in_assignmentOperator4676); if (state.failed) return;
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:739:7: PLUS_ASSIGN
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:746:7: PLUS_ASSIGN
 					{
-					match(input,PLUS_ASSIGN,FOLLOW_PLUS_ASSIGN_in_assignmentOperator4678); if (state.failed) return;
+					match(input,PLUS_ASSIGN,FOLLOW_PLUS_ASSIGN_in_assignmentOperator4684); if (state.failed) return;
 					}
 					break;
 				case 3 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:740:7: MINUS_ASSIGN
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:747:7: MINUS_ASSIGN
 					{
-					match(input,MINUS_ASSIGN,FOLLOW_MINUS_ASSIGN_in_assignmentOperator4686); if (state.failed) return;
+					match(input,MINUS_ASSIGN,FOLLOW_MINUS_ASSIGN_in_assignmentOperator4692); if (state.failed) return;
 					}
 					break;
 				case 4 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:741:7: MULT_ASSIGN
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:748:7: MULT_ASSIGN
 					{
-					match(input,MULT_ASSIGN,FOLLOW_MULT_ASSIGN_in_assignmentOperator4694); if (state.failed) return;
+					match(input,MULT_ASSIGN,FOLLOW_MULT_ASSIGN_in_assignmentOperator4700); if (state.failed) return;
 					}
 					break;
 				case 5 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:742:7: DIV_ASSIGN
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:749:7: DIV_ASSIGN
 					{
-					match(input,DIV_ASSIGN,FOLLOW_DIV_ASSIGN_in_assignmentOperator4702); if (state.failed) return;
+					match(input,DIV_ASSIGN,FOLLOW_DIV_ASSIGN_in_assignmentOperator4708); if (state.failed) return;
 					}
 					break;
 				case 6 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:743:7: AND_ASSIGN
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:750:7: AND_ASSIGN
 					{
-					match(input,AND_ASSIGN,FOLLOW_AND_ASSIGN_in_assignmentOperator4710); if (state.failed) return;
+					match(input,AND_ASSIGN,FOLLOW_AND_ASSIGN_in_assignmentOperator4716); if (state.failed) return;
 					}
 					break;
 				case 7 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:744:7: OR_ASSIGN
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:751:7: OR_ASSIGN
 					{
-					match(input,OR_ASSIGN,FOLLOW_OR_ASSIGN_in_assignmentOperator4718); if (state.failed) return;
+					match(input,OR_ASSIGN,FOLLOW_OR_ASSIGN_in_assignmentOperator4724); if (state.failed) return;
 					}
 					break;
 				case 8 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:745:7: XOR_ASSIGN
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:752:7: XOR_ASSIGN
 					{
-					match(input,XOR_ASSIGN,FOLLOW_XOR_ASSIGN_in_assignmentOperator4726); if (state.failed) return;
+					match(input,XOR_ASSIGN,FOLLOW_XOR_ASSIGN_in_assignmentOperator4732); if (state.failed) return;
 					}
 					break;
 				case 9 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:746:7: MOD_ASSIGN
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:753:7: MOD_ASSIGN
 					{
-					match(input,MOD_ASSIGN,FOLLOW_MOD_ASSIGN_in_assignmentOperator4734); if (state.failed) return;
+					match(input,MOD_ASSIGN,FOLLOW_MOD_ASSIGN_in_assignmentOperator4740); if (state.failed) return;
 					}
 					break;
 				case 10 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:747:7: LESS LESS EQUALS_ASSIGN
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:754:7: LESS LESS EQUALS_ASSIGN
 					{
-					match(input,LESS,FOLLOW_LESS_in_assignmentOperator4742); if (state.failed) return;
-					match(input,LESS,FOLLOW_LESS_in_assignmentOperator4744); if (state.failed) return;
-					match(input,EQUALS_ASSIGN,FOLLOW_EQUALS_ASSIGN_in_assignmentOperator4746); if (state.failed) return;
+					match(input,LESS,FOLLOW_LESS_in_assignmentOperator4748); if (state.failed) return;
+					match(input,LESS,FOLLOW_LESS_in_assignmentOperator4750); if (state.failed) return;
+					match(input,EQUALS_ASSIGN,FOLLOW_EQUALS_ASSIGN_in_assignmentOperator4752); if (state.failed) return;
 					}
 					break;
 				case 11 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:748:7: ( GREATER GREATER GREATER )=> GREATER GREATER GREATER EQUALS_ASSIGN
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:755:7: ( GREATER GREATER GREATER )=> GREATER GREATER GREATER EQUALS_ASSIGN
 					{
-					match(input,GREATER,FOLLOW_GREATER_in_assignmentOperator4763); if (state.failed) return;
-					match(input,GREATER,FOLLOW_GREATER_in_assignmentOperator4765); if (state.failed) return;
-					match(input,GREATER,FOLLOW_GREATER_in_assignmentOperator4767); if (state.failed) return;
-					match(input,EQUALS_ASSIGN,FOLLOW_EQUALS_ASSIGN_in_assignmentOperator4769); if (state.failed) return;
+					match(input,GREATER,FOLLOW_GREATER_in_assignmentOperator4769); if (state.failed) return;
+					match(input,GREATER,FOLLOW_GREATER_in_assignmentOperator4771); if (state.failed) return;
+					match(input,GREATER,FOLLOW_GREATER_in_assignmentOperator4773); if (state.failed) return;
+					match(input,EQUALS_ASSIGN,FOLLOW_EQUALS_ASSIGN_in_assignmentOperator4775); if (state.failed) return;
 					}
 					break;
 				case 12 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:749:7: ( GREATER GREATER )=> GREATER GREATER EQUALS_ASSIGN
+					// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:756:7: ( GREATER GREATER )=> GREATER GREATER EQUALS_ASSIGN
 					{
-					match(input,GREATER,FOLLOW_GREATER_in_assignmentOperator4784); if (state.failed) return;
-					match(input,GREATER,FOLLOW_GREATER_in_assignmentOperator4786); if (state.failed) return;
-					match(input,EQUALS_ASSIGN,FOLLOW_EQUALS_ASSIGN_in_assignmentOperator4788); if (state.failed) return;
+					match(input,GREATER,FOLLOW_GREATER_in_assignmentOperator4790); if (state.failed) return;
+					match(input,GREATER,FOLLOW_GREATER_in_assignmentOperator4792); if (state.failed) return;
+					match(input,EQUALS_ASSIGN,FOLLOW_EQUALS_ASSIGN_in_assignmentOperator4794); if (state.failed) return;
 					}
 					break;
 
@@ -6441,19 +6444,19 @@ else if ( (LA98_12==EQUALS_ASSIGN) && (synpred50_DRL6Expressions())) {
 
 
 	// $ANTLR start "extends_key"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:755:1: extends_key :{...}? =>id= ID ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:762:1: extends_key :{...}? =>id= ID ;
 	public final void extends_key() throws RecognitionException {
 		Token id=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:756:5: ({...}? =>id= ID )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:756:12: {...}? =>id= ID
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:763:5: ({...}? =>id= ID )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:763:12: {...}? =>id= ID
 			{
 			if ( !(((helper.validateIdentifierKey(DroolsSoftKeywords.EXTENDS)))) ) {
 				if (state.backtracking>0) {state.failed=true; return;}
 				throw new FailedPredicateException(input, "extends_key", "(helper.validateIdentifierKey(DroolsSoftKeywords.EXTENDS))");
 			}
-			id=(Token)match(input,ID,FOLLOW_ID_in_extends_key4818); if (state.failed) return;
+			id=(Token)match(input,ID,FOLLOW_ID_in_extends_key4824); if (state.failed) return;
 			if ( state.backtracking==0 ) { helper.emit(id, DroolsEditorType.KEYWORD); }
 			}
 
@@ -6472,19 +6475,19 @@ public final void extends_key() throws RecognitionException {
 
 
 	// $ANTLR start "super_key"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:759:1: super_key :{...}? =>id= ID ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:766:1: super_key :{...}? =>id= ID ;
 	public final void super_key() throws RecognitionException {
 		Token id=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:760:5: ({...}? =>id= ID )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:760:12: {...}? =>id= ID
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:767:5: ({...}? =>id= ID )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:767:12: {...}? =>id= ID
 			{
 			if ( !(((helper.validateIdentifierKey(DroolsSoftKeywords.SUPER)))) ) {
 				if (state.backtracking>0) {state.failed=true; return;}
 				throw new FailedPredicateException(input, "super_key", "(helper.validateIdentifierKey(DroolsSoftKeywords.SUPER))");
 			}
-			id=(Token)match(input,ID,FOLLOW_ID_in_super_key4847); if (state.failed) return;
+			id=(Token)match(input,ID,FOLLOW_ID_in_super_key4853); if (state.failed) return;
 			if ( state.backtracking==0 ) { helper.emit(id, DroolsEditorType.KEYWORD); }
 			}
 
@@ -6506,7 +6509,7 @@ public static class instanceof_key_return extends ParserRuleReturnScope {
 
 
 	// $ANTLR start "instanceof_key"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:763:1: instanceof_key :{...}? =>id= ID ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:770:1: instanceof_key :{...}? =>id= ID ;
 	public final DRL6Expressions.instanceof_key_return instanceof_key() throws RecognitionException {
 		DRL6Expressions.instanceof_key_return retval = new DRL6Expressions.instanceof_key_return();
 		retval.start = input.LT(1);
@@ -6514,14 +6517,14 @@ public final DRL6Expressions.instanceof_key_return instanceof_key() throws Recog
 		Token id=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:764:5: ({...}? =>id= ID )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:764:12: {...}? =>id= ID
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:771:5: ({...}? =>id= ID )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:771:12: {...}? =>id= ID
 			{
 			if ( !(((helper.validateIdentifierKey(DroolsSoftKeywords.INSTANCEOF)))) ) {
 				if (state.backtracking>0) {state.failed=true; return retval;}
 				throw new FailedPredicateException(input, "instanceof_key", "(helper.validateIdentifierKey(DroolsSoftKeywords.INSTANCEOF))");
 			}
-			id=(Token)match(input,ID,FOLLOW_ID_in_instanceof_key4876); if (state.failed) return retval;
+			id=(Token)match(input,ID,FOLLOW_ID_in_instanceof_key4882); if (state.failed) return retval;
 			if ( state.backtracking==0 ) { helper.emit(id, DroolsEditorType.KEYWORD); }
 			}
 
@@ -6543,19 +6546,19 @@ public final DRL6Expressions.instanceof_key_return instanceof_key() throws Recog
 
 
 	// $ANTLR start "boolean_key"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:767:1: boolean_key :{...}? =>id= ID ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:774:1: boolean_key :{...}? =>id= ID ;
 	public final void boolean_key() throws RecognitionException {
 		Token id=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:768:5: ({...}? =>id= ID )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:768:12: {...}? =>id= ID
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:775:5: ({...}? =>id= ID )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:775:12: {...}? =>id= ID
 			{
 			if ( !(((helper.validateIdentifierKey(DroolsSoftKeywords.BOOLEAN)))) ) {
 				if (state.backtracking>0) {state.failed=true; return;}
 				throw new FailedPredicateException(input, "boolean_key", "(helper.validateIdentifierKey(DroolsSoftKeywords.BOOLEAN))");
 			}
-			id=(Token)match(input,ID,FOLLOW_ID_in_boolean_key4905); if (state.failed) return;
+			id=(Token)match(input,ID,FOLLOW_ID_in_boolean_key4911); if (state.failed) return;
 			if ( state.backtracking==0 ) { helper.emit(id, DroolsEditorType.KEYWORD); }
 			}
 
@@ -6574,19 +6577,19 @@ public final void boolean_key() throws RecognitionException {
 
 
 	// $ANTLR start "char_key"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:771:1: char_key :{...}? =>id= ID ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:778:1: char_key :{...}? =>id= ID ;
 	public final void char_key() throws RecognitionException {
 		Token id=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:772:5: ({...}? =>id= ID )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:772:12: {...}? =>id= ID
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:779:5: ({...}? =>id= ID )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:779:12: {...}? =>id= ID
 			{
 			if ( !(((helper.validateIdentifierKey(DroolsSoftKeywords.CHAR)))) ) {
 				if (state.backtracking>0) {state.failed=true; return;}
 				throw new FailedPredicateException(input, "char_key", "(helper.validateIdentifierKey(DroolsSoftKeywords.CHAR))");
 			}
-			id=(Token)match(input,ID,FOLLOW_ID_in_char_key4934); if (state.failed) return;
+			id=(Token)match(input,ID,FOLLOW_ID_in_char_key4940); if (state.failed) return;
 			if ( state.backtracking==0 ) { helper.emit(id, DroolsEditorType.KEYWORD); }
 			}
 
@@ -6605,19 +6608,19 @@ public final void char_key() throws RecognitionException {
 
 
 	// $ANTLR start "byte_key"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:775:1: byte_key :{...}? =>id= ID ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:782:1: byte_key :{...}? =>id= ID ;
 	public final void byte_key() throws RecognitionException {
 		Token id=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:776:5: ({...}? =>id= ID )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:776:12: {...}? =>id= ID
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:783:5: ({...}? =>id= ID )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:783:12: {...}? =>id= ID
 			{
 			if ( !(((helper.validateIdentifierKey(DroolsSoftKeywords.BYTE)))) ) {
 				if (state.backtracking>0) {state.failed=true; return;}
 				throw new FailedPredicateException(input, "byte_key", "(helper.validateIdentifierKey(DroolsSoftKeywords.BYTE))");
 			}
-			id=(Token)match(input,ID,FOLLOW_ID_in_byte_key4963); if (state.failed) return;
+			id=(Token)match(input,ID,FOLLOW_ID_in_byte_key4969); if (state.failed) return;
 			if ( state.backtracking==0 ) { helper.emit(id, DroolsEditorType.KEYWORD); }
 			}
 
@@ -6636,19 +6639,19 @@ public final void byte_key() throws RecognitionException {
 
 
 	// $ANTLR start "short_key"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:779:1: short_key :{...}? =>id= ID ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:786:1: short_key :{...}? =>id= ID ;
 	public final void short_key() throws RecognitionException {
 		Token id=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:780:5: ({...}? =>id= ID )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:780:12: {...}? =>id= ID
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:787:5: ({...}? =>id= ID )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:787:12: {...}? =>id= ID
 			{
 			if ( !(((helper.validateIdentifierKey(DroolsSoftKeywords.SHORT)))) ) {
 				if (state.backtracking>0) {state.failed=true; return;}
 				throw new FailedPredicateException(input, "short_key", "(helper.validateIdentifierKey(DroolsSoftKeywords.SHORT))");
 			}
-			id=(Token)match(input,ID,FOLLOW_ID_in_short_key4992); if (state.failed) return;
+			id=(Token)match(input,ID,FOLLOW_ID_in_short_key4998); if (state.failed) return;
 			if ( state.backtracking==0 ) { helper.emit(id, DroolsEditorType.KEYWORD); }
 			}
 
@@ -6667,19 +6670,19 @@ public final void short_key() throws RecognitionException {
 
 
 	// $ANTLR start "int_key"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:783:1: int_key :{...}? =>id= ID ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:790:1: int_key :{...}? =>id= ID ;
 	public final void int_key() throws RecognitionException {
 		Token id=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:784:5: ({...}? =>id= ID )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:784:12: {...}? =>id= ID
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:791:5: ({...}? =>id= ID )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:791:12: {...}? =>id= ID
 			{
 			if ( !(((helper.validateIdentifierKey(DroolsSoftKeywords.INT)))) ) {
 				if (state.backtracking>0) {state.failed=true; return;}
 				throw new FailedPredicateException(input, "int_key", "(helper.validateIdentifierKey(DroolsSoftKeywords.INT))");
 			}
-			id=(Token)match(input,ID,FOLLOW_ID_in_int_key5021); if (state.failed) return;
+			id=(Token)match(input,ID,FOLLOW_ID_in_int_key5027); if (state.failed) return;
 			if ( state.backtracking==0 ) { helper.emit(id, DroolsEditorType.KEYWORD); }
 			}
 
@@ -6698,19 +6701,19 @@ public final void int_key() throws RecognitionException {
 
 
 	// $ANTLR start "float_key"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:787:1: float_key :{...}? =>id= ID ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:794:1: float_key :{...}? =>id= ID ;
 	public final void float_key() throws RecognitionException {
 		Token id=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:788:5: ({...}? =>id= ID )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:788:12: {...}? =>id= ID
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:795:5: ({...}? =>id= ID )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:795:12: {...}? =>id= ID
 			{
 			if ( !(((helper.validateIdentifierKey(DroolsSoftKeywords.FLOAT)))) ) {
 				if (state.backtracking>0) {state.failed=true; return;}
 				throw new FailedPredicateException(input, "float_key", "(helper.validateIdentifierKey(DroolsSoftKeywords.FLOAT))");
 			}
-			id=(Token)match(input,ID,FOLLOW_ID_in_float_key5050); if (state.failed) return;
+			id=(Token)match(input,ID,FOLLOW_ID_in_float_key5056); if (state.failed) return;
 			if ( state.backtracking==0 ) { helper.emit(id, DroolsEditorType.KEYWORD); }
 			}
 
@@ -6729,19 +6732,19 @@ public final void float_key() throws RecognitionException {
 
 
 	// $ANTLR start "long_key"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:791:1: long_key :{...}? =>id= ID ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:798:1: long_key :{...}? =>id= ID ;
 	public final void long_key() throws RecognitionException {
 		Token id=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:792:5: ({...}? =>id= ID )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:792:12: {...}? =>id= ID
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:799:5: ({...}? =>id= ID )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:799:12: {...}? =>id= ID
 			{
 			if ( !(((helper.validateIdentifierKey(DroolsSoftKeywords.LONG)))) ) {
 				if (state.backtracking>0) {state.failed=true; return;}
 				throw new FailedPredicateException(input, "long_key", "(helper.validateIdentifierKey(DroolsSoftKeywords.LONG))");
 			}
-			id=(Token)match(input,ID,FOLLOW_ID_in_long_key5079); if (state.failed) return;
+			id=(Token)match(input,ID,FOLLOW_ID_in_long_key5085); if (state.failed) return;
 			if ( state.backtracking==0 ) { helper.emit(id, DroolsEditorType.KEYWORD); }
 			}
 
@@ -6760,19 +6763,19 @@ public final void long_key() throws RecognitionException {
 
 
 	// $ANTLR start "double_key"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:795:1: double_key :{...}? =>id= ID ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:802:1: double_key :{...}? =>id= ID ;
 	public final void double_key() throws RecognitionException {
 		Token id=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:796:5: ({...}? =>id= ID )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:796:12: {...}? =>id= ID
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:803:5: ({...}? =>id= ID )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:803:12: {...}? =>id= ID
 			{
 			if ( !(((helper.validateIdentifierKey(DroolsSoftKeywords.DOUBLE)))) ) {
 				if (state.backtracking>0) {state.failed=true; return;}
 				throw new FailedPredicateException(input, "double_key", "(helper.validateIdentifierKey(DroolsSoftKeywords.DOUBLE))");
 			}
-			id=(Token)match(input,ID,FOLLOW_ID_in_double_key5108); if (state.failed) return;
+			id=(Token)match(input,ID,FOLLOW_ID_in_double_key5114); if (state.failed) return;
 			if ( state.backtracking==0 ) { helper.emit(id, DroolsEditorType.KEYWORD); }
 			}
 
@@ -6791,19 +6794,19 @@ public final void double_key() throws RecognitionException {
 
 
 	// $ANTLR start "void_key"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:799:1: void_key :{...}? =>id= ID ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:806:1: void_key :{...}? =>id= ID ;
 	public final void void_key() throws RecognitionException {
 		Token id=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:800:5: ({...}? =>id= ID )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:800:12: {...}? =>id= ID
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:807:5: ({...}? =>id= ID )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:807:12: {...}? =>id= ID
 			{
 			if ( !(((helper.validateIdentifierKey(DroolsSoftKeywords.VOID)))) ) {
 				if (state.backtracking>0) {state.failed=true; return;}
 				throw new FailedPredicateException(input, "void_key", "(helper.validateIdentifierKey(DroolsSoftKeywords.VOID))");
 			}
-			id=(Token)match(input,ID,FOLLOW_ID_in_void_key5137); if (state.failed) return;
+			id=(Token)match(input,ID,FOLLOW_ID_in_void_key5143); if (state.failed) return;
 			if ( state.backtracking==0 ) { helper.emit(id, DroolsEditorType.KEYWORD); }
 			}
 
@@ -6822,19 +6825,19 @@ public final void void_key() throws RecognitionException {
 
 
 	// $ANTLR start "this_key"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:803:1: this_key :{...}? =>id= ID ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:810:1: this_key :{...}? =>id= ID ;
 	public final void this_key() throws RecognitionException {
 		Token id=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:804:5: ({...}? =>id= ID )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:804:12: {...}? =>id= ID
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:811:5: ({...}? =>id= ID )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:811:12: {...}? =>id= ID
 			{
 			if ( !(((helper.validateIdentifierKey(DroolsSoftKeywords.THIS)))) ) {
 				if (state.backtracking>0) {state.failed=true; return;}
 				throw new FailedPredicateException(input, "this_key", "(helper.validateIdentifierKey(DroolsSoftKeywords.THIS))");
 			}
-			id=(Token)match(input,ID,FOLLOW_ID_in_this_key5166); if (state.failed) return;
+			id=(Token)match(input,ID,FOLLOW_ID_in_this_key5172); if (state.failed) return;
 			if ( state.backtracking==0 ) { helper.emit(id, DroolsEditorType.KEYWORD); }
 			}
 
@@ -6853,19 +6856,19 @@ public final void this_key() throws RecognitionException {
 
 
 	// $ANTLR start "class_key"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:807:1: class_key :{...}? =>id= ID ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:814:1: class_key :{...}? =>id= ID ;
 	public final void class_key() throws RecognitionException {
 		Token id=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:808:5: ({...}? =>id= ID )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:808:12: {...}? =>id= ID
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:815:5: ({...}? =>id= ID )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:815:12: {...}? =>id= ID
 			{
 			if ( !(((helper.validateIdentifierKey(DroolsSoftKeywords.CLASS)))) ) {
 				if (state.backtracking>0) {state.failed=true; return;}
 				throw new FailedPredicateException(input, "class_key", "(helper.validateIdentifierKey(DroolsSoftKeywords.CLASS))");
 			}
-			id=(Token)match(input,ID,FOLLOW_ID_in_class_key5195); if (state.failed) return;
+			id=(Token)match(input,ID,FOLLOW_ID_in_class_key5201); if (state.failed) return;
 			if ( state.backtracking==0 ) { helper.emit(id, DroolsEditorType.KEYWORD); }
 			}
 
@@ -6884,19 +6887,19 @@ public final void class_key() throws RecognitionException {
 
 
 	// $ANTLR start "new_key"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:811:1: new_key :{...}? =>id= ID ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:818:1: new_key :{...}? =>id= ID ;
 	public final void new_key() throws RecognitionException {
 		Token id=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:812:5: ({...}? =>id= ID )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:812:12: {...}? =>id= ID
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:819:5: ({...}? =>id= ID )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:819:12: {...}? =>id= ID
 			{
 			if ( !(((helper.validateIdentifierKey(DroolsSoftKeywords.NEW)))) ) {
 				if (state.backtracking>0) {state.failed=true; return;}
 				throw new FailedPredicateException(input, "new_key", "(helper.validateIdentifierKey(DroolsSoftKeywords.NEW))");
 			}
-			id=(Token)match(input,ID,FOLLOW_ID_in_new_key5225); if (state.failed) return;
+			id=(Token)match(input,ID,FOLLOW_ID_in_new_key5231); if (state.failed) return;
 			if ( state.backtracking==0 ) { helper.emit(id, DroolsEditorType.KEYWORD); }
 			}
 
@@ -6915,19 +6918,19 @@ public final void new_key() throws RecognitionException {
 
 
 	// $ANTLR start "not_key"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:815:1: not_key :{...}? =>id= ID ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:822:1: not_key :{...}? =>id= ID ;
 	public final void not_key() throws RecognitionException {
 		Token id=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:816:5: ({...}? =>id= ID )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:816:12: {...}? =>id= ID
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:823:5: ({...}? =>id= ID )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:823:12: {...}? =>id= ID
 			{
 			if ( !(((helper.validateIdentifierKey(DroolsSoftKeywords.NOT)))) ) {
 				if (state.backtracking>0) {state.failed=true; return;}
 				throw new FailedPredicateException(input, "not_key", "(helper.validateIdentifierKey(DroolsSoftKeywords.NOT))");
 			}
-			id=(Token)match(input,ID,FOLLOW_ID_in_not_key5254); if (state.failed) return;
+			id=(Token)match(input,ID,FOLLOW_ID_in_not_key5260); if (state.failed) return;
 			if ( state.backtracking==0 ) { helper.emit(id, DroolsEditorType.KEYWORD); }
 			}
 
@@ -6946,19 +6949,19 @@ public final void not_key() throws RecognitionException {
 
 
 	// $ANTLR start "in_key"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:819:1: in_key :{...}? =>id= ID ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:826:1: in_key :{...}? =>id= ID ;
 	public final void in_key() throws RecognitionException {
 		Token id=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:820:3: ({...}? =>id= ID )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:820:10: {...}? =>id= ID
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:827:3: ({...}? =>id= ID )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:827:10: {...}? =>id= ID
 			{
 			if ( !(((helper.validateIdentifierKey(DroolsSoftKeywords.IN)))) ) {
 				if (state.backtracking>0) {state.failed=true; return;}
 				throw new FailedPredicateException(input, "in_key", "(helper.validateIdentifierKey(DroolsSoftKeywords.IN))");
 			}
-			id=(Token)match(input,ID,FOLLOW_ID_in_in_key5281); if (state.failed) return;
+			id=(Token)match(input,ID,FOLLOW_ID_in_in_key5287); if (state.failed) return;
 			if ( state.backtracking==0 ) { helper.emit(id, DroolsEditorType.KEYWORD); }
 			}
 
@@ -6980,7 +6983,7 @@ public static class operator_key_return extends ParserRuleReturnScope {
 
 
 	// $ANTLR start "operator_key"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:823:1: operator_key :{...}? =>id= ID ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:830:1: operator_key :{...}? =>id= ID ;
 	public final DRL6Expressions.operator_key_return operator_key() throws RecognitionException {
 		DRL6Expressions.operator_key_return retval = new DRL6Expressions.operator_key_return();
 		retval.start = input.LT(1);
@@ -6988,14 +6991,14 @@ public final DRL6Expressions.operator_key_return operator_key() throws Recogniti
 		Token id=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:824:3: ({...}? =>id= ID )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:824:10: {...}? =>id= ID
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:831:3: ({...}? =>id= ID )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:831:10: {...}? =>id= ID
 			{
 			if ( !(((helper.isPluggableEvaluator(false)))) ) {
 				if (state.backtracking>0) {state.failed=true; return retval;}
 				throw new FailedPredicateException(input, "operator_key", "(helper.isPluggableEvaluator(false))");
 			}
-			id=(Token)match(input,ID,FOLLOW_ID_in_operator_key5306); if (state.failed) return retval;
+			id=(Token)match(input,ID,FOLLOW_ID_in_operator_key5312); if (state.failed) return retval;
 			if ( state.backtracking==0 ) { helper.emit(id, DroolsEditorType.KEYWORD); }
 			}
 
@@ -7020,7 +7023,7 @@ public static class neg_operator_key_return extends ParserRuleReturnScope {
 
 
 	// $ANTLR start "neg_operator_key"
-	// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:827:1: neg_operator_key :{...}? =>id= ID ;
+	// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:834:1: neg_operator_key :{...}? =>id= ID ;
 	public final DRL6Expressions.neg_operator_key_return neg_operator_key() throws RecognitionException {
 		DRL6Expressions.neg_operator_key_return retval = new DRL6Expressions.neg_operator_key_return();
 		retval.start = input.LT(1);
@@ -7028,14 +7031,14 @@ public final DRL6Expressions.neg_operator_key_return neg_operator_key() throws R
 		Token id=null;
 
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:828:3: ({...}? =>id= ID )
-			// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:828:10: {...}? =>id= ID
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:835:3: ({...}? =>id= ID )
+			// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:835:10: {...}? =>id= ID
 			{
 			if ( !(((helper.isPluggableEvaluator(true)))) ) {
 				if (state.backtracking>0) {state.failed=true; return retval;}
 				throw new FailedPredicateException(input, "neg_operator_key", "(helper.isPluggableEvaluator(true))");
 			}
-			id=(Token)match(input,ID,FOLLOW_ID_in_neg_operator_key5331); if (state.failed) return retval;
+			id=(Token)match(input,ID,FOLLOW_ID_in_neg_operator_key5337); if (state.failed) return retval;
 			if ( state.backtracking==0 ) { helper.emit(id, DroolsEditorType.KEYWORD); }
 			}
 
@@ -7056,8 +7059,8 @@ public final DRL6Expressions.neg_operator_key_return neg_operator_key() throws R
 
 	// $ANTLR start synpred1_DRL6Expressions
 	public final void synpred1_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:138:8: ( primitiveType )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:138:9: primitiveType
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:145:8: ( primitiveType )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:145:9: primitiveType
 		{
 		pushFollow(FOLLOW_primitiveType_in_synpred1_DRL6Expressions548);
 		primitiveType();
@@ -7070,8 +7073,8 @@ public final void synpred1_DRL6Expressions_fragment() throws RecognitionExceptio
 
 	// $ANTLR start synpred2_DRL6Expressions
 	public final void synpred2_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:138:44: ( LEFT_SQUARE RIGHT_SQUARE )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:138:45: LEFT_SQUARE RIGHT_SQUARE
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:145:44: ( LEFT_SQUARE RIGHT_SQUARE )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:145:45: LEFT_SQUARE RIGHT_SQUARE
 		{
 		match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_synpred2_DRL6Expressions559); if (state.failed) return;
 		match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_synpred2_DRL6Expressions561); if (state.failed) return;
@@ -7082,8 +7085,8 @@ public final void synpred2_DRL6Expressions_fragment() throws RecognitionExceptio
 
 	// $ANTLR start synpred3_DRL6Expressions
 	public final void synpred3_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:139:13: ( typeArguments )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:139:14: typeArguments
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:146:13: ( typeArguments )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:146:14: typeArguments
 		{
 		pushFollow(FOLLOW_typeArguments_in_synpred3_DRL6Expressions585);
 		typeArguments();
@@ -7096,8 +7099,8 @@ public final void synpred3_DRL6Expressions_fragment() throws RecognitionExceptio
 
 	// $ANTLR start synpred4_DRL6Expressions
 	public final void synpred4_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:139:55: ( typeArguments )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:139:56: typeArguments
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:146:55: ( typeArguments )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:146:56: typeArguments
 		{
 		pushFollow(FOLLOW_typeArguments_in_synpred4_DRL6Expressions599);
 		typeArguments();
@@ -7110,8 +7113,8 @@ public final void synpred4_DRL6Expressions_fragment() throws RecognitionExceptio
 
 	// $ANTLR start synpred5_DRL6Expressions
 	public final void synpred5_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:139:92: ( LEFT_SQUARE RIGHT_SQUARE )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:139:93: LEFT_SQUARE RIGHT_SQUARE
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:146:92: ( LEFT_SQUARE RIGHT_SQUARE )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:146:93: LEFT_SQUARE RIGHT_SQUARE
 		{
 		match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_synpred5_DRL6Expressions611); if (state.failed) return;
 		match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_synpred5_DRL6Expressions613); if (state.failed) return;
@@ -7122,8 +7125,8 @@ public final void synpred5_DRL6Expressions_fragment() throws RecognitionExceptio
 
 	// $ANTLR start synpred6_DRL6Expressions
 	public final void synpred6_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:165:10: ( assignmentOperator )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:165:11: assignmentOperator
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:172:10: ( assignmentOperator )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:172:11: assignmentOperator
 		{
 		pushFollow(FOLLOW_assignmentOperator_in_synpred6_DRL6Expressions782);
 		assignmentOperator();
@@ -7136,8 +7139,8 @@ public final void synpred6_DRL6Expressions_fragment() throws RecognitionExceptio
 
 	// $ANTLR start synpred7_DRL6Expressions
 	public final void synpred7_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:199:8: ( ID EQUALS_ASSIGN )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:199:9: ID EQUALS_ASSIGN
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:206:8: ( ID EQUALS_ASSIGN )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:206:9: ID EQUALS_ASSIGN
 		{
 		match(input,ID,FOLLOW_ID_in_synpred7_DRL6Expressions961); if (state.failed) return;
 		match(input,EQUALS_ASSIGN,FOLLOW_EQUALS_ASSIGN_in_synpred7_DRL6Expressions963); if (state.failed) return;
@@ -7148,8 +7151,8 @@ public final void synpred7_DRL6Expressions_fragment() throws RecognitionExceptio
 
 	// $ANTLR start synpred8_DRL6Expressions
 	public final void synpred8_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:337:6: ( not_key in_key )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:337:7: not_key in_key
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:344:6: ( not_key in_key )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:344:7: not_key in_key
 		{
 		pushFollow(FOLLOW_not_key_in_synpred8_DRL6Expressions1629);
 		not_key();
@@ -7166,7 +7169,7 @@ public final void synpred8_DRL6Expressions_fragment() throws RecognitionExceptio
 
 	// $ANTLR start synpred9_DRL6Expressions
 	public final void synpred9_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:396:5: ( operator | LEFT_PAREN )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:403:5: ( operator | LEFT_PAREN )
 		int alt99=2;
 		int LA99_0 = input.LA(1);
 		if ( (LA99_0==EQUALS||(LA99_0 >= GREATER && LA99_0 <= GREATER_EQUALS)||(LA99_0 >= LESS && LA99_0 <= LESS_EQUALS)||LA99_0==NOT_EQUALS||LA99_0==TILDE) ) {
@@ -7188,7 +7191,7 @@ else if ( (LA99_0==LEFT_PAREN) ) {
 
 		switch (alt99) {
 			case 1 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:396:7: operator
+				// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:403:7: operator
 				{
 				pushFollow(FOLLOW_operator_in_synpred9_DRL6Expressions1846);
 				operator();
@@ -7197,7 +7200,7 @@ else if ( (LA99_0==LEFT_PAREN) ) {
 				}
 				break;
 			case 2 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:396:18: LEFT_PAREN
+				// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:403:18: LEFT_PAREN
 				{
 				match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred9_DRL6Expressions1850); if (state.failed) return;
 				}
@@ -7209,11 +7212,11 @@ else if ( (LA99_0==LEFT_PAREN) ) {
 
 	// $ANTLR start synpred10_DRL6Expressions
 	public final void synpred10_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:407:7: ( DOUBLE_PIPE ( fullAnnotation[null] )? andRestriction )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:407:8: DOUBLE_PIPE ( fullAnnotation[null] )? andRestriction
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:414:7: ( DOUBLE_PIPE ( fullAnnotation[null] )? andRestriction )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:414:8: DOUBLE_PIPE ( fullAnnotation[null] )? andRestriction
 		{
 		match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_synpred10_DRL6Expressions1903); if (state.failed) return;
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:407:20: ( fullAnnotation[null] )?
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:414:20: ( fullAnnotation[null] )?
 		int alt100=2;
 		int LA100_0 = input.LA(1);
 		if ( (LA100_0==AT) ) {
@@ -7221,7 +7224,7 @@ public final void synpred10_DRL6Expressions_fragment() throws RecognitionExcepti
 		}
 		switch (alt100) {
 			case 1 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:407:20: fullAnnotation[null]
+				// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:414:20: fullAnnotation[null]
 				{
 				pushFollow(FOLLOW_fullAnnotation_in_synpred10_DRL6Expressions1905);
 				fullAnnotation(null);
@@ -7243,11 +7246,11 @@ public final void synpred10_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred11_DRL6Expressions
 	public final void synpred11_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:421:5: ( DOUBLE_AMPER ( fullAnnotation[null] )? operator )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:421:6: DOUBLE_AMPER ( fullAnnotation[null] )? operator
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:428:5: ( DOUBLE_AMPER ( fullAnnotation[null] )? operator )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:428:6: DOUBLE_AMPER ( fullAnnotation[null] )? operator
 		{
 		match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_synpred11_DRL6Expressions1972); if (state.failed) return;
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:421:19: ( fullAnnotation[null] )?
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:428:19: ( fullAnnotation[null] )?
 		int alt101=2;
 		int LA101_0 = input.LA(1);
 		if ( (LA101_0==AT) ) {
@@ -7255,7 +7258,7 @@ public final void synpred11_DRL6Expressions_fragment() throws RecognitionExcepti
 		}
 		switch (alt101) {
 			case 1 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:421:19: fullAnnotation[null]
+				// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:428:19: fullAnnotation[null]
 				{
 				pushFollow(FOLLOW_fullAnnotation_in_synpred11_DRL6Expressions1974);
 				fullAnnotation(null);
@@ -7277,8 +7280,8 @@ public final void synpred11_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred12_DRL6Expressions
 	public final void synpred12_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:438:8: ( squareArguments shiftExpression )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:438:9: squareArguments shiftExpression
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:445:8: ( squareArguments shiftExpression )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:445:9: squareArguments shiftExpression
 		{
 		pushFollow(FOLLOW_squareArguments_in_synpred12_DRL6Expressions2066);
 		squareArguments();
@@ -7295,8 +7298,8 @@ public final void synpred12_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred13_DRL6Expressions
 	public final void synpred13_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:461:7: ( shiftOp )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:461:8: shiftOp
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:468:7: ( shiftOp )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:468:8: shiftOp
 		{
 		pushFollow(FOLLOW_shiftOp_in_synpred13_DRL6Expressions2157);
 		shiftOp();
@@ -7309,8 +7312,8 @@ public final void synpred13_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred14_DRL6Expressions
 	public final void synpred14_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:472:11: ( PLUS | MINUS )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:479:11: ( PLUS | MINUS )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:
 		{
 		if ( input.LA(1)==MINUS||input.LA(1)==PLUS ) {
 			input.consume();
@@ -7329,8 +7332,8 @@ public final void synpred14_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred15_DRL6Expressions
 	public final void synpred15_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:509:9: ( castExpression )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:509:10: castExpression
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:516:9: ( castExpression )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:516:10: castExpression
 		{
 		pushFollow(FOLLOW_castExpression_in_synpred15_DRL6Expressions2489);
 		castExpression();
@@ -7343,8 +7346,8 @@ public final void synpred15_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred16_DRL6Expressions
 	public final void synpred16_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:510:9: ( backReferenceExpression )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:510:10: backReferenceExpression
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:517:9: ( backReferenceExpression )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:517:10: backReferenceExpression
 		{
 		pushFollow(FOLLOW_backReferenceExpression_in_synpred16_DRL6Expressions2503);
 		backReferenceExpression();
@@ -7357,8 +7360,8 @@ public final void synpred16_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred17_DRL6Expressions
 	public final void synpred17_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:518:11: ( xpathSeparator ID )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:518:12: xpathSeparator ID
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:525:11: ( xpathSeparator ID )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:525:12: xpathSeparator ID
 		{
 		pushFollow(FOLLOW_xpathSeparator_in_synpred17_DRL6Expressions2624);
 		xpathSeparator();
@@ -7372,8 +7375,8 @@ public final void synpred17_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred18_DRL6Expressions
 	public final void synpred18_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:522:10: ( selector )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:522:11: selector
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:529:10: ( selector )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:529:11: selector
 		{
 		pushFollow(FOLLOW_selector_in_synpred18_DRL6Expressions2674);
 		selector();
@@ -7386,8 +7389,8 @@ public final void synpred18_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred19_DRL6Expressions
 	public final void synpred19_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:541:10: ( INCR | DECR )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:548:10: ( INCR | DECR )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:
 		{
 		if ( input.LA(1)==DECR||input.LA(1)==INCR ) {
 			input.consume();
@@ -7406,8 +7409,8 @@ public final void synpred19_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred20_DRL6Expressions
 	public final void synpred20_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:545:8: ( LEFT_PAREN primitiveType )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:545:9: LEFT_PAREN primitiveType
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:552:8: ( LEFT_PAREN primitiveType )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:552:9: LEFT_PAREN primitiveType
 		{
 		match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred20_DRL6Expressions2732); if (state.failed) return;
 		pushFollow(FOLLOW_primitiveType_in_synpred20_DRL6Expressions2734);
@@ -7421,8 +7424,8 @@ public final void synpred20_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred21_DRL6Expressions
 	public final void synpred21_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:546:8: ( LEFT_PAREN type )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:546:9: LEFT_PAREN type
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:553:8: ( LEFT_PAREN type )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:553:9: LEFT_PAREN type
 		{
 		match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred21_DRL6Expressions2757); if (state.failed) return;
 		pushFollow(FOLLOW_type_in_synpred21_DRL6Expressions2759);
@@ -7436,10 +7439,10 @@ public final void synpred21_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred24_DRL6Expressions
 	public final void synpred24_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:584:7: ( LEFT_PAREN )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:584:8: LEFT_PAREN
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:591:7: ( LEFT_PAREN )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:591:8: LEFT_PAREN
 		{
-		match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred24_DRL6Expressions3051); if (state.failed) return;
+		match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred24_DRL6Expressions3057); if (state.failed) return;
 		}
 
 	}
@@ -7447,10 +7450,10 @@ public final void synpred24_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred25_DRL6Expressions
 	public final void synpred25_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:585:9: ( nonWildcardTypeArguments )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:585:10: nonWildcardTypeArguments
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:592:9: ( nonWildcardTypeArguments )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:592:10: nonWildcardTypeArguments
 		{
-		pushFollow(FOLLOW_nonWildcardTypeArguments_in_synpred25_DRL6Expressions3070);
+		pushFollow(FOLLOW_nonWildcardTypeArguments_in_synpred25_DRL6Expressions3076);
 		nonWildcardTypeArguments();
 		state._fsp--;
 		if (state.failed) return;
@@ -7461,10 +7464,10 @@ public final void synpred25_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred26_DRL6Expressions
 	public final void synpred26_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:586:9: ( literal )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:586:10: literal
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:593:9: ( literal )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:593:10: literal
 		{
-		pushFollow(FOLLOW_literal_in_synpred26_DRL6Expressions3095);
+		pushFollow(FOLLOW_literal_in_synpred26_DRL6Expressions3101);
 		literal();
 		state._fsp--;
 		if (state.failed) return;
@@ -7475,10 +7478,10 @@ public final void synpred26_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred27_DRL6Expressions
 	public final void synpred27_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:588:9: ( super_key )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:588:10: super_key
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:595:9: ( super_key )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:595:10: super_key
 		{
-		pushFollow(FOLLOW_super_key_in_synpred27_DRL6Expressions3117);
+		pushFollow(FOLLOW_super_key_in_synpred27_DRL6Expressions3123);
 		super_key();
 		state._fsp--;
 		if (state.failed) return;
@@ -7489,10 +7492,10 @@ public final void synpred27_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred28_DRL6Expressions
 	public final void synpred28_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:589:9: ( new_key )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:589:10: new_key
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:596:9: ( new_key )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:596:10: new_key
 		{
-		pushFollow(FOLLOW_new_key_in_synpred28_DRL6Expressions3134);
+		pushFollow(FOLLOW_new_key_in_synpred28_DRL6Expressions3140);
 		new_key();
 		state._fsp--;
 		if (state.failed) return;
@@ -7503,10 +7506,10 @@ public final void synpred28_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred29_DRL6Expressions
 	public final void synpred29_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:590:9: ( primitiveType )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:590:10: primitiveType
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:597:9: ( primitiveType )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:597:10: primitiveType
 		{
-		pushFollow(FOLLOW_primitiveType_in_synpred29_DRL6Expressions3151);
+		pushFollow(FOLLOW_primitiveType_in_synpred29_DRL6Expressions3157);
 		primitiveType();
 		state._fsp--;
 		if (state.failed) return;
@@ -7517,10 +7520,10 @@ public final void synpred29_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred30_DRL6Expressions
 	public final void synpred30_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:592:9: ( inlineMapExpression )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:592:10: inlineMapExpression
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:599:9: ( inlineMapExpression )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:599:10: inlineMapExpression
 		{
-		pushFollow(FOLLOW_inlineMapExpression_in_synpred30_DRL6Expressions3182);
+		pushFollow(FOLLOW_inlineMapExpression_in_synpred30_DRL6Expressions3188);
 		inlineMapExpression();
 		state._fsp--;
 		if (state.failed) return;
@@ -7531,10 +7534,10 @@ public final void synpred30_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred31_DRL6Expressions
 	public final void synpred31_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:593:9: ( inlineListExpression )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:593:10: inlineListExpression
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:600:9: ( inlineListExpression )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:600:10: inlineListExpression
 		{
-		pushFollow(FOLLOW_inlineListExpression_in_synpred31_DRL6Expressions3197);
+		pushFollow(FOLLOW_inlineListExpression_in_synpred31_DRL6Expressions3203);
 		inlineListExpression();
 		state._fsp--;
 		if (state.failed) return;
@@ -7545,10 +7548,10 @@ public final void synpred31_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred32_DRL6Expressions
 	public final void synpred32_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:594:9: ( ID )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:594:10: ID
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:601:9: ( ID )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:601:10: ID
 		{
-		match(input,ID,FOLLOW_ID_in_synpred32_DRL6Expressions3212); if (state.failed) return;
+		match(input,ID,FOLLOW_ID_in_synpred32_DRL6Expressions3218); if (state.failed) return;
 		}
 
 	}
@@ -7556,11 +7559,11 @@ public final void synpred32_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred33_DRL6Expressions
 	public final void synpred33_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:596:15: ( DOT ID )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:596:16: DOT ID
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:603:15: ( DOT ID )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:603:16: DOT ID
 		{
-		match(input,DOT,FOLLOW_DOT_in_synpred33_DRL6Expressions3246); if (state.failed) return;
-		match(input,ID,FOLLOW_ID_in_synpred33_DRL6Expressions3248); if (state.failed) return;
+		match(input,DOT,FOLLOW_DOT_in_synpred33_DRL6Expressions3252); if (state.failed) return;
+		match(input,ID,FOLLOW_ID_in_synpred33_DRL6Expressions3254); if (state.failed) return;
 		}
 
 	}
@@ -7568,8 +7571,8 @@ public final void synpred33_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred34_DRL6Expressions
 	public final void synpred34_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:598:15: ( ( DOT | NULL_SAFE_DOT ) LEFT_PAREN )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:598:16: ( DOT | NULL_SAFE_DOT ) LEFT_PAREN
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:605:15: ( ( DOT | NULL_SAFE_DOT ) LEFT_PAREN )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:605:16: ( DOT | NULL_SAFE_DOT ) LEFT_PAREN
 		{
 		if ( input.LA(1)==DOT||input.LA(1)==NULL_SAFE_DOT ) {
 			input.consume();
@@ -7581,7 +7584,7 @@ public final void synpred34_DRL6Expressions_fragment() throws RecognitionExcepti
 			MismatchedSetException mse = new MismatchedSetException(null,input);
 			throw mse;
 		}
-		match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred34_DRL6Expressions3298); if (state.failed) return;
+		match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred34_DRL6Expressions3304); if (state.failed) return;
 		}
 
 	}
@@ -7589,11 +7592,11 @@ public final void synpred34_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred35_DRL6Expressions
 	public final void synpred35_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:603:15: ( HASH ID )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:603:16: HASH ID
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:610:15: ( HASH ID )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:610:16: HASH ID
 		{
-		match(input,HASH,FOLLOW_HASH_in_synpred35_DRL6Expressions3443); if (state.failed) return;
-		match(input,ID,FOLLOW_ID_in_synpred35_DRL6Expressions3445); if (state.failed) return;
+		match(input,HASH,FOLLOW_HASH_in_synpred35_DRL6Expressions3449); if (state.failed) return;
+		match(input,ID,FOLLOW_ID_in_synpred35_DRL6Expressions3451); if (state.failed) return;
 		}
 
 	}
@@ -7601,11 +7604,11 @@ public final void synpred35_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred36_DRL6Expressions
 	public final void synpred36_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:605:15: ( NULL_SAFE_DOT ID )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:605:16: NULL_SAFE_DOT ID
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:612:15: ( NULL_SAFE_DOT ID )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:612:16: NULL_SAFE_DOT ID
 		{
-		match(input,NULL_SAFE_DOT,FOLLOW_NULL_SAFE_DOT_in_synpred36_DRL6Expressions3489); if (state.failed) return;
-		match(input,ID,FOLLOW_ID_in_synpred36_DRL6Expressions3491); if (state.failed) return;
+		match(input,NULL_SAFE_DOT,FOLLOW_NULL_SAFE_DOT_in_synpred36_DRL6Expressions3495); if (state.failed) return;
+		match(input,ID,FOLLOW_ID_in_synpred36_DRL6Expressions3497); if (state.failed) return;
 		}
 
 	}
@@ -7613,10 +7616,10 @@ public final void synpred36_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred37_DRL6Expressions
 	public final void synpred37_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:606:13: ( identifierSuffix )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:606:14: identifierSuffix
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:613:13: ( identifierSuffix )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:613:14: identifierSuffix
 		{
-		pushFollow(FOLLOW_identifierSuffix_in_synpred37_DRL6Expressions3519);
+		pushFollow(FOLLOW_identifierSuffix_in_synpred37_DRL6Expressions3525);
 		identifierSuffix();
 		state._fsp--;
 		if (state.failed) return;
@@ -7627,11 +7630,11 @@ public final void synpred37_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred38_DRL6Expressions
 	public final void synpred38_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:639:7: ( LEFT_SQUARE RIGHT_SQUARE )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:639:8: LEFT_SQUARE RIGHT_SQUARE
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:646:7: ( LEFT_SQUARE RIGHT_SQUARE )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:646:8: LEFT_SQUARE RIGHT_SQUARE
 		{
-		match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_synpred38_DRL6Expressions3677); if (state.failed) return;
-		match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_synpred38_DRL6Expressions3679); if (state.failed) return;
+		match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_synpred38_DRL6Expressions3683); if (state.failed) return;
+		match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_synpred38_DRL6Expressions3685); if (state.failed) return;
 		}
 
 	}
@@ -7639,10 +7642,10 @@ public final void synpred38_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred39_DRL6Expressions
 	public final void synpred39_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:642:8: ( LEFT_SQUARE )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:642:9: LEFT_SQUARE
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:649:8: ( LEFT_SQUARE )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:649:9: LEFT_SQUARE
 		{
-		match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_synpred39_DRL6Expressions3782); if (state.failed) return;
+		match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_synpred39_DRL6Expressions3788); if (state.failed) return;
 		}
 
 	}
@@ -7650,11 +7653,11 @@ public final void synpred39_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred40_DRL6Expressions
 	public final void synpred40_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:671:107: ( LEFT_SQUARE RIGHT_SQUARE )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:671:108: LEFT_SQUARE RIGHT_SQUARE
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:678:107: ( LEFT_SQUARE RIGHT_SQUARE )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:678:108: LEFT_SQUARE RIGHT_SQUARE
 		{
-		match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_synpred40_DRL6Expressions4044); if (state.failed) return;
-		match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_synpred40_DRL6Expressions4046); if (state.failed) return;
+		match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_synpred40_DRL6Expressions4050); if (state.failed) return;
+		match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_synpred40_DRL6Expressions4052); if (state.failed) return;
 		}
 
 	}
@@ -7662,11 +7665,11 @@ public final void synpred40_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred41_DRL6Expressions
 	public final void synpred41_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:702:9: ( DOT super_key )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:702:10: DOT super_key
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:709:9: ( DOT super_key )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:709:10: DOT super_key
 		{
-		match(input,DOT,FOLLOW_DOT_in_synpred41_DRL6Expressions4242); if (state.failed) return;
-		pushFollow(FOLLOW_super_key_in_synpred41_DRL6Expressions4244);
+		match(input,DOT,FOLLOW_DOT_in_synpred41_DRL6Expressions4248); if (state.failed) return;
+		pushFollow(FOLLOW_super_key_in_synpred41_DRL6Expressions4250);
 		super_key();
 		state._fsp--;
 		if (state.failed) return;
@@ -7677,11 +7680,11 @@ public final void synpred41_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred42_DRL6Expressions
 	public final void synpred42_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:703:9: ( DOT new_key )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:703:10: DOT new_key
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:710:9: ( DOT new_key )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:710:10: DOT new_key
 		{
-		match(input,DOT,FOLLOW_DOT_in_synpred42_DRL6Expressions4264); if (state.failed) return;
-		pushFollow(FOLLOW_new_key_in_synpred42_DRL6Expressions4266);
+		match(input,DOT,FOLLOW_DOT_in_synpred42_DRL6Expressions4270); if (state.failed) return;
+		pushFollow(FOLLOW_new_key_in_synpred42_DRL6Expressions4272);
 		new_key();
 		state._fsp--;
 		if (state.failed) return;
@@ -7692,11 +7695,11 @@ public final void synpred42_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred43_DRL6Expressions
 	public final void synpred43_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:704:9: ( DOT ID )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:704:10: DOT ID
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:711:9: ( DOT ID )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:711:10: DOT ID
 		{
-		match(input,DOT,FOLLOW_DOT_in_synpred43_DRL6Expressions4291); if (state.failed) return;
-		match(input,ID,FOLLOW_ID_in_synpred43_DRL6Expressions4293); if (state.failed) return;
+		match(input,DOT,FOLLOW_DOT_in_synpred43_DRL6Expressions4297); if (state.failed) return;
+		match(input,ID,FOLLOW_ID_in_synpred43_DRL6Expressions4299); if (state.failed) return;
 		}
 
 	}
@@ -7704,10 +7707,10 @@ public final void synpred43_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred44_DRL6Expressions
 	public final void synpred44_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:706:20: ( LEFT_PAREN )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:706:21: LEFT_PAREN
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:713:20: ( LEFT_PAREN )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:713:21: LEFT_PAREN
 		{
-		match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred44_DRL6Expressions4342); if (state.failed) return;
+		match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred44_DRL6Expressions4348); if (state.failed) return;
 		}
 
 	}
@@ -7715,11 +7718,11 @@ public final void synpred44_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred45_DRL6Expressions
 	public final void synpred45_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:707:9: ( NULL_SAFE_DOT ID )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:707:10: NULL_SAFE_DOT ID
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:714:9: ( NULL_SAFE_DOT ID )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:714:10: NULL_SAFE_DOT ID
 		{
-		match(input,NULL_SAFE_DOT,FOLLOW_NULL_SAFE_DOT_in_synpred45_DRL6Expressions4360); if (state.failed) return;
-		match(input,ID,FOLLOW_ID_in_synpred45_DRL6Expressions4362); if (state.failed) return;
+		match(input,NULL_SAFE_DOT,FOLLOW_NULL_SAFE_DOT_in_synpred45_DRL6Expressions4366); if (state.failed) return;
+		match(input,ID,FOLLOW_ID_in_synpred45_DRL6Expressions4368); if (state.failed) return;
 		}
 
 	}
@@ -7727,10 +7730,10 @@ public final void synpred45_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred46_DRL6Expressions
 	public final void synpred46_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:709:20: ( LEFT_PAREN )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:709:21: LEFT_PAREN
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:716:20: ( LEFT_PAREN )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:716:21: LEFT_PAREN
 		{
-		match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred46_DRL6Expressions4411); if (state.failed) return;
+		match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred46_DRL6Expressions4417); if (state.failed) return;
 		}
 
 	}
@@ -7738,10 +7741,10 @@ public final void synpred46_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred47_DRL6Expressions
 	public final void synpred47_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:711:9: ( LEFT_SQUARE )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:711:10: LEFT_SQUARE
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:718:9: ( LEFT_SQUARE )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:718:10: LEFT_SQUARE
 		{
-		match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_synpred47_DRL6Expressions4434); if (state.failed) return;
+		match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_synpred47_DRL6Expressions4440); if (state.failed) return;
 		}
 
 	}
@@ -7749,10 +7752,10 @@ public final void synpred47_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred48_DRL6Expressions
 	public final void synpred48_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:718:18: ( LEFT_PAREN )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:718:19: LEFT_PAREN
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:725:18: ( LEFT_PAREN )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:725:19: LEFT_PAREN
 		{
-		match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred48_DRL6Expressions4525); if (state.failed) return;
+		match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred48_DRL6Expressions4531); if (state.failed) return;
 		}
 
 	}
@@ -7760,12 +7763,12 @@ public final void synpred48_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred49_DRL6Expressions
 	public final void synpred49_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:748:7: ( GREATER GREATER GREATER )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:748:8: GREATER GREATER GREATER
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:755:7: ( GREATER GREATER GREATER )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:755:8: GREATER GREATER GREATER
 		{
-		match(input,GREATER,FOLLOW_GREATER_in_synpred49_DRL6Expressions4755); if (state.failed) return;
-		match(input,GREATER,FOLLOW_GREATER_in_synpred49_DRL6Expressions4757); if (state.failed) return;
-		match(input,GREATER,FOLLOW_GREATER_in_synpred49_DRL6Expressions4759); if (state.failed) return;
+		match(input,GREATER,FOLLOW_GREATER_in_synpred49_DRL6Expressions4761); if (state.failed) return;
+		match(input,GREATER,FOLLOW_GREATER_in_synpred49_DRL6Expressions4763); if (state.failed) return;
+		match(input,GREATER,FOLLOW_GREATER_in_synpred49_DRL6Expressions4765); if (state.failed) return;
 		}
 
 	}
@@ -7773,11 +7776,11 @@ public final void synpred49_DRL6Expressions_fragment() throws RecognitionExcepti
 
 	// $ANTLR start synpred50_DRL6Expressions
 	public final void synpred50_DRL6Expressions_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:749:7: ( GREATER GREATER )
-		// src/main/resources/org/drools/compiler/lang/DRL6Expressions.g:749:8: GREATER GREATER
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:756:7: ( GREATER GREATER )
+		// src/main/resources/org/drools/drl/parser/DRL6Expressions.g:756:8: GREATER GREATER
 		{
-		match(input,GREATER,FOLLOW_GREATER_in_synpred50_DRL6Expressions4778); if (state.failed) return;
-		match(input,GREATER,FOLLOW_GREATER_in_synpred50_DRL6Expressions4780); if (state.failed) return;
+		match(input,GREATER,FOLLOW_GREATER_in_synpred50_DRL6Expressions4784); if (state.failed) return;
+		match(input,GREATER,FOLLOW_GREATER_in_synpred50_DRL6Expressions4786); if (state.failed) return;
 		}
 
 	}
@@ -8658,181 +8661,182 @@ public final boolean synpred26_DRL6Expressions() {
 	public static final BitSet FOLLOW_float_key_in_primitiveType2874 = new BitSet(new long[]{0x0000000000000002L});
 	public static final BitSet FOLLOW_double_key_in_primitiveType2882 = new BitSet(new long[]{0x0000000000000002L});
 	public static final BitSet FOLLOW_xpathChunk_in_xpathPrimary2930 = new BitSet(new long[]{0x0400000000004002L});
-	public static final BitSet FOLLOW_xpathSeparator_in_xpathChunk2959 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_ID_in_xpathChunk2961 = new BitSet(new long[]{0x0000004010010002L});
-	public static final BitSet FOLLOW_DOT_in_xpathChunk2964 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_ID_in_xpathChunk2966 = new BitSet(new long[]{0x0000004010010002L});
-	public static final BitSet FOLLOW_HASH_in_xpathChunk2971 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_ID_in_xpathChunk2973 = new BitSet(new long[]{0x0000004000000002L});
-	public static final BitSet FOLLOW_LEFT_SQUARE_in_xpathChunk2978 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
-	public static final BitSet FOLLOW_xpathExpressionList_in_xpathChunk2980 = new BitSet(new long[]{0x2000000000000000L});
-	public static final BitSet FOLLOW_RIGHT_SQUARE_in_xpathChunk2982 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_expression_in_xpathExpressionList3012 = new BitSet(new long[]{0x0000000000000402L});
-	public static final BitSet FOLLOW_COMMA_in_xpathExpressionList3023 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
-	public static final BitSet FOLLOW_expression_in_xpathExpressionList3027 = new BitSet(new long[]{0x0000000000000402L});
-	public static final BitSet FOLLOW_parExpression_in_primary3057 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_nonWildcardTypeArguments_in_primary3074 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_explicitGenericInvocationSuffix_in_primary3077 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_this_key_in_primary3081 = new BitSet(new long[]{0x0000002000000000L});
-	public static final BitSet FOLLOW_arguments_in_primary3083 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_literal_in_primary3099 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_super_key_in_primary3121 = new BitSet(new long[]{0x0000002000010000L});
-	public static final BitSet FOLLOW_superSuffix_in_primary3123 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_new_key_in_primary3138 = new BitSet(new long[]{0x0000008080000000L});
-	public static final BitSet FOLLOW_creator_in_primary3140 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_primitiveType_in_primary3155 = new BitSet(new long[]{0x0000004000010000L});
-	public static final BitSet FOLLOW_LEFT_SQUARE_in_primary3158 = new BitSet(new long[]{0x2000000000000000L});
-	public static final BitSet FOLLOW_RIGHT_SQUARE_in_primary3160 = new BitSet(new long[]{0x0000004000010000L});
-	public static final BitSet FOLLOW_DOT_in_primary3164 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_class_key_in_primary3166 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_inlineMapExpression_in_primary3186 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_inlineListExpression_in_primary3201 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_primary3217 = new BitSet(new long[]{0x0008006010010002L});
-	public static final BitSet FOLLOW_DOT_in_primary3253 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_ID_in_primary3257 = new BitSet(new long[]{0x0008006010010002L});
-	public static final BitSet FOLLOW_set_in_primary3303 = new BitSet(new long[]{0x0000002000000000L});
-	public static final BitSet FOLLOW_LEFT_PAREN_in_primary3309 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
-	public static final BitSet FOLLOW_expression_in_primary3349 = new BitSet(new long[]{0x1000000000000400L});
-	public static final BitSet FOLLOW_COMMA_in_primary3352 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
-	public static final BitSet FOLLOW_expression_in_primary3356 = new BitSet(new long[]{0x1000000000000400L});
-	public static final BitSet FOLLOW_RIGHT_PAREN_in_primary3396 = new BitSet(new long[]{0x0008006010010002L});
-	public static final BitSet FOLLOW_HASH_in_primary3450 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_ID_in_primary3454 = new BitSet(new long[]{0x0008006010010002L});
-	public static final BitSet FOLLOW_NULL_SAFE_DOT_in_primary3496 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_ID_in_primary3500 = new BitSet(new long[]{0x0008006010010002L});
-	public static final BitSet FOLLOW_identifierSuffix_in_primary3522 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_LEFT_SQUARE_in_inlineListExpression3543 = new BitSet(new long[]{0x248502E1A1017100L,0x000000000000000FL});
-	public static final BitSet FOLLOW_expressionList_in_inlineListExpression3545 = new BitSet(new long[]{0x2000000000000000L});
-	public static final BitSet FOLLOW_RIGHT_SQUARE_in_inlineListExpression3548 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_LEFT_SQUARE_in_inlineMapExpression3569 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
-	public static final BitSet FOLLOW_mapExpressionList_in_inlineMapExpression3571 = new BitSet(new long[]{0x2000000000000000L});
-	public static final BitSet FOLLOW_RIGHT_SQUARE_in_inlineMapExpression3573 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_mapEntry_in_mapExpressionList3594 = new BitSet(new long[]{0x0000000000000402L});
-	public static final BitSet FOLLOW_COMMA_in_mapExpressionList3597 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
-	public static final BitSet FOLLOW_mapEntry_in_mapExpressionList3599 = new BitSet(new long[]{0x0000000000000402L});
-	public static final BitSet FOLLOW_expression_in_mapEntry3618 = new BitSet(new long[]{0x0000000000000200L});
-	public static final BitSet FOLLOW_COLON_in_mapEntry3620 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
-	public static final BitSet FOLLOW_expression_in_mapEntry3622 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_LEFT_PAREN_in_parExpression3643 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
-	public static final BitSet FOLLOW_expression_in_parExpression3647 = new BitSet(new long[]{0x1000000000000000L});
-	public static final BitSet FOLLOW_RIGHT_PAREN_in_parExpression3649 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_LEFT_SQUARE_in_identifierSuffix3683 = new BitSet(new long[]{0x2000000000000000L});
-	public static final BitSet FOLLOW_RIGHT_SQUARE_in_identifierSuffix3724 = new BitSet(new long[]{0x0000004000010000L});
-	public static final BitSet FOLLOW_DOT_in_identifierSuffix3768 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_class_key_in_identifierSuffix3772 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_LEFT_SQUARE_in_identifierSuffix3787 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
-	public static final BitSet FOLLOW_expression_in_identifierSuffix3817 = new BitSet(new long[]{0x2000000000000000L});
-	public static final BitSet FOLLOW_RIGHT_SQUARE_in_identifierSuffix3845 = new BitSet(new long[]{0x0000004000000002L});
-	public static final BitSet FOLLOW_arguments_in_identifierSuffix3861 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_nonWildcardTypeArguments_in_creator3883 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_createdName_in_creator3886 = new BitSet(new long[]{0x0000006000000000L});
-	public static final BitSet FOLLOW_arrayCreatorRest_in_creator3897 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_classCreatorRest_in_creator3901 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_createdName3919 = new BitSet(new long[]{0x0000008000010002L});
-	public static final BitSet FOLLOW_typeArguments_in_createdName3921 = new BitSet(new long[]{0x0000000000010002L});
-	public static final BitSet FOLLOW_DOT_in_createdName3934 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_ID_in_createdName3936 = new BitSet(new long[]{0x0000008000010002L});
-	public static final BitSet FOLLOW_typeArguments_in_createdName3938 = new BitSet(new long[]{0x0000000000010002L});
-	public static final BitSet FOLLOW_primitiveType_in_createdName3953 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_innerCreator3973 = new BitSet(new long[]{0x0000002000000000L});
-	public static final BitSet FOLLOW_classCreatorRest_in_innerCreator3975 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_LEFT_SQUARE_in_arrayCreatorRest3994 = new BitSet(new long[]{0x248502E1A1017100L,0x000000000000000FL});
-	public static final BitSet FOLLOW_RIGHT_SQUARE_in_arrayCreatorRest4004 = new BitSet(new long[]{0x0000005000000000L});
-	public static final BitSet FOLLOW_LEFT_SQUARE_in_arrayCreatorRest4007 = new BitSet(new long[]{0x2000000000000000L});
-	public static final BitSet FOLLOW_RIGHT_SQUARE_in_arrayCreatorRest4009 = new BitSet(new long[]{0x0000005000000000L});
-	public static final BitSet FOLLOW_arrayInitializer_in_arrayCreatorRest4013 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_expression_in_arrayCreatorRest4027 = new BitSet(new long[]{0x2000000000000000L});
-	public static final BitSet FOLLOW_RIGHT_SQUARE_in_arrayCreatorRest4029 = new BitSet(new long[]{0x0000004000000002L});
-	public static final BitSet FOLLOW_LEFT_SQUARE_in_arrayCreatorRest4034 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
-	public static final BitSet FOLLOW_expression_in_arrayCreatorRest4036 = new BitSet(new long[]{0x2000000000000000L});
-	public static final BitSet FOLLOW_RIGHT_SQUARE_in_arrayCreatorRest4038 = new BitSet(new long[]{0x0000004000000002L});
-	public static final BitSet FOLLOW_LEFT_SQUARE_in_arrayCreatorRest4050 = new BitSet(new long[]{0x2000000000000000L});
-	public static final BitSet FOLLOW_RIGHT_SQUARE_in_arrayCreatorRest4052 = new BitSet(new long[]{0x0000004000000002L});
-	public static final BitSet FOLLOW_arrayInitializer_in_variableInitializer4081 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_expression_in_variableInitializer4095 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_LEFT_CURLY_in_arrayInitializer4112 = new BitSet(new long[]{0x0C8502F1A1017100L,0x000000000000000FL});
-	public static final BitSet FOLLOW_variableInitializer_in_arrayInitializer4115 = new BitSet(new long[]{0x0800000000000400L});
-	public static final BitSet FOLLOW_COMMA_in_arrayInitializer4118 = new BitSet(new long[]{0x048502F1A1017100L,0x000000000000000FL});
-	public static final BitSet FOLLOW_variableInitializer_in_arrayInitializer4120 = new BitSet(new long[]{0x0800000000000400L});
-	public static final BitSet FOLLOW_COMMA_in_arrayInitializer4125 = new BitSet(new long[]{0x0800000000000000L});
-	public static final BitSet FOLLOW_RIGHT_CURLY_in_arrayInitializer4132 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_arguments_in_classCreatorRest4149 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_nonWildcardTypeArguments_in_explicitGenericInvocation4167 = new BitSet(new long[]{0x0000002000000000L});
-	public static final BitSet FOLLOW_arguments_in_explicitGenericInvocation4169 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_LESS_in_nonWildcardTypeArguments4186 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_typeList_in_nonWildcardTypeArguments4188 = new BitSet(new long[]{0x0000000004000000L});
-	public static final BitSet FOLLOW_GREATER_in_nonWildcardTypeArguments4190 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_super_key_in_explicitGenericInvocationSuffix4207 = new BitSet(new long[]{0x0000002000010000L});
-	public static final BitSet FOLLOW_superSuffix_in_explicitGenericInvocationSuffix4209 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_explicitGenericInvocationSuffix4220 = new BitSet(new long[]{0x0000002000000000L});
-	public static final BitSet FOLLOW_arguments_in_explicitGenericInvocationSuffix4222 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_DOT_in_selector4247 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_super_key_in_selector4251 = new BitSet(new long[]{0x0000002000010000L});
-	public static final BitSet FOLLOW_superSuffix_in_selector4253 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_DOT_in_selector4269 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_new_key_in_selector4273 = new BitSet(new long[]{0x0000008080000000L});
-	public static final BitSet FOLLOW_nonWildcardTypeArguments_in_selector4276 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_innerCreator_in_selector4280 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_DOT_in_selector4296 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_ID_in_selector4318 = new BitSet(new long[]{0x0000002000000002L});
-	public static final BitSet FOLLOW_arguments_in_selector4347 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_NULL_SAFE_DOT_in_selector4365 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_ID_in_selector4387 = new BitSet(new long[]{0x0000002000000002L});
-	public static final BitSet FOLLOW_arguments_in_selector4416 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_LEFT_SQUARE_in_selector4437 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
-	public static final BitSet FOLLOW_expression_in_selector4464 = new BitSet(new long[]{0x2000000000000000L});
-	public static final BitSet FOLLOW_RIGHT_SQUARE_in_selector4489 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_arguments_in_superSuffix4508 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_DOT_in_superSuffix4519 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_ID_in_superSuffix4521 = new BitSet(new long[]{0x0000002000000002L});
-	public static final BitSet FOLLOW_arguments_in_superSuffix4530 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_LEFT_SQUARE_in_squareArguments4553 = new BitSet(new long[]{0x248502E1A1017100L,0x000000000000000FL});
-	public static final BitSet FOLLOW_expressionList_in_squareArguments4558 = new BitSet(new long[]{0x2000000000000000L});
-	public static final BitSet FOLLOW_RIGHT_SQUARE_in_squareArguments4564 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_LEFT_PAREN_in_arguments4581 = new BitSet(new long[]{0x148502E1A1017100L,0x000000000000000FL});
-	public static final BitSet FOLLOW_expressionList_in_arguments4593 = new BitSet(new long[]{0x1000000000000000L});
-	public static final BitSet FOLLOW_RIGHT_PAREN_in_arguments4604 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_expression_in_expressionList4634 = new BitSet(new long[]{0x0000000000000402L});
-	public static final BitSet FOLLOW_COMMA_in_expressionList4645 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
-	public static final BitSet FOLLOW_expression_in_expressionList4649 = new BitSet(new long[]{0x0000000000000402L});
-	public static final BitSet FOLLOW_EQUALS_ASSIGN_in_assignmentOperator4670 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_PLUS_ASSIGN_in_assignmentOperator4678 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_MINUS_ASSIGN_in_assignmentOperator4686 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_MULT_ASSIGN_in_assignmentOperator4694 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_DIV_ASSIGN_in_assignmentOperator4702 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_AND_ASSIGN_in_assignmentOperator4710 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_OR_ASSIGN_in_assignmentOperator4718 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_XOR_ASSIGN_in_assignmentOperator4726 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_MOD_ASSIGN_in_assignmentOperator4734 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_LESS_in_assignmentOperator4742 = new BitSet(new long[]{0x0000008000000000L});
-	public static final BitSet FOLLOW_LESS_in_assignmentOperator4744 = new BitSet(new long[]{0x0000000000200000L});
-	public static final BitSet FOLLOW_EQUALS_ASSIGN_in_assignmentOperator4746 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_GREATER_in_assignmentOperator4763 = new BitSet(new long[]{0x0000000004000000L});
-	public static final BitSet FOLLOW_GREATER_in_assignmentOperator4765 = new BitSet(new long[]{0x0000000004000000L});
-	public static final BitSet FOLLOW_GREATER_in_assignmentOperator4767 = new BitSet(new long[]{0x0000000000200000L});
-	public static final BitSet FOLLOW_EQUALS_ASSIGN_in_assignmentOperator4769 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_GREATER_in_assignmentOperator4784 = new BitSet(new long[]{0x0000000004000000L});
-	public static final BitSet FOLLOW_GREATER_in_assignmentOperator4786 = new BitSet(new long[]{0x0000000000200000L});
-	public static final BitSet FOLLOW_EQUALS_ASSIGN_in_assignmentOperator4788 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_extends_key4818 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_super_key4847 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_instanceof_key4876 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_boolean_key4905 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_char_key4934 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_byte_key4963 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_short_key4992 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_int_key5021 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_float_key5050 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_long_key5079 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_double_key5108 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_void_key5137 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_this_key5166 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_class_key5195 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_new_key5225 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_not_key5254 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_in_key5281 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_operator_key5306 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_neg_operator_key5331 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_xpathChunk_in_xpathPrimary2935 = new BitSet(new long[]{0x0400000000004002L});
+	public static final BitSet FOLLOW_xpathSeparator_in_xpathChunk2965 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_ID_in_xpathChunk2967 = new BitSet(new long[]{0x0000004010010002L});
+	public static final BitSet FOLLOW_DOT_in_xpathChunk2970 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_ID_in_xpathChunk2972 = new BitSet(new long[]{0x0000004010010002L});
+	public static final BitSet FOLLOW_HASH_in_xpathChunk2977 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_ID_in_xpathChunk2979 = new BitSet(new long[]{0x0000004000000002L});
+	public static final BitSet FOLLOW_LEFT_SQUARE_in_xpathChunk2984 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
+	public static final BitSet FOLLOW_xpathExpressionList_in_xpathChunk2986 = new BitSet(new long[]{0x2000000000000000L});
+	public static final BitSet FOLLOW_RIGHT_SQUARE_in_xpathChunk2988 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_expression_in_xpathExpressionList3018 = new BitSet(new long[]{0x0000000000000402L});
+	public static final BitSet FOLLOW_COMMA_in_xpathExpressionList3029 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
+	public static final BitSet FOLLOW_expression_in_xpathExpressionList3033 = new BitSet(new long[]{0x0000000000000402L});
+	public static final BitSet FOLLOW_parExpression_in_primary3063 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_nonWildcardTypeArguments_in_primary3080 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_explicitGenericInvocationSuffix_in_primary3083 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_this_key_in_primary3087 = new BitSet(new long[]{0x0000002000000000L});
+	public static final BitSet FOLLOW_arguments_in_primary3089 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_literal_in_primary3105 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_super_key_in_primary3127 = new BitSet(new long[]{0x0000002000010000L});
+	public static final BitSet FOLLOW_superSuffix_in_primary3129 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_new_key_in_primary3144 = new BitSet(new long[]{0x0000008080000000L});
+	public static final BitSet FOLLOW_creator_in_primary3146 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_primitiveType_in_primary3161 = new BitSet(new long[]{0x0000004000010000L});
+	public static final BitSet FOLLOW_LEFT_SQUARE_in_primary3164 = new BitSet(new long[]{0x2000000000000000L});
+	public static final BitSet FOLLOW_RIGHT_SQUARE_in_primary3166 = new BitSet(new long[]{0x0000004000010000L});
+	public static final BitSet FOLLOW_DOT_in_primary3170 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_class_key_in_primary3172 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_inlineMapExpression_in_primary3192 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_inlineListExpression_in_primary3207 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_primary3223 = new BitSet(new long[]{0x0008006010010002L});
+	public static final BitSet FOLLOW_DOT_in_primary3259 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_ID_in_primary3263 = new BitSet(new long[]{0x0008006010010002L});
+	public static final BitSet FOLLOW_set_in_primary3309 = new BitSet(new long[]{0x0000002000000000L});
+	public static final BitSet FOLLOW_LEFT_PAREN_in_primary3315 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
+	public static final BitSet FOLLOW_expression_in_primary3355 = new BitSet(new long[]{0x1000000000000400L});
+	public static final BitSet FOLLOW_COMMA_in_primary3358 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
+	public static final BitSet FOLLOW_expression_in_primary3362 = new BitSet(new long[]{0x1000000000000400L});
+	public static final BitSet FOLLOW_RIGHT_PAREN_in_primary3402 = new BitSet(new long[]{0x0008006010010002L});
+	public static final BitSet FOLLOW_HASH_in_primary3456 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_ID_in_primary3460 = new BitSet(new long[]{0x0008006010010002L});
+	public static final BitSet FOLLOW_NULL_SAFE_DOT_in_primary3502 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_ID_in_primary3506 = new BitSet(new long[]{0x0008006010010002L});
+	public static final BitSet FOLLOW_identifierSuffix_in_primary3528 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_LEFT_SQUARE_in_inlineListExpression3549 = new BitSet(new long[]{0x248502E1A1017100L,0x000000000000000FL});
+	public static final BitSet FOLLOW_expressionList_in_inlineListExpression3551 = new BitSet(new long[]{0x2000000000000000L});
+	public static final BitSet FOLLOW_RIGHT_SQUARE_in_inlineListExpression3554 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_LEFT_SQUARE_in_inlineMapExpression3575 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
+	public static final BitSet FOLLOW_mapExpressionList_in_inlineMapExpression3577 = new BitSet(new long[]{0x2000000000000000L});
+	public static final BitSet FOLLOW_RIGHT_SQUARE_in_inlineMapExpression3579 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_mapEntry_in_mapExpressionList3600 = new BitSet(new long[]{0x0000000000000402L});
+	public static final BitSet FOLLOW_COMMA_in_mapExpressionList3603 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
+	public static final BitSet FOLLOW_mapEntry_in_mapExpressionList3605 = new BitSet(new long[]{0x0000000000000402L});
+	public static final BitSet FOLLOW_expression_in_mapEntry3624 = new BitSet(new long[]{0x0000000000000200L});
+	public static final BitSet FOLLOW_COLON_in_mapEntry3626 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
+	public static final BitSet FOLLOW_expression_in_mapEntry3628 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_LEFT_PAREN_in_parExpression3649 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
+	public static final BitSet FOLLOW_expression_in_parExpression3653 = new BitSet(new long[]{0x1000000000000000L});
+	public static final BitSet FOLLOW_RIGHT_PAREN_in_parExpression3655 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_LEFT_SQUARE_in_identifierSuffix3689 = new BitSet(new long[]{0x2000000000000000L});
+	public static final BitSet FOLLOW_RIGHT_SQUARE_in_identifierSuffix3730 = new BitSet(new long[]{0x0000004000010000L});
+	public static final BitSet FOLLOW_DOT_in_identifierSuffix3774 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_class_key_in_identifierSuffix3778 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_LEFT_SQUARE_in_identifierSuffix3793 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
+	public static final BitSet FOLLOW_expression_in_identifierSuffix3823 = new BitSet(new long[]{0x2000000000000000L});
+	public static final BitSet FOLLOW_RIGHT_SQUARE_in_identifierSuffix3851 = new BitSet(new long[]{0x0000004000000002L});
+	public static final BitSet FOLLOW_arguments_in_identifierSuffix3867 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_nonWildcardTypeArguments_in_creator3889 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_createdName_in_creator3892 = new BitSet(new long[]{0x0000006000000000L});
+	public static final BitSet FOLLOW_arrayCreatorRest_in_creator3903 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_classCreatorRest_in_creator3907 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_createdName3925 = new BitSet(new long[]{0x0000008000010002L});
+	public static final BitSet FOLLOW_typeArguments_in_createdName3927 = new BitSet(new long[]{0x0000000000010002L});
+	public static final BitSet FOLLOW_DOT_in_createdName3940 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_ID_in_createdName3942 = new BitSet(new long[]{0x0000008000010002L});
+	public static final BitSet FOLLOW_typeArguments_in_createdName3944 = new BitSet(new long[]{0x0000000000010002L});
+	public static final BitSet FOLLOW_primitiveType_in_createdName3959 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_innerCreator3979 = new BitSet(new long[]{0x0000002000000000L});
+	public static final BitSet FOLLOW_classCreatorRest_in_innerCreator3981 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_LEFT_SQUARE_in_arrayCreatorRest4000 = new BitSet(new long[]{0x248502E1A1017100L,0x000000000000000FL});
+	public static final BitSet FOLLOW_RIGHT_SQUARE_in_arrayCreatorRest4010 = new BitSet(new long[]{0x0000005000000000L});
+	public static final BitSet FOLLOW_LEFT_SQUARE_in_arrayCreatorRest4013 = new BitSet(new long[]{0x2000000000000000L});
+	public static final BitSet FOLLOW_RIGHT_SQUARE_in_arrayCreatorRest4015 = new BitSet(new long[]{0x0000005000000000L});
+	public static final BitSet FOLLOW_arrayInitializer_in_arrayCreatorRest4019 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_expression_in_arrayCreatorRest4033 = new BitSet(new long[]{0x2000000000000000L});
+	public static final BitSet FOLLOW_RIGHT_SQUARE_in_arrayCreatorRest4035 = new BitSet(new long[]{0x0000004000000002L});
+	public static final BitSet FOLLOW_LEFT_SQUARE_in_arrayCreatorRest4040 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
+	public static final BitSet FOLLOW_expression_in_arrayCreatorRest4042 = new BitSet(new long[]{0x2000000000000000L});
+	public static final BitSet FOLLOW_RIGHT_SQUARE_in_arrayCreatorRest4044 = new BitSet(new long[]{0x0000004000000002L});
+	public static final BitSet FOLLOW_LEFT_SQUARE_in_arrayCreatorRest4056 = new BitSet(new long[]{0x2000000000000000L});
+	public static final BitSet FOLLOW_RIGHT_SQUARE_in_arrayCreatorRest4058 = new BitSet(new long[]{0x0000004000000002L});
+	public static final BitSet FOLLOW_arrayInitializer_in_variableInitializer4087 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_expression_in_variableInitializer4101 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_LEFT_CURLY_in_arrayInitializer4118 = new BitSet(new long[]{0x0C8502F1A1017100L,0x000000000000000FL});
+	public static final BitSet FOLLOW_variableInitializer_in_arrayInitializer4121 = new BitSet(new long[]{0x0800000000000400L});
+	public static final BitSet FOLLOW_COMMA_in_arrayInitializer4124 = new BitSet(new long[]{0x048502F1A1017100L,0x000000000000000FL});
+	public static final BitSet FOLLOW_variableInitializer_in_arrayInitializer4126 = new BitSet(new long[]{0x0800000000000400L});
+	public static final BitSet FOLLOW_COMMA_in_arrayInitializer4131 = new BitSet(new long[]{0x0800000000000000L});
+	public static final BitSet FOLLOW_RIGHT_CURLY_in_arrayInitializer4138 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_arguments_in_classCreatorRest4155 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_nonWildcardTypeArguments_in_explicitGenericInvocation4173 = new BitSet(new long[]{0x0000002000000000L});
+	public static final BitSet FOLLOW_arguments_in_explicitGenericInvocation4175 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_LESS_in_nonWildcardTypeArguments4192 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_typeList_in_nonWildcardTypeArguments4194 = new BitSet(new long[]{0x0000000004000000L});
+	public static final BitSet FOLLOW_GREATER_in_nonWildcardTypeArguments4196 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_super_key_in_explicitGenericInvocationSuffix4213 = new BitSet(new long[]{0x0000002000010000L});
+	public static final BitSet FOLLOW_superSuffix_in_explicitGenericInvocationSuffix4215 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_explicitGenericInvocationSuffix4226 = new BitSet(new long[]{0x0000002000000000L});
+	public static final BitSet FOLLOW_arguments_in_explicitGenericInvocationSuffix4228 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_DOT_in_selector4253 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_super_key_in_selector4257 = new BitSet(new long[]{0x0000002000010000L});
+	public static final BitSet FOLLOW_superSuffix_in_selector4259 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_DOT_in_selector4275 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_new_key_in_selector4279 = new BitSet(new long[]{0x0000008080000000L});
+	public static final BitSet FOLLOW_nonWildcardTypeArguments_in_selector4282 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_innerCreator_in_selector4286 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_DOT_in_selector4302 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_ID_in_selector4324 = new BitSet(new long[]{0x0000002000000002L});
+	public static final BitSet FOLLOW_arguments_in_selector4353 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_NULL_SAFE_DOT_in_selector4371 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_ID_in_selector4393 = new BitSet(new long[]{0x0000002000000002L});
+	public static final BitSet FOLLOW_arguments_in_selector4422 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_LEFT_SQUARE_in_selector4443 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
+	public static final BitSet FOLLOW_expression_in_selector4470 = new BitSet(new long[]{0x2000000000000000L});
+	public static final BitSet FOLLOW_RIGHT_SQUARE_in_selector4495 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_arguments_in_superSuffix4514 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_DOT_in_superSuffix4525 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_ID_in_superSuffix4527 = new BitSet(new long[]{0x0000002000000002L});
+	public static final BitSet FOLLOW_arguments_in_superSuffix4536 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_LEFT_SQUARE_in_squareArguments4559 = new BitSet(new long[]{0x248502E1A1017100L,0x000000000000000FL});
+	public static final BitSet FOLLOW_expressionList_in_squareArguments4564 = new BitSet(new long[]{0x2000000000000000L});
+	public static final BitSet FOLLOW_RIGHT_SQUARE_in_squareArguments4570 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_LEFT_PAREN_in_arguments4587 = new BitSet(new long[]{0x148502E1A1017100L,0x000000000000000FL});
+	public static final BitSet FOLLOW_expressionList_in_arguments4599 = new BitSet(new long[]{0x1000000000000000L});
+	public static final BitSet FOLLOW_RIGHT_PAREN_in_arguments4610 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_expression_in_expressionList4640 = new BitSet(new long[]{0x0000000000000402L});
+	public static final BitSet FOLLOW_COMMA_in_expressionList4651 = new BitSet(new long[]{0x048502E1A1017100L,0x000000000000000FL});
+	public static final BitSet FOLLOW_expression_in_expressionList4655 = new BitSet(new long[]{0x0000000000000402L});
+	public static final BitSet FOLLOW_EQUALS_ASSIGN_in_assignmentOperator4676 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_PLUS_ASSIGN_in_assignmentOperator4684 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_MINUS_ASSIGN_in_assignmentOperator4692 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_MULT_ASSIGN_in_assignmentOperator4700 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_DIV_ASSIGN_in_assignmentOperator4708 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_AND_ASSIGN_in_assignmentOperator4716 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_OR_ASSIGN_in_assignmentOperator4724 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_XOR_ASSIGN_in_assignmentOperator4732 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_MOD_ASSIGN_in_assignmentOperator4740 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_LESS_in_assignmentOperator4748 = new BitSet(new long[]{0x0000008000000000L});
+	public static final BitSet FOLLOW_LESS_in_assignmentOperator4750 = new BitSet(new long[]{0x0000000000200000L});
+	public static final BitSet FOLLOW_EQUALS_ASSIGN_in_assignmentOperator4752 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_GREATER_in_assignmentOperator4769 = new BitSet(new long[]{0x0000000004000000L});
+	public static final BitSet FOLLOW_GREATER_in_assignmentOperator4771 = new BitSet(new long[]{0x0000000004000000L});
+	public static final BitSet FOLLOW_GREATER_in_assignmentOperator4773 = new BitSet(new long[]{0x0000000000200000L});
+	public static final BitSet FOLLOW_EQUALS_ASSIGN_in_assignmentOperator4775 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_GREATER_in_assignmentOperator4790 = new BitSet(new long[]{0x0000000004000000L});
+	public static final BitSet FOLLOW_GREATER_in_assignmentOperator4792 = new BitSet(new long[]{0x0000000000200000L});
+	public static final BitSet FOLLOW_EQUALS_ASSIGN_in_assignmentOperator4794 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_extends_key4824 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_super_key4853 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_instanceof_key4882 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_boolean_key4911 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_char_key4940 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_byte_key4969 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_short_key4998 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_int_key5027 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_float_key5056 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_long_key5085 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_double_key5114 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_void_key5143 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_this_key5172 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_class_key5201 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_new_key5231 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_not_key5260 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_in_key5287 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_operator_key5312 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_neg_operator_key5337 = new BitSet(new long[]{0x0000000000000002L});
 	public static final BitSet FOLLOW_primitiveType_in_synpred1_DRL6Expressions548 = new BitSet(new long[]{0x0000000000000002L});
 	public static final BitSet FOLLOW_LEFT_SQUARE_in_synpred2_DRL6Expressions559 = new BitSet(new long[]{0x2000000000000000L});
 	public static final BitSet FOLLOW_RIGHT_SQUARE_in_synpred2_DRL6Expressions561 = new BitSet(new long[]{0x0000000000000002L});
@@ -8865,44 +8869,44 @@ public final boolean synpred26_DRL6Expressions() {
 	public static final BitSet FOLLOW_primitiveType_in_synpred20_DRL6Expressions2734 = new BitSet(new long[]{0x0000000000000002L});
 	public static final BitSet FOLLOW_LEFT_PAREN_in_synpred21_DRL6Expressions2757 = new BitSet(new long[]{0x0000000080000000L});
 	public static final BitSet FOLLOW_type_in_synpred21_DRL6Expressions2759 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_LEFT_PAREN_in_synpred24_DRL6Expressions3051 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_nonWildcardTypeArguments_in_synpred25_DRL6Expressions3070 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_literal_in_synpred26_DRL6Expressions3095 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_super_key_in_synpred27_DRL6Expressions3117 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_new_key_in_synpred28_DRL6Expressions3134 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_primitiveType_in_synpred29_DRL6Expressions3151 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_inlineMapExpression_in_synpred30_DRL6Expressions3182 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_inlineListExpression_in_synpred31_DRL6Expressions3197 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_ID_in_synpred32_DRL6Expressions3212 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_DOT_in_synpred33_DRL6Expressions3246 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_ID_in_synpred33_DRL6Expressions3248 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_set_in_synpred34_DRL6Expressions3292 = new BitSet(new long[]{0x0000002000000000L});
-	public static final BitSet FOLLOW_LEFT_PAREN_in_synpred34_DRL6Expressions3298 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_HASH_in_synpred35_DRL6Expressions3443 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_ID_in_synpred35_DRL6Expressions3445 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_NULL_SAFE_DOT_in_synpred36_DRL6Expressions3489 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_ID_in_synpred36_DRL6Expressions3491 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_identifierSuffix_in_synpred37_DRL6Expressions3519 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_LEFT_SQUARE_in_synpred38_DRL6Expressions3677 = new BitSet(new long[]{0x2000000000000000L});
-	public static final BitSet FOLLOW_RIGHT_SQUARE_in_synpred38_DRL6Expressions3679 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_LEFT_SQUARE_in_synpred39_DRL6Expressions3782 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_LEFT_SQUARE_in_synpred40_DRL6Expressions4044 = new BitSet(new long[]{0x2000000000000000L});
-	public static final BitSet FOLLOW_RIGHT_SQUARE_in_synpred40_DRL6Expressions4046 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_DOT_in_synpred41_DRL6Expressions4242 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_super_key_in_synpred41_DRL6Expressions4244 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_DOT_in_synpred42_DRL6Expressions4264 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_new_key_in_synpred42_DRL6Expressions4266 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_DOT_in_synpred43_DRL6Expressions4291 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_ID_in_synpred43_DRL6Expressions4293 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_LEFT_PAREN_in_synpred44_DRL6Expressions4342 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_NULL_SAFE_DOT_in_synpred45_DRL6Expressions4360 = new BitSet(new long[]{0x0000000080000000L});
-	public static final BitSet FOLLOW_ID_in_synpred45_DRL6Expressions4362 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_LEFT_PAREN_in_synpred46_DRL6Expressions4411 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_LEFT_SQUARE_in_synpred47_DRL6Expressions4434 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_LEFT_PAREN_in_synpred48_DRL6Expressions4525 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_GREATER_in_synpred49_DRL6Expressions4755 = new BitSet(new long[]{0x0000000004000000L});
-	public static final BitSet FOLLOW_GREATER_in_synpred49_DRL6Expressions4757 = new BitSet(new long[]{0x0000000004000000L});
-	public static final BitSet FOLLOW_GREATER_in_synpred49_DRL6Expressions4759 = new BitSet(new long[]{0x0000000000000002L});
-	public static final BitSet FOLLOW_GREATER_in_synpred50_DRL6Expressions4778 = new BitSet(new long[]{0x0000000004000000L});
-	public static final BitSet FOLLOW_GREATER_in_synpred50_DRL6Expressions4780 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_LEFT_PAREN_in_synpred24_DRL6Expressions3057 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_nonWildcardTypeArguments_in_synpred25_DRL6Expressions3076 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_literal_in_synpred26_DRL6Expressions3101 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_super_key_in_synpred27_DRL6Expressions3123 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_new_key_in_synpred28_DRL6Expressions3140 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_primitiveType_in_synpred29_DRL6Expressions3157 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_inlineMapExpression_in_synpred30_DRL6Expressions3188 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_inlineListExpression_in_synpred31_DRL6Expressions3203 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_ID_in_synpred32_DRL6Expressions3218 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_DOT_in_synpred33_DRL6Expressions3252 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_ID_in_synpred33_DRL6Expressions3254 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_set_in_synpred34_DRL6Expressions3298 = new BitSet(new long[]{0x0000002000000000L});
+	public static final BitSet FOLLOW_LEFT_PAREN_in_synpred34_DRL6Expressions3304 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_HASH_in_synpred35_DRL6Expressions3449 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_ID_in_synpred35_DRL6Expressions3451 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_NULL_SAFE_DOT_in_synpred36_DRL6Expressions3495 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_ID_in_synpred36_DRL6Expressions3497 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_identifierSuffix_in_synpred37_DRL6Expressions3525 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_LEFT_SQUARE_in_synpred38_DRL6Expressions3683 = new BitSet(new long[]{0x2000000000000000L});
+	public static final BitSet FOLLOW_RIGHT_SQUARE_in_synpred38_DRL6Expressions3685 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_LEFT_SQUARE_in_synpred39_DRL6Expressions3788 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_LEFT_SQUARE_in_synpred40_DRL6Expressions4050 = new BitSet(new long[]{0x2000000000000000L});
+	public static final BitSet FOLLOW_RIGHT_SQUARE_in_synpred40_DRL6Expressions4052 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_DOT_in_synpred41_DRL6Expressions4248 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_super_key_in_synpred41_DRL6Expressions4250 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_DOT_in_synpred42_DRL6Expressions4270 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_new_key_in_synpred42_DRL6Expressions4272 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_DOT_in_synpred43_DRL6Expressions4297 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_ID_in_synpred43_DRL6Expressions4299 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_LEFT_PAREN_in_synpred44_DRL6Expressions4348 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_NULL_SAFE_DOT_in_synpred45_DRL6Expressions4366 = new BitSet(new long[]{0x0000000080000000L});
+	public static final BitSet FOLLOW_ID_in_synpred45_DRL6Expressions4368 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_LEFT_PAREN_in_synpred46_DRL6Expressions4417 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_LEFT_SQUARE_in_synpred47_DRL6Expressions4440 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_LEFT_PAREN_in_synpred48_DRL6Expressions4531 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_GREATER_in_synpred49_DRL6Expressions4761 = new BitSet(new long[]{0x0000000004000000L});
+	public static final BitSet FOLLOW_GREATER_in_synpred49_DRL6Expressions4763 = new BitSet(new long[]{0x0000000004000000L});
+	public static final BitSet FOLLOW_GREATER_in_synpred49_DRL6Expressions4765 = new BitSet(new long[]{0x0000000000000002L});
+	public static final BitSet FOLLOW_GREATER_in_synpred50_DRL6Expressions4784 = new BitSet(new long[]{0x0000000004000000L});
+	public static final BitSet FOLLOW_GREATER_in_synpred50_DRL6Expressions4786 = new BitSet(new long[]{0x0000000000000002L});
 }
diff --git a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/lang/DRL6Lexer.java b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/lang/DRL6Lexer.java
index 9d55b0afd9d..00d1241b68f 100644
--- a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/lang/DRL6Lexer.java
+++ b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/lang/DRL6Lexer.java
@@ -1,33 +1,18 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-// $ANTLR 3.5 src/main/resources/org/drools/compiler/lang/DRL6Lexer.g 2017-05-16 10:26:27
+// $ANTLR 3.5.2 src/main/resources/org/drools/drl/parser/DRL6Lexer.g 2024-01-03 11:41:50
 
     package org.drools.drl.parser.lang;
 
     import org.kie.internal.builder.conf.LanguageLevelOption;
     import org.drools.drl.parser.DroolsParserException;
+    import org.drools.util.StringUtils;
 
 
-    import org.antlr.runtime.*;
-
-    import java.util.List;
+import org.antlr.runtime.*;
+import java.util.Stack;
+import java.util.List;
 import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
 
 @SuppressWarnings("all")
 public class DRL6Lexer extends AbstractDRLLexer {
@@ -134,7 +119,7 @@ public void emitErrorMessage(String msg) {
 	    }
 	    
 	    public String normalizeString( String input ) {
-			if( input != null && (input.length() == 2 || input.length() >= 4) ) {
+	        if( input != null && (input.length() == 2 || input.length() >= 4) ) {
 	            input = input.substring( 1, input.length() - 1 ); 
 	            input = input.replaceAll( "\'", "'" );
 	            input = input.replaceAll( "\"", "\\\"" );
@@ -165,17 +150,17 @@ public DRL6Lexer(CharStream input) {
 	public DRL6Lexer(CharStream input, RecognizerSharedState state) {
 		super(input,state);
 	}
-	@Override public String getGrammarFileName() { return "src/main/resources/org/drools/compiler/lang/DRL6Lexer.g"; }
+	@Override public String getGrammarFileName() { return "src/main/resources/org/drools/drl/parser/DRL6Lexer.g"; }
 
 	// $ANTLR start "WS"
 	public final void mWS() throws RecognitionException {
 		try {
 			int _type = WS;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:71:9: ( ( ' ' | '\\t' | '\\f' | EOL )+ )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:71:17: ( ' ' | '\\t' | '\\f' | EOL )+
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:71:9: ( ( ' ' | '\\t' | '\\f' | EOL )+ )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:71:17: ( ' ' | '\\t' | '\\f' | EOL )+
 			{
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:71:17: ( ' ' | '\\t' | '\\f' | EOL )+
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:71:17: ( ' ' | '\\t' | '\\f' | EOL )+
 			int cnt1=0;
 			loop1:
 			while (true) {
@@ -205,25 +190,25 @@ public final void mWS() throws RecognitionException {
 				}
 				switch (alt1) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:71:19: ' '
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:71:19: ' '
 					{
 					match(' '); if (state.failed) return;
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:72:19: '\\t'
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:72:19: '\\t'
 					{
 					match('\t'); if (state.failed) return;
 					}
 					break;
 				case 3 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:73:19: '\\f'
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:73:19: '\\f'
 					{
 					match('\f'); if (state.failed) return;
 					}
 					break;
 				case 4 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:74:19: EOL
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:74:19: EOL
 					{
 					mEOL(); if (state.failed) return;
 
@@ -254,10 +239,10 @@ public final void mWS() throws RecognitionException {
 	// $ANTLR start "EOL"
 	public final void mEOL() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:80:6: ( ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' ) )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:81:12: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:80:6: ( ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' ) )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:81:12: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
 			{
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:81:12: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:81:12: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
 			int alt2=3;
 			int LA2_0 = input.LA(1);
 			if ( (LA2_0=='\r') ) {
@@ -280,20 +265,20 @@ else if ( (LA2_0=='\n') ) {
 
 			switch (alt2) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:81:20: ( '\\r\\n' )=> '\\r\\n'
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:81:20: ( '\\r\\n' )=> '\\r\\n'
 					{
 					match("\r\n"); if (state.failed) return;
 
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:82:25: '\\r'
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:82:25: '\\r'
 					{
 					match('\r'); if (state.failed) return;
 					}
 					break;
 				case 3 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:83:25: '\\n'
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:83:25: '\\n'
 					{
 					match('\n'); if (state.failed) return;
 					}
@@ -315,14 +300,14 @@ public final void mFLOAT() throws RecognitionException {
 		try {
 			int _type = FLOAT;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:88:5: ( ( '0' .. '9' )+ '.' ( '0' .. '9' )* ( Exponent )? ( FloatTypeSuffix )? | '.' ( '0' .. '9' )+ ( Exponent )? ( FloatTypeSuffix )? | ( '0' .. '9' )+ Exponent ( FloatTypeSuffix )? | ( '0' .. '9' )+ FloatTypeSuffix )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:88:5: ( ( '0' .. '9' )+ '.' ( '0' .. '9' )* ( Exponent )? ( FloatTypeSuffix )? | '.' ( '0' .. '9' )+ ( Exponent )? ( FloatTypeSuffix )? | ( '0' .. '9' )+ Exponent ( FloatTypeSuffix )? | ( '0' .. '9' )+ FloatTypeSuffix )
 			int alt13=4;
 			alt13 = dfa13.predict(input);
 			switch (alt13) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:88:9: ( '0' .. '9' )+ '.' ( '0' .. '9' )* ( Exponent )? ( FloatTypeSuffix )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:88:9: ( '0' .. '9' )+ '.' ( '0' .. '9' )* ( Exponent )? ( FloatTypeSuffix )?
 					{
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:88:9: ( '0' .. '9' )+
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:88:9: ( '0' .. '9' )+
 					int cnt3=0;
 					loop3:
 					while (true) {
@@ -334,7 +319,7 @@ public final void mFLOAT() throws RecognitionException {
 
 						switch (alt3) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 							{
 							if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
 								input.consume();
@@ -359,7 +344,7 @@ public final void mFLOAT() throws RecognitionException {
 					}
 
 					match('.'); if (state.failed) return;
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:88:25: ( '0' .. '9' )*
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:88:25: ( '0' .. '9' )*
 					loop4:
 					while (true) {
 						int alt4=2;
@@ -370,7 +355,7 @@ public final void mFLOAT() throws RecognitionException {
 
 						switch (alt4) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 							{
 							if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
 								input.consume();
@@ -390,7 +375,7 @@ public final void mFLOAT() throws RecognitionException {
 						}
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:88:37: ( Exponent )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:88:37: ( Exponent )?
 					int alt5=2;
 					int LA5_0 = input.LA(1);
 					if ( (LA5_0=='E'||LA5_0=='e') ) {
@@ -398,7 +383,7 @@ public final void mFLOAT() throws RecognitionException {
 					}
 					switch (alt5) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:88:37: Exponent
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:88:37: Exponent
 							{
 							mExponent(); if (state.failed) return;
 
@@ -407,7 +392,7 @@ public final void mFLOAT() throws RecognitionException {
 
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:88:47: ( FloatTypeSuffix )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:88:47: ( FloatTypeSuffix )?
 					int alt6=2;
 					int LA6_0 = input.LA(1);
 					if ( (LA6_0=='B'||LA6_0=='D'||LA6_0=='F'||LA6_0=='d'||LA6_0=='f') ) {
@@ -415,7 +400,7 @@ public final void mFLOAT() throws RecognitionException {
 					}
 					switch (alt6) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 							{
 							if ( input.LA(1)=='B'||input.LA(1)=='D'||input.LA(1)=='F'||input.LA(1)=='d'||input.LA(1)=='f' ) {
 								input.consume();
@@ -435,10 +420,10 @@ public final void mFLOAT() throws RecognitionException {
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:89:9: '.' ( '0' .. '9' )+ ( Exponent )? ( FloatTypeSuffix )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:89:9: '.' ( '0' .. '9' )+ ( Exponent )? ( FloatTypeSuffix )?
 					{
 					match('.'); if (state.failed) return;
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:89:13: ( '0' .. '9' )+
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:89:13: ( '0' .. '9' )+
 					int cnt7=0;
 					loop7:
 					while (true) {
@@ -450,7 +435,7 @@ public final void mFLOAT() throws RecognitionException {
 
 						switch (alt7) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 							{
 							if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
 								input.consume();
@@ -474,7 +459,7 @@ public final void mFLOAT() throws RecognitionException {
 						cnt7++;
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:89:25: ( Exponent )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:89:25: ( Exponent )?
 					int alt8=2;
 					int LA8_0 = input.LA(1);
 					if ( (LA8_0=='E'||LA8_0=='e') ) {
@@ -482,7 +467,7 @@ public final void mFLOAT() throws RecognitionException {
 					}
 					switch (alt8) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:89:25: Exponent
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:89:25: Exponent
 							{
 							mExponent(); if (state.failed) return;
 
@@ -491,7 +476,7 @@ public final void mFLOAT() throws RecognitionException {
 
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:89:35: ( FloatTypeSuffix )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:89:35: ( FloatTypeSuffix )?
 					int alt9=2;
 					int LA9_0 = input.LA(1);
 					if ( (LA9_0=='B'||LA9_0=='D'||LA9_0=='F'||LA9_0=='d'||LA9_0=='f') ) {
@@ -499,7 +484,7 @@ public final void mFLOAT() throws RecognitionException {
 					}
 					switch (alt9) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 							{
 							if ( input.LA(1)=='B'||input.LA(1)=='D'||input.LA(1)=='F'||input.LA(1)=='d'||input.LA(1)=='f' ) {
 								input.consume();
@@ -519,9 +504,9 @@ public final void mFLOAT() throws RecognitionException {
 					}
 					break;
 				case 3 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:90:9: ( '0' .. '9' )+ Exponent ( FloatTypeSuffix )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:90:9: ( '0' .. '9' )+ Exponent ( FloatTypeSuffix )?
 					{
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:90:9: ( '0' .. '9' )+
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:90:9: ( '0' .. '9' )+
 					int cnt10=0;
 					loop10:
 					while (true) {
@@ -533,7 +518,7 @@ public final void mFLOAT() throws RecognitionException {
 
 						switch (alt10) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 							{
 							if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
 								input.consume();
@@ -559,7 +544,7 @@ public final void mFLOAT() throws RecognitionException {
 
 					mExponent(); if (state.failed) return;
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:90:30: ( FloatTypeSuffix )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:90:30: ( FloatTypeSuffix )?
 					int alt11=2;
 					int LA11_0 = input.LA(1);
 					if ( (LA11_0=='B'||LA11_0=='D'||LA11_0=='F'||LA11_0=='d'||LA11_0=='f') ) {
@@ -567,7 +552,7 @@ public final void mFLOAT() throws RecognitionException {
 					}
 					switch (alt11) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 							{
 							if ( input.LA(1)=='B'||input.LA(1)=='D'||input.LA(1)=='F'||input.LA(1)=='d'||input.LA(1)=='f' ) {
 								input.consume();
@@ -587,9 +572,9 @@ public final void mFLOAT() throws RecognitionException {
 					}
 					break;
 				case 4 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:91:9: ( '0' .. '9' )+ FloatTypeSuffix
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:91:9: ( '0' .. '9' )+ FloatTypeSuffix
 					{
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:91:9: ( '0' .. '9' )+
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:91:9: ( '0' .. '9' )+
 					int cnt12=0;
 					loop12:
 					while (true) {
@@ -601,7 +586,7 @@ public final void mFLOAT() throws RecognitionException {
 
 						switch (alt12) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 							{
 							if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
 								input.consume();
@@ -643,8 +628,8 @@ public final void mFLOAT() throws RecognitionException {
 	// $ANTLR start "Exponent"
 	public final void mExponent() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:95:10: ( ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:95:12: ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:95:10: ( ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:95:12: ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+
 			{
 			if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
 				input.consume();
@@ -656,7 +641,7 @@ public final void mExponent() throws RecognitionException {
 				recover(mse);
 				throw mse;
 			}
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:95:22: ( '+' | '-' )?
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:95:22: ( '+' | '-' )?
 			int alt14=2;
 			int LA14_0 = input.LA(1);
 			if ( (LA14_0=='+'||LA14_0=='-') ) {
@@ -664,7 +649,7 @@ public final void mExponent() throws RecognitionException {
 			}
 			switch (alt14) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 					{
 					if ( input.LA(1)=='+'||input.LA(1)=='-' ) {
 						input.consume();
@@ -681,7 +666,7 @@ public final void mExponent() throws RecognitionException {
 
 			}
 
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:95:33: ( '0' .. '9' )+
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:95:33: ( '0' .. '9' )+
 			int cnt15=0;
 			loop15:
 			while (true) {
@@ -693,7 +678,7 @@ public final void mExponent() throws RecognitionException {
 
 				switch (alt15) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 					{
 					if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
 						input.consume();
@@ -729,8 +714,8 @@ public final void mExponent() throws RecognitionException {
 	// $ANTLR start "FloatTypeSuffix"
 	public final void mFloatTypeSuffix() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:98:17: ( ( 'f' | 'F' | 'd' | 'D' | 'B' ) )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:98:17: ( ( 'f' | 'F' | 'd' | 'D' | 'B' ) )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 			{
 			if ( input.LA(1)=='B'||input.LA(1)=='D'||input.LA(1)=='F'||input.LA(1)=='d'||input.LA(1)=='f' ) {
 				input.consume();
@@ -756,8 +741,8 @@ public final void mHEX() throws RecognitionException {
 		try {
 			int _type = HEX;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:100:6: ( '0' ( 'x' | 'X' ) ( HexDigit )+ ( IntegerTypeSuffix )? )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:100:8: '0' ( 'x' | 'X' ) ( HexDigit )+ ( IntegerTypeSuffix )?
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:100:6: ( '0' ( 'x' | 'X' ) ( HexDigit )+ ( IntegerTypeSuffix )? )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:100:8: '0' ( 'x' | 'X' ) ( HexDigit )+ ( IntegerTypeSuffix )?
 			{
 			match('0'); if (state.failed) return;
 			if ( input.LA(1)=='X'||input.LA(1)=='x' ) {
@@ -770,7 +755,7 @@ public final void mHEX() throws RecognitionException {
 				recover(mse);
 				throw mse;
 			}
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:100:22: ( HexDigit )+
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:100:22: ( HexDigit )+
 			int cnt16=0;
 			loop16:
 			while (true) {
@@ -782,7 +767,7 @@ public final void mHEX() throws RecognitionException {
 
 				switch (alt16) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 					{
 					if ( (input.LA(1) >= '0' && input.LA(1) <= '9')||(input.LA(1) >= 'A' && input.LA(1) <= 'F')||(input.LA(1) >= 'a' && input.LA(1) <= 'f') ) {
 						input.consume();
@@ -806,7 +791,7 @@ public final void mHEX() throws RecognitionException {
 				cnt16++;
 			}
 
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:100:32: ( IntegerTypeSuffix )?
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:100:32: ( IntegerTypeSuffix )?
 			int alt17=2;
 			int LA17_0 = input.LA(1);
 			if ( (LA17_0=='I'||LA17_0=='L'||LA17_0=='l') ) {
@@ -814,7 +799,7 @@ public final void mHEX() throws RecognitionException {
 			}
 			switch (alt17) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 					{
 					if ( input.LA(1)=='I'||input.LA(1)=='L'||input.LA(1)=='l' ) {
 						input.consume();
@@ -847,10 +832,10 @@ public final void mDECIMAL() throws RecognitionException {
 		try {
 			int _type = DECIMAL;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:102:9: ( ( '0' .. '9' )+ ( IntegerTypeSuffix )? )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:102:11: ( '0' .. '9' )+ ( IntegerTypeSuffix )?
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:102:9: ( ( '0' .. '9' )+ ( IntegerTypeSuffix )? )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:102:11: ( '0' .. '9' )+ ( IntegerTypeSuffix )?
 			{
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:102:11: ( '0' .. '9' )+
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:102:11: ( '0' .. '9' )+
 			int cnt18=0;
 			loop18:
 			while (true) {
@@ -862,7 +847,7 @@ public final void mDECIMAL() throws RecognitionException {
 
 				switch (alt18) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 					{
 					if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
 						input.consume();
@@ -886,7 +871,7 @@ public final void mDECIMAL() throws RecognitionException {
 				cnt18++;
 			}
 
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:102:23: ( IntegerTypeSuffix )?
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:102:23: ( IntegerTypeSuffix )?
 			int alt19=2;
 			int LA19_0 = input.LA(1);
 			if ( (LA19_0=='I'||LA19_0=='L'||LA19_0=='l') ) {
@@ -894,7 +879,7 @@ public final void mDECIMAL() throws RecognitionException {
 			}
 			switch (alt19) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 					{
 					if ( input.LA(1)=='I'||input.LA(1)=='L'||input.LA(1)=='l' ) {
 						input.consume();
@@ -925,8 +910,8 @@ public final void mDECIMAL() throws RecognitionException {
 	// $ANTLR start "IntegerTypeSuffix"
 	public final void mIntegerTypeSuffix() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:105:19: ( ( 'l' | 'L' | 'I' ) )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:105:19: ( ( 'l' | 'L' | 'I' ) )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 			{
 			if ( input.LA(1)=='I'||input.LA(1)=='L'||input.LA(1)=='l' ) {
 				input.consume();
@@ -952,7 +937,7 @@ public final void mSTRING() throws RecognitionException {
 		try {
 			int _type = STRING;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:108:5: ( ( '\"' ( EscapeSequence |~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence |~ ( '\\\\' | '\\'' ) )* '\\'' ) )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:108:5: ( ( '\"' ( EscapeSequence |~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence |~ ( '\\\\' | '\\'' ) )* '\\'' ) )
 			int alt22=2;
 			int LA22_0 = input.LA(1);
 			if ( (LA22_0=='\"') ) {
@@ -971,13 +956,13 @@ else if ( (LA22_0=='\'') ) {
 
 			switch (alt22) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:108:8: ( '\"' ( EscapeSequence |~ ( '\\\\' | '\"' ) )* '\"' )
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:108:8: ( '\"' ( EscapeSequence |~ ( '\\\\' | '\"' ) )* '\"' )
 					{
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:108:8: ( '\"' ( EscapeSequence |~ ( '\\\\' | '\"' ) )* '\"' )
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:108:9: '\"' ( EscapeSequence |~ ( '\\\\' | '\"' ) )* '\"'
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:108:8: ( '\"' ( EscapeSequence |~ ( '\\\\' | '\"' ) )* '\"' )
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:108:9: '\"' ( EscapeSequence |~ ( '\\\\' | '\"' ) )* '\"'
 					{
 					match('\"'); if (state.failed) return;
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:108:13: ( EscapeSequence |~ ( '\\\\' | '\"' ) )*
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:108:13: ( EscapeSequence |~ ( '\\\\' | '\"' ) )*
 					loop20:
 					while (true) {
 						int alt20=3;
@@ -991,14 +976,14 @@ else if ( ((LA20_0 >= '\u0000' && LA20_0 <= '!')||(LA20_0 >= '#' && LA20_0 <= '[
 
 						switch (alt20) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:108:15: EscapeSequence
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:108:15: EscapeSequence
 							{
 							mEscapeSequence(); if (state.failed) return;
 
 							}
 							break;
 						case 2 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:108:32: ~ ( '\\\\' | '\"' )
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:108:32: ~ ( '\\\\' | '\"' )
 							{
 							if ( (input.LA(1) >= '\u0000' && input.LA(1) <= '!')||(input.LA(1) >= '#' && input.LA(1) <= '[')||(input.LA(1) >= ']' && input.LA(1) <= '\uFFFF') ) {
 								input.consume();
@@ -1024,13 +1009,13 @@ else if ( ((LA20_0 >= '\u0000' && LA20_0 <= '!')||(LA20_0 >= '#' && LA20_0 <= '[
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:109:8: ( '\\'' ( EscapeSequence |~ ( '\\\\' | '\\'' ) )* '\\'' )
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:109:8: ( '\\'' ( EscapeSequence |~ ( '\\\\' | '\\'' ) )* '\\'' )
 					{
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:109:8: ( '\\'' ( EscapeSequence |~ ( '\\\\' | '\\'' ) )* '\\'' )
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:109:9: '\\'' ( EscapeSequence |~ ( '\\\\' | '\\'' ) )* '\\''
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:109:8: ( '\\'' ( EscapeSequence |~ ( '\\\\' | '\\'' ) )* '\\'' )
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:109:9: '\\'' ( EscapeSequence |~ ( '\\\\' | '\\'' ) )* '\\''
 					{
 					match('\''); if (state.failed) return;
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:109:14: ( EscapeSequence |~ ( '\\\\' | '\\'' ) )*
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:109:14: ( EscapeSequence |~ ( '\\\\' | '\\'' ) )*
 					loop21:
 					while (true) {
 						int alt21=3;
@@ -1044,14 +1029,14 @@ else if ( ((LA21_0 >= '\u0000' && LA21_0 <= '&')||(LA21_0 >= '(' && LA21_0 <= '[
 
 						switch (alt21) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:109:16: EscapeSequence
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:109:16: EscapeSequence
 							{
 							mEscapeSequence(); if (state.failed) return;
 
 							}
 							break;
 						case 2 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:109:33: ~ ( '\\\\' | '\\'' )
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:109:33: ~ ( '\\\\' | '\\'' )
 							{
 							if ( (input.LA(1) >= '\u0000' && input.LA(1) <= '&')||(input.LA(1) >= '(' && input.LA(1) <= '[')||(input.LA(1) >= ']' && input.LA(1) <= '\uFFFF') ) {
 								input.consume();
@@ -1093,17 +1078,17 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 		try {
 			int _type = TIME_INTERVAL;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:114:5: ( ( ( '0' .. '9' )+ 'd' ) ( ( '0' .. '9' )+ 'h' )? ( ( '0' .. '9' )+ 'm' )? ( ( '0' .. '9' )+ 's' )? ( ( '0' .. '9' )+ ( 'ms' )? )? | ( ( '0' .. '9' )+ 'h' ) ( ( '0' .. '9' )+ 'm' )? ( ( '0' .. '9' )+ 's' )? ( ( '0' .. '9' )+ ( 'ms' )? )? | ( ( '0' .. '9' )+ 'm' ) ( ( '0' .. '9' )+ 's' )? ( ( '0' .. '9' )+ ( 'ms' )? )? | ( ( '0' .. '9' )+ 's' ) ( ( '0' .. '9' )+ ( 'ms' )? )? | ( ( '0' .. '9' )+ ( 'ms' )? ) )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:114:5: ( ( ( '0' .. '9' )+ 'd' ) ( ( '0' .. '9' )+ 'h' )? ( ( '0' .. '9' )+ 'm' )? ( ( '0' .. '9' )+ 's' )? ( ( '0' .. '9' )+ ( 'ms' )? )? | ( ( '0' .. '9' )+ 'h' ) ( ( '0' .. '9' )+ 'm' )? ( ( '0' .. '9' )+ 's' )? ( ( '0' .. '9' )+ ( 'ms' )? )? | ( ( '0' .. '9' )+ 'm' ) ( ( '0' .. '9' )+ 's' )? ( ( '0' .. '9' )+ ( 'ms' )? )? | ( ( '0' .. '9' )+ 's' ) ( ( '0' .. '9' )+ ( 'ms' )? )? | ( ( '0' .. '9' )+ ( 'ms' )? ) )
 			int alt53=5;
 			alt53 = dfa53.predict(input);
 			switch (alt53) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:114:7: ( ( '0' .. '9' )+ 'd' ) ( ( '0' .. '9' )+ 'h' )? ( ( '0' .. '9' )+ 'm' )? ( ( '0' .. '9' )+ 's' )? ( ( '0' .. '9' )+ ( 'ms' )? )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:114:7: ( ( '0' .. '9' )+ 'd' ) ( ( '0' .. '9' )+ 'h' )? ( ( '0' .. '9' )+ 'm' )? ( ( '0' .. '9' )+ 's' )? ( ( '0' .. '9' )+ ( 'ms' )? )?
 					{
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:114:7: ( ( '0' .. '9' )+ 'd' )
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:114:8: ( '0' .. '9' )+ 'd'
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:114:7: ( ( '0' .. '9' )+ 'd' )
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:114:8: ( '0' .. '9' )+ 'd'
 					{
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:114:8: ( '0' .. '9' )+
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:114:8: ( '0' .. '9' )+
 					int cnt23=0;
 					loop23:
 					while (true) {
@@ -1115,7 +1100,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 
 						switch (alt23) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 							{
 							if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
 								input.consume();
@@ -1142,14 +1127,14 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 					match('d'); if (state.failed) return;
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:114:25: ( ( '0' .. '9' )+ 'h' )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:114:25: ( ( '0' .. '9' )+ 'h' )?
 					int alt25=2;
 					alt25 = dfa25.predict(input);
 					switch (alt25) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:114:26: ( '0' .. '9' )+ 'h'
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:114:26: ( '0' .. '9' )+ 'h'
 							{
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:114:26: ( '0' .. '9' )+
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:114:26: ( '0' .. '9' )+
 							int cnt24=0;
 							loop24:
 							while (true) {
@@ -1161,7 +1146,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 
 								switch (alt24) {
 								case 1 :
-									// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+									// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 									{
 									if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
 										input.consume();
@@ -1191,14 +1176,14 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:114:43: ( ( '0' .. '9' )+ 'm' )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:114:43: ( ( '0' .. '9' )+ 'm' )?
 					int alt27=2;
 					alt27 = dfa27.predict(input);
 					switch (alt27) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:114:44: ( '0' .. '9' )+ 'm'
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:114:44: ( '0' .. '9' )+ 'm'
 							{
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:114:44: ( '0' .. '9' )+
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:114:44: ( '0' .. '9' )+
 							int cnt26=0;
 							loop26:
 							while (true) {
@@ -1210,7 +1195,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 
 								switch (alt26) {
 								case 1 :
-									// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+									// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 									{
 									if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
 										input.consume();
@@ -1240,14 +1225,14 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:114:61: ( ( '0' .. '9' )+ 's' )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:114:61: ( ( '0' .. '9' )+ 's' )?
 					int alt29=2;
 					alt29 = dfa29.predict(input);
 					switch (alt29) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:114:62: ( '0' .. '9' )+ 's'
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:114:62: ( '0' .. '9' )+ 's'
 							{
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:114:62: ( '0' .. '9' )+
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:114:62: ( '0' .. '9' )+
 							int cnt28=0;
 							loop28:
 							while (true) {
@@ -1259,7 +1244,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 
 								switch (alt28) {
 								case 1 :
-									// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+									// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 									{
 									if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
 										input.consume();
@@ -1289,7 +1274,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:114:79: ( ( '0' .. '9' )+ ( 'ms' )? )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:114:79: ( ( '0' .. '9' )+ ( 'ms' )? )?
 					int alt32=2;
 					int LA32_0 = input.LA(1);
 					if ( ((LA32_0 >= '0' && LA32_0 <= '9')) ) {
@@ -1297,9 +1282,9 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 					}
 					switch (alt32) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:114:80: ( '0' .. '9' )+ ( 'ms' )?
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:114:80: ( '0' .. '9' )+ ( 'ms' )?
 							{
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:114:80: ( '0' .. '9' )+
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:114:80: ( '0' .. '9' )+
 							int cnt30=0;
 							loop30:
 							while (true) {
@@ -1311,7 +1296,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 
 								switch (alt30) {
 								case 1 :
-									// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+									// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 									{
 									if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
 										input.consume();
@@ -1335,7 +1320,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 								cnt30++;
 							}
 
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:114:92: ( 'ms' )?
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:114:92: ( 'ms' )?
 							int alt31=2;
 							int LA31_0 = input.LA(1);
 							if ( (LA31_0=='m') ) {
@@ -1343,7 +1328,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 							}
 							switch (alt31) {
 								case 1 :
-									// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:114:92: 'ms'
+									// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:114:92: 'ms'
 									{
 									match("ms"); if (state.failed) return;
 
@@ -1360,12 +1345,12 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:115:7: ( ( '0' .. '9' )+ 'h' ) ( ( '0' .. '9' )+ 'm' )? ( ( '0' .. '9' )+ 's' )? ( ( '0' .. '9' )+ ( 'ms' )? )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:115:7: ( ( '0' .. '9' )+ 'h' ) ( ( '0' .. '9' )+ 'm' )? ( ( '0' .. '9' )+ 's' )? ( ( '0' .. '9' )+ ( 'ms' )? )?
 					{
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:115:7: ( ( '0' .. '9' )+ 'h' )
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:115:8: ( '0' .. '9' )+ 'h'
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:115:7: ( ( '0' .. '9' )+ 'h' )
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:115:8: ( '0' .. '9' )+ 'h'
 					{
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:115:8: ( '0' .. '9' )+
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:115:8: ( '0' .. '9' )+
 					int cnt33=0;
 					loop33:
 					while (true) {
@@ -1377,7 +1362,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 
 						switch (alt33) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 							{
 							if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
 								input.consume();
@@ -1404,14 +1389,14 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 					match('h'); if (state.failed) return;
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:115:25: ( ( '0' .. '9' )+ 'm' )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:115:25: ( ( '0' .. '9' )+ 'm' )?
 					int alt35=2;
 					alt35 = dfa35.predict(input);
 					switch (alt35) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:115:26: ( '0' .. '9' )+ 'm'
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:115:26: ( '0' .. '9' )+ 'm'
 							{
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:115:26: ( '0' .. '9' )+
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:115:26: ( '0' .. '9' )+
 							int cnt34=0;
 							loop34:
 							while (true) {
@@ -1423,7 +1408,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 
 								switch (alt34) {
 								case 1 :
-									// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+									// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 									{
 									if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
 										input.consume();
@@ -1453,14 +1438,14 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:115:43: ( ( '0' .. '9' )+ 's' )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:115:43: ( ( '0' .. '9' )+ 's' )?
 					int alt37=2;
 					alt37 = dfa37.predict(input);
 					switch (alt37) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:115:44: ( '0' .. '9' )+ 's'
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:115:44: ( '0' .. '9' )+ 's'
 							{
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:115:44: ( '0' .. '9' )+
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:115:44: ( '0' .. '9' )+
 							int cnt36=0;
 							loop36:
 							while (true) {
@@ -1472,7 +1457,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 
 								switch (alt36) {
 								case 1 :
-									// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+									// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 									{
 									if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
 										input.consume();
@@ -1502,7 +1487,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:115:61: ( ( '0' .. '9' )+ ( 'ms' )? )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:115:61: ( ( '0' .. '9' )+ ( 'ms' )? )?
 					int alt40=2;
 					int LA40_0 = input.LA(1);
 					if ( ((LA40_0 >= '0' && LA40_0 <= '9')) ) {
@@ -1510,9 +1495,9 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 					}
 					switch (alt40) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:115:62: ( '0' .. '9' )+ ( 'ms' )?
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:115:62: ( '0' .. '9' )+ ( 'ms' )?
 							{
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:115:62: ( '0' .. '9' )+
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:115:62: ( '0' .. '9' )+
 							int cnt38=0;
 							loop38:
 							while (true) {
@@ -1524,7 +1509,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 
 								switch (alt38) {
 								case 1 :
-									// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+									// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 									{
 									if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
 										input.consume();
@@ -1548,7 +1533,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 								cnt38++;
 							}
 
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:115:74: ( 'ms' )?
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:115:74: ( 'ms' )?
 							int alt39=2;
 							int LA39_0 = input.LA(1);
 							if ( (LA39_0=='m') ) {
@@ -1556,7 +1541,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 							}
 							switch (alt39) {
 								case 1 :
-									// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:115:74: 'ms'
+									// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:115:74: 'ms'
 									{
 									match("ms"); if (state.failed) return;
 
@@ -1573,12 +1558,12 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 					}
 					break;
 				case 3 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:116:7: ( ( '0' .. '9' )+ 'm' ) ( ( '0' .. '9' )+ 's' )? ( ( '0' .. '9' )+ ( 'ms' )? )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:116:7: ( ( '0' .. '9' )+ 'm' ) ( ( '0' .. '9' )+ 's' )? ( ( '0' .. '9' )+ ( 'ms' )? )?
 					{
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:116:7: ( ( '0' .. '9' )+ 'm' )
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:116:8: ( '0' .. '9' )+ 'm'
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:116:7: ( ( '0' .. '9' )+ 'm' )
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:116:8: ( '0' .. '9' )+ 'm'
 					{
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:116:8: ( '0' .. '9' )+
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:116:8: ( '0' .. '9' )+
 					int cnt41=0;
 					loop41:
 					while (true) {
@@ -1590,7 +1575,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 
 						switch (alt41) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 							{
 							if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
 								input.consume();
@@ -1617,14 +1602,14 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 					match('m'); if (state.failed) return;
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:116:25: ( ( '0' .. '9' )+ 's' )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:116:25: ( ( '0' .. '9' )+ 's' )?
 					int alt43=2;
 					alt43 = dfa43.predict(input);
 					switch (alt43) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:116:26: ( '0' .. '9' )+ 's'
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:116:26: ( '0' .. '9' )+ 's'
 							{
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:116:26: ( '0' .. '9' )+
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:116:26: ( '0' .. '9' )+
 							int cnt42=0;
 							loop42:
 							while (true) {
@@ -1636,7 +1621,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 
 								switch (alt42) {
 								case 1 :
-									// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+									// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 									{
 									if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
 										input.consume();
@@ -1666,7 +1651,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:116:43: ( ( '0' .. '9' )+ ( 'ms' )? )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:116:43: ( ( '0' .. '9' )+ ( 'ms' )? )?
 					int alt46=2;
 					int LA46_0 = input.LA(1);
 					if ( ((LA46_0 >= '0' && LA46_0 <= '9')) ) {
@@ -1674,9 +1659,9 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 					}
 					switch (alt46) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:116:44: ( '0' .. '9' )+ ( 'ms' )?
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:116:44: ( '0' .. '9' )+ ( 'ms' )?
 							{
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:116:44: ( '0' .. '9' )+
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:116:44: ( '0' .. '9' )+
 							int cnt44=0;
 							loop44:
 							while (true) {
@@ -1688,7 +1673,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 
 								switch (alt44) {
 								case 1 :
-									// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+									// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 									{
 									if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
 										input.consume();
@@ -1712,7 +1697,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 								cnt44++;
 							}
 
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:116:56: ( 'ms' )?
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:116:56: ( 'ms' )?
 							int alt45=2;
 							int LA45_0 = input.LA(1);
 							if ( (LA45_0=='m') ) {
@@ -1720,7 +1705,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 							}
 							switch (alt45) {
 								case 1 :
-									// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:116:56: 'ms'
+									// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:116:56: 'ms'
 									{
 									match("ms"); if (state.failed) return;
 
@@ -1737,12 +1722,12 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 					}
 					break;
 				case 4 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:117:7: ( ( '0' .. '9' )+ 's' ) ( ( '0' .. '9' )+ ( 'ms' )? )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:117:7: ( ( '0' .. '9' )+ 's' ) ( ( '0' .. '9' )+ ( 'ms' )? )?
 					{
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:117:7: ( ( '0' .. '9' )+ 's' )
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:117:8: ( '0' .. '9' )+ 's'
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:117:7: ( ( '0' .. '9' )+ 's' )
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:117:8: ( '0' .. '9' )+ 's'
 					{
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:117:8: ( '0' .. '9' )+
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:117:8: ( '0' .. '9' )+
 					int cnt47=0;
 					loop47:
 					while (true) {
@@ -1754,7 +1739,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 
 						switch (alt47) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 							{
 							if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
 								input.consume();
@@ -1781,7 +1766,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 					match('s'); if (state.failed) return;
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:117:25: ( ( '0' .. '9' )+ ( 'ms' )? )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:117:25: ( ( '0' .. '9' )+ ( 'ms' )? )?
 					int alt50=2;
 					int LA50_0 = input.LA(1);
 					if ( ((LA50_0 >= '0' && LA50_0 <= '9')) ) {
@@ -1789,9 +1774,9 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 					}
 					switch (alt50) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:117:26: ( '0' .. '9' )+ ( 'ms' )?
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:117:26: ( '0' .. '9' )+ ( 'ms' )?
 							{
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:117:26: ( '0' .. '9' )+
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:117:26: ( '0' .. '9' )+
 							int cnt48=0;
 							loop48:
 							while (true) {
@@ -1803,7 +1788,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 
 								switch (alt48) {
 								case 1 :
-									// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+									// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 									{
 									if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
 										input.consume();
@@ -1827,7 +1812,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 								cnt48++;
 							}
 
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:117:38: ( 'ms' )?
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:117:38: ( 'ms' )?
 							int alt49=2;
 							int LA49_0 = input.LA(1);
 							if ( (LA49_0=='m') ) {
@@ -1835,7 +1820,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 							}
 							switch (alt49) {
 								case 1 :
-									// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:117:38: 'ms'
+									// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:117:38: 'ms'
 									{
 									match("ms"); if (state.failed) return;
 
@@ -1852,12 +1837,12 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 					}
 					break;
 				case 5 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:118:7: ( ( '0' .. '9' )+ ( 'ms' )? )
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:118:7: ( ( '0' .. '9' )+ ( 'ms' )? )
 					{
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:118:7: ( ( '0' .. '9' )+ ( 'ms' )? )
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:118:8: ( '0' .. '9' )+ ( 'ms' )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:118:7: ( ( '0' .. '9' )+ ( 'ms' )? )
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:118:8: ( '0' .. '9' )+ ( 'ms' )?
 					{
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:118:8: ( '0' .. '9' )+
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:118:8: ( '0' .. '9' )+
 					int cnt51=0;
 					loop51:
 					while (true) {
@@ -1869,7 +1854,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 
 						switch (alt51) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 							{
 							if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
 								input.consume();
@@ -1893,7 +1878,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 						cnt51++;
 					}
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:118:20: ( 'ms' )?
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:118:20: ( 'ms' )?
 					int alt52=2;
 					int LA52_0 = input.LA(1);
 					if ( (LA52_0=='m') ) {
@@ -1901,7 +1886,7 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 					}
 					switch (alt52) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:118:20: 'ms'
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:118:20: 'ms'
 							{
 							match("ms"); if (state.failed) return;
 
@@ -1928,8 +1913,8 @@ public final void mTIME_INTERVAL() throws RecognitionException {
 	// $ANTLR start "HexDigit"
 	public final void mHexDigit() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:122:10: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:122:10: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 			{
 			if ( (input.LA(1) >= '0' && input.LA(1) <= '9')||(input.LA(1) >= 'A' && input.LA(1) <= 'F')||(input.LA(1) >= 'a' && input.LA(1) <= 'f') ) {
 				input.consume();
@@ -1953,7 +1938,7 @@ public final void mHexDigit() throws RecognitionException {
 	// $ANTLR start "EscapeSequence"
 	public final void mEscapeSequence() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:126:5: ( '\\\\' ( 'b' | 'B' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' | '.' | 'o' | 'x' | 'a' | 'e' | 'c' | 'd' | 'D' | 's' | 'S' | 'w' | 'W' | 'p' | 'A' | 'G' | 'Z' | 'z' | 'Q' | 'E' | '*' | '[' | ']' | '(' | ')' | '$' | '^' | '{' | '}' | '?' | '+' | '-' | '&' | '|' ) | UnicodeEscape | OctalEscape )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:126:5: ( '\\\\' ( 'b' | 'B' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' | '.' | 'o' | 'x' | 'a' | 'e' | 'c' | 'd' | 'D' | 's' | 'S' | 'w' | 'W' | 'p' | 'A' | 'G' | 'Z' | 'z' | 'Q' | 'E' | '*' | '[' | ']' | '(' | ')' | '$' | '^' | '{' | '}' | '?' | '+' | '-' | '&' | '|' ) | UnicodeEscape | OctalEscape )
 			int alt54=3;
 			int LA54_0 = input.LA(1);
 			if ( (LA54_0=='\\') ) {
@@ -2044,7 +2029,7 @@ public final void mEscapeSequence() throws RecognitionException {
 
 			switch (alt54) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:126:9: '\\\\' ( 'b' | 'B' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' | '.' | 'o' | 'x' | 'a' | 'e' | 'c' | 'd' | 'D' | 's' | 'S' | 'w' | 'W' | 'p' | 'A' | 'G' | 'Z' | 'z' | 'Q' | 'E' | '*' | '[' | ']' | '(' | ')' | '$' | '^' | '{' | '}' | '?' | '+' | '-' | '&' | '|' )
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:126:9: '\\\\' ( 'b' | 'B' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' | '.' | 'o' | 'x' | 'a' | 'e' | 'c' | 'd' | 'D' | 's' | 'S' | 'w' | 'W' | 'p' | 'A' | 'G' | 'Z' | 'z' | 'Q' | 'E' | '*' | '[' | ']' | '(' | ')' | '$' | '^' | '{' | '}' | '?' | '+' | '-' | '&' | '|' )
 					{
 					match('\\'); if (state.failed) return;
 					if ( input.LA(1)=='\"'||input.LA(1)=='$'||(input.LA(1) >= '&' && input.LA(1) <= '+')||(input.LA(1) >= '-' && input.LA(1) <= '.')||input.LA(1)=='?'||(input.LA(1) >= 'A' && input.LA(1) <= 'B')||(input.LA(1) >= 'D' && input.LA(1) <= 'E')||input.LA(1)=='G'||input.LA(1)=='Q'||input.LA(1)=='S'||input.LA(1)=='W'||(input.LA(1) >= 'Z' && input.LA(1) <= '^')||(input.LA(1) >= 'a' && input.LA(1) <= 'f')||(input.LA(1) >= 'n' && input.LA(1) <= 'p')||(input.LA(1) >= 'r' && input.LA(1) <= 't')||(input.LA(1) >= 'w' && input.LA(1) <= 'x')||(input.LA(1) >= 'z' && input.LA(1) <= '}') ) {
@@ -2060,14 +2045,14 @@ public final void mEscapeSequence() throws RecognitionException {
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:130:9: UnicodeEscape
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:130:9: UnicodeEscape
 					{
 					mUnicodeEscape(); if (state.failed) return;
 
 					}
 					break;
 				case 3 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:131:9: OctalEscape
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:131:9: OctalEscape
 					{
 					mOctalEscape(); if (state.failed) return;
 
@@ -2085,7 +2070,7 @@ public final void mEscapeSequence() throws RecognitionException {
 	// $ANTLR start "OctalEscape"
 	public final void mOctalEscape() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:136:5: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:136:5: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
 			int alt55=3;
 			int LA55_0 = input.LA(1);
 			if ( (LA55_0=='\\') ) {
@@ -2145,7 +2130,7 @@ else if ( ((LA55_1 >= '4' && LA55_1 <= '7')) ) {
 
 			switch (alt55) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:136:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:136:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
 					{
 					match('\\'); if (state.failed) return;
 					if ( (input.LA(1) >= '0' && input.LA(1) <= '3') ) {
@@ -2181,7 +2166,7 @@ else if ( ((LA55_1 >= '4' && LA55_1 <= '7')) ) {
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:137:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:137:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
 					{
 					match('\\'); if (state.failed) return;
 					if ( (input.LA(1) >= '0' && input.LA(1) <= '7') ) {
@@ -2207,7 +2192,7 @@ else if ( ((LA55_1 >= '4' && LA55_1 <= '7')) ) {
 					}
 					break;
 				case 3 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:138:9: '\\\\' ( '0' .. '7' )
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:138:9: '\\\\' ( '0' .. '7' )
 					{
 					match('\\'); if (state.failed) return;
 					if ( (input.LA(1) >= '0' && input.LA(1) <= '7') ) {
@@ -2234,8 +2219,8 @@ else if ( ((LA55_1 >= '4' && LA55_1 <= '7')) ) {
 	// $ANTLR start "UnicodeEscape"
 	public final void mUnicodeEscape() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:143:5: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:143:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:143:5: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:143:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
 			{
 			match('\\'); if (state.failed) return;
 			match('u'); if (state.failed) return;
@@ -2261,10 +2246,10 @@ public final void mBOOL() throws RecognitionException {
 		try {
 			int _type = BOOL;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:146:6: ( ( 'true' | 'false' ) )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:146:8: ( 'true' | 'false' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:146:6: ( ( 'true' | 'false' ) )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:146:8: ( 'true' | 'false' )
 			{
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:146:8: ( 'true' | 'false' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:146:8: ( 'true' | 'false' )
 			int alt56=2;
 			int LA56_0 = input.LA(1);
 			if ( (LA56_0=='t') ) {
@@ -2283,14 +2268,14 @@ else if ( (LA56_0=='f') ) {
 
 			switch (alt56) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:146:9: 'true'
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:146:9: 'true'
 					{
 					match("true"); if (state.failed) return;
 
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:146:16: 'false'
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:146:16: 'false'
 					{
 					match("false"); if (state.failed) return;
 
@@ -2315,8 +2300,8 @@ public final void mNULL() throws RecognitionException {
 		try {
 			int _type = NULL;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:149:6: ( 'null' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:149:8: 'null'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:149:6: ( 'null' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:149:8: 'null'
 			{
 			match("null"); if (state.failed) return;
 
@@ -2336,8 +2321,8 @@ public final void mAT() throws RecognitionException {
 		try {
 			int _type = AT;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:152:4: ( '@' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:152:6: '@'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:152:4: ( '@' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:152:6: '@'
 			{
 			match('@'); if (state.failed) return;
 			}
@@ -2356,8 +2341,8 @@ public final void mPLUS_ASSIGN() throws RecognitionException {
 		try {
 			int _type = PLUS_ASSIGN;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:156:5: ( '+=' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:156:7: '+='
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:156:5: ( '+=' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:156:7: '+='
 			{
 			match("+="); if (state.failed) return;
 
@@ -2377,8 +2362,8 @@ public final void mMINUS_ASSIGN() throws RecognitionException {
 		try {
 			int _type = MINUS_ASSIGN;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:160:5: ( '-=' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:160:7: '-='
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:160:5: ( '-=' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:160:7: '-='
 			{
 			match("-="); if (state.failed) return;
 
@@ -2398,8 +2383,8 @@ public final void mMULT_ASSIGN() throws RecognitionException {
 		try {
 			int _type = MULT_ASSIGN;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:164:5: ( '*=' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:164:7: '*='
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:164:5: ( '*=' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:164:7: '*='
 			{
 			match("*="); if (state.failed) return;
 
@@ -2419,8 +2404,8 @@ public final void mDIV_ASSIGN() throws RecognitionException {
 		try {
 			int _type = DIV_ASSIGN;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:168:5: ( '/=' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:168:7: '/='
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:168:5: ( '/=' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:168:7: '/='
 			{
 			match("/="); if (state.failed) return;
 
@@ -2440,8 +2425,8 @@ public final void mAND_ASSIGN() throws RecognitionException {
 		try {
 			int _type = AND_ASSIGN;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:172:5: ( '&=' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:172:7: '&='
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:172:5: ( '&=' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:172:7: '&='
 			{
 			match("&="); if (state.failed) return;
 
@@ -2461,8 +2446,8 @@ public final void mOR_ASSIGN() throws RecognitionException {
 		try {
 			int _type = OR_ASSIGN;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:176:5: ( '|=' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:176:7: '|='
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:176:5: ( '|=' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:176:7: '|='
 			{
 			match("|="); if (state.failed) return;
 
@@ -2482,8 +2467,8 @@ public final void mXOR_ASSIGN() throws RecognitionException {
 		try {
 			int _type = XOR_ASSIGN;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:180:5: ( '^=' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:180:7: '^='
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:180:5: ( '^=' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:180:7: '^='
 			{
 			match("^="); if (state.failed) return;
 
@@ -2503,8 +2488,8 @@ public final void mMOD_ASSIGN() throws RecognitionException {
 		try {
 			int _type = MOD_ASSIGN;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:184:5: ( '%=' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:184:7: '%='
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:184:5: ( '%=' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:184:7: '%='
 			{
 			match("%="); if (state.failed) return;
 
@@ -2524,8 +2509,8 @@ public final void mUNIFY() throws RecognitionException {
 		try {
 			int _type = UNIFY;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:188:5: ( ':=' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:188:7: ':='
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:188:5: ( ':=' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:188:7: ':='
 			{
 			match(":="); if (state.failed) return;
 
@@ -2545,8 +2530,8 @@ public final void mDECR() throws RecognitionException {
 		try {
 			int _type = DECR;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:191:6: ( '--' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:191:8: '--'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:191:6: ( '--' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:191:8: '--'
 			{
 			match("--"); if (state.failed) return;
 
@@ -2566,8 +2551,8 @@ public final void mINCR() throws RecognitionException {
 		try {
 			int _type = INCR;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:194:6: ( '++' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:194:8: '++'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:194:6: ( '++' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:194:8: '++'
 			{
 			match("++"); if (state.failed) return;
 
@@ -2587,8 +2572,8 @@ public final void mARROW() throws RecognitionException {
 		try {
 			int _type = ARROW;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:198:5: ( '->' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:198:7: '->'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:198:5: ( '->' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:198:7: '->'
 			{
 			match("->"); if (state.failed) return;
 
@@ -2608,8 +2593,8 @@ public final void mSEMICOLON() throws RecognitionException {
 		try {
 			int _type = SEMICOLON;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:202:5: ( ';' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:202:7: ';'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:202:5: ( ';' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:202:7: ';'
 			{
 			match(';'); if (state.failed) return;
 			}
@@ -2628,8 +2613,8 @@ public final void mCOLON() throws RecognitionException {
 		try {
 			int _type = COLON;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:206:5: ( ':' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:206:7: ':'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:206:5: ( ':' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:206:7: ':'
 			{
 			match(':'); if (state.failed) return;
 			}
@@ -2648,8 +2633,8 @@ public final void mEQUALS() throws RecognitionException {
 		try {
 			int _type = EQUALS;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:210:5: ( '==' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:210:7: '=='
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:210:5: ( '==' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:210:7: '=='
 			{
 			match("=="); if (state.failed) return;
 
@@ -2669,8 +2654,8 @@ public final void mNOT_EQUALS() throws RecognitionException {
 		try {
 			int _type = NOT_EQUALS;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:214:5: ( '!=' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:214:7: '!='
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:214:5: ( '!=' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:214:7: '!='
 			{
 			match("!="); if (state.failed) return;
 
@@ -2690,8 +2675,8 @@ public final void mGREATER_EQUALS() throws RecognitionException {
 		try {
 			int _type = GREATER_EQUALS;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:218:5: ( '>=' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:218:7: '>='
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:218:5: ( '>=' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:218:7: '>='
 			{
 			match(">="); if (state.failed) return;
 
@@ -2711,8 +2696,8 @@ public final void mLESS_EQUALS() throws RecognitionException {
 		try {
 			int _type = LESS_EQUALS;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:222:5: ( '<=' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:222:7: '<='
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:222:5: ( '<=' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:222:7: '<='
 			{
 			match("<="); if (state.failed) return;
 
@@ -2732,8 +2717,8 @@ public final void mGREATER() throws RecognitionException {
 		try {
 			int _type = GREATER;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:226:5: ( '>' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:226:7: '>'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:226:5: ( '>' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:226:7: '>'
 			{
 			match('>'); if (state.failed) return;
 			}
@@ -2752,8 +2737,8 @@ public final void mLESS() throws RecognitionException {
 		try {
 			int _type = LESS;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:230:5: ( '<' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:230:7: '<'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:230:5: ( '<' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:230:7: '<'
 			{
 			match('<'); if (state.failed) return;
 			}
@@ -2772,8 +2757,8 @@ public final void mEQUALS_ASSIGN() throws RecognitionException {
 		try {
 			int _type = EQUALS_ASSIGN;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:234:5: ( '=' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:234:7: '='
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:234:5: ( '=' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:234:7: '='
 			{
 			match('='); if (state.failed) return;
 			}
@@ -2792,8 +2777,8 @@ public final void mLEFT_PAREN() throws RecognitionException {
 		try {
 			int _type = LEFT_PAREN;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:238:9: ( '(' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:238:11: '('
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:238:9: ( '(' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:238:11: '('
 			{
 			match('('); if (state.failed) return;
 			}
@@ -2812,8 +2797,8 @@ public final void mRIGHT_PAREN() throws RecognitionException {
 		try {
 			int _type = RIGHT_PAREN;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:242:9: ( ')' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:242:11: ')'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:242:9: ( ')' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:242:11: ')'
 			{
 			match(')'); if (state.failed) return;
 			}
@@ -2832,8 +2817,8 @@ public final void mLEFT_SQUARE() throws RecognitionException {
 		try {
 			int _type = LEFT_SQUARE;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:246:9: ( '[' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:246:11: '['
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:246:9: ( '[' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:246:11: '['
 			{
 			match('['); if (state.failed) return;
 			}
@@ -2852,8 +2837,8 @@ public final void mRIGHT_SQUARE() throws RecognitionException {
 		try {
 			int _type = RIGHT_SQUARE;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:250:9: ( ']' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:250:11: ']'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:250:9: ( ']' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:250:11: ']'
 			{
 			match(']'); if (state.failed) return;
 			}
@@ -2872,8 +2857,8 @@ public final void mLEFT_CURLY() throws RecognitionException {
 		try {
 			int _type = LEFT_CURLY;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:254:9: ( '{' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:254:11: '{'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:254:9: ( '{' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:254:11: '{'
 			{
 			match('{'); if (state.failed) return;
 			}
@@ -2892,8 +2877,8 @@ public final void mRIGHT_CURLY() throws RecognitionException {
 		try {
 			int _type = RIGHT_CURLY;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:258:9: ( '}' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:258:11: '}'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:258:9: ( '}' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:258:11: '}'
 			{
 			match('}'); if (state.failed) return;
 			}
@@ -2912,8 +2897,8 @@ public final void mCOMMA() throws RecognitionException {
 		try {
 			int _type = COMMA;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:261:7: ( ',' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:261:9: ','
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:261:7: ( ',' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:261:9: ','
 			{
 			match(','); if (state.failed) return;
 			}
@@ -2932,8 +2917,8 @@ public final void mDOT() throws RecognitionException {
 		try {
 			int _type = DOT;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:264:5: ( '.' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:264:7: '.'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:264:5: ( '.' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:264:7: '.'
 			{
 			match('.'); if (state.failed) return;
 			}
@@ -2952,8 +2937,8 @@ public final void mNULL_SAFE_DOT() throws RecognitionException {
 		try {
 			int _type = NULL_SAFE_DOT;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:267:15: ( '!.' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:267:17: '!.'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:267:15: ( '!.' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:267:17: '!.'
 			{
 			match("!."); if (state.failed) return;
 
@@ -2973,8 +2958,8 @@ public final void mDOUBLE_AMPER() throws RecognitionException {
 		try {
 			int _type = DOUBLE_AMPER;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:271:5: ( '&&' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:271:7: '&&'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:271:5: ( '&&' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:271:7: '&&'
 			{
 			match("&&"); if (state.failed) return;
 
@@ -2994,8 +2979,8 @@ public final void mDOUBLE_PIPE() throws RecognitionException {
 		try {
 			int _type = DOUBLE_PIPE;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:275:5: ( '||' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:275:7: '||'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:275:5: ( '||' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:275:7: '||'
 			{
 			match("||"); if (state.failed) return;
 
@@ -3015,8 +3000,8 @@ public final void mQUESTION() throws RecognitionException {
 		try {
 			int _type = QUESTION;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:279:5: ( '?' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:279:7: '?'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:279:5: ( '?' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:279:7: '?'
 			{
 			match('?'); if (state.failed) return;
 			}
@@ -3035,8 +3020,8 @@ public final void mNEGATION() throws RecognitionException {
 		try {
 			int _type = NEGATION;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:283:5: ( '!' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:283:7: '!'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:283:5: ( '!' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:283:7: '!'
 			{
 			match('!'); if (state.failed) return;
 			}
@@ -3055,8 +3040,8 @@ public final void mTILDE() throws RecognitionException {
 		try {
 			int _type = TILDE;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:287:5: ( '~' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:287:7: '~'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:287:5: ( '~' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:287:7: '~'
 			{
 			match('~'); if (state.failed) return;
 			}
@@ -3075,8 +3060,8 @@ public final void mPIPE() throws RecognitionException {
 		try {
 			int _type = PIPE;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:291:5: ( '|' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:291:7: '|'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:291:5: ( '|' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:291:7: '|'
 			{
 			match('|'); if (state.failed) return;
 			}
@@ -3095,8 +3080,8 @@ public final void mAMPER() throws RecognitionException {
 		try {
 			int _type = AMPER;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:295:5: ( '&' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:295:7: '&'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:295:5: ( '&' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:295:7: '&'
 			{
 			match('&'); if (state.failed) return;
 			}
@@ -3115,8 +3100,8 @@ public final void mXOR() throws RecognitionException {
 		try {
 			int _type = XOR;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:299:5: ( '^' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:299:7: '^'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:299:5: ( '^' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:299:7: '^'
 			{
 			match('^'); if (state.failed) return;
 			}
@@ -3135,8 +3120,8 @@ public final void mMOD() throws RecognitionException {
 		try {
 			int _type = MOD;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:303:5: ( '%' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:303:7: '%'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:303:5: ( '%' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:303:7: '%'
 			{
 			match('%'); if (state.failed) return;
 			}
@@ -3155,8 +3140,8 @@ public final void mSTAR() throws RecognitionException {
 		try {
 			int _type = STAR;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:306:6: ( '*' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:306:8: '*'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:306:6: ( '*' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:306:8: '*'
 			{
 			match('*'); if (state.failed) return;
 			}
@@ -3175,8 +3160,8 @@ public final void mMINUS() throws RecognitionException {
 		try {
 			int _type = MINUS;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:309:7: ( '-' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:309:9: '-'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:309:7: ( '-' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:309:9: '-'
 			{
 			match('-'); if (state.failed) return;
 			}
@@ -3195,8 +3180,8 @@ public final void mPLUS() throws RecognitionException {
 		try {
 			int _type = PLUS;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:312:6: ( '+' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:312:8: '+'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:312:6: ( '+' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:312:8: '+'
 			{
 			match('+'); if (state.failed) return;
 			}
@@ -3215,8 +3200,8 @@ public final void mHASH() throws RecognitionException {
 		try {
 			int _type = HASH;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:315:9: ( '#' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:315:13: '#'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:315:9: ( '#' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:315:13: '#'
 			{
 			match('#'); if (state.failed) return;
 			}
@@ -3235,12 +3220,12 @@ public final void mC_STYLE_SINGLE_LINE_COMMENT() throws RecognitionException {
 		try {
 			int _type = C_STYLE_SINGLE_LINE_COMMENT;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:319:5: ( '//' (~ ( '\\r' | '\\n' ) )* ( EOL | EOF ) )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:319:7: '//' (~ ( '\\r' | '\\n' ) )* ( EOL | EOF )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:319:5: ( '//' (~ ( '\\r' | '\\n' ) )* ( EOL | EOF ) )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:319:7: '//' (~ ( '\\r' | '\\n' ) )* ( EOL | EOF )
 			{
 			match("//"); if (state.failed) return;
 
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:319:12: (~ ( '\\r' | '\\n' ) )*
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:319:12: (~ ( '\\r' | '\\n' ) )*
 			loop57:
 			while (true) {
 				int alt57=2;
@@ -3251,7 +3236,7 @@ public final void mC_STYLE_SINGLE_LINE_COMMENT() throws RecognitionException {
 
 				switch (alt57) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 					{
 					if ( (input.LA(1) >= '\u0000' && input.LA(1) <= '\t')||(input.LA(1) >= '\u000B' && input.LA(1) <= '\f')||(input.LA(1) >= '\u000E' && input.LA(1) <= '\uFFFF') ) {
 						input.consume();
@@ -3271,7 +3256,7 @@ public final void mC_STYLE_SINGLE_LINE_COMMENT() throws RecognitionException {
 				}
 			}
 
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:319:28: ( EOL | EOF )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:319:28: ( EOL | EOF )
 			int alt58=2;
 			int LA58_0 = input.LA(1);
 			if ( (LA58_0=='\n'||LA58_0=='\r') ) {
@@ -3284,14 +3269,14 @@ public final void mC_STYLE_SINGLE_LINE_COMMENT() throws RecognitionException {
 
 			switch (alt58) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:319:29: EOL
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:319:29: EOL
 					{
 					mEOL(); if (state.failed) return;
 
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:319:33: EOF
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:319:33: EOF
 					{
 					match(EOF); if (state.failed) return;
 
@@ -3317,12 +3302,12 @@ public final void mMULTI_LINE_COMMENT() throws RecognitionException {
 		try {
 			int _type = MULTI_LINE_COMMENT;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:324:5: ( '/*' ( options {greedy=false; } : . )* '*/' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:324:7: '/*' ( options {greedy=false; } : . )* '*/'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:324:5: ( '/*' ( options {greedy=false; } : . )* '*/' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:324:7: '/*' ( options {greedy=false; } : . )* '*/'
 			{
 			match("/*"); if (state.failed) return;
 
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:324:12: ( options {greedy=false; } : . )*
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:324:12: ( options {greedy=false; } : . )*
 			loop59:
 			while (true) {
 				int alt59=2;
@@ -3343,7 +3328,7 @@ else if ( ((LA59_0 >= '\u0000' && LA59_0 <= ')')||(LA59_0 >= '+' && LA59_0 <= '\
 
 				switch (alt59) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:324:38: .
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:324:38: .
 					{
 					matchAny(); if (state.failed) return;
 					}
@@ -3373,7 +3358,7 @@ public final void mID() throws RecognitionException {
 		try {
 			int _type = ID;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:329:5: ( IdentifierStart ( IdentifierPart )* | '`' IdentifierStart ( IdentifierPart )* '`' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:329:5: ( IdentifierStart ( IdentifierPart )* | '`' IdentifierStart ( IdentifierPart )* '`' )
 			int alt62=2;
 			int LA62_0 = input.LA(1);
 			if ( (LA62_0=='$'||(LA62_0 >= 'A' && LA62_0 <= 'Z')||LA62_0=='_'||(LA62_0 >= 'a' && LA62_0 <= 'z')||(LA62_0 >= '\u00A2' && LA62_0 <= '\u00A5')||LA62_0=='\u00AA'||LA62_0=='\u00B5'||LA62_0=='\u00BA'||(LA62_0 >= '\u00C0' && LA62_0 <= '\u00D6')||(LA62_0 >= '\u00D8' && LA62_0 <= '\u00F6')||(LA62_0 >= '\u00F8' && LA62_0 <= '\u0236')||(LA62_0 >= '\u0250' && LA62_0 <= '\u02C1')||(LA62_0 >= '\u02C6' && LA62_0 <= '\u02D1')||(LA62_0 >= '\u02E0' && LA62_0 <= '\u02E4')||LA62_0=='\u02EE'||LA62_0=='\u037A'||LA62_0=='\u0386'||(LA62_0 >= '\u0388' && LA62_0 <= '\u038A')||LA62_0=='\u038C'||(LA62_0 >= '\u038E' && LA62_0 <= '\u03A1')||(LA62_0 >= '\u03A3' && LA62_0 <= '\u03CE')||(LA62_0 >= '\u03D0' && LA62_0 <= '\u03F5')||(LA62_0 >= '\u03F7' && LA62_0 <= '\u03FB')||(LA62_0 >= '\u0400' && LA62_0 <= '\u0481')||(LA62_0 >= '\u048A' && LA62_0 <= '\u04CE')||(LA62_0 >= '\u04D0' && LA62_0 <= '\u04F5')||(LA62_0 >= '\u04F8' && LA62_0 <= '\u04F9')||(LA62_0 >= '\u0500' && LA62_0 <= '\u050F')||(LA62_0 >= '\u0531' && LA62_0 <= '\u0556')||LA62_0=='\u0559'||(LA62_0 >= '\u0561' && LA62_0 <= '\u0587')||(LA62_0 >= '\u05D0' && LA62_0 <= '\u05EA')||(LA62_0 >= '\u05F0' && LA62_0 <= '\u05F2')||(LA62_0 >= '\u0621' && LA62_0 <= '\u063A')||(LA62_0 >= '\u0640' && LA62_0 <= '\u064A')||(LA62_0 >= '\u066E' && LA62_0 <= '\u066F')||(LA62_0 >= '\u0671' && LA62_0 <= '\u06D3')||LA62_0=='\u06D5'||(LA62_0 >= '\u06E5' && LA62_0 <= '\u06E6')||(LA62_0 >= '\u06EE' && LA62_0 <= '\u06EF')||(LA62_0 >= '\u06FA' && LA62_0 <= '\u06FC')||LA62_0=='\u06FF'||LA62_0=='\u0710'||(LA62_0 >= '\u0712' && LA62_0 <= '\u072F')||(LA62_0 >= '\u074D' && LA62_0 <= '\u074F')||(LA62_0 >= '\u0780' && LA62_0 <= '\u07A5')||LA62_0=='\u07B1'||(LA62_0 >= '\u0904' && LA62_0 <= '\u0939')||LA62_0=='\u093D'||LA62_0=='\u0950'||(LA62_0 >= '\u0958' && LA62_0 <= '\u0961')||(LA62_0 >= '\u0985' && LA62_0 <= '\u098C')||(LA62_0 >= '\u098F' && LA62_0 <= '\u0990')||(LA62_0 >= '\u0993' && LA62_0 <= '\u09A8')||(LA62_0 >= '\u09AA' && LA62_0 <= '\u09B0')||LA62_0=='\u09B2'||(LA62_0 >= '\u09B6' && LA62_0 <= '\u09B9')||LA62_0=='\u09BD'||(LA62_0 >= '\u09DC' && LA62_0 <= '\u09DD')||(LA62_0 >= '\u09DF' && LA62_0 <= '\u09E1')||(LA62_0 >= '\u09F0' && LA62_0 <= '\u09F3')||(LA62_0 >= '\u0A05' && LA62_0 <= '\u0A0A')||(LA62_0 >= '\u0A0F' && LA62_0 <= '\u0A10')||(LA62_0 >= '\u0A13' && LA62_0 <= '\u0A28')||(LA62_0 >= '\u0A2A' && LA62_0 <= '\u0A30')||(LA62_0 >= '\u0A32' && LA62_0 <= '\u0A33')||(LA62_0 >= '\u0A35' && LA62_0 <= '\u0A36')||(LA62_0 >= '\u0A38' && LA62_0 <= '\u0A39')||(LA62_0 >= '\u0A59' && LA62_0 <= '\u0A5C')||LA62_0=='\u0A5E'||(LA62_0 >= '\u0A72' && LA62_0 <= '\u0A74')||(LA62_0 >= '\u0A85' && LA62_0 <= '\u0A8D')||(LA62_0 >= '\u0A8F' && LA62_0 <= '\u0A91')||(LA62_0 >= '\u0A93' && LA62_0 <= '\u0AA8')||(LA62_0 >= '\u0AAA' && LA62_0 <= '\u0AB0')||(LA62_0 >= '\u0AB2' && LA62_0 <= '\u0AB3')||(LA62_0 >= '\u0AB5' && LA62_0 <= '\u0AB9')||LA62_0=='\u0ABD'||LA62_0=='\u0AD0'||(LA62_0 >= '\u0AE0' && LA62_0 <= '\u0AE1')||LA62_0=='\u0AF1'||(LA62_0 >= '\u0B05' && LA62_0 <= '\u0B0C')||(LA62_0 >= '\u0B0F' && LA62_0 <= '\u0B10')||(LA62_0 >= '\u0B13' && LA62_0 <= '\u0B28')||(LA62_0 >= '\u0B2A' && LA62_0 <= '\u0B30')||(LA62_0 >= '\u0B32' && LA62_0 <= '\u0B33')||(LA62_0 >= '\u0B35' && LA62_0 <= '\u0B39')||LA62_0=='\u0B3D'||(LA62_0 >= '\u0B5C' && LA62_0 <= '\u0B5D')||(LA62_0 >= '\u0B5F' && LA62_0 <= '\u0B61')||LA62_0=='\u0B71'||LA62_0=='\u0B83'||(LA62_0 >= '\u0B85' && LA62_0 <= '\u0B8A')||(LA62_0 >= '\u0B8E' && LA62_0 <= '\u0B90')||(LA62_0 >= '\u0B92' && LA62_0 <= '\u0B95')||(LA62_0 >= '\u0B99' && LA62_0 <= '\u0B9A')||LA62_0=='\u0B9C'||(LA62_0 >= '\u0B9E' && LA62_0 <= '\u0B9F')||(LA62_0 >= '\u0BA3' && LA62_0 <= '\u0BA4')||(LA62_0 >= '\u0BA8' && LA62_0 <= '\u0BAA')||(LA62_0 >= '\u0BAE' && LA62_0 <= '\u0BB5')||(LA62_0 >= '\u0BB7' && LA62_0 <= '\u0BB9')||LA62_0=='\u0BF9'||(LA62_0 >= '\u0C05' && LA62_0 <= '\u0C0C')||(LA62_0 >= '\u0C0E' && LA62_0 <= '\u0C10')||(LA62_0 >= '\u0C12' && LA62_0 <= '\u0C28')||(LA62_0 >= '\u0C2A' && LA62_0 <= '\u0C33')||(LA62_0 >= '\u0C35' && LA62_0 <= '\u0C39')||(LA62_0 >= '\u0C60' && LA62_0 <= '\u0C61')||(LA62_0 >= '\u0C85' && LA62_0 <= '\u0C8C')||(LA62_0 >= '\u0C8E' && LA62_0 <= '\u0C90')||(LA62_0 >= '\u0C92' && LA62_0 <= '\u0CA8')||(LA62_0 >= '\u0CAA' && LA62_0 <= '\u0CB3')||(LA62_0 >= '\u0CB5' && LA62_0 <= '\u0CB9')||LA62_0=='\u0CBD'||LA62_0=='\u0CDE'||(LA62_0 >= '\u0CE0' && LA62_0 <= '\u0CE1')||(LA62_0 >= '\u0D05' && LA62_0 <= '\u0D0C')||(LA62_0 >= '\u0D0E' && LA62_0 <= '\u0D10')||(LA62_0 >= '\u0D12' && LA62_0 <= '\u0D28')||(LA62_0 >= '\u0D2A' && LA62_0 <= '\u0D39')||(LA62_0 >= '\u0D60' && LA62_0 <= '\u0D61')||(LA62_0 >= '\u0D85' && LA62_0 <= '\u0D96')||(LA62_0 >= '\u0D9A' && LA62_0 <= '\u0DB1')||(LA62_0 >= '\u0DB3' && LA62_0 <= '\u0DBB')||LA62_0=='\u0DBD'||(LA62_0 >= '\u0DC0' && LA62_0 <= '\u0DC6')||(LA62_0 >= '\u0E01' && LA62_0 <= '\u0E30')||(LA62_0 >= '\u0E32' && LA62_0 <= '\u0E33')||(LA62_0 >= '\u0E3F' && LA62_0 <= '\u0E46')||(LA62_0 >= '\u0E81' && LA62_0 <= '\u0E82')||LA62_0=='\u0E84'||(LA62_0 >= '\u0E87' && LA62_0 <= '\u0E88')||LA62_0=='\u0E8A'||LA62_0=='\u0E8D'||(LA62_0 >= '\u0E94' && LA62_0 <= '\u0E97')||(LA62_0 >= '\u0E99' && LA62_0 <= '\u0E9F')||(LA62_0 >= '\u0EA1' && LA62_0 <= '\u0EA3')||LA62_0=='\u0EA5'||LA62_0=='\u0EA7'||(LA62_0 >= '\u0EAA' && LA62_0 <= '\u0EAB')||(LA62_0 >= '\u0EAD' && LA62_0 <= '\u0EB0')||(LA62_0 >= '\u0EB2' && LA62_0 <= '\u0EB3')||LA62_0=='\u0EBD'||(LA62_0 >= '\u0EC0' && LA62_0 <= '\u0EC4')||LA62_0=='\u0EC6'||(LA62_0 >= '\u0EDC' && LA62_0 <= '\u0EDD')||LA62_0=='\u0F00'||(LA62_0 >= '\u0F40' && LA62_0 <= '\u0F47')||(LA62_0 >= '\u0F49' && LA62_0 <= '\u0F6A')||(LA62_0 >= '\u0F88' && LA62_0 <= '\u0F8B')||(LA62_0 >= '\u1000' && LA62_0 <= '\u1021')||(LA62_0 >= '\u1023' && LA62_0 <= '\u1027')||(LA62_0 >= '\u1029' && LA62_0 <= '\u102A')||(LA62_0 >= '\u1050' && LA62_0 <= '\u1055')||(LA62_0 >= '\u10A0' && LA62_0 <= '\u10C5')||(LA62_0 >= '\u10D0' && LA62_0 <= '\u10F8')||(LA62_0 >= '\u1100' && LA62_0 <= '\u1159')||(LA62_0 >= '\u115F' && LA62_0 <= '\u11A2')||(LA62_0 >= '\u11A8' && LA62_0 <= '\u11F9')||(LA62_0 >= '\u1200' && LA62_0 <= '\u1206')||(LA62_0 >= '\u1208' && LA62_0 <= '\u1246')||LA62_0=='\u1248'||(LA62_0 >= '\u124A' && LA62_0 <= '\u124D')||(LA62_0 >= '\u1250' && LA62_0 <= '\u1256')||LA62_0=='\u1258'||(LA62_0 >= '\u125A' && LA62_0 <= '\u125D')||(LA62_0 >= '\u1260' && LA62_0 <= '\u1286')||LA62_0=='\u1288'||(LA62_0 >= '\u128A' && LA62_0 <= '\u128D')||(LA62_0 >= '\u1290' && LA62_0 <= '\u12AE')||LA62_0=='\u12B0'||(LA62_0 >= '\u12B2' && LA62_0 <= '\u12B5')||(LA62_0 >= '\u12B8' && LA62_0 <= '\u12BE')||LA62_0=='\u12C0'||(LA62_0 >= '\u12C2' && LA62_0 <= '\u12C5')||(LA62_0 >= '\u12C8' && LA62_0 <= '\u12CE')||(LA62_0 >= '\u12D0' && LA62_0 <= '\u12D6')||(LA62_0 >= '\u12D8' && LA62_0 <= '\u12EE')||(LA62_0 >= '\u12F0' && LA62_0 <= '\u130E')||LA62_0=='\u1310'||(LA62_0 >= '\u1312' && LA62_0 <= '\u1315')||(LA62_0 >= '\u1318' && LA62_0 <= '\u131E')||(LA62_0 >= '\u1320' && LA62_0 <= '\u1346')||(LA62_0 >= '\u1348' && LA62_0 <= '\u135A')||(LA62_0 >= '\u13A0' && LA62_0 <= '\u13F4')||(LA62_0 >= '\u1401' && LA62_0 <= '\u166C')||(LA62_0 >= '\u166F' && LA62_0 <= '\u1676')||(LA62_0 >= '\u1681' && LA62_0 <= '\u169A')||(LA62_0 >= '\u16A0' && LA62_0 <= '\u16EA')||(LA62_0 >= '\u16EE' && LA62_0 <= '\u16F0')||(LA62_0 >= '\u1700' && LA62_0 <= '\u170C')||(LA62_0 >= '\u170E' && LA62_0 <= '\u1711')||(LA62_0 >= '\u1720' && LA62_0 <= '\u1731')||(LA62_0 >= '\u1740' && LA62_0 <= '\u1751')||(LA62_0 >= '\u1760' && LA62_0 <= '\u176C')||(LA62_0 >= '\u176E' && LA62_0 <= '\u1770')||(LA62_0 >= '\u1780' && LA62_0 <= '\u17B3')||LA62_0=='\u17D7'||(LA62_0 >= '\u17DB' && LA62_0 <= '\u17DC')||(LA62_0 >= '\u1820' && LA62_0 <= '\u1877')||(LA62_0 >= '\u1880' && LA62_0 <= '\u18A8')||(LA62_0 >= '\u1900' && LA62_0 <= '\u191C')||(LA62_0 >= '\u1950' && LA62_0 <= '\u196D')||(LA62_0 >= '\u1970' && LA62_0 <= '\u1974')||(LA62_0 >= '\u1D00' && LA62_0 <= '\u1D6B')||(LA62_0 >= '\u1E00' && LA62_0 <= '\u1E9B')||(LA62_0 >= '\u1EA0' && LA62_0 <= '\u1EF9')||(LA62_0 >= '\u1F00' && LA62_0 <= '\u1F15')||(LA62_0 >= '\u1F18' && LA62_0 <= '\u1F1D')||(LA62_0 >= '\u1F20' && LA62_0 <= '\u1F45')||(LA62_0 >= '\u1F48' && LA62_0 <= '\u1F4D')||(LA62_0 >= '\u1F50' && LA62_0 <= '\u1F57')||LA62_0=='\u1F59'||LA62_0=='\u1F5B'||LA62_0=='\u1F5D'||(LA62_0 >= '\u1F5F' && LA62_0 <= '\u1F7D')||(LA62_0 >= '\u1F80' && LA62_0 <= '\u1FB4')||(LA62_0 >= '\u1FB6' && LA62_0 <= '\u1FBC')||LA62_0=='\u1FBE'||(LA62_0 >= '\u1FC2' && LA62_0 <= '\u1FC4')||(LA62_0 >= '\u1FC6' && LA62_0 <= '\u1FCC')||(LA62_0 >= '\u1FD0' && LA62_0 <= '\u1FD3')||(LA62_0 >= '\u1FD6' && LA62_0 <= '\u1FDB')||(LA62_0 >= '\u1FE0' && LA62_0 <= '\u1FEC')||(LA62_0 >= '\u1FF2' && LA62_0 <= '\u1FF4')||(LA62_0 >= '\u1FF6' && LA62_0 <= '\u1FFC')||(LA62_0 >= '\u203F' && LA62_0 <= '\u2040')||LA62_0=='\u2054'||LA62_0=='\u2071'||LA62_0=='\u207F'||(LA62_0 >= '\u20A0' && LA62_0 <= '\u20B1')||LA62_0=='\u2102'||LA62_0=='\u2107'||(LA62_0 >= '\u210A' && LA62_0 <= '\u2113')||LA62_0=='\u2115'||(LA62_0 >= '\u2119' && LA62_0 <= '\u211D')||LA62_0=='\u2124'||LA62_0=='\u2126'||LA62_0=='\u2128'||(LA62_0 >= '\u212A' && LA62_0 <= '\u212D')||(LA62_0 >= '\u212F' && LA62_0 <= '\u2131')||(LA62_0 >= '\u2133' && LA62_0 <= '\u2139')||(LA62_0 >= '\u213D' && LA62_0 <= '\u213F')||(LA62_0 >= '\u2145' && LA62_0 <= '\u2149')||(LA62_0 >= '\u2160' && LA62_0 <= '\u2183')||(LA62_0 >= '\u3005' && LA62_0 <= '\u3007')||(LA62_0 >= '\u3021' && LA62_0 <= '\u3029')||(LA62_0 >= '\u3031' && LA62_0 <= '\u3035')||(LA62_0 >= '\u3038' && LA62_0 <= '\u303C')||(LA62_0 >= '\u3041' && LA62_0 <= '\u3096')||(LA62_0 >= '\u309D' && LA62_0 <= '\u309F')||(LA62_0 >= '\u30A1' && LA62_0 <= '\u30FF')||(LA62_0 >= '\u3105' && LA62_0 <= '\u312C')||(LA62_0 >= '\u3131' && LA62_0 <= '\u318E')||(LA62_0 >= '\u31A0' && LA62_0 <= '\u31B7')||(LA62_0 >= '\u31F0' && LA62_0 <= '\u31FF')||(LA62_0 >= '\u3400' && LA62_0 <= '\u4DB5')||(LA62_0 >= '\u4E00' && LA62_0 <= '\u9FA5')||(LA62_0 >= '\uA000' && LA62_0 <= '\uA48C')||(LA62_0 >= '\uAC00' && LA62_0 <= '\uD7A3')||(LA62_0 >= '\uF900' && LA62_0 <= '\uFA2D')||(LA62_0 >= '\uFA30' && LA62_0 <= '\uFA6A')||(LA62_0 >= '\uFB00' && LA62_0 <= '\uFB06')||(LA62_0 >= '\uFB13' && LA62_0 <= '\uFB17')||LA62_0=='\uFB1D'||(LA62_0 >= '\uFB1F' && LA62_0 <= '\uFB28')||(LA62_0 >= '\uFB2A' && LA62_0 <= '\uFB36')||(LA62_0 >= '\uFB38' && LA62_0 <= '\uFB3C')||LA62_0=='\uFB3E'||(LA62_0 >= '\uFB40' && LA62_0 <= '\uFB41')||(LA62_0 >= '\uFB43' && LA62_0 <= '\uFB44')||(LA62_0 >= '\uFB46' && LA62_0 <= '\uFBB1')||(LA62_0 >= '\uFBD3' && LA62_0 <= '\uFD3D')||(LA62_0 >= '\uFD50' && LA62_0 <= '\uFD8F')||(LA62_0 >= '\uFD92' && LA62_0 <= '\uFDC7')||(LA62_0 >= '\uFDF0' && LA62_0 <= '\uFDFC')||(LA62_0 >= '\uFE33' && LA62_0 <= '\uFE34')||(LA62_0 >= '\uFE4D' && LA62_0 <= '\uFE4F')||LA62_0=='\uFE69'||(LA62_0 >= '\uFE70' && LA62_0 <= '\uFE74')||(LA62_0 >= '\uFE76' && LA62_0 <= '\uFEFC')||LA62_0=='\uFF04'||(LA62_0 >= '\uFF21' && LA62_0 <= '\uFF3A')||LA62_0=='\uFF3F'||(LA62_0 >= '\uFF41' && LA62_0 <= '\uFF5A')||(LA62_0 >= '\uFF65' && LA62_0 <= '\uFFBE')||(LA62_0 >= '\uFFC2' && LA62_0 <= '\uFFC7')||(LA62_0 >= '\uFFCA' && LA62_0 <= '\uFFCF')||(LA62_0 >= '\uFFD2' && LA62_0 <= '\uFFD7')||(LA62_0 >= '\uFFDA' && LA62_0 <= '\uFFDC')||(LA62_0 >= '\uFFE0' && LA62_0 <= '\uFFE1')||(LA62_0 >= '\uFFE5' && LA62_0 <= '\uFFE6')) ) {
@@ -3392,11 +3377,11 @@ else if ( (LA62_0=='`') ) {
 
 			switch (alt62) {
 				case 1 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:329:7: IdentifierStart ( IdentifierPart )*
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:329:7: IdentifierStart ( IdentifierPart )*
 					{
 					mIdentifierStart(); if (state.failed) return;
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:329:23: ( IdentifierPart )*
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:329:23: ( IdentifierPart )*
 					loop60:
 					while (true) {
 						int alt60=2;
@@ -3407,7 +3392,7 @@ else if ( (LA62_0=='`') ) {
 
 						switch (alt60) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 							{
 							if ( (input.LA(1) >= '\u0000' && input.LA(1) <= '\b')||(input.LA(1) >= '\u000E' && input.LA(1) <= '\u001B')||input.LA(1)=='$'||(input.LA(1) >= '0' && input.LA(1) <= '9')||(input.LA(1) >= 'A' && input.LA(1) <= 'Z')||input.LA(1)=='_'||(input.LA(1) >= 'a' && input.LA(1) <= 'z')||(input.LA(1) >= '\u007F' && input.LA(1) <= '\u009F')||(input.LA(1) >= '\u00A2' && input.LA(1) <= '\u00A5')||input.LA(1)=='\u00AA'||input.LA(1)=='\u00AD'||input.LA(1)=='\u00B5'||input.LA(1)=='\u00BA'||(input.LA(1) >= '\u00C0' && input.LA(1) <= '\u00D6')||(input.LA(1) >= '\u00D8' && input.LA(1) <= '\u00F6')||(input.LA(1) >= '\u00F8' && input.LA(1) <= '\u0236')||(input.LA(1) >= '\u0250' && input.LA(1) <= '\u02C1')||(input.LA(1) >= '\u02C6' && input.LA(1) <= '\u02D1')||(input.LA(1) >= '\u02E0' && input.LA(1) <= '\u02E4')||input.LA(1)=='\u02EE'||(input.LA(1) >= '\u0300' && input.LA(1) <= '\u0357')||(input.LA(1) >= '\u035D' && input.LA(1) <= '\u036F')||input.LA(1)=='\u037A'||input.LA(1)=='\u0386'||(input.LA(1) >= '\u0388' && input.LA(1) <= '\u038A')||input.LA(1)=='\u038C'||(input.LA(1) >= '\u038E' && input.LA(1) <= '\u03A1')||(input.LA(1) >= '\u03A3' && input.LA(1) <= '\u03CE')||(input.LA(1) >= '\u03D0' && input.LA(1) <= '\u03F5')||(input.LA(1) >= '\u03F7' && input.LA(1) <= '\u03FB')||(input.LA(1) >= '\u0400' && input.LA(1) <= '\u0481')||(input.LA(1) >= '\u0483' && input.LA(1) <= '\u0486')||(input.LA(1) >= '\u048A' && input.LA(1) <= '\u04CE')||(input.LA(1) >= '\u04D0' && input.LA(1) <= '\u04F5')||(input.LA(1) >= '\u04F8' && input.LA(1) <= '\u04F9')||(input.LA(1) >= '\u0500' && input.LA(1) <= '\u050F')||(input.LA(1) >= '\u0531' && input.LA(1) <= '\u0556')||input.LA(1)=='\u0559'||(input.LA(1) >= '\u0561' && input.LA(1) <= '\u0587')||(input.LA(1) >= '\u0591' && input.LA(1) <= '\u05A1')||(input.LA(1) >= '\u05A3' && input.LA(1) <= '\u05B9')||(input.LA(1) >= '\u05BB' && input.LA(1) <= '\u05BD')||input.LA(1)=='\u05BF'||(input.LA(1) >= '\u05C1' && input.LA(1) <= '\u05C2')||input.LA(1)=='\u05C4'||(input.LA(1) >= '\u05D0' && input.LA(1) <= '\u05EA')||(input.LA(1) >= '\u05F0' && input.LA(1) <= '\u05F2')||(input.LA(1) >= '\u0600' && input.LA(1) <= '\u0603')||(input.LA(1) >= '\u0610' && input.LA(1) <= '\u0615')||(input.LA(1) >= '\u0621' && input.LA(1) <= '\u063A')||(input.LA(1) >= '\u0640' && input.LA(1) <= '\u0658')||(input.LA(1) >= '\u0660' && input.LA(1) <= '\u0669')||(input.LA(1) >= '\u066E' && input.LA(1) <= '\u06D3')||(input.LA(1) >= '\u06D5' && input.LA(1) <= '\u06DD')||(input.LA(1) >= '\u06DF' && input.LA(1) <= '\u06E8')||(input.LA(1) >= '\u06EA' && input.LA(1) <= '\u06FC')||input.LA(1)=='\u06FF'||(input.LA(1) >= '\u070F' && input.LA(1) <= '\u074A')||(input.LA(1) >= '\u074D' && input.LA(1) <= '\u074F')||(input.LA(1) >= '\u0780' && input.LA(1) <= '\u07B1')||(input.LA(1) >= '\u0901' && input.LA(1) <= '\u0939')||(input.LA(1) >= '\u093C' && input.LA(1) <= '\u094D')||(input.LA(1) >= '\u0950' && input.LA(1) <= '\u0954')||(input.LA(1) >= '\u0958' && input.LA(1) <= '\u0963')||(input.LA(1) >= '\u0966' && input.LA(1) <= '\u096F')||(input.LA(1) >= '\u0981' && input.LA(1) <= '\u0983')||(input.LA(1) >= '\u0985' && input.LA(1) <= '\u098C')||(input.LA(1) >= '\u098F' && input.LA(1) <= '\u0990')||(input.LA(1) >= '\u0993' && input.LA(1) <= '\u09A8')||(input.LA(1) >= '\u09AA' && input.LA(1) <= '\u09B0')||input.LA(1)=='\u09B2'||(input.LA(1) >= '\u09B6' && input.LA(1) <= '\u09B9')||(input.LA(1) >= '\u09BC' && input.LA(1) <= '\u09C4')||(input.LA(1) >= '\u09C7' && input.LA(1) <= '\u09C8')||(input.LA(1) >= '\u09CB' && input.LA(1) <= '\u09CD')||input.LA(1)=='\u09D7'||(input.LA(1) >= '\u09DC' && input.LA(1) <= '\u09DD')||(input.LA(1) >= '\u09DF' && input.LA(1) <= '\u09E3')||(input.LA(1) >= '\u09E6' && input.LA(1) <= '\u09F3')||(input.LA(1) >= '\u0A01' && input.LA(1) <= '\u0A03')||(input.LA(1) >= '\u0A05' && input.LA(1) <= '\u0A0A')||(input.LA(1) >= '\u0A0F' && input.LA(1) <= '\u0A10')||(input.LA(1) >= '\u0A13' && input.LA(1) <= '\u0A28')||(input.LA(1) >= '\u0A2A' && input.LA(1) <= '\u0A30')||(input.LA(1) >= '\u0A32' && input.LA(1) <= '\u0A33')||(input.LA(1) >= '\u0A35' && input.LA(1) <= '\u0A36')||(input.LA(1) >= '\u0A38' && input.LA(1) <= '\u0A39')||input.LA(1)=='\u0A3C'||(input.LA(1) >= '\u0A3E' && input.LA(1) <= '\u0A42')||(input.LA(1) >= '\u0A47' && input.LA(1) <= '\u0A48')||(input.LA(1) >= '\u0A4B' && input.LA(1) <= '\u0A4D')||(input.LA(1) >= '\u0A59' && input.LA(1) <= '\u0A5C')||input.LA(1)=='\u0A5E'||(input.LA(1) >= '\u0A66' && input.LA(1) <= '\u0A74')||(input.LA(1) >= '\u0A81' && input.LA(1) <= '\u0A83')||(input.LA(1) >= '\u0A85' && input.LA(1) <= '\u0A8D')||(input.LA(1) >= '\u0A8F' && input.LA(1) <= '\u0A91')||(input.LA(1) >= '\u0A93' && input.LA(1) <= '\u0AA8')||(input.LA(1) >= '\u0AAA' && input.LA(1) <= '\u0AB0')||(input.LA(1) >= '\u0AB2' && input.LA(1) <= '\u0AB3')||(input.LA(1) >= '\u0AB5' && input.LA(1) <= '\u0AB9')||(input.LA(1) >= '\u0ABC' && input.LA(1) <= '\u0AC5')||(input.LA(1) >= '\u0AC7' && input.LA(1) <= '\u0AC9')||(input.LA(1) >= '\u0ACB' && input.LA(1) <= '\u0ACD')||input.LA(1)=='\u0AD0'||(input.LA(1) >= '\u0AE0' && input.LA(1) <= '\u0AE3')||(input.LA(1) >= '\u0AE6' && input.LA(1) <= '\u0AEF')||input.LA(1)=='\u0AF1'||(input.LA(1) >= '\u0B01' && input.LA(1) <= '\u0B03')||(input.LA(1) >= '\u0B05' && input.LA(1) <= '\u0B0C')||(input.LA(1) >= '\u0B0F' && input.LA(1) <= '\u0B10')||(input.LA(1) >= '\u0B13' && input.LA(1) <= '\u0B28')||(input.LA(1) >= '\u0B2A' && input.LA(1) <= '\u0B30')||(input.LA(1) >= '\u0B32' && input.LA(1) <= '\u0B33')||(input.LA(1) >= '\u0B35' && input.LA(1) <= '\u0B39')||(input.LA(1) >= '\u0B3C' && input.LA(1) <= '\u0B43')||(input.LA(1) >= '\u0B47' && input.LA(1) <= '\u0B48')||(input.LA(1) >= '\u0B4B' && input.LA(1) <= '\u0B4D')||(input.LA(1) >= '\u0B56' && input.LA(1) <= '\u0B57')||(input.LA(1) >= '\u0B5C' && input.LA(1) <= '\u0B5D')||(input.LA(1) >= '\u0B5F' && input.LA(1) <= '\u0B61')||(input.LA(1) >= '\u0B66' && input.LA(1) <= '\u0B6F')||input.LA(1)=='\u0B71'||(input.LA(1) >= '\u0B82' && input.LA(1) <= '\u0B83')||(input.LA(1) >= '\u0B85' && input.LA(1) <= '\u0B8A')||(input.LA(1) >= '\u0B8E' && input.LA(1) <= '\u0B90')||(input.LA(1) >= '\u0B92' && input.LA(1) <= '\u0B95')||(input.LA(1) >= '\u0B99' && input.LA(1) <= '\u0B9A')||input.LA(1)=='\u0B9C'||(input.LA(1) >= '\u0B9E' && input.LA(1) <= '\u0B9F')||(input.LA(1) >= '\u0BA3' && input.LA(1) <= '\u0BA4')||(input.LA(1) >= '\u0BA8' && input.LA(1) <= '\u0BAA')||(input.LA(1) >= '\u0BAE' && input.LA(1) <= '\u0BB5')||(input.LA(1) >= '\u0BB7' && input.LA(1) <= '\u0BB9')||(input.LA(1) >= '\u0BBE' && input.LA(1) <= '\u0BC2')||(input.LA(1) >= '\u0BC6' && input.LA(1) <= '\u0BC8')||(input.LA(1) >= '\u0BCA' && input.LA(1) <= '\u0BCD')||input.LA(1)=='\u0BD7'||(input.LA(1) >= '\u0BE7' && input.LA(1) <= '\u0BEF')||input.LA(1)=='\u0BF9'||(input.LA(1) >= '\u0C01' && input.LA(1) <= '\u0C03')||(input.LA(1) >= '\u0C05' && input.LA(1) <= '\u0C0C')||(input.LA(1) >= '\u0C0E' && input.LA(1) <= '\u0C10')||(input.LA(1) >= '\u0C12' && input.LA(1) <= '\u0C28')||(input.LA(1) >= '\u0C2A' && input.LA(1) <= '\u0C33')||(input.LA(1) >= '\u0C35' && input.LA(1) <= '\u0C39')||(input.LA(1) >= '\u0C3E' && input.LA(1) <= '\u0C44')||(input.LA(1) >= '\u0C46' && input.LA(1) <= '\u0C48')||(input.LA(1) >= '\u0C4A' && input.LA(1) <= '\u0C4D')||(input.LA(1) >= '\u0C55' && input.LA(1) <= '\u0C56')||(input.LA(1) >= '\u0C60' && input.LA(1) <= '\u0C61')||(input.LA(1) >= '\u0C66' && input.LA(1) <= '\u0C6F')||(input.LA(1) >= '\u0C82' && input.LA(1) <= '\u0C83')||(input.LA(1) >= '\u0C85' && input.LA(1) <= '\u0C8C')||(input.LA(1) >= '\u0C8E' && input.LA(1) <= '\u0C90')||(input.LA(1) >= '\u0C92' && input.LA(1) <= '\u0CA8')||(input.LA(1) >= '\u0CAA' && input.LA(1) <= '\u0CB3')||(input.LA(1) >= '\u0CB5' && input.LA(1) <= '\u0CB9')||(input.LA(1) >= '\u0CBC' && input.LA(1) <= '\u0CC4')||(input.LA(1) >= '\u0CC6' && input.LA(1) <= '\u0CC8')||(input.LA(1) >= '\u0CCA' && input.LA(1) <= '\u0CCD')||(input.LA(1) >= '\u0CD5' && input.LA(1) <= '\u0CD6')||input.LA(1)=='\u0CDE'||(input.LA(1) >= '\u0CE0' && input.LA(1) <= '\u0CE1')||(input.LA(1) >= '\u0CE6' && input.LA(1) <= '\u0CEF')||(input.LA(1) >= '\u0D02' && input.LA(1) <= '\u0D03')||(input.LA(1) >= '\u0D05' && input.LA(1) <= '\u0D0C')||(input.LA(1) >= '\u0D0E' && input.LA(1) <= '\u0D10')||(input.LA(1) >= '\u0D12' && input.LA(1) <= '\u0D28')||(input.LA(1) >= '\u0D2A' && input.LA(1) <= '\u0D39')||(input.LA(1) >= '\u0D3E' && input.LA(1) <= '\u0D43')||(input.LA(1) >= '\u0D46' && input.LA(1) <= '\u0D48')||(input.LA(1) >= '\u0D4A' && input.LA(1) <= '\u0D4D')||input.LA(1)=='\u0D57'||(input.LA(1) >= '\u0D60' && input.LA(1) <= '\u0D61')||(input.LA(1) >= '\u0D66' && input.LA(1) <= '\u0D6F')||(input.LA(1) >= '\u0D82' && input.LA(1) <= '\u0D83')||(input.LA(1) >= '\u0D85' && input.LA(1) <= '\u0D96')||(input.LA(1) >= '\u0D9A' && input.LA(1) <= '\u0DB1')||(input.LA(1) >= '\u0DB3' && input.LA(1) <= '\u0DBB')||input.LA(1)=='\u0DBD'||(input.LA(1) >= '\u0DC0' && input.LA(1) <= '\u0DC6')||input.LA(1)=='\u0DCA'||(input.LA(1) >= '\u0DCF' && input.LA(1) <= '\u0DD4')||input.LA(1)=='\u0DD6'||(input.LA(1) >= '\u0DD8' && input.LA(1) <= '\u0DDF')||(input.LA(1) >= '\u0DF2' && input.LA(1) <= '\u0DF3')||(input.LA(1) >= '\u0E01' && input.LA(1) <= '\u0E3A')||(input.LA(1) >= '\u0E3F' && input.LA(1) <= '\u0E4E')||(input.LA(1) >= '\u0E50' && input.LA(1) <= '\u0E59')||(input.LA(1) >= '\u0E81' && input.LA(1) <= '\u0E82')||input.LA(1)=='\u0E84'||(input.LA(1) >= '\u0E87' && input.LA(1) <= '\u0E88')||input.LA(1)=='\u0E8A'||input.LA(1)=='\u0E8D'||(input.LA(1) >= '\u0E94' && input.LA(1) <= '\u0E97')||(input.LA(1) >= '\u0E99' && input.LA(1) <= '\u0E9F')||(input.LA(1) >= '\u0EA1' && input.LA(1) <= '\u0EA3')||input.LA(1)=='\u0EA5'||input.LA(1)=='\u0EA7'||(input.LA(1) >= '\u0EAA' && input.LA(1) <= '\u0EAB')||(input.LA(1) >= '\u0EAD' && input.LA(1) <= '\u0EB9')||(input.LA(1) >= '\u0EBB' && input.LA(1) <= '\u0EBD')||(input.LA(1) >= '\u0EC0' && input.LA(1) <= '\u0EC4')||input.LA(1)=='\u0EC6'||(input.LA(1) >= '\u0EC8' && input.LA(1) <= '\u0ECD')||(input.LA(1) >= '\u0ED0' && input.LA(1) <= '\u0ED9')||(input.LA(1) >= '\u0EDC' && input.LA(1) <= '\u0EDD')||input.LA(1)=='\u0F00'||(input.LA(1) >= '\u0F18' && input.LA(1) <= '\u0F19')||(input.LA(1) >= '\u0F20' && input.LA(1) <= '\u0F29')||input.LA(1)=='\u0F35'||input.LA(1)=='\u0F37'||input.LA(1)=='\u0F39'||(input.LA(1) >= '\u0F3E' && input.LA(1) <= '\u0F47')||(input.LA(1) >= '\u0F49' && input.LA(1) <= '\u0F6A')||(input.LA(1) >= '\u0F71' && input.LA(1) <= '\u0F84')||(input.LA(1) >= '\u0F86' && input.LA(1) <= '\u0F8B')||(input.LA(1) >= '\u0F90' && input.LA(1) <= '\u0F97')||(input.LA(1) >= '\u0F99' && input.LA(1) <= '\u0FBC')||input.LA(1)=='\u0FC6'||(input.LA(1) >= '\u1000' && input.LA(1) <= '\u1021')||(input.LA(1) >= '\u1023' && input.LA(1) <= '\u1027')||(input.LA(1) >= '\u1029' && input.LA(1) <= '\u102A')||(input.LA(1) >= '\u102C' && input.LA(1) <= '\u1032')||(input.LA(1) >= '\u1036' && input.LA(1) <= '\u1039')||(input.LA(1) >= '\u1040' && input.LA(1) <= '\u1049')||(input.LA(1) >= '\u1050' && input.LA(1) <= '\u1059')||(input.LA(1) >= '\u10A0' && input.LA(1) <= '\u10C5')||(input.LA(1) >= '\u10D0' && input.LA(1) <= '\u10F8')||(input.LA(1) >= '\u1100' && input.LA(1) <= '\u1159')||(input.LA(1) >= '\u115F' && input.LA(1) <= '\u11A2')||(input.LA(1) >= '\u11A8' && input.LA(1) <= '\u11F9')||(input.LA(1) >= '\u1200' && input.LA(1) <= '\u1206')||(input.LA(1) >= '\u1208' && input.LA(1) <= '\u1246')||input.LA(1)=='\u1248'||(input.LA(1) >= '\u124A' && input.LA(1) <= '\u124D')||(input.LA(1) >= '\u1250' && input.LA(1) <= '\u1256')||input.LA(1)=='\u1258'||(input.LA(1) >= '\u125A' && input.LA(1) <= '\u125D')||(input.LA(1) >= '\u1260' && input.LA(1) <= '\u1286')||input.LA(1)=='\u1288'||(input.LA(1) >= '\u128A' && input.LA(1) <= '\u128D')||(input.LA(1) >= '\u1290' && input.LA(1) <= '\u12AE')||input.LA(1)=='\u12B0'||(input.LA(1) >= '\u12B2' && input.LA(1) <= '\u12B5')||(input.LA(1) >= '\u12B8' && input.LA(1) <= '\u12BE')||input.LA(1)=='\u12C0'||(input.LA(1) >= '\u12C2' && input.LA(1) <= '\u12C5')||(input.LA(1) >= '\u12C8' && input.LA(1) <= '\u12CE')||(input.LA(1) >= '\u12D0' && input.LA(1) <= '\u12D6')||(input.LA(1) >= '\u12D8' && input.LA(1) <= '\u12EE')||(input.LA(1) >= '\u12F0' && input.LA(1) <= '\u130E')||input.LA(1)=='\u1310'||(input.LA(1) >= '\u1312' && input.LA(1) <= '\u1315')||(input.LA(1) >= '\u1318' && input.LA(1) <= '\u131E')||(input.LA(1) >= '\u1320' && input.LA(1) <= '\u1346')||(input.LA(1) >= '\u1348' && input.LA(1) <= '\u135A')||(input.LA(1) >= '\u1369' && input.LA(1) <= '\u1371')||(input.LA(1) >= '\u13A0' && input.LA(1) <= '\u13F4')||(input.LA(1) >= '\u1401' && input.LA(1) <= '\u166C')||(input.LA(1) >= '\u166F' && input.LA(1) <= '\u1676')||(input.LA(1) >= '\u1681' && input.LA(1) <= '\u169A')||(input.LA(1) >= '\u16A0' && input.LA(1) <= '\u16EA')||(input.LA(1) >= '\u16EE' && input.LA(1) <= '\u16F0')||(input.LA(1) >= '\u1700' && input.LA(1) <= '\u170C')||(input.LA(1) >= '\u170E' && input.LA(1) <= '\u1714')||(input.LA(1) >= '\u1720' && input.LA(1) <= '\u1734')||(input.LA(1) >= '\u1740' && input.LA(1) <= '\u1753')||(input.LA(1) >= '\u1760' && input.LA(1) <= '\u176C')||(input.LA(1) >= '\u176E' && input.LA(1) <= '\u1770')||(input.LA(1) >= '\u1772' && input.LA(1) <= '\u1773')||(input.LA(1) >= '\u1780' && input.LA(1) <= '\u17D3')||input.LA(1)=='\u17D7'||(input.LA(1) >= '\u17DB' && input.LA(1) <= '\u17DD')||(input.LA(1) >= '\u17E0' && input.LA(1) <= '\u17E9')||(input.LA(1) >= '\u180B' && input.LA(1) <= '\u180D')||(input.LA(1) >= '\u1810' && input.LA(1) <= '\u1819')||(input.LA(1) >= '\u1820' && input.LA(1) <= '\u1877')||(input.LA(1) >= '\u1880' && input.LA(1) <= '\u18A9')||(input.LA(1) >= '\u1900' && input.LA(1) <= '\u191C')||(input.LA(1) >= '\u1920' && input.LA(1) <= '\u192B')||(input.LA(1) >= '\u1930' && input.LA(1) <= '\u193B')||(input.LA(1) >= '\u1946' && input.LA(1) <= '\u196D')||(input.LA(1) >= '\u1970' && input.LA(1) <= '\u1974')||(input.LA(1) >= '\u1D00' && input.LA(1) <= '\u1D6B')||(input.LA(1) >= '\u1E00' && input.LA(1) <= '\u1E9B')||(input.LA(1) >= '\u1EA0' && input.LA(1) <= '\u1EF9')||(input.LA(1) >= '\u1F00' && input.LA(1) <= '\u1F15')||(input.LA(1) >= '\u1F18' && input.LA(1) <= '\u1F1D')||(input.LA(1) >= '\u1F20' && input.LA(1) <= '\u1F45')||(input.LA(1) >= '\u1F48' && input.LA(1) <= '\u1F4D')||(input.LA(1) >= '\u1F50' && input.LA(1) <= '\u1F57')||input.LA(1)=='\u1F59'||input.LA(1)=='\u1F5B'||input.LA(1)=='\u1F5D'||(input.LA(1) >= '\u1F5F' && input.LA(1) <= '\u1F7D')||(input.LA(1) >= '\u1F80' && input.LA(1) <= '\u1FB4')||(input.LA(1) >= '\u1FB6' && input.LA(1) <= '\u1FBC')||input.LA(1)=='\u1FBE'||(input.LA(1) >= '\u1FC2' && input.LA(1) <= '\u1FC4')||(input.LA(1) >= '\u1FC6' && input.LA(1) <= '\u1FCC')||(input.LA(1) >= '\u1FD0' && input.LA(1) <= '\u1FD3')||(input.LA(1) >= '\u1FD6' && input.LA(1) <= '\u1FDB')||(input.LA(1) >= '\u1FE0' && input.LA(1) <= '\u1FEC')||(input.LA(1) >= '\u1FF2' && input.LA(1) <= '\u1FF4')||(input.LA(1) >= '\u1FF6' && input.LA(1) <= '\u1FFC')||(input.LA(1) >= '\u200C' && input.LA(1) <= '\u200F')||(input.LA(1) >= '\u202A' && input.LA(1) <= '\u202E')||(input.LA(1) >= '\u203F' && input.LA(1) <= '\u2040')||input.LA(1)=='\u2054'||(input.LA(1) >= '\u2060' && input.LA(1) <= '\u2063')||(input.LA(1) >= '\u206A' && input.LA(1) <= '\u206F')||input.LA(1)=='\u2071'||input.LA(1)=='\u207F'||(input.LA(1) >= '\u20A0' && input.LA(1) <= '\u20B1')||(input.LA(1) >= '\u20D0' && input.LA(1) <= '\u20DC')||input.LA(1)=='\u20E1'||(input.LA(1) >= '\u20E5' && input.LA(1) <= '\u20EA')||input.LA(1)=='\u2102'||input.LA(1)=='\u2107'||(input.LA(1) >= '\u210A' && input.LA(1) <= '\u2113')||input.LA(1)=='\u2115'||(input.LA(1) >= '\u2119' && input.LA(1) <= '\u211D')||input.LA(1)=='\u2124'||input.LA(1)=='\u2126'||input.LA(1)=='\u2128'||(input.LA(1) >= '\u212A' && input.LA(1) <= '\u212D')||(input.LA(1) >= '\u212F' && input.LA(1) <= '\u2131')||(input.LA(1) >= '\u2133' && input.LA(1) <= '\u2139')||(input.LA(1) >= '\u213D' && input.LA(1) <= '\u213F')||(input.LA(1) >= '\u2145' && input.LA(1) <= '\u2149')||(input.LA(1) >= '\u2160' && input.LA(1) <= '\u2183')||(input.LA(1) >= '\u3005' && input.LA(1) <= '\u3007')||(input.LA(1) >= '\u3021' && input.LA(1) <= '\u302F')||(input.LA(1) >= '\u3031' && input.LA(1) <= '\u3035')||(input.LA(1) >= '\u3038' && input.LA(1) <= '\u303C')||(input.LA(1) >= '\u3041' && input.LA(1) <= '\u3096')||(input.LA(1) >= '\u3099' && input.LA(1) <= '\u309A')||(input.LA(1) >= '\u309D' && input.LA(1) <= '\u309F')||(input.LA(1) >= '\u30A1' && input.LA(1) <= '\u30FF')||(input.LA(1) >= '\u3105' && input.LA(1) <= '\u312C')||(input.LA(1) >= '\u3131' && input.LA(1) <= '\u318E')||(input.LA(1) >= '\u31A0' && input.LA(1) <= '\u31B7')||(input.LA(1) >= '\u31F0' && input.LA(1) <= '\u31FF')||(input.LA(1) >= '\u3400' && input.LA(1) <= '\u4DB5')||(input.LA(1) >= '\u4E00' && input.LA(1) <= '\u9FA5')||(input.LA(1) >= '\uA000' && input.LA(1) <= '\uA48C')||(input.LA(1) >= '\uAC00' && input.LA(1) <= '\uD7A3')||(input.LA(1) >= '\uF900' && input.LA(1) <= '\uFA2D')||(input.LA(1) >= '\uFA30' && input.LA(1) <= '\uFA6A')||(input.LA(1) >= '\uFB00' && input.LA(1) <= '\uFB06')||(input.LA(1) >= '\uFB13' && input.LA(1) <= '\uFB17')||(input.LA(1) >= '\uFB1D' && input.LA(1) <= '\uFB28')||(input.LA(1) >= '\uFB2A' && input.LA(1) <= '\uFB36')||(input.LA(1) >= '\uFB38' && input.LA(1) <= '\uFB3C')||input.LA(1)=='\uFB3E'||(input.LA(1) >= '\uFB40' && input.LA(1) <= '\uFB41')||(input.LA(1) >= '\uFB43' && input.LA(1) <= '\uFB44')||(input.LA(1) >= '\uFB46' && input.LA(1) <= '\uFBB1')||(input.LA(1) >= '\uFBD3' && input.LA(1) <= '\uFD3D')||(input.LA(1) >= '\uFD50' && input.LA(1) <= '\uFD8F')||(input.LA(1) >= '\uFD92' && input.LA(1) <= '\uFDC7')||(input.LA(1) >= '\uFDF0' && input.LA(1) <= '\uFDFC')||(input.LA(1) >= '\uFE00' && input.LA(1) <= '\uFE0F')||(input.LA(1) >= '\uFE20' && input.LA(1) <= '\uFE23')||(input.LA(1) >= '\uFE33' && input.LA(1) <= '\uFE34')||(input.LA(1) >= '\uFE4D' && input.LA(1) <= '\uFE4F')||input.LA(1)=='\uFE69'||(input.LA(1) >= '\uFE70' && input.LA(1) <= '\uFE74')||(input.LA(1) >= '\uFE76' && input.LA(1) <= '\uFEFC')||input.LA(1)=='\uFEFF'||input.LA(1)=='\uFF04'||(input.LA(1) >= '\uFF10' && input.LA(1) <= '\uFF19')||(input.LA(1) >= '\uFF21' && input.LA(1) <= '\uFF3A')||input.LA(1)=='\uFF3F'||(input.LA(1) >= '\uFF41' && input.LA(1) <= '\uFF5A')||(input.LA(1) >= '\uFF65' && input.LA(1) <= '\uFFBE')||(input.LA(1) >= '\uFFC2' && input.LA(1) <= '\uFFC7')||(input.LA(1) >= '\uFFCA' && input.LA(1) <= '\uFFCF')||(input.LA(1) >= '\uFFD2' && input.LA(1) <= '\uFFD7')||(input.LA(1) >= '\uFFDA' && input.LA(1) <= '\uFFDC')||(input.LA(1) >= '\uFFE0' && input.LA(1) <= '\uFFE1')||(input.LA(1) >= '\uFFE5' && input.LA(1) <= '\uFFE6')||(input.LA(1) >= '\uFFF9' && input.LA(1) <= '\uFFFB') ) {
 								input.consume();
@@ -3430,12 +3415,12 @@ else if ( (LA62_0=='`') ) {
 					}
 					break;
 				case 2 :
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:330:7: '`' IdentifierStart ( IdentifierPart )* '`'
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:330:7: '`' IdentifierStart ( IdentifierPart )* '`'
 					{
 					match('`'); if (state.failed) return;
 					mIdentifierStart(); if (state.failed) return;
 
-					// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:330:27: ( IdentifierPart )*
+					// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:330:27: ( IdentifierPart )*
 					loop61:
 					while (true) {
 						int alt61=2;
@@ -3446,7 +3431,7 @@ else if ( (LA62_0=='`') ) {
 
 						switch (alt61) {
 						case 1 :
-							// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+							// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 							{
 							if ( (input.LA(1) >= '\u0000' && input.LA(1) <= '\b')||(input.LA(1) >= '\u000E' && input.LA(1) <= '\u001B')||input.LA(1)=='$'||(input.LA(1) >= '0' && input.LA(1) <= '9')||(input.LA(1) >= 'A' && input.LA(1) <= 'Z')||input.LA(1)=='_'||(input.LA(1) >= 'a' && input.LA(1) <= 'z')||(input.LA(1) >= '\u007F' && input.LA(1) <= '\u009F')||(input.LA(1) >= '\u00A2' && input.LA(1) <= '\u00A5')||input.LA(1)=='\u00AA'||input.LA(1)=='\u00AD'||input.LA(1)=='\u00B5'||input.LA(1)=='\u00BA'||(input.LA(1) >= '\u00C0' && input.LA(1) <= '\u00D6')||(input.LA(1) >= '\u00D8' && input.LA(1) <= '\u00F6')||(input.LA(1) >= '\u00F8' && input.LA(1) <= '\u0236')||(input.LA(1) >= '\u0250' && input.LA(1) <= '\u02C1')||(input.LA(1) >= '\u02C6' && input.LA(1) <= '\u02D1')||(input.LA(1) >= '\u02E0' && input.LA(1) <= '\u02E4')||input.LA(1)=='\u02EE'||(input.LA(1) >= '\u0300' && input.LA(1) <= '\u0357')||(input.LA(1) >= '\u035D' && input.LA(1) <= '\u036F')||input.LA(1)=='\u037A'||input.LA(1)=='\u0386'||(input.LA(1) >= '\u0388' && input.LA(1) <= '\u038A')||input.LA(1)=='\u038C'||(input.LA(1) >= '\u038E' && input.LA(1) <= '\u03A1')||(input.LA(1) >= '\u03A3' && input.LA(1) <= '\u03CE')||(input.LA(1) >= '\u03D0' && input.LA(1) <= '\u03F5')||(input.LA(1) >= '\u03F7' && input.LA(1) <= '\u03FB')||(input.LA(1) >= '\u0400' && input.LA(1) <= '\u0481')||(input.LA(1) >= '\u0483' && input.LA(1) <= '\u0486')||(input.LA(1) >= '\u048A' && input.LA(1) <= '\u04CE')||(input.LA(1) >= '\u04D0' && input.LA(1) <= '\u04F5')||(input.LA(1) >= '\u04F8' && input.LA(1) <= '\u04F9')||(input.LA(1) >= '\u0500' && input.LA(1) <= '\u050F')||(input.LA(1) >= '\u0531' && input.LA(1) <= '\u0556')||input.LA(1)=='\u0559'||(input.LA(1) >= '\u0561' && input.LA(1) <= '\u0587')||(input.LA(1) >= '\u0591' && input.LA(1) <= '\u05A1')||(input.LA(1) >= '\u05A3' && input.LA(1) <= '\u05B9')||(input.LA(1) >= '\u05BB' && input.LA(1) <= '\u05BD')||input.LA(1)=='\u05BF'||(input.LA(1) >= '\u05C1' && input.LA(1) <= '\u05C2')||input.LA(1)=='\u05C4'||(input.LA(1) >= '\u05D0' && input.LA(1) <= '\u05EA')||(input.LA(1) >= '\u05F0' && input.LA(1) <= '\u05F2')||(input.LA(1) >= '\u0600' && input.LA(1) <= '\u0603')||(input.LA(1) >= '\u0610' && input.LA(1) <= '\u0615')||(input.LA(1) >= '\u0621' && input.LA(1) <= '\u063A')||(input.LA(1) >= '\u0640' && input.LA(1) <= '\u0658')||(input.LA(1) >= '\u0660' && input.LA(1) <= '\u0669')||(input.LA(1) >= '\u066E' && input.LA(1) <= '\u06D3')||(input.LA(1) >= '\u06D5' && input.LA(1) <= '\u06DD')||(input.LA(1) >= '\u06DF' && input.LA(1) <= '\u06E8')||(input.LA(1) >= '\u06EA' && input.LA(1) <= '\u06FC')||input.LA(1)=='\u06FF'||(input.LA(1) >= '\u070F' && input.LA(1) <= '\u074A')||(input.LA(1) >= '\u074D' && input.LA(1) <= '\u074F')||(input.LA(1) >= '\u0780' && input.LA(1) <= '\u07B1')||(input.LA(1) >= '\u0901' && input.LA(1) <= '\u0939')||(input.LA(1) >= '\u093C' && input.LA(1) <= '\u094D')||(input.LA(1) >= '\u0950' && input.LA(1) <= '\u0954')||(input.LA(1) >= '\u0958' && input.LA(1) <= '\u0963')||(input.LA(1) >= '\u0966' && input.LA(1) <= '\u096F')||(input.LA(1) >= '\u0981' && input.LA(1) <= '\u0983')||(input.LA(1) >= '\u0985' && input.LA(1) <= '\u098C')||(input.LA(1) >= '\u098F' && input.LA(1) <= '\u0990')||(input.LA(1) >= '\u0993' && input.LA(1) <= '\u09A8')||(input.LA(1) >= '\u09AA' && input.LA(1) <= '\u09B0')||input.LA(1)=='\u09B2'||(input.LA(1) >= '\u09B6' && input.LA(1) <= '\u09B9')||(input.LA(1) >= '\u09BC' && input.LA(1) <= '\u09C4')||(input.LA(1) >= '\u09C7' && input.LA(1) <= '\u09C8')||(input.LA(1) >= '\u09CB' && input.LA(1) <= '\u09CD')||input.LA(1)=='\u09D7'||(input.LA(1) >= '\u09DC' && input.LA(1) <= '\u09DD')||(input.LA(1) >= '\u09DF' && input.LA(1) <= '\u09E3')||(input.LA(1) >= '\u09E6' && input.LA(1) <= '\u09F3')||(input.LA(1) >= '\u0A01' && input.LA(1) <= '\u0A03')||(input.LA(1) >= '\u0A05' && input.LA(1) <= '\u0A0A')||(input.LA(1) >= '\u0A0F' && input.LA(1) <= '\u0A10')||(input.LA(1) >= '\u0A13' && input.LA(1) <= '\u0A28')||(input.LA(1) >= '\u0A2A' && input.LA(1) <= '\u0A30')||(input.LA(1) >= '\u0A32' && input.LA(1) <= '\u0A33')||(input.LA(1) >= '\u0A35' && input.LA(1) <= '\u0A36')||(input.LA(1) >= '\u0A38' && input.LA(1) <= '\u0A39')||input.LA(1)=='\u0A3C'||(input.LA(1) >= '\u0A3E' && input.LA(1) <= '\u0A42')||(input.LA(1) >= '\u0A47' && input.LA(1) <= '\u0A48')||(input.LA(1) >= '\u0A4B' && input.LA(1) <= '\u0A4D')||(input.LA(1) >= '\u0A59' && input.LA(1) <= '\u0A5C')||input.LA(1)=='\u0A5E'||(input.LA(1) >= '\u0A66' && input.LA(1) <= '\u0A74')||(input.LA(1) >= '\u0A81' && input.LA(1) <= '\u0A83')||(input.LA(1) >= '\u0A85' && input.LA(1) <= '\u0A8D')||(input.LA(1) >= '\u0A8F' && input.LA(1) <= '\u0A91')||(input.LA(1) >= '\u0A93' && input.LA(1) <= '\u0AA8')||(input.LA(1) >= '\u0AAA' && input.LA(1) <= '\u0AB0')||(input.LA(1) >= '\u0AB2' && input.LA(1) <= '\u0AB3')||(input.LA(1) >= '\u0AB5' && input.LA(1) <= '\u0AB9')||(input.LA(1) >= '\u0ABC' && input.LA(1) <= '\u0AC5')||(input.LA(1) >= '\u0AC7' && input.LA(1) <= '\u0AC9')||(input.LA(1) >= '\u0ACB' && input.LA(1) <= '\u0ACD')||input.LA(1)=='\u0AD0'||(input.LA(1) >= '\u0AE0' && input.LA(1) <= '\u0AE3')||(input.LA(1) >= '\u0AE6' && input.LA(1) <= '\u0AEF')||input.LA(1)=='\u0AF1'||(input.LA(1) >= '\u0B01' && input.LA(1) <= '\u0B03')||(input.LA(1) >= '\u0B05' && input.LA(1) <= '\u0B0C')||(input.LA(1) >= '\u0B0F' && input.LA(1) <= '\u0B10')||(input.LA(1) >= '\u0B13' && input.LA(1) <= '\u0B28')||(input.LA(1) >= '\u0B2A' && input.LA(1) <= '\u0B30')||(input.LA(1) >= '\u0B32' && input.LA(1) <= '\u0B33')||(input.LA(1) >= '\u0B35' && input.LA(1) <= '\u0B39')||(input.LA(1) >= '\u0B3C' && input.LA(1) <= '\u0B43')||(input.LA(1) >= '\u0B47' && input.LA(1) <= '\u0B48')||(input.LA(1) >= '\u0B4B' && input.LA(1) <= '\u0B4D')||(input.LA(1) >= '\u0B56' && input.LA(1) <= '\u0B57')||(input.LA(1) >= '\u0B5C' && input.LA(1) <= '\u0B5D')||(input.LA(1) >= '\u0B5F' && input.LA(1) <= '\u0B61')||(input.LA(1) >= '\u0B66' && input.LA(1) <= '\u0B6F')||input.LA(1)=='\u0B71'||(input.LA(1) >= '\u0B82' && input.LA(1) <= '\u0B83')||(input.LA(1) >= '\u0B85' && input.LA(1) <= '\u0B8A')||(input.LA(1) >= '\u0B8E' && input.LA(1) <= '\u0B90')||(input.LA(1) >= '\u0B92' && input.LA(1) <= '\u0B95')||(input.LA(1) >= '\u0B99' && input.LA(1) <= '\u0B9A')||input.LA(1)=='\u0B9C'||(input.LA(1) >= '\u0B9E' && input.LA(1) <= '\u0B9F')||(input.LA(1) >= '\u0BA3' && input.LA(1) <= '\u0BA4')||(input.LA(1) >= '\u0BA8' && input.LA(1) <= '\u0BAA')||(input.LA(1) >= '\u0BAE' && input.LA(1) <= '\u0BB5')||(input.LA(1) >= '\u0BB7' && input.LA(1) <= '\u0BB9')||(input.LA(1) >= '\u0BBE' && input.LA(1) <= '\u0BC2')||(input.LA(1) >= '\u0BC6' && input.LA(1) <= '\u0BC8')||(input.LA(1) >= '\u0BCA' && input.LA(1) <= '\u0BCD')||input.LA(1)=='\u0BD7'||(input.LA(1) >= '\u0BE7' && input.LA(1) <= '\u0BEF')||input.LA(1)=='\u0BF9'||(input.LA(1) >= '\u0C01' && input.LA(1) <= '\u0C03')||(input.LA(1) >= '\u0C05' && input.LA(1) <= '\u0C0C')||(input.LA(1) >= '\u0C0E' && input.LA(1) <= '\u0C10')||(input.LA(1) >= '\u0C12' && input.LA(1) <= '\u0C28')||(input.LA(1) >= '\u0C2A' && input.LA(1) <= '\u0C33')||(input.LA(1) >= '\u0C35' && input.LA(1) <= '\u0C39')||(input.LA(1) >= '\u0C3E' && input.LA(1) <= '\u0C44')||(input.LA(1) >= '\u0C46' && input.LA(1) <= '\u0C48')||(input.LA(1) >= '\u0C4A' && input.LA(1) <= '\u0C4D')||(input.LA(1) >= '\u0C55' && input.LA(1) <= '\u0C56')||(input.LA(1) >= '\u0C60' && input.LA(1) <= '\u0C61')||(input.LA(1) >= '\u0C66' && input.LA(1) <= '\u0C6F')||(input.LA(1) >= '\u0C82' && input.LA(1) <= '\u0C83')||(input.LA(1) >= '\u0C85' && input.LA(1) <= '\u0C8C')||(input.LA(1) >= '\u0C8E' && input.LA(1) <= '\u0C90')||(input.LA(1) >= '\u0C92' && input.LA(1) <= '\u0CA8')||(input.LA(1) >= '\u0CAA' && input.LA(1) <= '\u0CB3')||(input.LA(1) >= '\u0CB5' && input.LA(1) <= '\u0CB9')||(input.LA(1) >= '\u0CBC' && input.LA(1) <= '\u0CC4')||(input.LA(1) >= '\u0CC6' && input.LA(1) <= '\u0CC8')||(input.LA(1) >= '\u0CCA' && input.LA(1) <= '\u0CCD')||(input.LA(1) >= '\u0CD5' && input.LA(1) <= '\u0CD6')||input.LA(1)=='\u0CDE'||(input.LA(1) >= '\u0CE0' && input.LA(1) <= '\u0CE1')||(input.LA(1) >= '\u0CE6' && input.LA(1) <= '\u0CEF')||(input.LA(1) >= '\u0D02' && input.LA(1) <= '\u0D03')||(input.LA(1) >= '\u0D05' && input.LA(1) <= '\u0D0C')||(input.LA(1) >= '\u0D0E' && input.LA(1) <= '\u0D10')||(input.LA(1) >= '\u0D12' && input.LA(1) <= '\u0D28')||(input.LA(1) >= '\u0D2A' && input.LA(1) <= '\u0D39')||(input.LA(1) >= '\u0D3E' && input.LA(1) <= '\u0D43')||(input.LA(1) >= '\u0D46' && input.LA(1) <= '\u0D48')||(input.LA(1) >= '\u0D4A' && input.LA(1) <= '\u0D4D')||input.LA(1)=='\u0D57'||(input.LA(1) >= '\u0D60' && input.LA(1) <= '\u0D61')||(input.LA(1) >= '\u0D66' && input.LA(1) <= '\u0D6F')||(input.LA(1) >= '\u0D82' && input.LA(1) <= '\u0D83')||(input.LA(1) >= '\u0D85' && input.LA(1) <= '\u0D96')||(input.LA(1) >= '\u0D9A' && input.LA(1) <= '\u0DB1')||(input.LA(1) >= '\u0DB3' && input.LA(1) <= '\u0DBB')||input.LA(1)=='\u0DBD'||(input.LA(1) >= '\u0DC0' && input.LA(1) <= '\u0DC6')||input.LA(1)=='\u0DCA'||(input.LA(1) >= '\u0DCF' && input.LA(1) <= '\u0DD4')||input.LA(1)=='\u0DD6'||(input.LA(1) >= '\u0DD8' && input.LA(1) <= '\u0DDF')||(input.LA(1) >= '\u0DF2' && input.LA(1) <= '\u0DF3')||(input.LA(1) >= '\u0E01' && input.LA(1) <= '\u0E3A')||(input.LA(1) >= '\u0E3F' && input.LA(1) <= '\u0E4E')||(input.LA(1) >= '\u0E50' && input.LA(1) <= '\u0E59')||(input.LA(1) >= '\u0E81' && input.LA(1) <= '\u0E82')||input.LA(1)=='\u0E84'||(input.LA(1) >= '\u0E87' && input.LA(1) <= '\u0E88')||input.LA(1)=='\u0E8A'||input.LA(1)=='\u0E8D'||(input.LA(1) >= '\u0E94' && input.LA(1) <= '\u0E97')||(input.LA(1) >= '\u0E99' && input.LA(1) <= '\u0E9F')||(input.LA(1) >= '\u0EA1' && input.LA(1) <= '\u0EA3')||input.LA(1)=='\u0EA5'||input.LA(1)=='\u0EA7'||(input.LA(1) >= '\u0EAA' && input.LA(1) <= '\u0EAB')||(input.LA(1) >= '\u0EAD' && input.LA(1) <= '\u0EB9')||(input.LA(1) >= '\u0EBB' && input.LA(1) <= '\u0EBD')||(input.LA(1) >= '\u0EC0' && input.LA(1) <= '\u0EC4')||input.LA(1)=='\u0EC6'||(input.LA(1) >= '\u0EC8' && input.LA(1) <= '\u0ECD')||(input.LA(1) >= '\u0ED0' && input.LA(1) <= '\u0ED9')||(input.LA(1) >= '\u0EDC' && input.LA(1) <= '\u0EDD')||input.LA(1)=='\u0F00'||(input.LA(1) >= '\u0F18' && input.LA(1) <= '\u0F19')||(input.LA(1) >= '\u0F20' && input.LA(1) <= '\u0F29')||input.LA(1)=='\u0F35'||input.LA(1)=='\u0F37'||input.LA(1)=='\u0F39'||(input.LA(1) >= '\u0F3E' && input.LA(1) <= '\u0F47')||(input.LA(1) >= '\u0F49' && input.LA(1) <= '\u0F6A')||(input.LA(1) >= '\u0F71' && input.LA(1) <= '\u0F84')||(input.LA(1) >= '\u0F86' && input.LA(1) <= '\u0F8B')||(input.LA(1) >= '\u0F90' && input.LA(1) <= '\u0F97')||(input.LA(1) >= '\u0F99' && input.LA(1) <= '\u0FBC')||input.LA(1)=='\u0FC6'||(input.LA(1) >= '\u1000' && input.LA(1) <= '\u1021')||(input.LA(1) >= '\u1023' && input.LA(1) <= '\u1027')||(input.LA(1) >= '\u1029' && input.LA(1) <= '\u102A')||(input.LA(1) >= '\u102C' && input.LA(1) <= '\u1032')||(input.LA(1) >= '\u1036' && input.LA(1) <= '\u1039')||(input.LA(1) >= '\u1040' && input.LA(1) <= '\u1049')||(input.LA(1) >= '\u1050' && input.LA(1) <= '\u1059')||(input.LA(1) >= '\u10A0' && input.LA(1) <= '\u10C5')||(input.LA(1) >= '\u10D0' && input.LA(1) <= '\u10F8')||(input.LA(1) >= '\u1100' && input.LA(1) <= '\u1159')||(input.LA(1) >= '\u115F' && input.LA(1) <= '\u11A2')||(input.LA(1) >= '\u11A8' && input.LA(1) <= '\u11F9')||(input.LA(1) >= '\u1200' && input.LA(1) <= '\u1206')||(input.LA(1) >= '\u1208' && input.LA(1) <= '\u1246')||input.LA(1)=='\u1248'||(input.LA(1) >= '\u124A' && input.LA(1) <= '\u124D')||(input.LA(1) >= '\u1250' && input.LA(1) <= '\u1256')||input.LA(1)=='\u1258'||(input.LA(1) >= '\u125A' && input.LA(1) <= '\u125D')||(input.LA(1) >= '\u1260' && input.LA(1) <= '\u1286')||input.LA(1)=='\u1288'||(input.LA(1) >= '\u128A' && input.LA(1) <= '\u128D')||(input.LA(1) >= '\u1290' && input.LA(1) <= '\u12AE')||input.LA(1)=='\u12B0'||(input.LA(1) >= '\u12B2' && input.LA(1) <= '\u12B5')||(input.LA(1) >= '\u12B8' && input.LA(1) <= '\u12BE')||input.LA(1)=='\u12C0'||(input.LA(1) >= '\u12C2' && input.LA(1) <= '\u12C5')||(input.LA(1) >= '\u12C8' && input.LA(1) <= '\u12CE')||(input.LA(1) >= '\u12D0' && input.LA(1) <= '\u12D6')||(input.LA(1) >= '\u12D8' && input.LA(1) <= '\u12EE')||(input.LA(1) >= '\u12F0' && input.LA(1) <= '\u130E')||input.LA(1)=='\u1310'||(input.LA(1) >= '\u1312' && input.LA(1) <= '\u1315')||(input.LA(1) >= '\u1318' && input.LA(1) <= '\u131E')||(input.LA(1) >= '\u1320' && input.LA(1) <= '\u1346')||(input.LA(1) >= '\u1348' && input.LA(1) <= '\u135A')||(input.LA(1) >= '\u1369' && input.LA(1) <= '\u1371')||(input.LA(1) >= '\u13A0' && input.LA(1) <= '\u13F4')||(input.LA(1) >= '\u1401' && input.LA(1) <= '\u166C')||(input.LA(1) >= '\u166F' && input.LA(1) <= '\u1676')||(input.LA(1) >= '\u1681' && input.LA(1) <= '\u169A')||(input.LA(1) >= '\u16A0' && input.LA(1) <= '\u16EA')||(input.LA(1) >= '\u16EE' && input.LA(1) <= '\u16F0')||(input.LA(1) >= '\u1700' && input.LA(1) <= '\u170C')||(input.LA(1) >= '\u170E' && input.LA(1) <= '\u1714')||(input.LA(1) >= '\u1720' && input.LA(1) <= '\u1734')||(input.LA(1) >= '\u1740' && input.LA(1) <= '\u1753')||(input.LA(1) >= '\u1760' && input.LA(1) <= '\u176C')||(input.LA(1) >= '\u176E' && input.LA(1) <= '\u1770')||(input.LA(1) >= '\u1772' && input.LA(1) <= '\u1773')||(input.LA(1) >= '\u1780' && input.LA(1) <= '\u17D3')||input.LA(1)=='\u17D7'||(input.LA(1) >= '\u17DB' && input.LA(1) <= '\u17DD')||(input.LA(1) >= '\u17E0' && input.LA(1) <= '\u17E9')||(input.LA(1) >= '\u180B' && input.LA(1) <= '\u180D')||(input.LA(1) >= '\u1810' && input.LA(1) <= '\u1819')||(input.LA(1) >= '\u1820' && input.LA(1) <= '\u1877')||(input.LA(1) >= '\u1880' && input.LA(1) <= '\u18A9')||(input.LA(1) >= '\u1900' && input.LA(1) <= '\u191C')||(input.LA(1) >= '\u1920' && input.LA(1) <= '\u192B')||(input.LA(1) >= '\u1930' && input.LA(1) <= '\u193B')||(input.LA(1) >= '\u1946' && input.LA(1) <= '\u196D')||(input.LA(1) >= '\u1970' && input.LA(1) <= '\u1974')||(input.LA(1) >= '\u1D00' && input.LA(1) <= '\u1D6B')||(input.LA(1) >= '\u1E00' && input.LA(1) <= '\u1E9B')||(input.LA(1) >= '\u1EA0' && input.LA(1) <= '\u1EF9')||(input.LA(1) >= '\u1F00' && input.LA(1) <= '\u1F15')||(input.LA(1) >= '\u1F18' && input.LA(1) <= '\u1F1D')||(input.LA(1) >= '\u1F20' && input.LA(1) <= '\u1F45')||(input.LA(1) >= '\u1F48' && input.LA(1) <= '\u1F4D')||(input.LA(1) >= '\u1F50' && input.LA(1) <= '\u1F57')||input.LA(1)=='\u1F59'||input.LA(1)=='\u1F5B'||input.LA(1)=='\u1F5D'||(input.LA(1) >= '\u1F5F' && input.LA(1) <= '\u1F7D')||(input.LA(1) >= '\u1F80' && input.LA(1) <= '\u1FB4')||(input.LA(1) >= '\u1FB6' && input.LA(1) <= '\u1FBC')||input.LA(1)=='\u1FBE'||(input.LA(1) >= '\u1FC2' && input.LA(1) <= '\u1FC4')||(input.LA(1) >= '\u1FC6' && input.LA(1) <= '\u1FCC')||(input.LA(1) >= '\u1FD0' && input.LA(1) <= '\u1FD3')||(input.LA(1) >= '\u1FD6' && input.LA(1) <= '\u1FDB')||(input.LA(1) >= '\u1FE0' && input.LA(1) <= '\u1FEC')||(input.LA(1) >= '\u1FF2' && input.LA(1) <= '\u1FF4')||(input.LA(1) >= '\u1FF6' && input.LA(1) <= '\u1FFC')||(input.LA(1) >= '\u200C' && input.LA(1) <= '\u200F')||(input.LA(1) >= '\u202A' && input.LA(1) <= '\u202E')||(input.LA(1) >= '\u203F' && input.LA(1) <= '\u2040')||input.LA(1)=='\u2054'||(input.LA(1) >= '\u2060' && input.LA(1) <= '\u2063')||(input.LA(1) >= '\u206A' && input.LA(1) <= '\u206F')||input.LA(1)=='\u2071'||input.LA(1)=='\u207F'||(input.LA(1) >= '\u20A0' && input.LA(1) <= '\u20B1')||(input.LA(1) >= '\u20D0' && input.LA(1) <= '\u20DC')||input.LA(1)=='\u20E1'||(input.LA(1) >= '\u20E5' && input.LA(1) <= '\u20EA')||input.LA(1)=='\u2102'||input.LA(1)=='\u2107'||(input.LA(1) >= '\u210A' && input.LA(1) <= '\u2113')||input.LA(1)=='\u2115'||(input.LA(1) >= '\u2119' && input.LA(1) <= '\u211D')||input.LA(1)=='\u2124'||input.LA(1)=='\u2126'||input.LA(1)=='\u2128'||(input.LA(1) >= '\u212A' && input.LA(1) <= '\u212D')||(input.LA(1) >= '\u212F' && input.LA(1) <= '\u2131')||(input.LA(1) >= '\u2133' && input.LA(1) <= '\u2139')||(input.LA(1) >= '\u213D' && input.LA(1) <= '\u213F')||(input.LA(1) >= '\u2145' && input.LA(1) <= '\u2149')||(input.LA(1) >= '\u2160' && input.LA(1) <= '\u2183')||(input.LA(1) >= '\u3005' && input.LA(1) <= '\u3007')||(input.LA(1) >= '\u3021' && input.LA(1) <= '\u302F')||(input.LA(1) >= '\u3031' && input.LA(1) <= '\u3035')||(input.LA(1) >= '\u3038' && input.LA(1) <= '\u303C')||(input.LA(1) >= '\u3041' && input.LA(1) <= '\u3096')||(input.LA(1) >= '\u3099' && input.LA(1) <= '\u309A')||(input.LA(1) >= '\u309D' && input.LA(1) <= '\u309F')||(input.LA(1) >= '\u30A1' && input.LA(1) <= '\u30FF')||(input.LA(1) >= '\u3105' && input.LA(1) <= '\u312C')||(input.LA(1) >= '\u3131' && input.LA(1) <= '\u318E')||(input.LA(1) >= '\u31A0' && input.LA(1) <= '\u31B7')||(input.LA(1) >= '\u31F0' && input.LA(1) <= '\u31FF')||(input.LA(1) >= '\u3400' && input.LA(1) <= '\u4DB5')||(input.LA(1) >= '\u4E00' && input.LA(1) <= '\u9FA5')||(input.LA(1) >= '\uA000' && input.LA(1) <= '\uA48C')||(input.LA(1) >= '\uAC00' && input.LA(1) <= '\uD7A3')||(input.LA(1) >= '\uF900' && input.LA(1) <= '\uFA2D')||(input.LA(1) >= '\uFA30' && input.LA(1) <= '\uFA6A')||(input.LA(1) >= '\uFB00' && input.LA(1) <= '\uFB06')||(input.LA(1) >= '\uFB13' && input.LA(1) <= '\uFB17')||(input.LA(1) >= '\uFB1D' && input.LA(1) <= '\uFB28')||(input.LA(1) >= '\uFB2A' && input.LA(1) <= '\uFB36')||(input.LA(1) >= '\uFB38' && input.LA(1) <= '\uFB3C')||input.LA(1)=='\uFB3E'||(input.LA(1) >= '\uFB40' && input.LA(1) <= '\uFB41')||(input.LA(1) >= '\uFB43' && input.LA(1) <= '\uFB44')||(input.LA(1) >= '\uFB46' && input.LA(1) <= '\uFBB1')||(input.LA(1) >= '\uFBD3' && input.LA(1) <= '\uFD3D')||(input.LA(1) >= '\uFD50' && input.LA(1) <= '\uFD8F')||(input.LA(1) >= '\uFD92' && input.LA(1) <= '\uFDC7')||(input.LA(1) >= '\uFDF0' && input.LA(1) <= '\uFDFC')||(input.LA(1) >= '\uFE00' && input.LA(1) <= '\uFE0F')||(input.LA(1) >= '\uFE20' && input.LA(1) <= '\uFE23')||(input.LA(1) >= '\uFE33' && input.LA(1) <= '\uFE34')||(input.LA(1) >= '\uFE4D' && input.LA(1) <= '\uFE4F')||input.LA(1)=='\uFE69'||(input.LA(1) >= '\uFE70' && input.LA(1) <= '\uFE74')||(input.LA(1) >= '\uFE76' && input.LA(1) <= '\uFEFC')||input.LA(1)=='\uFEFF'||input.LA(1)=='\uFF04'||(input.LA(1) >= '\uFF10' && input.LA(1) <= '\uFF19')||(input.LA(1) >= '\uFF21' && input.LA(1) <= '\uFF3A')||input.LA(1)=='\uFF3F'||(input.LA(1) >= '\uFF41' && input.LA(1) <= '\uFF5A')||(input.LA(1) >= '\uFF65' && input.LA(1) <= '\uFFBE')||(input.LA(1) >= '\uFFC2' && input.LA(1) <= '\uFFC7')||(input.LA(1) >= '\uFFCA' && input.LA(1) <= '\uFFCF')||(input.LA(1) >= '\uFFD2' && input.LA(1) <= '\uFFD7')||(input.LA(1) >= '\uFFDA' && input.LA(1) <= '\uFFDC')||(input.LA(1) >= '\uFFE0' && input.LA(1) <= '\uFFE1')||(input.LA(1) >= '\uFFE5' && input.LA(1) <= '\uFFE6')||(input.LA(1) >= '\uFFF9' && input.LA(1) <= '\uFFFB') ) {
 								input.consume();
@@ -3486,8 +3471,8 @@ public final void mDIV() throws RecognitionException {
 		try {
 			int _type = DIV;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:335:5: ( '/' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:335:7: '/'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:335:5: ( '/' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:335:7: '/'
 			{
 			match('/'); if (state.failed) return;
 			}
@@ -3506,8 +3491,8 @@ public final void mQUESTION_DIV() throws RecognitionException {
 		try {
 			int _type = QUESTION_DIV;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:339:5: ( '?/' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:339:7: '?/'
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:339:5: ( '?/' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:339:7: '?/'
 			{
 			match("?/"); if (state.failed) return;
 
@@ -3527,8 +3512,8 @@ public final void mMISC() throws RecognitionException {
 		try {
 			int _type = MISC;
 			int _channel = DEFAULT_TOKEN_CHANNEL;
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:342:7: ( '\\'' | '\\\\' | '$' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:342:7: ( '\\'' | '\\\\' | '$' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 			{
 			if ( input.LA(1)=='$'||input.LA(1)=='\''||input.LA(1)=='\\' ) {
 				input.consume();
@@ -3554,8 +3539,8 @@ public final void mMISC() throws RecognitionException {
 	// $ANTLR start "IdentifierStart"
 	public final void mIdentifierStart() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:348:5: ( '\\u0024' | '\\u0041' .. '\\u005a' | '\\u005f' | '\\u0061' .. '\\u007a' | '\\u00a2' .. '\\u00a5' | '\\u00aa' | '\\u00b5' | '\\u00ba' | '\\u00c0' .. '\\u00d6' | '\\u00d8' .. '\\u00f6' | '\\u00f8' .. '\\u0236' | '\\u0250' .. '\\u02c1' | '\\u02c6' .. '\\u02d1' | '\\u02e0' .. '\\u02e4' | '\\u02ee' | '\\u037a' | '\\u0386' | '\\u0388' .. '\\u038a' | '\\u038c' | '\\u038e' .. '\\u03a1' | '\\u03a3' .. '\\u03ce' | '\\u03d0' .. '\\u03f5' | '\\u03f7' .. '\\u03fb' | '\\u0400' .. '\\u0481' | '\\u048a' .. '\\u04ce' | '\\u04d0' .. '\\u04f5' | '\\u04f8' .. '\\u04f9' | '\\u0500' .. '\\u050f' | '\\u0531' .. '\\u0556' | '\\u0559' | '\\u0561' .. '\\u0587' | '\\u05d0' .. '\\u05ea' | '\\u05f0' .. '\\u05f2' | '\\u0621' .. '\\u063a' | '\\u0640' .. '\\u064a' | '\\u066e' .. '\\u066f' | '\\u0671' .. '\\u06d3' | '\\u06d5' | '\\u06e5' .. '\\u06e6' | '\\u06ee' .. '\\u06ef' | '\\u06fa' .. '\\u06fc' | '\\u06ff' | '\\u0710' | '\\u0712' .. '\\u072f' | '\\u074d' .. '\\u074f' | '\\u0780' .. '\\u07a5' | '\\u07b1' | '\\u0904' .. '\\u0939' | '\\u093d' | '\\u0950' | '\\u0958' .. '\\u0961' | '\\u0985' .. '\\u098c' | '\\u098f' .. '\\u0990' | '\\u0993' .. '\\u09a8' | '\\u09aa' .. '\\u09b0' | '\\u09b2' | '\\u09b6' .. '\\u09b9' | '\\u09bd' | '\\u09dc' .. '\\u09dd' | '\\u09df' .. '\\u09e1' | '\\u09f0' .. '\\u09f3' | '\\u0a05' .. '\\u0a0a' | '\\u0a0f' .. '\\u0a10' | '\\u0a13' .. '\\u0a28' | '\\u0a2a' .. '\\u0a30' | '\\u0a32' .. '\\u0a33' | '\\u0a35' .. '\\u0a36' | '\\u0a38' .. '\\u0a39' | '\\u0a59' .. '\\u0a5c' | '\\u0a5e' | '\\u0a72' .. '\\u0a74' | '\\u0a85' .. '\\u0a8d' | '\\u0a8f' .. '\\u0a91' | '\\u0a93' .. '\\u0aa8' | '\\u0aaa' .. '\\u0ab0' | '\\u0ab2' .. '\\u0ab3' | '\\u0ab5' .. '\\u0ab9' | '\\u0abd' | '\\u0ad0' | '\\u0ae0' .. '\\u0ae1' | '\\u0af1' | '\\u0b05' .. '\\u0b0c' | '\\u0b0f' .. '\\u0b10' | '\\u0b13' .. '\\u0b28' | '\\u0b2a' .. '\\u0b30' | '\\u0b32' .. '\\u0b33' | '\\u0b35' .. '\\u0b39' | '\\u0b3d' | '\\u0b5c' .. '\\u0b5d' | '\\u0b5f' .. '\\u0b61' | '\\u0b71' | '\\u0b83' | '\\u0b85' .. '\\u0b8a' | '\\u0b8e' .. '\\u0b90' | '\\u0b92' .. '\\u0b95' | '\\u0b99' .. '\\u0b9a' | '\\u0b9c' | '\\u0b9e' .. '\\u0b9f' | '\\u0ba3' .. '\\u0ba4' | '\\u0ba8' .. '\\u0baa' | '\\u0bae' .. '\\u0bb5' | '\\u0bb7' .. '\\u0bb9' | '\\u0bf9' | '\\u0c05' .. '\\u0c0c' | '\\u0c0e' .. '\\u0c10' | '\\u0c12' .. '\\u0c28' | '\\u0c2a' .. '\\u0c33' | '\\u0c35' .. '\\u0c39' | '\\u0c60' .. '\\u0c61' | '\\u0c85' .. '\\u0c8c' | '\\u0c8e' .. '\\u0c90' | '\\u0c92' .. '\\u0ca8' | '\\u0caa' .. '\\u0cb3' | '\\u0cb5' .. '\\u0cb9' | '\\u0cbd' | '\\u0cde' | '\\u0ce0' .. '\\u0ce1' | '\\u0d05' .. '\\u0d0c' | '\\u0d0e' .. '\\u0d10' | '\\u0d12' .. '\\u0d28' | '\\u0d2a' .. '\\u0d39' | '\\u0d60' .. '\\u0d61' | '\\u0d85' .. '\\u0d96' | '\\u0d9a' .. '\\u0db1' | '\\u0db3' .. '\\u0dbb' | '\\u0dbd' | '\\u0dc0' .. '\\u0dc6' | '\\u0e01' .. '\\u0e30' | '\\u0e32' .. '\\u0e33' | '\\u0e3f' .. '\\u0e46' | '\\u0e81' .. '\\u0e82' | '\\u0e84' | '\\u0e87' .. '\\u0e88' | '\\u0e8a' | '\\u0e8d' | '\\u0e94' .. '\\u0e97' | '\\u0e99' .. '\\u0e9f' | '\\u0ea1' .. '\\u0ea3' | '\\u0ea5' | '\\u0ea7' | '\\u0eaa' .. '\\u0eab' | '\\u0ead' .. '\\u0eb0' | '\\u0eb2' .. '\\u0eb3' | '\\u0ebd' | '\\u0ec0' .. '\\u0ec4' | '\\u0ec6' | '\\u0edc' .. '\\u0edd' | '\\u0f00' | '\\u0f40' .. '\\u0f47' | '\\u0f49' .. '\\u0f6a' | '\\u0f88' .. '\\u0f8b' | '\\u1000' .. '\\u1021' | '\\u1023' .. '\\u1027' | '\\u1029' .. '\\u102a' | '\\u1050' .. '\\u1055' | '\\u10a0' .. '\\u10c5' | '\\u10d0' .. '\\u10f8' | '\\u1100' .. '\\u1159' | '\\u115f' .. '\\u11a2' | '\\u11a8' .. '\\u11f9' | '\\u1200' .. '\\u1206' | '\\u1208' .. '\\u1246' | '\\u1248' | '\\u124a' .. '\\u124d' | '\\u1250' .. '\\u1256' | '\\u1258' | '\\u125a' .. '\\u125d' | '\\u1260' .. '\\u1286' | '\\u1288' | '\\u128a' .. '\\u128d' | '\\u1290' .. '\\u12ae' | '\\u12b0' | '\\u12b2' .. '\\u12b5' | '\\u12b8' .. '\\u12be' | '\\u12c0' | '\\u12c2' .. '\\u12c5' | '\\u12c8' .. '\\u12ce' | '\\u12d0' .. '\\u12d6' | '\\u12d8' .. '\\u12ee' | '\\u12f0' .. '\\u130e' | '\\u1310' | '\\u1312' .. '\\u1315' | '\\u1318' .. '\\u131e' | '\\u1320' .. '\\u1346' | '\\u1348' .. '\\u135a' | '\\u13a0' .. '\\u13f4' | '\\u1401' .. '\\u166c' | '\\u166f' .. '\\u1676' | '\\u1681' .. '\\u169a' | '\\u16a0' .. '\\u16ea' | '\\u16ee' .. '\\u16f0' | '\\u1700' .. '\\u170c' | '\\u170e' .. '\\u1711' | '\\u1720' .. '\\u1731' | '\\u1740' .. '\\u1751' | '\\u1760' .. '\\u176c' | '\\u176e' .. '\\u1770' | '\\u1780' .. '\\u17b3' | '\\u17d7' | '\\u17db' .. '\\u17dc' | '\\u1820' .. '\\u1877' | '\\u1880' .. '\\u18a8' | '\\u1900' .. '\\u191c' | '\\u1950' .. '\\u196d' | '\\u1970' .. '\\u1974' | '\\u1d00' .. '\\u1d6b' | '\\u1e00' .. '\\u1e9b' | '\\u1ea0' .. '\\u1ef9' | '\\u1f00' .. '\\u1f15' | '\\u1f18' .. '\\u1f1d' | '\\u1f20' .. '\\u1f45' | '\\u1f48' .. '\\u1f4d' | '\\u1f50' .. '\\u1f57' | '\\u1f59' | '\\u1f5b' | '\\u1f5d' | '\\u1f5f' .. '\\u1f7d' | '\\u1f80' .. '\\u1fb4' | '\\u1fb6' .. '\\u1fbc' | '\\u1fbe' | '\\u1fc2' .. '\\u1fc4' | '\\u1fc6' .. '\\u1fcc' | '\\u1fd0' .. '\\u1fd3' | '\\u1fd6' .. '\\u1fdb' | '\\u1fe0' .. '\\u1fec' | '\\u1ff2' .. '\\u1ff4' | '\\u1ff6' .. '\\u1ffc' | '\\u203f' .. '\\u2040' | '\\u2054' | '\\u2071' | '\\u207f' | '\\u20a0' .. '\\u20b1' | '\\u2102' | '\\u2107' | '\\u210a' .. '\\u2113' | '\\u2115' | '\\u2119' .. '\\u211d' | '\\u2124' | '\\u2126' | '\\u2128' | '\\u212a' .. '\\u212d' | '\\u212f' .. '\\u2131' | '\\u2133' .. '\\u2139' | '\\u213d' .. '\\u213f' | '\\u2145' .. '\\u2149' | '\\u2160' .. '\\u2183' | '\\u3005' .. '\\u3007' | '\\u3021' .. '\\u3029' | '\\u3031' .. '\\u3035' | '\\u3038' .. '\\u303c' | '\\u3041' .. '\\u3096' | '\\u309d' .. '\\u309f' | '\\u30a1' .. '\\u30ff' | '\\u3105' .. '\\u312c' | '\\u3131' .. '\\u318e' | '\\u31a0' .. '\\u31b7' | '\\u31f0' .. '\\u31ff' | '\\u3400' .. '\\u4db5' | '\\u4e00' .. '\\u9fa5' | '\\ua000' .. '\\ua48c' | '\\uac00' .. '\\ud7a3' | '\\uf900' .. '\\ufa2d' | '\\ufa30' .. '\\ufa6a' | '\\ufb00' .. '\\ufb06' | '\\ufb13' .. '\\ufb17' | '\\ufb1d' | '\\ufb1f' .. '\\ufb28' | '\\ufb2a' .. '\\ufb36' | '\\ufb38' .. '\\ufb3c' | '\\ufb3e' | '\\ufb40' .. '\\ufb41' | '\\ufb43' .. '\\ufb44' | '\\ufb46' .. '\\ufbb1' | '\\ufbd3' .. '\\ufd3d' | '\\ufd50' .. '\\ufd8f' | '\\ufd92' .. '\\ufdc7' | '\\ufdf0' .. '\\ufdfc' | '\\ufe33' .. '\\ufe34' | '\\ufe4d' .. '\\ufe4f' | '\\ufe69' | '\\ufe70' .. '\\ufe74' | '\\ufe76' .. '\\ufefc' | '\\uff04' | '\\uff21' .. '\\uff3a' | '\\uff3f' | '\\uff41' .. '\\uff5a' | '\\uff65' .. '\\uffbe' | '\\uffc2' .. '\\uffc7' | '\\uffca' .. '\\uffcf' | '\\uffd2' .. '\\uffd7' | '\\uffda' .. '\\uffdc' | '\\uffe0' .. '\\uffe1' | '\\uffe5' .. '\\uffe6' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:348:5: ( '\\u0024' | '\\u0041' .. '\\u005a' | '\\u005f' | '\\u0061' .. '\\u007a' | '\\u00a2' .. '\\u00a5' | '\\u00aa' | '\\u00b5' | '\\u00ba' | '\\u00c0' .. '\\u00d6' | '\\u00d8' .. '\\u00f6' | '\\u00f8' .. '\\u0236' | '\\u0250' .. '\\u02c1' | '\\u02c6' .. '\\u02d1' | '\\u02e0' .. '\\u02e4' | '\\u02ee' | '\\u037a' | '\\u0386' | '\\u0388' .. '\\u038a' | '\\u038c' | '\\u038e' .. '\\u03a1' | '\\u03a3' .. '\\u03ce' | '\\u03d0' .. '\\u03f5' | '\\u03f7' .. '\\u03fb' | '\\u0400' .. '\\u0481' | '\\u048a' .. '\\u04ce' | '\\u04d0' .. '\\u04f5' | '\\u04f8' .. '\\u04f9' | '\\u0500' .. '\\u050f' | '\\u0531' .. '\\u0556' | '\\u0559' | '\\u0561' .. '\\u0587' | '\\u05d0' .. '\\u05ea' | '\\u05f0' .. '\\u05f2' | '\\u0621' .. '\\u063a' | '\\u0640' .. '\\u064a' | '\\u066e' .. '\\u066f' | '\\u0671' .. '\\u06d3' | '\\u06d5' | '\\u06e5' .. '\\u06e6' | '\\u06ee' .. '\\u06ef' | '\\u06fa' .. '\\u06fc' | '\\u06ff' | '\\u0710' | '\\u0712' .. '\\u072f' | '\\u074d' .. '\\u074f' | '\\u0780' .. '\\u07a5' | '\\u07b1' | '\\u0904' .. '\\u0939' | '\\u093d' | '\\u0950' | '\\u0958' .. '\\u0961' | '\\u0985' .. '\\u098c' | '\\u098f' .. '\\u0990' | '\\u0993' .. '\\u09a8' | '\\u09aa' .. '\\u09b0' | '\\u09b2' | '\\u09b6' .. '\\u09b9' | '\\u09bd' | '\\u09dc' .. '\\u09dd' | '\\u09df' .. '\\u09e1' | '\\u09f0' .. '\\u09f3' | '\\u0a05' .. '\\u0a0a' | '\\u0a0f' .. '\\u0a10' | '\\u0a13' .. '\\u0a28' | '\\u0a2a' .. '\\u0a30' | '\\u0a32' .. '\\u0a33' | '\\u0a35' .. '\\u0a36' | '\\u0a38' .. '\\u0a39' | '\\u0a59' .. '\\u0a5c' | '\\u0a5e' | '\\u0a72' .. '\\u0a74' | '\\u0a85' .. '\\u0a8d' | '\\u0a8f' .. '\\u0a91' | '\\u0a93' .. '\\u0aa8' | '\\u0aaa' .. '\\u0ab0' | '\\u0ab2' .. '\\u0ab3' | '\\u0ab5' .. '\\u0ab9' | '\\u0abd' | '\\u0ad0' | '\\u0ae0' .. '\\u0ae1' | '\\u0af1' | '\\u0b05' .. '\\u0b0c' | '\\u0b0f' .. '\\u0b10' | '\\u0b13' .. '\\u0b28' | '\\u0b2a' .. '\\u0b30' | '\\u0b32' .. '\\u0b33' | '\\u0b35' .. '\\u0b39' | '\\u0b3d' | '\\u0b5c' .. '\\u0b5d' | '\\u0b5f' .. '\\u0b61' | '\\u0b71' | '\\u0b83' | '\\u0b85' .. '\\u0b8a' | '\\u0b8e' .. '\\u0b90' | '\\u0b92' .. '\\u0b95' | '\\u0b99' .. '\\u0b9a' | '\\u0b9c' | '\\u0b9e' .. '\\u0b9f' | '\\u0ba3' .. '\\u0ba4' | '\\u0ba8' .. '\\u0baa' | '\\u0bae' .. '\\u0bb5' | '\\u0bb7' .. '\\u0bb9' | '\\u0bf9' | '\\u0c05' .. '\\u0c0c' | '\\u0c0e' .. '\\u0c10' | '\\u0c12' .. '\\u0c28' | '\\u0c2a' .. '\\u0c33' | '\\u0c35' .. '\\u0c39' | '\\u0c60' .. '\\u0c61' | '\\u0c85' .. '\\u0c8c' | '\\u0c8e' .. '\\u0c90' | '\\u0c92' .. '\\u0ca8' | '\\u0caa' .. '\\u0cb3' | '\\u0cb5' .. '\\u0cb9' | '\\u0cbd' | '\\u0cde' | '\\u0ce0' .. '\\u0ce1' | '\\u0d05' .. '\\u0d0c' | '\\u0d0e' .. '\\u0d10' | '\\u0d12' .. '\\u0d28' | '\\u0d2a' .. '\\u0d39' | '\\u0d60' .. '\\u0d61' | '\\u0d85' .. '\\u0d96' | '\\u0d9a' .. '\\u0db1' | '\\u0db3' .. '\\u0dbb' | '\\u0dbd' | '\\u0dc0' .. '\\u0dc6' | '\\u0e01' .. '\\u0e30' | '\\u0e32' .. '\\u0e33' | '\\u0e3f' .. '\\u0e46' | '\\u0e81' .. '\\u0e82' | '\\u0e84' | '\\u0e87' .. '\\u0e88' | '\\u0e8a' | '\\u0e8d' | '\\u0e94' .. '\\u0e97' | '\\u0e99' .. '\\u0e9f' | '\\u0ea1' .. '\\u0ea3' | '\\u0ea5' | '\\u0ea7' | '\\u0eaa' .. '\\u0eab' | '\\u0ead' .. '\\u0eb0' | '\\u0eb2' .. '\\u0eb3' | '\\u0ebd' | '\\u0ec0' .. '\\u0ec4' | '\\u0ec6' | '\\u0edc' .. '\\u0edd' | '\\u0f00' | '\\u0f40' .. '\\u0f47' | '\\u0f49' .. '\\u0f6a' | '\\u0f88' .. '\\u0f8b' | '\\u1000' .. '\\u1021' | '\\u1023' .. '\\u1027' | '\\u1029' .. '\\u102a' | '\\u1050' .. '\\u1055' | '\\u10a0' .. '\\u10c5' | '\\u10d0' .. '\\u10f8' | '\\u1100' .. '\\u1159' | '\\u115f' .. '\\u11a2' | '\\u11a8' .. '\\u11f9' | '\\u1200' .. '\\u1206' | '\\u1208' .. '\\u1246' | '\\u1248' | '\\u124a' .. '\\u124d' | '\\u1250' .. '\\u1256' | '\\u1258' | '\\u125a' .. '\\u125d' | '\\u1260' .. '\\u1286' | '\\u1288' | '\\u128a' .. '\\u128d' | '\\u1290' .. '\\u12ae' | '\\u12b0' | '\\u12b2' .. '\\u12b5' | '\\u12b8' .. '\\u12be' | '\\u12c0' | '\\u12c2' .. '\\u12c5' | '\\u12c8' .. '\\u12ce' | '\\u12d0' .. '\\u12d6' | '\\u12d8' .. '\\u12ee' | '\\u12f0' .. '\\u130e' | '\\u1310' | '\\u1312' .. '\\u1315' | '\\u1318' .. '\\u131e' | '\\u1320' .. '\\u1346' | '\\u1348' .. '\\u135a' | '\\u13a0' .. '\\u13f4' | '\\u1401' .. '\\u166c' | '\\u166f' .. '\\u1676' | '\\u1681' .. '\\u169a' | '\\u16a0' .. '\\u16ea' | '\\u16ee' .. '\\u16f0' | '\\u1700' .. '\\u170c' | '\\u170e' .. '\\u1711' | '\\u1720' .. '\\u1731' | '\\u1740' .. '\\u1751' | '\\u1760' .. '\\u176c' | '\\u176e' .. '\\u1770' | '\\u1780' .. '\\u17b3' | '\\u17d7' | '\\u17db' .. '\\u17dc' | '\\u1820' .. '\\u1877' | '\\u1880' .. '\\u18a8' | '\\u1900' .. '\\u191c' | '\\u1950' .. '\\u196d' | '\\u1970' .. '\\u1974' | '\\u1d00' .. '\\u1d6b' | '\\u1e00' .. '\\u1e9b' | '\\u1ea0' .. '\\u1ef9' | '\\u1f00' .. '\\u1f15' | '\\u1f18' .. '\\u1f1d' | '\\u1f20' .. '\\u1f45' | '\\u1f48' .. '\\u1f4d' | '\\u1f50' .. '\\u1f57' | '\\u1f59' | '\\u1f5b' | '\\u1f5d' | '\\u1f5f' .. '\\u1f7d' | '\\u1f80' .. '\\u1fb4' | '\\u1fb6' .. '\\u1fbc' | '\\u1fbe' | '\\u1fc2' .. '\\u1fc4' | '\\u1fc6' .. '\\u1fcc' | '\\u1fd0' .. '\\u1fd3' | '\\u1fd6' .. '\\u1fdb' | '\\u1fe0' .. '\\u1fec' | '\\u1ff2' .. '\\u1ff4' | '\\u1ff6' .. '\\u1ffc' | '\\u203f' .. '\\u2040' | '\\u2054' | '\\u2071' | '\\u207f' | '\\u20a0' .. '\\u20b1' | '\\u2102' | '\\u2107' | '\\u210a' .. '\\u2113' | '\\u2115' | '\\u2119' .. '\\u211d' | '\\u2124' | '\\u2126' | '\\u2128' | '\\u212a' .. '\\u212d' | '\\u212f' .. '\\u2131' | '\\u2133' .. '\\u2139' | '\\u213d' .. '\\u213f' | '\\u2145' .. '\\u2149' | '\\u2160' .. '\\u2183' | '\\u3005' .. '\\u3007' | '\\u3021' .. '\\u3029' | '\\u3031' .. '\\u3035' | '\\u3038' .. '\\u303c' | '\\u3041' .. '\\u3096' | '\\u309d' .. '\\u309f' | '\\u30a1' .. '\\u30ff' | '\\u3105' .. '\\u312c' | '\\u3131' .. '\\u318e' | '\\u31a0' .. '\\u31b7' | '\\u31f0' .. '\\u31ff' | '\\u3400' .. '\\u4db5' | '\\u4e00' .. '\\u9fa5' | '\\ua000' .. '\\ua48c' | '\\uac00' .. '\\ud7a3' | '\\uf900' .. '\\ufa2d' | '\\ufa30' .. '\\ufa6a' | '\\ufb00' .. '\\ufb06' | '\\ufb13' .. '\\ufb17' | '\\ufb1d' | '\\ufb1f' .. '\\ufb28' | '\\ufb2a' .. '\\ufb36' | '\\ufb38' .. '\\ufb3c' | '\\ufb3e' | '\\ufb40' .. '\\ufb41' | '\\ufb43' .. '\\ufb44' | '\\ufb46' .. '\\ufbb1' | '\\ufbd3' .. '\\ufd3d' | '\\ufd50' .. '\\ufd8f' | '\\ufd92' .. '\\ufdc7' | '\\ufdf0' .. '\\ufdfc' | '\\ufe33' .. '\\ufe34' | '\\ufe4d' .. '\\ufe4f' | '\\ufe69' | '\\ufe70' .. '\\ufe74' | '\\ufe76' .. '\\ufefc' | '\\uff04' | '\\uff21' .. '\\uff3a' | '\\uff3f' | '\\uff41' .. '\\uff5a' | '\\uff65' .. '\\uffbe' | '\\uffc2' .. '\\uffc7' | '\\uffca' .. '\\uffcf' | '\\uffd2' .. '\\uffd7' | '\\uffda' .. '\\uffdc' | '\\uffe0' .. '\\uffe1' | '\\uffe5' .. '\\uffe6' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 			{
 			if ( input.LA(1)=='$'||(input.LA(1) >= 'A' && input.LA(1) <= 'Z')||input.LA(1)=='_'||(input.LA(1) >= 'a' && input.LA(1) <= 'z')||(input.LA(1) >= '\u00A2' && input.LA(1) <= '\u00A5')||input.LA(1)=='\u00AA'||input.LA(1)=='\u00B5'||input.LA(1)=='\u00BA'||(input.LA(1) >= '\u00C0' && input.LA(1) <= '\u00D6')||(input.LA(1) >= '\u00D8' && input.LA(1) <= '\u00F6')||(input.LA(1) >= '\u00F8' && input.LA(1) <= '\u0236')||(input.LA(1) >= '\u0250' && input.LA(1) <= '\u02C1')||(input.LA(1) >= '\u02C6' && input.LA(1) <= '\u02D1')||(input.LA(1) >= '\u02E0' && input.LA(1) <= '\u02E4')||input.LA(1)=='\u02EE'||input.LA(1)=='\u037A'||input.LA(1)=='\u0386'||(input.LA(1) >= '\u0388' && input.LA(1) <= '\u038A')||input.LA(1)=='\u038C'||(input.LA(1) >= '\u038E' && input.LA(1) <= '\u03A1')||(input.LA(1) >= '\u03A3' && input.LA(1) <= '\u03CE')||(input.LA(1) >= '\u03D0' && input.LA(1) <= '\u03F5')||(input.LA(1) >= '\u03F7' && input.LA(1) <= '\u03FB')||(input.LA(1) >= '\u0400' && input.LA(1) <= '\u0481')||(input.LA(1) >= '\u048A' && input.LA(1) <= '\u04CE')||(input.LA(1) >= '\u04D0' && input.LA(1) <= '\u04F5')||(input.LA(1) >= '\u04F8' && input.LA(1) <= '\u04F9')||(input.LA(1) >= '\u0500' && input.LA(1) <= '\u050F')||(input.LA(1) >= '\u0531' && input.LA(1) <= '\u0556')||input.LA(1)=='\u0559'||(input.LA(1) >= '\u0561' && input.LA(1) <= '\u0587')||(input.LA(1) >= '\u05D0' && input.LA(1) <= '\u05EA')||(input.LA(1) >= '\u05F0' && input.LA(1) <= '\u05F2')||(input.LA(1) >= '\u0621' && input.LA(1) <= '\u063A')||(input.LA(1) >= '\u0640' && input.LA(1) <= '\u064A')||(input.LA(1) >= '\u066E' && input.LA(1) <= '\u066F')||(input.LA(1) >= '\u0671' && input.LA(1) <= '\u06D3')||input.LA(1)=='\u06D5'||(input.LA(1) >= '\u06E5' && input.LA(1) <= '\u06E6')||(input.LA(1) >= '\u06EE' && input.LA(1) <= '\u06EF')||(input.LA(1) >= '\u06FA' && input.LA(1) <= '\u06FC')||input.LA(1)=='\u06FF'||input.LA(1)=='\u0710'||(input.LA(1) >= '\u0712' && input.LA(1) <= '\u072F')||(input.LA(1) >= '\u074D' && input.LA(1) <= '\u074F')||(input.LA(1) >= '\u0780' && input.LA(1) <= '\u07A5')||input.LA(1)=='\u07B1'||(input.LA(1) >= '\u0904' && input.LA(1) <= '\u0939')||input.LA(1)=='\u093D'||input.LA(1)=='\u0950'||(input.LA(1) >= '\u0958' && input.LA(1) <= '\u0961')||(input.LA(1) >= '\u0985' && input.LA(1) <= '\u098C')||(input.LA(1) >= '\u098F' && input.LA(1) <= '\u0990')||(input.LA(1) >= '\u0993' && input.LA(1) <= '\u09A8')||(input.LA(1) >= '\u09AA' && input.LA(1) <= '\u09B0')||input.LA(1)=='\u09B2'||(input.LA(1) >= '\u09B6' && input.LA(1) <= '\u09B9')||input.LA(1)=='\u09BD'||(input.LA(1) >= '\u09DC' && input.LA(1) <= '\u09DD')||(input.LA(1) >= '\u09DF' && input.LA(1) <= '\u09E1')||(input.LA(1) >= '\u09F0' && input.LA(1) <= '\u09F3')||(input.LA(1) >= '\u0A05' && input.LA(1) <= '\u0A0A')||(input.LA(1) >= '\u0A0F' && input.LA(1) <= '\u0A10')||(input.LA(1) >= '\u0A13' && input.LA(1) <= '\u0A28')||(input.LA(1) >= '\u0A2A' && input.LA(1) <= '\u0A30')||(input.LA(1) >= '\u0A32' && input.LA(1) <= '\u0A33')||(input.LA(1) >= '\u0A35' && input.LA(1) <= '\u0A36')||(input.LA(1) >= '\u0A38' && input.LA(1) <= '\u0A39')||(input.LA(1) >= '\u0A59' && input.LA(1) <= '\u0A5C')||input.LA(1)=='\u0A5E'||(input.LA(1) >= '\u0A72' && input.LA(1) <= '\u0A74')||(input.LA(1) >= '\u0A85' && input.LA(1) <= '\u0A8D')||(input.LA(1) >= '\u0A8F' && input.LA(1) <= '\u0A91')||(input.LA(1) >= '\u0A93' && input.LA(1) <= '\u0AA8')||(input.LA(1) >= '\u0AAA' && input.LA(1) <= '\u0AB0')||(input.LA(1) >= '\u0AB2' && input.LA(1) <= '\u0AB3')||(input.LA(1) >= '\u0AB5' && input.LA(1) <= '\u0AB9')||input.LA(1)=='\u0ABD'||input.LA(1)=='\u0AD0'||(input.LA(1) >= '\u0AE0' && input.LA(1) <= '\u0AE1')||input.LA(1)=='\u0AF1'||(input.LA(1) >= '\u0B05' && input.LA(1) <= '\u0B0C')||(input.LA(1) >= '\u0B0F' && input.LA(1) <= '\u0B10')||(input.LA(1) >= '\u0B13' && input.LA(1) <= '\u0B28')||(input.LA(1) >= '\u0B2A' && input.LA(1) <= '\u0B30')||(input.LA(1) >= '\u0B32' && input.LA(1) <= '\u0B33')||(input.LA(1) >= '\u0B35' && input.LA(1) <= '\u0B39')||input.LA(1)=='\u0B3D'||(input.LA(1) >= '\u0B5C' && input.LA(1) <= '\u0B5D')||(input.LA(1) >= '\u0B5F' && input.LA(1) <= '\u0B61')||input.LA(1)=='\u0B71'||input.LA(1)=='\u0B83'||(input.LA(1) >= '\u0B85' && input.LA(1) <= '\u0B8A')||(input.LA(1) >= '\u0B8E' && input.LA(1) <= '\u0B90')||(input.LA(1) >= '\u0B92' && input.LA(1) <= '\u0B95')||(input.LA(1) >= '\u0B99' && input.LA(1) <= '\u0B9A')||input.LA(1)=='\u0B9C'||(input.LA(1) >= '\u0B9E' && input.LA(1) <= '\u0B9F')||(input.LA(1) >= '\u0BA3' && input.LA(1) <= '\u0BA4')||(input.LA(1) >= '\u0BA8' && input.LA(1) <= '\u0BAA')||(input.LA(1) >= '\u0BAE' && input.LA(1) <= '\u0BB5')||(input.LA(1) >= '\u0BB7' && input.LA(1) <= '\u0BB9')||input.LA(1)=='\u0BF9'||(input.LA(1) >= '\u0C05' && input.LA(1) <= '\u0C0C')||(input.LA(1) >= '\u0C0E' && input.LA(1) <= '\u0C10')||(input.LA(1) >= '\u0C12' && input.LA(1) <= '\u0C28')||(input.LA(1) >= '\u0C2A' && input.LA(1) <= '\u0C33')||(input.LA(1) >= '\u0C35' && input.LA(1) <= '\u0C39')||(input.LA(1) >= '\u0C60' && input.LA(1) <= '\u0C61')||(input.LA(1) >= '\u0C85' && input.LA(1) <= '\u0C8C')||(input.LA(1) >= '\u0C8E' && input.LA(1) <= '\u0C90')||(input.LA(1) >= '\u0C92' && input.LA(1) <= '\u0CA8')||(input.LA(1) >= '\u0CAA' && input.LA(1) <= '\u0CB3')||(input.LA(1) >= '\u0CB5' && input.LA(1) <= '\u0CB9')||input.LA(1)=='\u0CBD'||input.LA(1)=='\u0CDE'||(input.LA(1) >= '\u0CE0' && input.LA(1) <= '\u0CE1')||(input.LA(1) >= '\u0D05' && input.LA(1) <= '\u0D0C')||(input.LA(1) >= '\u0D0E' && input.LA(1) <= '\u0D10')||(input.LA(1) >= '\u0D12' && input.LA(1) <= '\u0D28')||(input.LA(1) >= '\u0D2A' && input.LA(1) <= '\u0D39')||(input.LA(1) >= '\u0D60' && input.LA(1) <= '\u0D61')||(input.LA(1) >= '\u0D85' && input.LA(1) <= '\u0D96')||(input.LA(1) >= '\u0D9A' && input.LA(1) <= '\u0DB1')||(input.LA(1) >= '\u0DB3' && input.LA(1) <= '\u0DBB')||input.LA(1)=='\u0DBD'||(input.LA(1) >= '\u0DC0' && input.LA(1) <= '\u0DC6')||(input.LA(1) >= '\u0E01' && input.LA(1) <= '\u0E30')||(input.LA(1) >= '\u0E32' && input.LA(1) <= '\u0E33')||(input.LA(1) >= '\u0E3F' && input.LA(1) <= '\u0E46')||(input.LA(1) >= '\u0E81' && input.LA(1) <= '\u0E82')||input.LA(1)=='\u0E84'||(input.LA(1) >= '\u0E87' && input.LA(1) <= '\u0E88')||input.LA(1)=='\u0E8A'||input.LA(1)=='\u0E8D'||(input.LA(1) >= '\u0E94' && input.LA(1) <= '\u0E97')||(input.LA(1) >= '\u0E99' && input.LA(1) <= '\u0E9F')||(input.LA(1) >= '\u0EA1' && input.LA(1) <= '\u0EA3')||input.LA(1)=='\u0EA5'||input.LA(1)=='\u0EA7'||(input.LA(1) >= '\u0EAA' && input.LA(1) <= '\u0EAB')||(input.LA(1) >= '\u0EAD' && input.LA(1) <= '\u0EB0')||(input.LA(1) >= '\u0EB2' && input.LA(1) <= '\u0EB3')||input.LA(1)=='\u0EBD'||(input.LA(1) >= '\u0EC0' && input.LA(1) <= '\u0EC4')||input.LA(1)=='\u0EC6'||(input.LA(1) >= '\u0EDC' && input.LA(1) <= '\u0EDD')||input.LA(1)=='\u0F00'||(input.LA(1) >= '\u0F40' && input.LA(1) <= '\u0F47')||(input.LA(1) >= '\u0F49' && input.LA(1) <= '\u0F6A')||(input.LA(1) >= '\u0F88' && input.LA(1) <= '\u0F8B')||(input.LA(1) >= '\u1000' && input.LA(1) <= '\u1021')||(input.LA(1) >= '\u1023' && input.LA(1) <= '\u1027')||(input.LA(1) >= '\u1029' && input.LA(1) <= '\u102A')||(input.LA(1) >= '\u1050' && input.LA(1) <= '\u1055')||(input.LA(1) >= '\u10A0' && input.LA(1) <= '\u10C5')||(input.LA(1) >= '\u10D0' && input.LA(1) <= '\u10F8')||(input.LA(1) >= '\u1100' && input.LA(1) <= '\u1159')||(input.LA(1) >= '\u115F' && input.LA(1) <= '\u11A2')||(input.LA(1) >= '\u11A8' && input.LA(1) <= '\u11F9')||(input.LA(1) >= '\u1200' && input.LA(1) <= '\u1206')||(input.LA(1) >= '\u1208' && input.LA(1) <= '\u1246')||input.LA(1)=='\u1248'||(input.LA(1) >= '\u124A' && input.LA(1) <= '\u124D')||(input.LA(1) >= '\u1250' && input.LA(1) <= '\u1256')||input.LA(1)=='\u1258'||(input.LA(1) >= '\u125A' && input.LA(1) <= '\u125D')||(input.LA(1) >= '\u1260' && input.LA(1) <= '\u1286')||input.LA(1)=='\u1288'||(input.LA(1) >= '\u128A' && input.LA(1) <= '\u128D')||(input.LA(1) >= '\u1290' && input.LA(1) <= '\u12AE')||input.LA(1)=='\u12B0'||(input.LA(1) >= '\u12B2' && input.LA(1) <= '\u12B5')||(input.LA(1) >= '\u12B8' && input.LA(1) <= '\u12BE')||input.LA(1)=='\u12C0'||(input.LA(1) >= '\u12C2' && input.LA(1) <= '\u12C5')||(input.LA(1) >= '\u12C8' && input.LA(1) <= '\u12CE')||(input.LA(1) >= '\u12D0' && input.LA(1) <= '\u12D6')||(input.LA(1) >= '\u12D8' && input.LA(1) <= '\u12EE')||(input.LA(1) >= '\u12F0' && input.LA(1) <= '\u130E')||input.LA(1)=='\u1310'||(input.LA(1) >= '\u1312' && input.LA(1) <= '\u1315')||(input.LA(1) >= '\u1318' && input.LA(1) <= '\u131E')||(input.LA(1) >= '\u1320' && input.LA(1) <= '\u1346')||(input.LA(1) >= '\u1348' && input.LA(1) <= '\u135A')||(input.LA(1) >= '\u13A0' && input.LA(1) <= '\u13F4')||(input.LA(1) >= '\u1401' && input.LA(1) <= '\u166C')||(input.LA(1) >= '\u166F' && input.LA(1) <= '\u1676')||(input.LA(1) >= '\u1681' && input.LA(1) <= '\u169A')||(input.LA(1) >= '\u16A0' && input.LA(1) <= '\u16EA')||(input.LA(1) >= '\u16EE' && input.LA(1) <= '\u16F0')||(input.LA(1) >= '\u1700' && input.LA(1) <= '\u170C')||(input.LA(1) >= '\u170E' && input.LA(1) <= '\u1711')||(input.LA(1) >= '\u1720' && input.LA(1) <= '\u1731')||(input.LA(1) >= '\u1740' && input.LA(1) <= '\u1751')||(input.LA(1) >= '\u1760' && input.LA(1) <= '\u176C')||(input.LA(1) >= '\u176E' && input.LA(1) <= '\u1770')||(input.LA(1) >= '\u1780' && input.LA(1) <= '\u17B3')||input.LA(1)=='\u17D7'||(input.LA(1) >= '\u17DB' && input.LA(1) <= '\u17DC')||(input.LA(1) >= '\u1820' && input.LA(1) <= '\u1877')||(input.LA(1) >= '\u1880' && input.LA(1) <= '\u18A8')||(input.LA(1) >= '\u1900' && input.LA(1) <= '\u191C')||(input.LA(1) >= '\u1950' && input.LA(1) <= '\u196D')||(input.LA(1) >= '\u1970' && input.LA(1) <= '\u1974')||(input.LA(1) >= '\u1D00' && input.LA(1) <= '\u1D6B')||(input.LA(1) >= '\u1E00' && input.LA(1) <= '\u1E9B')||(input.LA(1) >= '\u1EA0' && input.LA(1) <= '\u1EF9')||(input.LA(1) >= '\u1F00' && input.LA(1) <= '\u1F15')||(input.LA(1) >= '\u1F18' && input.LA(1) <= '\u1F1D')||(input.LA(1) >= '\u1F20' && input.LA(1) <= '\u1F45')||(input.LA(1) >= '\u1F48' && input.LA(1) <= '\u1F4D')||(input.LA(1) >= '\u1F50' && input.LA(1) <= '\u1F57')||input.LA(1)=='\u1F59'||input.LA(1)=='\u1F5B'||input.LA(1)=='\u1F5D'||(input.LA(1) >= '\u1F5F' && input.LA(1) <= '\u1F7D')||(input.LA(1) >= '\u1F80' && input.LA(1) <= '\u1FB4')||(input.LA(1) >= '\u1FB6' && input.LA(1) <= '\u1FBC')||input.LA(1)=='\u1FBE'||(input.LA(1) >= '\u1FC2' && input.LA(1) <= '\u1FC4')||(input.LA(1) >= '\u1FC6' && input.LA(1) <= '\u1FCC')||(input.LA(1) >= '\u1FD0' && input.LA(1) <= '\u1FD3')||(input.LA(1) >= '\u1FD6' && input.LA(1) <= '\u1FDB')||(input.LA(1) >= '\u1FE0' && input.LA(1) <= '\u1FEC')||(input.LA(1) >= '\u1FF2' && input.LA(1) <= '\u1FF4')||(input.LA(1) >= '\u1FF6' && input.LA(1) <= '\u1FFC')||(input.LA(1) >= '\u203F' && input.LA(1) <= '\u2040')||input.LA(1)=='\u2054'||input.LA(1)=='\u2071'||input.LA(1)=='\u207F'||(input.LA(1) >= '\u20A0' && input.LA(1) <= '\u20B1')||input.LA(1)=='\u2102'||input.LA(1)=='\u2107'||(input.LA(1) >= '\u210A' && input.LA(1) <= '\u2113')||input.LA(1)=='\u2115'||(input.LA(1) >= '\u2119' && input.LA(1) <= '\u211D')||input.LA(1)=='\u2124'||input.LA(1)=='\u2126'||input.LA(1)=='\u2128'||(input.LA(1) >= '\u212A' && input.LA(1) <= '\u212D')||(input.LA(1) >= '\u212F' && input.LA(1) <= '\u2131')||(input.LA(1) >= '\u2133' && input.LA(1) <= '\u2139')||(input.LA(1) >= '\u213D' && input.LA(1) <= '\u213F')||(input.LA(1) >= '\u2145' && input.LA(1) <= '\u2149')||(input.LA(1) >= '\u2160' && input.LA(1) <= '\u2183')||(input.LA(1) >= '\u3005' && input.LA(1) <= '\u3007')||(input.LA(1) >= '\u3021' && input.LA(1) <= '\u3029')||(input.LA(1) >= '\u3031' && input.LA(1) <= '\u3035')||(input.LA(1) >= '\u3038' && input.LA(1) <= '\u303C')||(input.LA(1) >= '\u3041' && input.LA(1) <= '\u3096')||(input.LA(1) >= '\u309D' && input.LA(1) <= '\u309F')||(input.LA(1) >= '\u30A1' && input.LA(1) <= '\u30FF')||(input.LA(1) >= '\u3105' && input.LA(1) <= '\u312C')||(input.LA(1) >= '\u3131' && input.LA(1) <= '\u318E')||(input.LA(1) >= '\u31A0' && input.LA(1) <= '\u31B7')||(input.LA(1) >= '\u31F0' && input.LA(1) <= '\u31FF')||(input.LA(1) >= '\u3400' && input.LA(1) <= '\u4DB5')||(input.LA(1) >= '\u4E00' && input.LA(1) <= '\u9FA5')||(input.LA(1) >= '\uA000' && input.LA(1) <= '\uA48C')||(input.LA(1) >= '\uAC00' && input.LA(1) <= '\uD7A3')||(input.LA(1) >= '\uF900' && input.LA(1) <= '\uFA2D')||(input.LA(1) >= '\uFA30' && input.LA(1) <= '\uFA6A')||(input.LA(1) >= '\uFB00' && input.LA(1) <= '\uFB06')||(input.LA(1) >= '\uFB13' && input.LA(1) <= '\uFB17')||input.LA(1)=='\uFB1D'||(input.LA(1) >= '\uFB1F' && input.LA(1) <= '\uFB28')||(input.LA(1) >= '\uFB2A' && input.LA(1) <= '\uFB36')||(input.LA(1) >= '\uFB38' && input.LA(1) <= '\uFB3C')||input.LA(1)=='\uFB3E'||(input.LA(1) >= '\uFB40' && input.LA(1) <= '\uFB41')||(input.LA(1) >= '\uFB43' && input.LA(1) <= '\uFB44')||(input.LA(1) >= '\uFB46' && input.LA(1) <= '\uFBB1')||(input.LA(1) >= '\uFBD3' && input.LA(1) <= '\uFD3D')||(input.LA(1) >= '\uFD50' && input.LA(1) <= '\uFD8F')||(input.LA(1) >= '\uFD92' && input.LA(1) <= '\uFDC7')||(input.LA(1) >= '\uFDF0' && input.LA(1) <= '\uFDFC')||(input.LA(1) >= '\uFE33' && input.LA(1) <= '\uFE34')||(input.LA(1) >= '\uFE4D' && input.LA(1) <= '\uFE4F')||input.LA(1)=='\uFE69'||(input.LA(1) >= '\uFE70' && input.LA(1) <= '\uFE74')||(input.LA(1) >= '\uFE76' && input.LA(1) <= '\uFEFC')||input.LA(1)=='\uFF04'||(input.LA(1) >= '\uFF21' && input.LA(1) <= '\uFF3A')||input.LA(1)=='\uFF3F'||(input.LA(1) >= '\uFF41' && input.LA(1) <= '\uFF5A')||(input.LA(1) >= '\uFF65' && input.LA(1) <= '\uFFBE')||(input.LA(1) >= '\uFFC2' && input.LA(1) <= '\uFFC7')||(input.LA(1) >= '\uFFCA' && input.LA(1) <= '\uFFCF')||(input.LA(1) >= '\uFFD2' && input.LA(1) <= '\uFFD7')||(input.LA(1) >= '\uFFDA' && input.LA(1) <= '\uFFDC')||(input.LA(1) >= '\uFFE0' && input.LA(1) <= '\uFFE1')||(input.LA(1) >= '\uFFE5' && input.LA(1) <= '\uFFE6') ) {
 				input.consume();
@@ -3579,8 +3564,8 @@ public final void mIdentifierStart() throws RecognitionException {
 	// $ANTLR start "IdentifierPart"
 	public final void mIdentifierPart() throws RecognitionException {
 		try {
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:646:5: ( '\\u0000' .. '\\u0008' | '\\u000e' .. '\\u001b' | '\\u0024' | '\\u0030' .. '\\u0039' | '\\u0041' .. '\\u005a' | '\\u005f' | '\\u0061' .. '\\u007a' | '\\u007f' .. '\\u009f' | '\\u00a2' .. '\\u00a5' | '\\u00aa' | '\\u00ad' | '\\u00b5' | '\\u00ba' | '\\u00c0' .. '\\u00d6' | '\\u00d8' .. '\\u00f6' | '\\u00f8' .. '\\u0236' | '\\u0250' .. '\\u02c1' | '\\u02c6' .. '\\u02d1' | '\\u02e0' .. '\\u02e4' | '\\u02ee' | '\\u0300' .. '\\u0357' | '\\u035d' .. '\\u036f' | '\\u037a' | '\\u0386' | '\\u0388' .. '\\u038a' | '\\u038c' | '\\u038e' .. '\\u03a1' | '\\u03a3' .. '\\u03ce' | '\\u03d0' .. '\\u03f5' | '\\u03f7' .. '\\u03fb' | '\\u0400' .. '\\u0481' | '\\u0483' .. '\\u0486' | '\\u048a' .. '\\u04ce' | '\\u04d0' .. '\\u04f5' | '\\u04f8' .. '\\u04f9' | '\\u0500' .. '\\u050f' | '\\u0531' .. '\\u0556' | '\\u0559' | '\\u0561' .. '\\u0587' | '\\u0591' .. '\\u05a1' | '\\u05a3' .. '\\u05b9' | '\\u05bb' .. '\\u05bd' | '\\u05bf' | '\\u05c1' .. '\\u05c2' | '\\u05c4' | '\\u05d0' .. '\\u05ea' | '\\u05f0' .. '\\u05f2' | '\\u0600' .. '\\u0603' | '\\u0610' .. '\\u0615' | '\\u0621' .. '\\u063a' | '\\u0640' .. '\\u0658' | '\\u0660' .. '\\u0669' | '\\u066e' .. '\\u06d3' | '\\u06d5' .. '\\u06dd' | '\\u06df' .. '\\u06e8' | '\\u06ea' .. '\\u06fc' | '\\u06ff' | '\\u070f' .. '\\u074a' | '\\u074d' .. '\\u074f' | '\\u0780' .. '\\u07b1' | '\\u0901' .. '\\u0939' | '\\u093c' .. '\\u094d' | '\\u0950' .. '\\u0954' | '\\u0958' .. '\\u0963' | '\\u0966' .. '\\u096f' | '\\u0981' .. '\\u0983' | '\\u0985' .. '\\u098c' | '\\u098f' .. '\\u0990' | '\\u0993' .. '\\u09a8' | '\\u09aa' .. '\\u09b0' | '\\u09b2' | '\\u09b6' .. '\\u09b9' | '\\u09bc' .. '\\u09c4' | '\\u09c7' .. '\\u09c8' | '\\u09cb' .. '\\u09cd' | '\\u09d7' | '\\u09dc' .. '\\u09dd' | '\\u09df' .. '\\u09e3' | '\\u09e6' .. '\\u09f3' | '\\u0a01' .. '\\u0a03' | '\\u0a05' .. '\\u0a0a' | '\\u0a0f' .. '\\u0a10' | '\\u0a13' .. '\\u0a28' | '\\u0a2a' .. '\\u0a30' | '\\u0a32' .. '\\u0a33' | '\\u0a35' .. '\\u0a36' | '\\u0a38' .. '\\u0a39' | '\\u0a3c' | '\\u0a3e' .. '\\u0a42' | '\\u0a47' .. '\\u0a48' | '\\u0a4b' .. '\\u0a4d' | '\\u0a59' .. '\\u0a5c' | '\\u0a5e' | '\\u0a66' .. '\\u0a74' | '\\u0a81' .. '\\u0a83' | '\\u0a85' .. '\\u0a8d' | '\\u0a8f' .. '\\u0a91' | '\\u0a93' .. '\\u0aa8' | '\\u0aaa' .. '\\u0ab0' | '\\u0ab2' .. '\\u0ab3' | '\\u0ab5' .. '\\u0ab9' | '\\u0abc' .. '\\u0ac5' | '\\u0ac7' .. '\\u0ac9' | '\\u0acb' .. '\\u0acd' | '\\u0ad0' | '\\u0ae0' .. '\\u0ae3' | '\\u0ae6' .. '\\u0aef' | '\\u0af1' | '\\u0b01' .. '\\u0b03' | '\\u0b05' .. '\\u0b0c' | '\\u0b0f' .. '\\u0b10' | '\\u0b13' .. '\\u0b28' | '\\u0b2a' .. '\\u0b30' | '\\u0b32' .. '\\u0b33' | '\\u0b35' .. '\\u0b39' | '\\u0b3c' .. '\\u0b43' | '\\u0b47' .. '\\u0b48' | '\\u0b4b' .. '\\u0b4d' | '\\u0b56' .. '\\u0b57' | '\\u0b5c' .. '\\u0b5d' | '\\u0b5f' .. '\\u0b61' | '\\u0b66' .. '\\u0b6f' | '\\u0b71' | '\\u0b82' .. '\\u0b83' | '\\u0b85' .. '\\u0b8a' | '\\u0b8e' .. '\\u0b90' | '\\u0b92' .. '\\u0b95' | '\\u0b99' .. '\\u0b9a' | '\\u0b9c' | '\\u0b9e' .. '\\u0b9f' | '\\u0ba3' .. '\\u0ba4' | '\\u0ba8' .. '\\u0baa' | '\\u0bae' .. '\\u0bb5' | '\\u0bb7' .. '\\u0bb9' | '\\u0bbe' .. '\\u0bc2' | '\\u0bc6' .. '\\u0bc8' | '\\u0bca' .. '\\u0bcd' | '\\u0bd7' | '\\u0be7' .. '\\u0bef' | '\\u0bf9' | '\\u0c01' .. '\\u0c03' | '\\u0c05' .. '\\u0c0c' | '\\u0c0e' .. '\\u0c10' | '\\u0c12' .. '\\u0c28' | '\\u0c2a' .. '\\u0c33' | '\\u0c35' .. '\\u0c39' | '\\u0c3e' .. '\\u0c44' | '\\u0c46' .. '\\u0c48' | '\\u0c4a' .. '\\u0c4d' | '\\u0c55' .. '\\u0c56' | '\\u0c60' .. '\\u0c61' | '\\u0c66' .. '\\u0c6f' | '\\u0c82' .. '\\u0c83' | '\\u0c85' .. '\\u0c8c' | '\\u0c8e' .. '\\u0c90' | '\\u0c92' .. '\\u0ca8' | '\\u0caa' .. '\\u0cb3' | '\\u0cb5' .. '\\u0cb9' | '\\u0cbc' .. '\\u0cc4' | '\\u0cc6' .. '\\u0cc8' | '\\u0cca' .. '\\u0ccd' | '\\u0cd5' .. '\\u0cd6' | '\\u0cde' | '\\u0ce0' .. '\\u0ce1' | '\\u0ce6' .. '\\u0cef' | '\\u0d02' .. '\\u0d03' | '\\u0d05' .. '\\u0d0c' | '\\u0d0e' .. '\\u0d10' | '\\u0d12' .. '\\u0d28' | '\\u0d2a' .. '\\u0d39' | '\\u0d3e' .. '\\u0d43' | '\\u0d46' .. '\\u0d48' | '\\u0d4a' .. '\\u0d4d' | '\\u0d57' | '\\u0d60' .. '\\u0d61' | '\\u0d66' .. '\\u0d6f' | '\\u0d82' .. '\\u0d83' | '\\u0d85' .. '\\u0d96' | '\\u0d9a' .. '\\u0db1' | '\\u0db3' .. '\\u0dbb' | '\\u0dbd' | '\\u0dc0' .. '\\u0dc6' | '\\u0dca' | '\\u0dcf' .. '\\u0dd4' | '\\u0dd6' | '\\u0dd8' .. '\\u0ddf' | '\\u0df2' .. '\\u0df3' | '\\u0e01' .. '\\u0e3a' | '\\u0e3f' .. '\\u0e4e' | '\\u0e50' .. '\\u0e59' | '\\u0e81' .. '\\u0e82' | '\\u0e84' | '\\u0e87' .. '\\u0e88' | '\\u0e8a' | '\\u0e8d' | '\\u0e94' .. '\\u0e97' | '\\u0e99' .. '\\u0e9f' | '\\u0ea1' .. '\\u0ea3' | '\\u0ea5' | '\\u0ea7' | '\\u0eaa' .. '\\u0eab' | '\\u0ead' .. '\\u0eb9' | '\\u0ebb' .. '\\u0ebd' | '\\u0ec0' .. '\\u0ec4' | '\\u0ec6' | '\\u0ec8' .. '\\u0ecd' | '\\u0ed0' .. '\\u0ed9' | '\\u0edc' .. '\\u0edd' | '\\u0f00' | '\\u0f18' .. '\\u0f19' | '\\u0f20' .. '\\u0f29' | '\\u0f35' | '\\u0f37' | '\\u0f39' | '\\u0f3e' .. '\\u0f47' | '\\u0f49' .. '\\u0f6a' | '\\u0f71' .. '\\u0f84' | '\\u0f86' .. '\\u0f8b' | '\\u0f90' .. '\\u0f97' | '\\u0f99' .. '\\u0fbc' | '\\u0fc6' | '\\u1000' .. '\\u1021' | '\\u1023' .. '\\u1027' | '\\u1029' .. '\\u102a' | '\\u102c' .. '\\u1032' | '\\u1036' .. '\\u1039' | '\\u1040' .. '\\u1049' | '\\u1050' .. '\\u1059' | '\\u10a0' .. '\\u10c5' | '\\u10d0' .. '\\u10f8' | '\\u1100' .. '\\u1159' | '\\u115f' .. '\\u11a2' | '\\u11a8' .. '\\u11f9' | '\\u1200' .. '\\u1206' | '\\u1208' .. '\\u1246' | '\\u1248' | '\\u124a' .. '\\u124d' | '\\u1250' .. '\\u1256' | '\\u1258' | '\\u125a' .. '\\u125d' | '\\u1260' .. '\\u1286' | '\\u1288' | '\\u128a' .. '\\u128d' | '\\u1290' .. '\\u12ae' | '\\u12b0' | '\\u12b2' .. '\\u12b5' | '\\u12b8' .. '\\u12be' | '\\u12c0' | '\\u12c2' .. '\\u12c5' | '\\u12c8' .. '\\u12ce' | '\\u12d0' .. '\\u12d6' | '\\u12d8' .. '\\u12ee' | '\\u12f0' .. '\\u130e' | '\\u1310' | '\\u1312' .. '\\u1315' | '\\u1318' .. '\\u131e' | '\\u1320' .. '\\u1346' | '\\u1348' .. '\\u135a' | '\\u1369' .. '\\u1371' | '\\u13a0' .. '\\u13f4' | '\\u1401' .. '\\u166c' | '\\u166f' .. '\\u1676' | '\\u1681' .. '\\u169a' | '\\u16a0' .. '\\u16ea' | '\\u16ee' .. '\\u16f0' | '\\u1700' .. '\\u170c' | '\\u170e' .. '\\u1714' | '\\u1720' .. '\\u1734' | '\\u1740' .. '\\u1753' | '\\u1760' .. '\\u176c' | '\\u176e' .. '\\u1770' | '\\u1772' .. '\\u1773' | '\\u1780' .. '\\u17d3' | '\\u17d7' | '\\u17db' .. '\\u17dd' | '\\u17e0' .. '\\u17e9' | '\\u180b' .. '\\u180d' | '\\u1810' .. '\\u1819' | '\\u1820' .. '\\u1877' | '\\u1880' .. '\\u18a9' | '\\u1900' .. '\\u191c' | '\\u1920' .. '\\u192b' | '\\u1930' .. '\\u193b' | '\\u1946' .. '\\u196d' | '\\u1970' .. '\\u1974' | '\\u1d00' .. '\\u1d6b' | '\\u1e00' .. '\\u1e9b' | '\\u1ea0' .. '\\u1ef9' | '\\u1f00' .. '\\u1f15' | '\\u1f18' .. '\\u1f1d' | '\\u1f20' .. '\\u1f45' | '\\u1f48' .. '\\u1f4d' | '\\u1f50' .. '\\u1f57' | '\\u1f59' | '\\u1f5b' | '\\u1f5d' | '\\u1f5f' .. '\\u1f7d' | '\\u1f80' .. '\\u1fb4' | '\\u1fb6' .. '\\u1fbc' | '\\u1fbe' | '\\u1fc2' .. '\\u1fc4' | '\\u1fc6' .. '\\u1fcc' | '\\u1fd0' .. '\\u1fd3' | '\\u1fd6' .. '\\u1fdb' | '\\u1fe0' .. '\\u1fec' | '\\u1ff2' .. '\\u1ff4' | '\\u1ff6' .. '\\u1ffc' | '\\u200c' .. '\\u200f' | '\\u202a' .. '\\u202e' | '\\u203f' .. '\\u2040' | '\\u2054' | '\\u2060' .. '\\u2063' | '\\u206a' .. '\\u206f' | '\\u2071' | '\\u207f' | '\\u20a0' .. '\\u20b1' | '\\u20d0' .. '\\u20dc' | '\\u20e1' | '\\u20e5' .. '\\u20ea' | '\\u2102' | '\\u2107' | '\\u210a' .. '\\u2113' | '\\u2115' | '\\u2119' .. '\\u211d' | '\\u2124' | '\\u2126' | '\\u2128' | '\\u212a' .. '\\u212d' | '\\u212f' .. '\\u2131' | '\\u2133' .. '\\u2139' | '\\u213d' .. '\\u213f' | '\\u2145' .. '\\u2149' | '\\u2160' .. '\\u2183' | '\\u3005' .. '\\u3007' | '\\u3021' .. '\\u302f' | '\\u3031' .. '\\u3035' | '\\u3038' .. '\\u303c' | '\\u3041' .. '\\u3096' | '\\u3099' .. '\\u309a' | '\\u309d' .. '\\u309f' | '\\u30a1' .. '\\u30ff' | '\\u3105' .. '\\u312c' | '\\u3131' .. '\\u318e' | '\\u31a0' .. '\\u31b7' | '\\u31f0' .. '\\u31ff' | '\\u3400' .. '\\u4db5' | '\\u4e00' .. '\\u9fa5' | '\\ua000' .. '\\ua48c' | '\\uac00' .. '\\ud7a3' | '\\uf900' .. '\\ufa2d' | '\\ufa30' .. '\\ufa6a' | '\\ufb00' .. '\\ufb06' | '\\ufb13' .. '\\ufb17' | '\\ufb1d' .. '\\ufb28' | '\\ufb2a' .. '\\ufb36' | '\\ufb38' .. '\\ufb3c' | '\\ufb3e' | '\\ufb40' .. '\\ufb41' | '\\ufb43' .. '\\ufb44' | '\\ufb46' .. '\\ufbb1' | '\\ufbd3' .. '\\ufd3d' | '\\ufd50' .. '\\ufd8f' | '\\ufd92' .. '\\ufdc7' | '\\ufdf0' .. '\\ufdfc' | '\\ufe00' .. '\\ufe0f' | '\\ufe20' .. '\\ufe23' | '\\ufe33' .. '\\ufe34' | '\\ufe4d' .. '\\ufe4f' | '\\ufe69' | '\\ufe70' .. '\\ufe74' | '\\ufe76' .. '\\ufefc' | '\\ufeff' | '\\uff04' | '\\uff10' .. '\\uff19' | '\\uff21' .. '\\uff3a' | '\\uff3f' | '\\uff41' .. '\\uff5a' | '\\uff65' .. '\\uffbe' | '\\uffc2' .. '\\uffc7' | '\\uffca' .. '\\uffcf' | '\\uffd2' .. '\\uffd7' | '\\uffda' .. '\\uffdc' | '\\uffe0' .. '\\uffe1' | '\\uffe5' .. '\\uffe6' | '\\ufff9' .. '\\ufffb' )
-			// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:646:5: ( '\\u0000' .. '\\u0008' | '\\u000e' .. '\\u001b' | '\\u0024' | '\\u0030' .. '\\u0039' | '\\u0041' .. '\\u005a' | '\\u005f' | '\\u0061' .. '\\u007a' | '\\u007f' .. '\\u009f' | '\\u00a2' .. '\\u00a5' | '\\u00aa' | '\\u00ad' | '\\u00b5' | '\\u00ba' | '\\u00c0' .. '\\u00d6' | '\\u00d8' .. '\\u00f6' | '\\u00f8' .. '\\u0236' | '\\u0250' .. '\\u02c1' | '\\u02c6' .. '\\u02d1' | '\\u02e0' .. '\\u02e4' | '\\u02ee' | '\\u0300' .. '\\u0357' | '\\u035d' .. '\\u036f' | '\\u037a' | '\\u0386' | '\\u0388' .. '\\u038a' | '\\u038c' | '\\u038e' .. '\\u03a1' | '\\u03a3' .. '\\u03ce' | '\\u03d0' .. '\\u03f5' | '\\u03f7' .. '\\u03fb' | '\\u0400' .. '\\u0481' | '\\u0483' .. '\\u0486' | '\\u048a' .. '\\u04ce' | '\\u04d0' .. '\\u04f5' | '\\u04f8' .. '\\u04f9' | '\\u0500' .. '\\u050f' | '\\u0531' .. '\\u0556' | '\\u0559' | '\\u0561' .. '\\u0587' | '\\u0591' .. '\\u05a1' | '\\u05a3' .. '\\u05b9' | '\\u05bb' .. '\\u05bd' | '\\u05bf' | '\\u05c1' .. '\\u05c2' | '\\u05c4' | '\\u05d0' .. '\\u05ea' | '\\u05f0' .. '\\u05f2' | '\\u0600' .. '\\u0603' | '\\u0610' .. '\\u0615' | '\\u0621' .. '\\u063a' | '\\u0640' .. '\\u0658' | '\\u0660' .. '\\u0669' | '\\u066e' .. '\\u06d3' | '\\u06d5' .. '\\u06dd' | '\\u06df' .. '\\u06e8' | '\\u06ea' .. '\\u06fc' | '\\u06ff' | '\\u070f' .. '\\u074a' | '\\u074d' .. '\\u074f' | '\\u0780' .. '\\u07b1' | '\\u0901' .. '\\u0939' | '\\u093c' .. '\\u094d' | '\\u0950' .. '\\u0954' | '\\u0958' .. '\\u0963' | '\\u0966' .. '\\u096f' | '\\u0981' .. '\\u0983' | '\\u0985' .. '\\u098c' | '\\u098f' .. '\\u0990' | '\\u0993' .. '\\u09a8' | '\\u09aa' .. '\\u09b0' | '\\u09b2' | '\\u09b6' .. '\\u09b9' | '\\u09bc' .. '\\u09c4' | '\\u09c7' .. '\\u09c8' | '\\u09cb' .. '\\u09cd' | '\\u09d7' | '\\u09dc' .. '\\u09dd' | '\\u09df' .. '\\u09e3' | '\\u09e6' .. '\\u09f3' | '\\u0a01' .. '\\u0a03' | '\\u0a05' .. '\\u0a0a' | '\\u0a0f' .. '\\u0a10' | '\\u0a13' .. '\\u0a28' | '\\u0a2a' .. '\\u0a30' | '\\u0a32' .. '\\u0a33' | '\\u0a35' .. '\\u0a36' | '\\u0a38' .. '\\u0a39' | '\\u0a3c' | '\\u0a3e' .. '\\u0a42' | '\\u0a47' .. '\\u0a48' | '\\u0a4b' .. '\\u0a4d' | '\\u0a59' .. '\\u0a5c' | '\\u0a5e' | '\\u0a66' .. '\\u0a74' | '\\u0a81' .. '\\u0a83' | '\\u0a85' .. '\\u0a8d' | '\\u0a8f' .. '\\u0a91' | '\\u0a93' .. '\\u0aa8' | '\\u0aaa' .. '\\u0ab0' | '\\u0ab2' .. '\\u0ab3' | '\\u0ab5' .. '\\u0ab9' | '\\u0abc' .. '\\u0ac5' | '\\u0ac7' .. '\\u0ac9' | '\\u0acb' .. '\\u0acd' | '\\u0ad0' | '\\u0ae0' .. '\\u0ae3' | '\\u0ae6' .. '\\u0aef' | '\\u0af1' | '\\u0b01' .. '\\u0b03' | '\\u0b05' .. '\\u0b0c' | '\\u0b0f' .. '\\u0b10' | '\\u0b13' .. '\\u0b28' | '\\u0b2a' .. '\\u0b30' | '\\u0b32' .. '\\u0b33' | '\\u0b35' .. '\\u0b39' | '\\u0b3c' .. '\\u0b43' | '\\u0b47' .. '\\u0b48' | '\\u0b4b' .. '\\u0b4d' | '\\u0b56' .. '\\u0b57' | '\\u0b5c' .. '\\u0b5d' | '\\u0b5f' .. '\\u0b61' | '\\u0b66' .. '\\u0b6f' | '\\u0b71' | '\\u0b82' .. '\\u0b83' | '\\u0b85' .. '\\u0b8a' | '\\u0b8e' .. '\\u0b90' | '\\u0b92' .. '\\u0b95' | '\\u0b99' .. '\\u0b9a' | '\\u0b9c' | '\\u0b9e' .. '\\u0b9f' | '\\u0ba3' .. '\\u0ba4' | '\\u0ba8' .. '\\u0baa' | '\\u0bae' .. '\\u0bb5' | '\\u0bb7' .. '\\u0bb9' | '\\u0bbe' .. '\\u0bc2' | '\\u0bc6' .. '\\u0bc8' | '\\u0bca' .. '\\u0bcd' | '\\u0bd7' | '\\u0be7' .. '\\u0bef' | '\\u0bf9' | '\\u0c01' .. '\\u0c03' | '\\u0c05' .. '\\u0c0c' | '\\u0c0e' .. '\\u0c10' | '\\u0c12' .. '\\u0c28' | '\\u0c2a' .. '\\u0c33' | '\\u0c35' .. '\\u0c39' | '\\u0c3e' .. '\\u0c44' | '\\u0c46' .. '\\u0c48' | '\\u0c4a' .. '\\u0c4d' | '\\u0c55' .. '\\u0c56' | '\\u0c60' .. '\\u0c61' | '\\u0c66' .. '\\u0c6f' | '\\u0c82' .. '\\u0c83' | '\\u0c85' .. '\\u0c8c' | '\\u0c8e' .. '\\u0c90' | '\\u0c92' .. '\\u0ca8' | '\\u0caa' .. '\\u0cb3' | '\\u0cb5' .. '\\u0cb9' | '\\u0cbc' .. '\\u0cc4' | '\\u0cc6' .. '\\u0cc8' | '\\u0cca' .. '\\u0ccd' | '\\u0cd5' .. '\\u0cd6' | '\\u0cde' | '\\u0ce0' .. '\\u0ce1' | '\\u0ce6' .. '\\u0cef' | '\\u0d02' .. '\\u0d03' | '\\u0d05' .. '\\u0d0c' | '\\u0d0e' .. '\\u0d10' | '\\u0d12' .. '\\u0d28' | '\\u0d2a' .. '\\u0d39' | '\\u0d3e' .. '\\u0d43' | '\\u0d46' .. '\\u0d48' | '\\u0d4a' .. '\\u0d4d' | '\\u0d57' | '\\u0d60' .. '\\u0d61' | '\\u0d66' .. '\\u0d6f' | '\\u0d82' .. '\\u0d83' | '\\u0d85' .. '\\u0d96' | '\\u0d9a' .. '\\u0db1' | '\\u0db3' .. '\\u0dbb' | '\\u0dbd' | '\\u0dc0' .. '\\u0dc6' | '\\u0dca' | '\\u0dcf' .. '\\u0dd4' | '\\u0dd6' | '\\u0dd8' .. '\\u0ddf' | '\\u0df2' .. '\\u0df3' | '\\u0e01' .. '\\u0e3a' | '\\u0e3f' .. '\\u0e4e' | '\\u0e50' .. '\\u0e59' | '\\u0e81' .. '\\u0e82' | '\\u0e84' | '\\u0e87' .. '\\u0e88' | '\\u0e8a' | '\\u0e8d' | '\\u0e94' .. '\\u0e97' | '\\u0e99' .. '\\u0e9f' | '\\u0ea1' .. '\\u0ea3' | '\\u0ea5' | '\\u0ea7' | '\\u0eaa' .. '\\u0eab' | '\\u0ead' .. '\\u0eb9' | '\\u0ebb' .. '\\u0ebd' | '\\u0ec0' .. '\\u0ec4' | '\\u0ec6' | '\\u0ec8' .. '\\u0ecd' | '\\u0ed0' .. '\\u0ed9' | '\\u0edc' .. '\\u0edd' | '\\u0f00' | '\\u0f18' .. '\\u0f19' | '\\u0f20' .. '\\u0f29' | '\\u0f35' | '\\u0f37' | '\\u0f39' | '\\u0f3e' .. '\\u0f47' | '\\u0f49' .. '\\u0f6a' | '\\u0f71' .. '\\u0f84' | '\\u0f86' .. '\\u0f8b' | '\\u0f90' .. '\\u0f97' | '\\u0f99' .. '\\u0fbc' | '\\u0fc6' | '\\u1000' .. '\\u1021' | '\\u1023' .. '\\u1027' | '\\u1029' .. '\\u102a' | '\\u102c' .. '\\u1032' | '\\u1036' .. '\\u1039' | '\\u1040' .. '\\u1049' | '\\u1050' .. '\\u1059' | '\\u10a0' .. '\\u10c5' | '\\u10d0' .. '\\u10f8' | '\\u1100' .. '\\u1159' | '\\u115f' .. '\\u11a2' | '\\u11a8' .. '\\u11f9' | '\\u1200' .. '\\u1206' | '\\u1208' .. '\\u1246' | '\\u1248' | '\\u124a' .. '\\u124d' | '\\u1250' .. '\\u1256' | '\\u1258' | '\\u125a' .. '\\u125d' | '\\u1260' .. '\\u1286' | '\\u1288' | '\\u128a' .. '\\u128d' | '\\u1290' .. '\\u12ae' | '\\u12b0' | '\\u12b2' .. '\\u12b5' | '\\u12b8' .. '\\u12be' | '\\u12c0' | '\\u12c2' .. '\\u12c5' | '\\u12c8' .. '\\u12ce' | '\\u12d0' .. '\\u12d6' | '\\u12d8' .. '\\u12ee' | '\\u12f0' .. '\\u130e' | '\\u1310' | '\\u1312' .. '\\u1315' | '\\u1318' .. '\\u131e' | '\\u1320' .. '\\u1346' | '\\u1348' .. '\\u135a' | '\\u1369' .. '\\u1371' | '\\u13a0' .. '\\u13f4' | '\\u1401' .. '\\u166c' | '\\u166f' .. '\\u1676' | '\\u1681' .. '\\u169a' | '\\u16a0' .. '\\u16ea' | '\\u16ee' .. '\\u16f0' | '\\u1700' .. '\\u170c' | '\\u170e' .. '\\u1714' | '\\u1720' .. '\\u1734' | '\\u1740' .. '\\u1753' | '\\u1760' .. '\\u176c' | '\\u176e' .. '\\u1770' | '\\u1772' .. '\\u1773' | '\\u1780' .. '\\u17d3' | '\\u17d7' | '\\u17db' .. '\\u17dd' | '\\u17e0' .. '\\u17e9' | '\\u180b' .. '\\u180d' | '\\u1810' .. '\\u1819' | '\\u1820' .. '\\u1877' | '\\u1880' .. '\\u18a9' | '\\u1900' .. '\\u191c' | '\\u1920' .. '\\u192b' | '\\u1930' .. '\\u193b' | '\\u1946' .. '\\u196d' | '\\u1970' .. '\\u1974' | '\\u1d00' .. '\\u1d6b' | '\\u1e00' .. '\\u1e9b' | '\\u1ea0' .. '\\u1ef9' | '\\u1f00' .. '\\u1f15' | '\\u1f18' .. '\\u1f1d' | '\\u1f20' .. '\\u1f45' | '\\u1f48' .. '\\u1f4d' | '\\u1f50' .. '\\u1f57' | '\\u1f59' | '\\u1f5b' | '\\u1f5d' | '\\u1f5f' .. '\\u1f7d' | '\\u1f80' .. '\\u1fb4' | '\\u1fb6' .. '\\u1fbc' | '\\u1fbe' | '\\u1fc2' .. '\\u1fc4' | '\\u1fc6' .. '\\u1fcc' | '\\u1fd0' .. '\\u1fd3' | '\\u1fd6' .. '\\u1fdb' | '\\u1fe0' .. '\\u1fec' | '\\u1ff2' .. '\\u1ff4' | '\\u1ff6' .. '\\u1ffc' | '\\u200c' .. '\\u200f' | '\\u202a' .. '\\u202e' | '\\u203f' .. '\\u2040' | '\\u2054' | '\\u2060' .. '\\u2063' | '\\u206a' .. '\\u206f' | '\\u2071' | '\\u207f' | '\\u20a0' .. '\\u20b1' | '\\u20d0' .. '\\u20dc' | '\\u20e1' | '\\u20e5' .. '\\u20ea' | '\\u2102' | '\\u2107' | '\\u210a' .. '\\u2113' | '\\u2115' | '\\u2119' .. '\\u211d' | '\\u2124' | '\\u2126' | '\\u2128' | '\\u212a' .. '\\u212d' | '\\u212f' .. '\\u2131' | '\\u2133' .. '\\u2139' | '\\u213d' .. '\\u213f' | '\\u2145' .. '\\u2149' | '\\u2160' .. '\\u2183' | '\\u3005' .. '\\u3007' | '\\u3021' .. '\\u302f' | '\\u3031' .. '\\u3035' | '\\u3038' .. '\\u303c' | '\\u3041' .. '\\u3096' | '\\u3099' .. '\\u309a' | '\\u309d' .. '\\u309f' | '\\u30a1' .. '\\u30ff' | '\\u3105' .. '\\u312c' | '\\u3131' .. '\\u318e' | '\\u31a0' .. '\\u31b7' | '\\u31f0' .. '\\u31ff' | '\\u3400' .. '\\u4db5' | '\\u4e00' .. '\\u9fa5' | '\\ua000' .. '\\ua48c' | '\\uac00' .. '\\ud7a3' | '\\uf900' .. '\\ufa2d' | '\\ufa30' .. '\\ufa6a' | '\\ufb00' .. '\\ufb06' | '\\ufb13' .. '\\ufb17' | '\\ufb1d' .. '\\ufb28' | '\\ufb2a' .. '\\ufb36' | '\\ufb38' .. '\\ufb3c' | '\\ufb3e' | '\\ufb40' .. '\\ufb41' | '\\ufb43' .. '\\ufb44' | '\\ufb46' .. '\\ufbb1' | '\\ufbd3' .. '\\ufd3d' | '\\ufd50' .. '\\ufd8f' | '\\ufd92' .. '\\ufdc7' | '\\ufdf0' .. '\\ufdfc' | '\\ufe00' .. '\\ufe0f' | '\\ufe20' .. '\\ufe23' | '\\ufe33' .. '\\ufe34' | '\\ufe4d' .. '\\ufe4f' | '\\ufe69' | '\\ufe70' .. '\\ufe74' | '\\ufe76' .. '\\ufefc' | '\\ufeff' | '\\uff04' | '\\uff10' .. '\\uff19' | '\\uff21' .. '\\uff3a' | '\\uff3f' | '\\uff41' .. '\\uff5a' | '\\uff65' .. '\\uffbe' | '\\uffc2' .. '\\uffc7' | '\\uffca' .. '\\uffcf' | '\\uffd2' .. '\\uffd7' | '\\uffda' .. '\\uffdc' | '\\uffe0' .. '\\uffe1' | '\\uffe5' .. '\\uffe6' | '\\ufff9' .. '\\ufffb' )
+			// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:
 			{
 			if ( (input.LA(1) >= '\u0000' && input.LA(1) <= '\b')||(input.LA(1) >= '\u000E' && input.LA(1) <= '\u001B')||input.LA(1)=='$'||(input.LA(1) >= '0' && input.LA(1) <= '9')||(input.LA(1) >= 'A' && input.LA(1) <= 'Z')||input.LA(1)=='_'||(input.LA(1) >= 'a' && input.LA(1) <= 'z')||(input.LA(1) >= '\u007F' && input.LA(1) <= '\u009F')||(input.LA(1) >= '\u00A2' && input.LA(1) <= '\u00A5')||input.LA(1)=='\u00AA'||input.LA(1)=='\u00AD'||input.LA(1)=='\u00B5'||input.LA(1)=='\u00BA'||(input.LA(1) >= '\u00C0' && input.LA(1) <= '\u00D6')||(input.LA(1) >= '\u00D8' && input.LA(1) <= '\u00F6')||(input.LA(1) >= '\u00F8' && input.LA(1) <= '\u0236')||(input.LA(1) >= '\u0250' && input.LA(1) <= '\u02C1')||(input.LA(1) >= '\u02C6' && input.LA(1) <= '\u02D1')||(input.LA(1) >= '\u02E0' && input.LA(1) <= '\u02E4')||input.LA(1)=='\u02EE'||(input.LA(1) >= '\u0300' && input.LA(1) <= '\u0357')||(input.LA(1) >= '\u035D' && input.LA(1) <= '\u036F')||input.LA(1)=='\u037A'||input.LA(1)=='\u0386'||(input.LA(1) >= '\u0388' && input.LA(1) <= '\u038A')||input.LA(1)=='\u038C'||(input.LA(1) >= '\u038E' && input.LA(1) <= '\u03A1')||(input.LA(1) >= '\u03A3' && input.LA(1) <= '\u03CE')||(input.LA(1) >= '\u03D0' && input.LA(1) <= '\u03F5')||(input.LA(1) >= '\u03F7' && input.LA(1) <= '\u03FB')||(input.LA(1) >= '\u0400' && input.LA(1) <= '\u0481')||(input.LA(1) >= '\u0483' && input.LA(1) <= '\u0486')||(input.LA(1) >= '\u048A' && input.LA(1) <= '\u04CE')||(input.LA(1) >= '\u04D0' && input.LA(1) <= '\u04F5')||(input.LA(1) >= '\u04F8' && input.LA(1) <= '\u04F9')||(input.LA(1) >= '\u0500' && input.LA(1) <= '\u050F')||(input.LA(1) >= '\u0531' && input.LA(1) <= '\u0556')||input.LA(1)=='\u0559'||(input.LA(1) >= '\u0561' && input.LA(1) <= '\u0587')||(input.LA(1) >= '\u0591' && input.LA(1) <= '\u05A1')||(input.LA(1) >= '\u05A3' && input.LA(1) <= '\u05B9')||(input.LA(1) >= '\u05BB' && input.LA(1) <= '\u05BD')||input.LA(1)=='\u05BF'||(input.LA(1) >= '\u05C1' && input.LA(1) <= '\u05C2')||input.LA(1)=='\u05C4'||(input.LA(1) >= '\u05D0' && input.LA(1) <= '\u05EA')||(input.LA(1) >= '\u05F0' && input.LA(1) <= '\u05F2')||(input.LA(1) >= '\u0600' && input.LA(1) <= '\u0603')||(input.LA(1) >= '\u0610' && input.LA(1) <= '\u0615')||(input.LA(1) >= '\u0621' && input.LA(1) <= '\u063A')||(input.LA(1) >= '\u0640' && input.LA(1) <= '\u0658')||(input.LA(1) >= '\u0660' && input.LA(1) <= '\u0669')||(input.LA(1) >= '\u066E' && input.LA(1) <= '\u06D3')||(input.LA(1) >= '\u06D5' && input.LA(1) <= '\u06DD')||(input.LA(1) >= '\u06DF' && input.LA(1) <= '\u06E8')||(input.LA(1) >= '\u06EA' && input.LA(1) <= '\u06FC')||input.LA(1)=='\u06FF'||(input.LA(1) >= '\u070F' && input.LA(1) <= '\u074A')||(input.LA(1) >= '\u074D' && input.LA(1) <= '\u074F')||(input.LA(1) >= '\u0780' && input.LA(1) <= '\u07B1')||(input.LA(1) >= '\u0901' && input.LA(1) <= '\u0939')||(input.LA(1) >= '\u093C' && input.LA(1) <= '\u094D')||(input.LA(1) >= '\u0950' && input.LA(1) <= '\u0954')||(input.LA(1) >= '\u0958' && input.LA(1) <= '\u0963')||(input.LA(1) >= '\u0966' && input.LA(1) <= '\u096F')||(input.LA(1) >= '\u0981' && input.LA(1) <= '\u0983')||(input.LA(1) >= '\u0985' && input.LA(1) <= '\u098C')||(input.LA(1) >= '\u098F' && input.LA(1) <= '\u0990')||(input.LA(1) >= '\u0993' && input.LA(1) <= '\u09A8')||(input.LA(1) >= '\u09AA' && input.LA(1) <= '\u09B0')||input.LA(1)=='\u09B2'||(input.LA(1) >= '\u09B6' && input.LA(1) <= '\u09B9')||(input.LA(1) >= '\u09BC' && input.LA(1) <= '\u09C4')||(input.LA(1) >= '\u09C7' && input.LA(1) <= '\u09C8')||(input.LA(1) >= '\u09CB' && input.LA(1) <= '\u09CD')||input.LA(1)=='\u09D7'||(input.LA(1) >= '\u09DC' && input.LA(1) <= '\u09DD')||(input.LA(1) >= '\u09DF' && input.LA(1) <= '\u09E3')||(input.LA(1) >= '\u09E6' && input.LA(1) <= '\u09F3')||(input.LA(1) >= '\u0A01' && input.LA(1) <= '\u0A03')||(input.LA(1) >= '\u0A05' && input.LA(1) <= '\u0A0A')||(input.LA(1) >= '\u0A0F' && input.LA(1) <= '\u0A10')||(input.LA(1) >= '\u0A13' && input.LA(1) <= '\u0A28')||(input.LA(1) >= '\u0A2A' && input.LA(1) <= '\u0A30')||(input.LA(1) >= '\u0A32' && input.LA(1) <= '\u0A33')||(input.LA(1) >= '\u0A35' && input.LA(1) <= '\u0A36')||(input.LA(1) >= '\u0A38' && input.LA(1) <= '\u0A39')||input.LA(1)=='\u0A3C'||(input.LA(1) >= '\u0A3E' && input.LA(1) <= '\u0A42')||(input.LA(1) >= '\u0A47' && input.LA(1) <= '\u0A48')||(input.LA(1) >= '\u0A4B' && input.LA(1) <= '\u0A4D')||(input.LA(1) >= '\u0A59' && input.LA(1) <= '\u0A5C')||input.LA(1)=='\u0A5E'||(input.LA(1) >= '\u0A66' && input.LA(1) <= '\u0A74')||(input.LA(1) >= '\u0A81' && input.LA(1) <= '\u0A83')||(input.LA(1) >= '\u0A85' && input.LA(1) <= '\u0A8D')||(input.LA(1) >= '\u0A8F' && input.LA(1) <= '\u0A91')||(input.LA(1) >= '\u0A93' && input.LA(1) <= '\u0AA8')||(input.LA(1) >= '\u0AAA' && input.LA(1) <= '\u0AB0')||(input.LA(1) >= '\u0AB2' && input.LA(1) <= '\u0AB3')||(input.LA(1) >= '\u0AB5' && input.LA(1) <= '\u0AB9')||(input.LA(1) >= '\u0ABC' && input.LA(1) <= '\u0AC5')||(input.LA(1) >= '\u0AC7' && input.LA(1) <= '\u0AC9')||(input.LA(1) >= '\u0ACB' && input.LA(1) <= '\u0ACD')||input.LA(1)=='\u0AD0'||(input.LA(1) >= '\u0AE0' && input.LA(1) <= '\u0AE3')||(input.LA(1) >= '\u0AE6' && input.LA(1) <= '\u0AEF')||input.LA(1)=='\u0AF1'||(input.LA(1) >= '\u0B01' && input.LA(1) <= '\u0B03')||(input.LA(1) >= '\u0B05' && input.LA(1) <= '\u0B0C')||(input.LA(1) >= '\u0B0F' && input.LA(1) <= '\u0B10')||(input.LA(1) >= '\u0B13' && input.LA(1) <= '\u0B28')||(input.LA(1) >= '\u0B2A' && input.LA(1) <= '\u0B30')||(input.LA(1) >= '\u0B32' && input.LA(1) <= '\u0B33')||(input.LA(1) >= '\u0B35' && input.LA(1) <= '\u0B39')||(input.LA(1) >= '\u0B3C' && input.LA(1) <= '\u0B43')||(input.LA(1) >= '\u0B47' && input.LA(1) <= '\u0B48')||(input.LA(1) >= '\u0B4B' && input.LA(1) <= '\u0B4D')||(input.LA(1) >= '\u0B56' && input.LA(1) <= '\u0B57')||(input.LA(1) >= '\u0B5C' && input.LA(1) <= '\u0B5D')||(input.LA(1) >= '\u0B5F' && input.LA(1) <= '\u0B61')||(input.LA(1) >= '\u0B66' && input.LA(1) <= '\u0B6F')||input.LA(1)=='\u0B71'||(input.LA(1) >= '\u0B82' && input.LA(1) <= '\u0B83')||(input.LA(1) >= '\u0B85' && input.LA(1) <= '\u0B8A')||(input.LA(1) >= '\u0B8E' && input.LA(1) <= '\u0B90')||(input.LA(1) >= '\u0B92' && input.LA(1) <= '\u0B95')||(input.LA(1) >= '\u0B99' && input.LA(1) <= '\u0B9A')||input.LA(1)=='\u0B9C'||(input.LA(1) >= '\u0B9E' && input.LA(1) <= '\u0B9F')||(input.LA(1) >= '\u0BA3' && input.LA(1) <= '\u0BA4')||(input.LA(1) >= '\u0BA8' && input.LA(1) <= '\u0BAA')||(input.LA(1) >= '\u0BAE' && input.LA(1) <= '\u0BB5')||(input.LA(1) >= '\u0BB7' && input.LA(1) <= '\u0BB9')||(input.LA(1) >= '\u0BBE' && input.LA(1) <= '\u0BC2')||(input.LA(1) >= '\u0BC6' && input.LA(1) <= '\u0BC8')||(input.LA(1) >= '\u0BCA' && input.LA(1) <= '\u0BCD')||input.LA(1)=='\u0BD7'||(input.LA(1) >= '\u0BE7' && input.LA(1) <= '\u0BEF')||input.LA(1)=='\u0BF9'||(input.LA(1) >= '\u0C01' && input.LA(1) <= '\u0C03')||(input.LA(1) >= '\u0C05' && input.LA(1) <= '\u0C0C')||(input.LA(1) >= '\u0C0E' && input.LA(1) <= '\u0C10')||(input.LA(1) >= '\u0C12' && input.LA(1) <= '\u0C28')||(input.LA(1) >= '\u0C2A' && input.LA(1) <= '\u0C33')||(input.LA(1) >= '\u0C35' && input.LA(1) <= '\u0C39')||(input.LA(1) >= '\u0C3E' && input.LA(1) <= '\u0C44')||(input.LA(1) >= '\u0C46' && input.LA(1) <= '\u0C48')||(input.LA(1) >= '\u0C4A' && input.LA(1) <= '\u0C4D')||(input.LA(1) >= '\u0C55' && input.LA(1) <= '\u0C56')||(input.LA(1) >= '\u0C60' && input.LA(1) <= '\u0C61')||(input.LA(1) >= '\u0C66' && input.LA(1) <= '\u0C6F')||(input.LA(1) >= '\u0C82' && input.LA(1) <= '\u0C83')||(input.LA(1) >= '\u0C85' && input.LA(1) <= '\u0C8C')||(input.LA(1) >= '\u0C8E' && input.LA(1) <= '\u0C90')||(input.LA(1) >= '\u0C92' && input.LA(1) <= '\u0CA8')||(input.LA(1) >= '\u0CAA' && input.LA(1) <= '\u0CB3')||(input.LA(1) >= '\u0CB5' && input.LA(1) <= '\u0CB9')||(input.LA(1) >= '\u0CBC' && input.LA(1) <= '\u0CC4')||(input.LA(1) >= '\u0CC6' && input.LA(1) <= '\u0CC8')||(input.LA(1) >= '\u0CCA' && input.LA(1) <= '\u0CCD')||(input.LA(1) >= '\u0CD5' && input.LA(1) <= '\u0CD6')||input.LA(1)=='\u0CDE'||(input.LA(1) >= '\u0CE0' && input.LA(1) <= '\u0CE1')||(input.LA(1) >= '\u0CE6' && input.LA(1) <= '\u0CEF')||(input.LA(1) >= '\u0D02' && input.LA(1) <= '\u0D03')||(input.LA(1) >= '\u0D05' && input.LA(1) <= '\u0D0C')||(input.LA(1) >= '\u0D0E' && input.LA(1) <= '\u0D10')||(input.LA(1) >= '\u0D12' && input.LA(1) <= '\u0D28')||(input.LA(1) >= '\u0D2A' && input.LA(1) <= '\u0D39')||(input.LA(1) >= '\u0D3E' && input.LA(1) <= '\u0D43')||(input.LA(1) >= '\u0D46' && input.LA(1) <= '\u0D48')||(input.LA(1) >= '\u0D4A' && input.LA(1) <= '\u0D4D')||input.LA(1)=='\u0D57'||(input.LA(1) >= '\u0D60' && input.LA(1) <= '\u0D61')||(input.LA(1) >= '\u0D66' && input.LA(1) <= '\u0D6F')||(input.LA(1) >= '\u0D82' && input.LA(1) <= '\u0D83')||(input.LA(1) >= '\u0D85' && input.LA(1) <= '\u0D96')||(input.LA(1) >= '\u0D9A' && input.LA(1) <= '\u0DB1')||(input.LA(1) >= '\u0DB3' && input.LA(1) <= '\u0DBB')||input.LA(1)=='\u0DBD'||(input.LA(1) >= '\u0DC0' && input.LA(1) <= '\u0DC6')||input.LA(1)=='\u0DCA'||(input.LA(1) >= '\u0DCF' && input.LA(1) <= '\u0DD4')||input.LA(1)=='\u0DD6'||(input.LA(1) >= '\u0DD8' && input.LA(1) <= '\u0DDF')||(input.LA(1) >= '\u0DF2' && input.LA(1) <= '\u0DF3')||(input.LA(1) >= '\u0E01' && input.LA(1) <= '\u0E3A')||(input.LA(1) >= '\u0E3F' && input.LA(1) <= '\u0E4E')||(input.LA(1) >= '\u0E50' && input.LA(1) <= '\u0E59')||(input.LA(1) >= '\u0E81' && input.LA(1) <= '\u0E82')||input.LA(1)=='\u0E84'||(input.LA(1) >= '\u0E87' && input.LA(1) <= '\u0E88')||input.LA(1)=='\u0E8A'||input.LA(1)=='\u0E8D'||(input.LA(1) >= '\u0E94' && input.LA(1) <= '\u0E97')||(input.LA(1) >= '\u0E99' && input.LA(1) <= '\u0E9F')||(input.LA(1) >= '\u0EA1' && input.LA(1) <= '\u0EA3')||input.LA(1)=='\u0EA5'||input.LA(1)=='\u0EA7'||(input.LA(1) >= '\u0EAA' && input.LA(1) <= '\u0EAB')||(input.LA(1) >= '\u0EAD' && input.LA(1) <= '\u0EB9')||(input.LA(1) >= '\u0EBB' && input.LA(1) <= '\u0EBD')||(input.LA(1) >= '\u0EC0' && input.LA(1) <= '\u0EC4')||input.LA(1)=='\u0EC6'||(input.LA(1) >= '\u0EC8' && input.LA(1) <= '\u0ECD')||(input.LA(1) >= '\u0ED0' && input.LA(1) <= '\u0ED9')||(input.LA(1) >= '\u0EDC' && input.LA(1) <= '\u0EDD')||input.LA(1)=='\u0F00'||(input.LA(1) >= '\u0F18' && input.LA(1) <= '\u0F19')||(input.LA(1) >= '\u0F20' && input.LA(1) <= '\u0F29')||input.LA(1)=='\u0F35'||input.LA(1)=='\u0F37'||input.LA(1)=='\u0F39'||(input.LA(1) >= '\u0F3E' && input.LA(1) <= '\u0F47')||(input.LA(1) >= '\u0F49' && input.LA(1) <= '\u0F6A')||(input.LA(1) >= '\u0F71' && input.LA(1) <= '\u0F84')||(input.LA(1) >= '\u0F86' && input.LA(1) <= '\u0F8B')||(input.LA(1) >= '\u0F90' && input.LA(1) <= '\u0F97')||(input.LA(1) >= '\u0F99' && input.LA(1) <= '\u0FBC')||input.LA(1)=='\u0FC6'||(input.LA(1) >= '\u1000' && input.LA(1) <= '\u1021')||(input.LA(1) >= '\u1023' && input.LA(1) <= '\u1027')||(input.LA(1) >= '\u1029' && input.LA(1) <= '\u102A')||(input.LA(1) >= '\u102C' && input.LA(1) <= '\u1032')||(input.LA(1) >= '\u1036' && input.LA(1) <= '\u1039')||(input.LA(1) >= '\u1040' && input.LA(1) <= '\u1049')||(input.LA(1) >= '\u1050' && input.LA(1) <= '\u1059')||(input.LA(1) >= '\u10A0' && input.LA(1) <= '\u10C5')||(input.LA(1) >= '\u10D0' && input.LA(1) <= '\u10F8')||(input.LA(1) >= '\u1100' && input.LA(1) <= '\u1159')||(input.LA(1) >= '\u115F' && input.LA(1) <= '\u11A2')||(input.LA(1) >= '\u11A8' && input.LA(1) <= '\u11F9')||(input.LA(1) >= '\u1200' && input.LA(1) <= '\u1206')||(input.LA(1) >= '\u1208' && input.LA(1) <= '\u1246')||input.LA(1)=='\u1248'||(input.LA(1) >= '\u124A' && input.LA(1) <= '\u124D')||(input.LA(1) >= '\u1250' && input.LA(1) <= '\u1256')||input.LA(1)=='\u1258'||(input.LA(1) >= '\u125A' && input.LA(1) <= '\u125D')||(input.LA(1) >= '\u1260' && input.LA(1) <= '\u1286')||input.LA(1)=='\u1288'||(input.LA(1) >= '\u128A' && input.LA(1) <= '\u128D')||(input.LA(1) >= '\u1290' && input.LA(1) <= '\u12AE')||input.LA(1)=='\u12B0'||(input.LA(1) >= '\u12B2' && input.LA(1) <= '\u12B5')||(input.LA(1) >= '\u12B8' && input.LA(1) <= '\u12BE')||input.LA(1)=='\u12C0'||(input.LA(1) >= '\u12C2' && input.LA(1) <= '\u12C5')||(input.LA(1) >= '\u12C8' && input.LA(1) <= '\u12CE')||(input.LA(1) >= '\u12D0' && input.LA(1) <= '\u12D6')||(input.LA(1) >= '\u12D8' && input.LA(1) <= '\u12EE')||(input.LA(1) >= '\u12F0' && input.LA(1) <= '\u130E')||input.LA(1)=='\u1310'||(input.LA(1) >= '\u1312' && input.LA(1) <= '\u1315')||(input.LA(1) >= '\u1318' && input.LA(1) <= '\u131E')||(input.LA(1) >= '\u1320' && input.LA(1) <= '\u1346')||(input.LA(1) >= '\u1348' && input.LA(1) <= '\u135A')||(input.LA(1) >= '\u1369' && input.LA(1) <= '\u1371')||(input.LA(1) >= '\u13A0' && input.LA(1) <= '\u13F4')||(input.LA(1) >= '\u1401' && input.LA(1) <= '\u166C')||(input.LA(1) >= '\u166F' && input.LA(1) <= '\u1676')||(input.LA(1) >= '\u1681' && input.LA(1) <= '\u169A')||(input.LA(1) >= '\u16A0' && input.LA(1) <= '\u16EA')||(input.LA(1) >= '\u16EE' && input.LA(1) <= '\u16F0')||(input.LA(1) >= '\u1700' && input.LA(1) <= '\u170C')||(input.LA(1) >= '\u170E' && input.LA(1) <= '\u1714')||(input.LA(1) >= '\u1720' && input.LA(1) <= '\u1734')||(input.LA(1) >= '\u1740' && input.LA(1) <= '\u1753')||(input.LA(1) >= '\u1760' && input.LA(1) <= '\u176C')||(input.LA(1) >= '\u176E' && input.LA(1) <= '\u1770')||(input.LA(1) >= '\u1772' && input.LA(1) <= '\u1773')||(input.LA(1) >= '\u1780' && input.LA(1) <= '\u17D3')||input.LA(1)=='\u17D7'||(input.LA(1) >= '\u17DB' && input.LA(1) <= '\u17DD')||(input.LA(1) >= '\u17E0' && input.LA(1) <= '\u17E9')||(input.LA(1) >= '\u180B' && input.LA(1) <= '\u180D')||(input.LA(1) >= '\u1810' && input.LA(1) <= '\u1819')||(input.LA(1) >= '\u1820' && input.LA(1) <= '\u1877')||(input.LA(1) >= '\u1880' && input.LA(1) <= '\u18A9')||(input.LA(1) >= '\u1900' && input.LA(1) <= '\u191C')||(input.LA(1) >= '\u1920' && input.LA(1) <= '\u192B')||(input.LA(1) >= '\u1930' && input.LA(1) <= '\u193B')||(input.LA(1) >= '\u1946' && input.LA(1) <= '\u196D')||(input.LA(1) >= '\u1970' && input.LA(1) <= '\u1974')||(input.LA(1) >= '\u1D00' && input.LA(1) <= '\u1D6B')||(input.LA(1) >= '\u1E00' && input.LA(1) <= '\u1E9B')||(input.LA(1) >= '\u1EA0' && input.LA(1) <= '\u1EF9')||(input.LA(1) >= '\u1F00' && input.LA(1) <= '\u1F15')||(input.LA(1) >= '\u1F18' && input.LA(1) <= '\u1F1D')||(input.LA(1) >= '\u1F20' && input.LA(1) <= '\u1F45')||(input.LA(1) >= '\u1F48' && input.LA(1) <= '\u1F4D')||(input.LA(1) >= '\u1F50' && input.LA(1) <= '\u1F57')||input.LA(1)=='\u1F59'||input.LA(1)=='\u1F5B'||input.LA(1)=='\u1F5D'||(input.LA(1) >= '\u1F5F' && input.LA(1) <= '\u1F7D')||(input.LA(1) >= '\u1F80' && input.LA(1) <= '\u1FB4')||(input.LA(1) >= '\u1FB6' && input.LA(1) <= '\u1FBC')||input.LA(1)=='\u1FBE'||(input.LA(1) >= '\u1FC2' && input.LA(1) <= '\u1FC4')||(input.LA(1) >= '\u1FC6' && input.LA(1) <= '\u1FCC')||(input.LA(1) >= '\u1FD0' && input.LA(1) <= '\u1FD3')||(input.LA(1) >= '\u1FD6' && input.LA(1) <= '\u1FDB')||(input.LA(1) >= '\u1FE0' && input.LA(1) <= '\u1FEC')||(input.LA(1) >= '\u1FF2' && input.LA(1) <= '\u1FF4')||(input.LA(1) >= '\u1FF6' && input.LA(1) <= '\u1FFC')||(input.LA(1) >= '\u200C' && input.LA(1) <= '\u200F')||(input.LA(1) >= '\u202A' && input.LA(1) <= '\u202E')||(input.LA(1) >= '\u203F' && input.LA(1) <= '\u2040')||input.LA(1)=='\u2054'||(input.LA(1) >= '\u2060' && input.LA(1) <= '\u2063')||(input.LA(1) >= '\u206A' && input.LA(1) <= '\u206F')||input.LA(1)=='\u2071'||input.LA(1)=='\u207F'||(input.LA(1) >= '\u20A0' && input.LA(1) <= '\u20B1')||(input.LA(1) >= '\u20D0' && input.LA(1) <= '\u20DC')||input.LA(1)=='\u20E1'||(input.LA(1) >= '\u20E5' && input.LA(1) <= '\u20EA')||input.LA(1)=='\u2102'||input.LA(1)=='\u2107'||(input.LA(1) >= '\u210A' && input.LA(1) <= '\u2113')||input.LA(1)=='\u2115'||(input.LA(1) >= '\u2119' && input.LA(1) <= '\u211D')||input.LA(1)=='\u2124'||input.LA(1)=='\u2126'||input.LA(1)=='\u2128'||(input.LA(1) >= '\u212A' && input.LA(1) <= '\u212D')||(input.LA(1) >= '\u212F' && input.LA(1) <= '\u2131')||(input.LA(1) >= '\u2133' && input.LA(1) <= '\u2139')||(input.LA(1) >= '\u213D' && input.LA(1) <= '\u213F')||(input.LA(1) >= '\u2145' && input.LA(1) <= '\u2149')||(input.LA(1) >= '\u2160' && input.LA(1) <= '\u2183')||(input.LA(1) >= '\u3005' && input.LA(1) <= '\u3007')||(input.LA(1) >= '\u3021' && input.LA(1) <= '\u302F')||(input.LA(1) >= '\u3031' && input.LA(1) <= '\u3035')||(input.LA(1) >= '\u3038' && input.LA(1) <= '\u303C')||(input.LA(1) >= '\u3041' && input.LA(1) <= '\u3096')||(input.LA(1) >= '\u3099' && input.LA(1) <= '\u309A')||(input.LA(1) >= '\u309D' && input.LA(1) <= '\u309F')||(input.LA(1) >= '\u30A1' && input.LA(1) <= '\u30FF')||(input.LA(1) >= '\u3105' && input.LA(1) <= '\u312C')||(input.LA(1) >= '\u3131' && input.LA(1) <= '\u318E')||(input.LA(1) >= '\u31A0' && input.LA(1) <= '\u31B7')||(input.LA(1) >= '\u31F0' && input.LA(1) <= '\u31FF')||(input.LA(1) >= '\u3400' && input.LA(1) <= '\u4DB5')||(input.LA(1) >= '\u4E00' && input.LA(1) <= '\u9FA5')||(input.LA(1) >= '\uA000' && input.LA(1) <= '\uA48C')||(input.LA(1) >= '\uAC00' && input.LA(1) <= '\uD7A3')||(input.LA(1) >= '\uF900' && input.LA(1) <= '\uFA2D')||(input.LA(1) >= '\uFA30' && input.LA(1) <= '\uFA6A')||(input.LA(1) >= '\uFB00' && input.LA(1) <= '\uFB06')||(input.LA(1) >= '\uFB13' && input.LA(1) <= '\uFB17')||(input.LA(1) >= '\uFB1D' && input.LA(1) <= '\uFB28')||(input.LA(1) >= '\uFB2A' && input.LA(1) <= '\uFB36')||(input.LA(1) >= '\uFB38' && input.LA(1) <= '\uFB3C')||input.LA(1)=='\uFB3E'||(input.LA(1) >= '\uFB40' && input.LA(1) <= '\uFB41')||(input.LA(1) >= '\uFB43' && input.LA(1) <= '\uFB44')||(input.LA(1) >= '\uFB46' && input.LA(1) <= '\uFBB1')||(input.LA(1) >= '\uFBD3' && input.LA(1) <= '\uFD3D')||(input.LA(1) >= '\uFD50' && input.LA(1) <= '\uFD8F')||(input.LA(1) >= '\uFD92' && input.LA(1) <= '\uFDC7')||(input.LA(1) >= '\uFDF0' && input.LA(1) <= '\uFDFC')||(input.LA(1) >= '\uFE00' && input.LA(1) <= '\uFE0F')||(input.LA(1) >= '\uFE20' && input.LA(1) <= '\uFE23')||(input.LA(1) >= '\uFE33' && input.LA(1) <= '\uFE34')||(input.LA(1) >= '\uFE4D' && input.LA(1) <= '\uFE4F')||input.LA(1)=='\uFE69'||(input.LA(1) >= '\uFE70' && input.LA(1) <= '\uFE74')||(input.LA(1) >= '\uFE76' && input.LA(1) <= '\uFEFC')||input.LA(1)=='\uFEFF'||input.LA(1)=='\uFF04'||(input.LA(1) >= '\uFF10' && input.LA(1) <= '\uFF19')||(input.LA(1) >= '\uFF21' && input.LA(1) <= '\uFF3A')||input.LA(1)=='\uFF3F'||(input.LA(1) >= '\uFF41' && input.LA(1) <= '\uFF5A')||(input.LA(1) >= '\uFF65' && input.LA(1) <= '\uFFBE')||(input.LA(1) >= '\uFFC2' && input.LA(1) <= '\uFFC7')||(input.LA(1) >= '\uFFCA' && input.LA(1) <= '\uFFCF')||(input.LA(1) >= '\uFFD2' && input.LA(1) <= '\uFFD7')||(input.LA(1) >= '\uFFDA' && input.LA(1) <= '\uFFDC')||(input.LA(1) >= '\uFFE0' && input.LA(1) <= '\uFFE1')||(input.LA(1) >= '\uFFE5' && input.LA(1) <= '\uFFE6')||(input.LA(1) >= '\uFFF9' && input.LA(1) <= '\uFFFB') ) {
 				input.consume();
@@ -3603,411 +3588,411 @@ public final void mIdentifierPart() throws RecognitionException {
 
 	@Override
 	public void mTokens() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:8: ( WS | FLOAT | HEX | DECIMAL | STRING | TIME_INTERVAL | BOOL | NULL | AT | PLUS_ASSIGN | MINUS_ASSIGN | MULT_ASSIGN | DIV_ASSIGN | AND_ASSIGN | OR_ASSIGN | XOR_ASSIGN | MOD_ASSIGN | UNIFY | DECR | INCR | ARROW | SEMICOLON | COLON | EQUALS | NOT_EQUALS | GREATER_EQUALS | LESS_EQUALS | GREATER | LESS | EQUALS_ASSIGN | LEFT_PAREN | RIGHT_PAREN | LEFT_SQUARE | RIGHT_SQUARE | LEFT_CURLY | RIGHT_CURLY | COMMA | DOT | NULL_SAFE_DOT | DOUBLE_AMPER | DOUBLE_PIPE | QUESTION | NEGATION | TILDE | PIPE | AMPER | XOR | MOD | STAR | MINUS | PLUS | HASH | C_STYLE_SINGLE_LINE_COMMENT | MULTI_LINE_COMMENT | ID | DIV | QUESTION_DIV | MISC )
+		// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:8: ( WS | FLOAT | HEX | DECIMAL | STRING | TIME_INTERVAL | BOOL | NULL | AT | PLUS_ASSIGN | MINUS_ASSIGN | MULT_ASSIGN | DIV_ASSIGN | AND_ASSIGN | OR_ASSIGN | XOR_ASSIGN | MOD_ASSIGN | UNIFY | DECR | INCR | ARROW | SEMICOLON | COLON | EQUALS | NOT_EQUALS | GREATER_EQUALS | LESS_EQUALS | GREATER | LESS | EQUALS_ASSIGN | LEFT_PAREN | RIGHT_PAREN | LEFT_SQUARE | RIGHT_SQUARE | LEFT_CURLY | RIGHT_CURLY | COMMA | DOT | NULL_SAFE_DOT | DOUBLE_AMPER | DOUBLE_PIPE | QUESTION | NEGATION | TILDE | PIPE | AMPER | XOR | MOD | STAR | MINUS | PLUS | HASH | C_STYLE_SINGLE_LINE_COMMENT | MULTI_LINE_COMMENT | ID | DIV | QUESTION_DIV | MISC )
 		int alt63=58;
 		alt63 = dfa63.predict(input);
 		switch (alt63) {
 			case 1 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:10: WS
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:10: WS
 				{
 				mWS(); if (state.failed) return;
 
 				}
 				break;
 			case 2 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:13: FLOAT
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:13: FLOAT
 				{
 				mFLOAT(); if (state.failed) return;
 
 				}
 				break;
 			case 3 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:19: HEX
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:19: HEX
 				{
 				mHEX(); if (state.failed) return;
 
 				}
 				break;
 			case 4 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:23: DECIMAL
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:23: DECIMAL
 				{
 				mDECIMAL(); if (state.failed) return;
 
 				}
 				break;
 			case 5 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:31: STRING
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:31: STRING
 				{
 				mSTRING(); if (state.failed) return;
 
 				}
 				break;
 			case 6 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:38: TIME_INTERVAL
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:38: TIME_INTERVAL
 				{
 				mTIME_INTERVAL(); if (state.failed) return;
 
 				}
 				break;
 			case 7 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:52: BOOL
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:52: BOOL
 				{
 				mBOOL(); if (state.failed) return;
 
 				}
 				break;
 			case 8 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:57: NULL
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:57: NULL
 				{
 				mNULL(); if (state.failed) return;
 
 				}
 				break;
 			case 9 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:62: AT
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:62: AT
 				{
 				mAT(); if (state.failed) return;
 
 				}
 				break;
 			case 10 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:65: PLUS_ASSIGN
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:65: PLUS_ASSIGN
 				{
 				mPLUS_ASSIGN(); if (state.failed) return;
 
 				}
 				break;
 			case 11 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:77: MINUS_ASSIGN
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:77: MINUS_ASSIGN
 				{
 				mMINUS_ASSIGN(); if (state.failed) return;
 
 				}
 				break;
 			case 12 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:90: MULT_ASSIGN
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:90: MULT_ASSIGN
 				{
 				mMULT_ASSIGN(); if (state.failed) return;
 
 				}
 				break;
 			case 13 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:102: DIV_ASSIGN
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:102: DIV_ASSIGN
 				{
 				mDIV_ASSIGN(); if (state.failed) return;
 
 				}
 				break;
 			case 14 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:113: AND_ASSIGN
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:113: AND_ASSIGN
 				{
 				mAND_ASSIGN(); if (state.failed) return;
 
 				}
 				break;
 			case 15 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:124: OR_ASSIGN
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:124: OR_ASSIGN
 				{
 				mOR_ASSIGN(); if (state.failed) return;
 
 				}
 				break;
 			case 16 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:134: XOR_ASSIGN
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:134: XOR_ASSIGN
 				{
 				mXOR_ASSIGN(); if (state.failed) return;
 
 				}
 				break;
 			case 17 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:145: MOD_ASSIGN
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:145: MOD_ASSIGN
 				{
 				mMOD_ASSIGN(); if (state.failed) return;
 
 				}
 				break;
 			case 18 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:156: UNIFY
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:156: UNIFY
 				{
 				mUNIFY(); if (state.failed) return;
 
 				}
 				break;
 			case 19 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:162: DECR
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:162: DECR
 				{
 				mDECR(); if (state.failed) return;
 
 				}
 				break;
 			case 20 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:167: INCR
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:167: INCR
 				{
 				mINCR(); if (state.failed) return;
 
 				}
 				break;
 			case 21 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:172: ARROW
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:172: ARROW
 				{
 				mARROW(); if (state.failed) return;
 
 				}
 				break;
 			case 22 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:178: SEMICOLON
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:178: SEMICOLON
 				{
 				mSEMICOLON(); if (state.failed) return;
 
 				}
 				break;
 			case 23 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:188: COLON
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:188: COLON
 				{
 				mCOLON(); if (state.failed) return;
 
 				}
 				break;
 			case 24 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:194: EQUALS
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:194: EQUALS
 				{
 				mEQUALS(); if (state.failed) return;
 
 				}
 				break;
 			case 25 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:201: NOT_EQUALS
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:201: NOT_EQUALS
 				{
 				mNOT_EQUALS(); if (state.failed) return;
 
 				}
 				break;
 			case 26 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:212: GREATER_EQUALS
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:212: GREATER_EQUALS
 				{
 				mGREATER_EQUALS(); if (state.failed) return;
 
 				}
 				break;
 			case 27 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:227: LESS_EQUALS
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:227: LESS_EQUALS
 				{
 				mLESS_EQUALS(); if (state.failed) return;
 
 				}
 				break;
 			case 28 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:239: GREATER
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:239: GREATER
 				{
 				mGREATER(); if (state.failed) return;
 
 				}
 				break;
 			case 29 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:247: LESS
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:247: LESS
 				{
 				mLESS(); if (state.failed) return;
 
 				}
 				break;
 			case 30 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:252: EQUALS_ASSIGN
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:252: EQUALS_ASSIGN
 				{
 				mEQUALS_ASSIGN(); if (state.failed) return;
 
 				}
 				break;
 			case 31 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:266: LEFT_PAREN
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:266: LEFT_PAREN
 				{
 				mLEFT_PAREN(); if (state.failed) return;
 
 				}
 				break;
 			case 32 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:277: RIGHT_PAREN
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:277: RIGHT_PAREN
 				{
 				mRIGHT_PAREN(); if (state.failed) return;
 
 				}
 				break;
 			case 33 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:289: LEFT_SQUARE
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:289: LEFT_SQUARE
 				{
 				mLEFT_SQUARE(); if (state.failed) return;
 
 				}
 				break;
 			case 34 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:301: RIGHT_SQUARE
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:301: RIGHT_SQUARE
 				{
 				mRIGHT_SQUARE(); if (state.failed) return;
 
 				}
 				break;
 			case 35 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:314: LEFT_CURLY
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:314: LEFT_CURLY
 				{
 				mLEFT_CURLY(); if (state.failed) return;
 
 				}
 				break;
 			case 36 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:325: RIGHT_CURLY
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:325: RIGHT_CURLY
 				{
 				mRIGHT_CURLY(); if (state.failed) return;
 
 				}
 				break;
 			case 37 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:337: COMMA
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:337: COMMA
 				{
 				mCOMMA(); if (state.failed) return;
 
 				}
 				break;
 			case 38 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:343: DOT
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:343: DOT
 				{
 				mDOT(); if (state.failed) return;
 
 				}
 				break;
 			case 39 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:347: NULL_SAFE_DOT
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:347: NULL_SAFE_DOT
 				{
 				mNULL_SAFE_DOT(); if (state.failed) return;
 
 				}
 				break;
 			case 40 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:361: DOUBLE_AMPER
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:361: DOUBLE_AMPER
 				{
 				mDOUBLE_AMPER(); if (state.failed) return;
 
 				}
 				break;
 			case 41 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:374: DOUBLE_PIPE
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:374: DOUBLE_PIPE
 				{
 				mDOUBLE_PIPE(); if (state.failed) return;
 
 				}
 				break;
 			case 42 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:386: QUESTION
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:386: QUESTION
 				{
 				mQUESTION(); if (state.failed) return;
 
 				}
 				break;
 			case 43 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:395: NEGATION
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:395: NEGATION
 				{
 				mNEGATION(); if (state.failed) return;
 
 				}
 				break;
 			case 44 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:404: TILDE
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:404: TILDE
 				{
 				mTILDE(); if (state.failed) return;
 
 				}
 				break;
 			case 45 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:410: PIPE
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:410: PIPE
 				{
 				mPIPE(); if (state.failed) return;
 
 				}
 				break;
 			case 46 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:415: AMPER
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:415: AMPER
 				{
 				mAMPER(); if (state.failed) return;
 
 				}
 				break;
 			case 47 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:421: XOR
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:421: XOR
 				{
 				mXOR(); if (state.failed) return;
 
 				}
 				break;
 			case 48 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:425: MOD
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:425: MOD
 				{
 				mMOD(); if (state.failed) return;
 
 				}
 				break;
 			case 49 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:429: STAR
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:429: STAR
 				{
 				mSTAR(); if (state.failed) return;
 
 				}
 				break;
 			case 50 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:434: MINUS
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:434: MINUS
 				{
 				mMINUS(); if (state.failed) return;
 
 				}
 				break;
 			case 51 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:440: PLUS
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:440: PLUS
 				{
 				mPLUS(); if (state.failed) return;
 
 				}
 				break;
 			case 52 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:445: HASH
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:445: HASH
 				{
 				mHASH(); if (state.failed) return;
 
 				}
 				break;
 			case 53 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:450: C_STYLE_SINGLE_LINE_COMMENT
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:450: C_STYLE_SINGLE_LINE_COMMENT
 				{
 				mC_STYLE_SINGLE_LINE_COMMENT(); if (state.failed) return;
 
 				}
 				break;
 			case 54 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:478: MULTI_LINE_COMMENT
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:478: MULTI_LINE_COMMENT
 				{
 				mMULTI_LINE_COMMENT(); if (state.failed) return;
 
 				}
 				break;
 			case 55 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:497: ID
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:497: ID
 				{
 				mID(); if (state.failed) return;
 
 				}
 				break;
 			case 56 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:500: DIV
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:500: DIV
 				{
 				mDIV(); if (state.failed) return;
 
 				}
 				break;
 			case 57 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:504: QUESTION_DIV
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:504: QUESTION_DIV
 				{
 				mQUESTION_DIV(); if (state.failed) return;
 
 				}
 				break;
 			case 58 :
-				// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:1:517: MISC
+				// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:1:517: MISC
 				{
 				mMISC(); if (state.failed) return;
 
@@ -4019,8 +4004,8 @@ public void mTokens() throws RecognitionException {
 
 	// $ANTLR start synpred1_DRL6Lexer
 	public final void synpred1_DRL6Lexer_fragment() throws RecognitionException {
-		// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:81:20: ( '\\r\\n' )
-		// src/main/resources/org/drools/compiler/lang/DRL6Lexer.g:81:22: '\\r\\n'
+		// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:81:20: ( '\\r\\n' )
+		// src/main/resources/org/drools/drl/parser/DRL6Lexer.g:81:22: '\\r\\n'
 		{
 		match("\r\n"); if (state.failed) return;
 
diff --git a/drools-drl/drools-drl-parser/src/main/resources/org/drools/drl/parser/DRL6Expressions.g b/drools-drl/drools-drl-parser/src/main/resources/org/drools/drl/parser/DRL6Expressions.g
index 67db73f4288..b531c38feff 100644
--- a/drools-drl/drools-drl-parser/src/main/resources/org/drools/drl/parser/DRL6Expressions.g
+++ b/drools-drl/drools-drl-parser/src/main/resources/org/drools/drl/parser/DRL6Expressions.g
@@ -7,16 +7,16 @@ options {
 }
   
 @header {
-    package org.drools.compiler.lang;
+    package org.drools.drl.parser.lang;
 
     import java.util.LinkedList;
-    import org.drools.compiler.compiler.DroolsParserException;
-    import org.drools.compiler.lang.ParserHelper;
-    import org.drools.compiler.lang.DroolsParserExceptionFactory;
-    import org.drools.compiler.lang.Location;
+    import org.drools.drl.parser.DroolsParserException;
+    import org.drools.drl.parser.lang.ParserHelper;
+    import org.drools.drl.parser.lang.DroolsParserExceptionFactory;
+    import org.drools.drl.parser.lang.Location;
 
-    import org.drools.compiler.lang.api.AnnotatedDescrBuilder;
-    import org.drools.compiler.lang.api.AnnotationDescrBuilder;
+    import org.drools.drl.ast.dsl.AnnotatedDescrBuilder;
+    import org.drools.drl.ast.dsl.AnnotationDescrBuilder;
 
     import org.drools.drl.ast.descr.AtomicExprDescr;
     import org.drools.drl.ast.descr.AnnotatedBaseDescr;
@@ -73,6 +73,13 @@ options {
         }
         return input.get( input.index() ).getType() != DRL6Lexer.EOF;
     }
+
+    private boolean notStartWithNewline() {
+        int currentTokenIndex = input.index(); // current position in input stream
+        Token previousHiddenToken = input.get(currentTokenIndex - 1);
+        String previousHiddenTokenText = previousHiddenToken.getText();
+        return !previousHiddenTokenText.contains("\n");
+    }
 }
 
 // Alter code generation so catch-clauses get replace with
@@ -567,7 +574,7 @@ xpathSeparator
     ;
 
 xpathPrimary returns [BaseDescr result]
-    : xpathChunk+
+    : xpathChunk ({notStartWithNewline()}? xpathChunk)*
     ;
 
 xpathChunk returns [BaseDescr result]
diff --git a/drools-drl/drools-drl-parser/src/main/resources/org/drools/drl/parser/DRL6Lexer.g b/drools-drl/drools-drl-parser/src/main/resources/org/drools/drl/parser/DRL6Lexer.g
index 6329f343750..897a1dc0c35 100644
--- a/drools-drl/drools-drl-parser/src/main/resources/org/drools/drl/parser/DRL6Lexer.g
+++ b/drools-drl/drools-drl-parser/src/main/resources/org/drools/drl/parser/DRL6Lexer.g
@@ -10,10 +10,10 @@ tokens {
 }
 
 @header {
-    package org.drools.compiler.lang;
+    package org.drools.drl.parser.lang;
 
     import org.kie.internal.builder.conf.LanguageLevelOption;
-    import org.drools.compiler.compiler.DroolsParserException;
+    import org.drools.drl.parser.DroolsParserException;
     import org.drools.util.StringUtils;
 }
  
diff --git a/drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/MultipleDataSourceUnit.java b/drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/MultipleDataSourceUnit.java
new file mode 100644
index 00000000000..cc066a1af03
--- /dev/null
+++ b/drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/MultipleDataSourceUnit.java
@@ -0,0 +1,58 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 

+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 

+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.drools.ruleunits.impl;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.drools.ruleunits.api.DataSource;
+import org.drools.ruleunits.api.DataStore;
+import org.drools.ruleunits.api.RuleUnitData;
+import org.drools.ruleunits.impl.domain.Measurement;
+import org.drools.ruleunits.impl.domain.Sensor;
+
+public class MultipleDataSourceUnit implements RuleUnitData {
+
+    private final DataStore measurements;
+    private final DataStore sensors;
+    private final Set controlSet = new HashSet<>();
+
+    public MultipleDataSourceUnit() {
+        this(DataSource.createStore(), DataSource.createStore());
+    }
+
+    public MultipleDataSourceUnit(DataStore measurements, DataStore sensors) {
+        this.measurements = measurements;
+        this.sensors = sensors;
+    }
+
+    public DataStore getMeasurements() {
+        return measurements;
+    }
+
+    public DataStore getSensors() {
+        return sensors;
+    }
+
+    public Set getControlSet() {
+        return controlSet;
+    }
+}
diff --git a/drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/RuleUnitProviderImplTest.java b/drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/RuleUnitProviderImplTest.java
index 6bf4e5b8b63..822ab51fb3d 100644
--- a/drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/RuleUnitProviderImplTest.java
+++ b/drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/RuleUnitProviderImplTest.java
@@ -27,7 +27,9 @@
 import org.drools.ruleunits.api.RuleUnitInstance;
 import org.drools.ruleunits.api.RuleUnitProvider;
 import org.drools.ruleunits.api.conf.RuleConfig;
+import org.drools.ruleunits.impl.domain.Measurement;
 import org.drools.ruleunits.impl.domain.Person;
+import org.drools.ruleunits.impl.domain.Sensor;
 import org.drools.ruleunits.impl.listener.TestAgendaEventListener;
 import org.drools.ruleunits.impl.listener.TestRuleEventListener;
 import org.drools.ruleunits.impl.listener.TestRuleRuntimeEventListener;
@@ -223,4 +225,16 @@ public void fireWithAgendaFilter() {
             assertThat(unit.getResults()).containsExactly("GoodByeWorld");
         }
     }
+
+    @Test
+    public void multipleOOPathLines() {
+        MultipleDataSourceUnit unit = new MultipleDataSourceUnit();
+        unit.getMeasurements().add(new Measurement("color", "red"));
+        unit.getSensors().add(new Sensor("color"));
+
+        try ( RuleUnitInstance unitInstance = RuleUnitProvider.get().createRuleUnitInstance(unit) ) {
+            assertThat(unitInstance.fire()).isEqualTo(1);
+            assertThat(unit.getControlSet()).containsExactly("red");
+        }
+    }
 }
diff --git a/drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/domain/Measurement.java b/drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/domain/Measurement.java
new file mode 100644
index 00000000000..9d0bf3df501
--- /dev/null
+++ b/drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/domain/Measurement.java
@@ -0,0 +1,53 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.drools.ruleunits.impl.domain;
+
+public class Measurement {
+
+    private String id;
+    private String val;
+
+    public Measurement(String id, String val) {
+        super();
+        this.id = id;
+        this.val = val;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getVal() {
+        return val;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("Measurement [");
+        if (id != null) {
+            builder.append("id=").append(id).append(", ");
+        }
+        if (val != null) {
+            builder.append("val=").append(val);
+        }
+        builder.append("]");
+        return builder.toString();
+    }
+}
\ No newline at end of file
diff --git a/drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/domain/Sensor.java b/drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/domain/Sensor.java
new file mode 100644
index 00000000000..b067b0351a4
--- /dev/null
+++ b/drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/domain/Sensor.java
@@ -0,0 +1,37 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.drools.ruleunits.impl.domain;
+
+public class Sensor {
+
+    private String id;
+
+    public Sensor(String id) {
+        super();
+        this.id = id;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+}
diff --git a/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/MultipleDataSource.drl b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/MultipleDataSource.drl
new file mode 100644
index 00000000000..33229b68447
--- /dev/null
+++ b/drools-ruleunits/drools-ruleunits-impl/src/test/resources/org/drools/ruleunits/impl/MultipleDataSource.drl
@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 

+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 

+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.drools.ruleunits.impl;
+unit MultipleDataSourceUnit;
+
+rule "will execute per each Measurement having ID color"
+when
+	/measurements[ $id: id == "color", $colorVal : val ]
+	/sensors[ id == $id ]
+then
+	controlSet.add($colorVal);
+end

From 2ee1a59b2afe0945ee6c90b55843b68e051dad2f Mon Sep 17 00:00:00 2001
From: Gabriele Cardosi 
Date: Tue, 9 Jan 2024 08:58:10 +0100
Subject: [PATCH 21/29] [incubator-kie-issues#758] Replace (T/t)upla with
 (T/t)uple (#5641)

Co-authored-by: BAMOE CI 
---
 .../common/utils/CommonCodegenUtils.java      | 22 ++++++++--------
 .../EfestoOriginalTypeGeneratedType.java      |  2 +-
 .../recipe/jpmml/JPMMLVisitor.java            | 18 ++++++-------
 .../recipe/jpmml/JPMMLVisitorTest.java        | 14 +++++-----
 .../commons/utils/CommonCodegenUtils.java     | 26 +++++++++----------
 .../commons/utils/CommonCodegenUtilsTest.java |  6 ++---
 .../KiePMMLDataDictionaryASTFactory.java      |  6 ++---
 .../KiePMMLDerivedFieldASTFactory.java        |  6 ++---
 .../factories/KiePMMLDescrTypesFactory.java   |  2 +-
 .../drools/tuples/KiePMMLOperatorValue.java   |  2 +-
 .../KiePMMLOriginalTypeGeneratedType.java     |  2 +-
 .../tuples/KiePMMLReasonCodeAndValue.java     |  2 +-
 .../KiePMMLScorecardModelASTFactory.java      |  2 +-
 .../factories/KiePMMLTreeModelASTFactory.java |  2 +-
 .../tuples/KiePMMLTableSourceCategory.java    |  2 +-
 15 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/efesto/efesto-common-utils/src/main/java/org/kie/efesto/common/utils/CommonCodegenUtils.java b/efesto/efesto-common-utils/src/main/java/org/kie/efesto/common/utils/CommonCodegenUtils.java
index 2a7006cf92a..46456e10e29 100644
--- a/efesto/efesto-common-utils/src/main/java/org/kie/efesto/common/utils/CommonCodegenUtils.java
+++ b/efesto/efesto-common-utils/src/main/java/org/kie/efesto/common/utils/CommonCodegenUtils.java
@@ -867,25 +867,25 @@ public static void replaceStringLiteralExpressionInStatement(final Statement con
      * Replace Nodes in the given Statement
      *
      * @param container
-     * @param replacementTuplas
+     * @param replacementTuples
      */
     public static void replaceNodesInStatement(final Statement container,
-                                               final List replacementTuplas) {
-        replacementTuplas.forEach(replacementTupla -> replaceNodeInStatement(container, replacementTupla));
+                                               final List replacementTuples) {
+        replacementTuples.forEach(replacementTuple -> replaceNodeInStatement(container, replacementTuple));
     }
 
     /**
      * Replace Node in the given Statement
      *
      * @param container
-     * @param replacementTupla
+     * @param replacementTuple
      */
     public static void replaceNodeInStatement(final Statement container,
-                                              final ReplacementTupla replacementTupla) {
+                                              final ReplacementTuple replacementTuple) {
         container.walk(node -> {
-            if (node.equals(replacementTupla.toReplace)) {
+            if (node.equals(replacementTuple.toReplace)) {
                 node.getParentNode()
-                        .ifPresent(parentNode -> parentNode.replace(replacementTupla.toReplace, replacementTupla.replacement));
+                        .ifPresent(parentNode -> parentNode.replace(replacementTuple.toReplace, replacementTuple.replacement));
             }
         });
     }
@@ -958,8 +958,8 @@ public static void replaceNameExprWithNullInStatement(final Statement container,
                                                           final List toReplace) {
         for (NameExpr nameExpr : toReplace) {
             NullLiteralExpr toAdd = new NullLiteralExpr();
-            ReplacementTupla replacementTupla = new ReplacementTupla(nameExpr, toAdd);
-            replaceNodeInStatement(container, replacementTupla);
+            ReplacementTuple replacementTuple = new ReplacementTuple(nameExpr, toAdd);
+            replaceNodeInStatement(container, replacementTuple);
         }
     }
 
@@ -975,12 +975,12 @@ public static NodeList getArraysAsListInvocation(NodeListoriginal type/generated type tupla
+ * Class to represent a original type/generated type tuple
  */
 public class EfestoOriginalTypeGeneratedType implements Serializable {
 
diff --git a/jpmml-migration-recipe/src/main/java/org/kie/openrewrite/recipe/jpmml/JPMMLVisitor.java b/jpmml-migration-recipe/src/main/java/org/kie/openrewrite/recipe/jpmml/JPMMLVisitor.java
index 2c471f50973..ba8db77801a 100644
--- a/jpmml-migration-recipe/src/main/java/org/kie/openrewrite/recipe/jpmml/JPMMLVisitor.java
+++ b/jpmml-migration-recipe/src/main/java/org/kie/openrewrite/recipe/jpmml/JPMMLVisitor.java
@@ -59,8 +59,8 @@ public class JPMMLVisitor extends JavaVisitor {
 
     private static final String DATADICTIONARY_FQDN = "org.dmg.pmml.DataDictionary";
 
-    private static final Map REMOVED_LIST_FROM_INSTANTIATION = Map.of(DATADICTIONARY_FQDN,
-            new RemovedListTupla("addDataFields", JavaType.buildType("org.dmg.pmml.DataField")));
+    private static final Map REMOVED_LIST_FROM_INSTANTIATION = Map.of(DATADICTIONARY_FQDN,
+            new RemovedListTuple("addDataFields", JavaType.buildType("org.dmg.pmml.DataField")));
 
 
     private static final J.Identifier STRING_IDENTIFIER = new J.Identifier(Tree.randomId(), Space.build(" ", Collections.emptyList()), Markers.EMPTY, "String", JavaType.buildType(String.class.getCanonicalName()), null);
@@ -327,23 +327,23 @@ protected J.NewClass replaceOriginalToTargetInstantiation(J.NewClass newClass) {
      */
     protected Expression replaceInstantiationListRemoved(J.NewClass newClass) {
         logger.trace("replaceInstantiationListRemoved {}", newClass);
-        Optional optionalRetrieved = getRemovedListTupla(newClass);
+        Optional optionalRetrieved = getRemovedListTuple(newClass);
         if (optionalRetrieved.isPresent()) {
-            RemovedListTupla removedListTupla = optionalRetrieved.get();
-            return removedListTupla.getJMethod(newClass);
+            RemovedListTuple removedListTuple = optionalRetrieved.get();
+            return removedListTuple.getJMethod(newClass);
         } else {
             return newClass;
         }
     }
 
     /**
-     * Return Optional<RemovedListTupla> if the given J.NewClass constructor has not the List anymore
+     * Return Optional<RemovedListTuple> if the given J.NewClass constructor has not the List anymore
      * Optional.empty() otherwise
      *
      * @param toCheck
      * @return
      */
-    protected Optional getRemovedListTupla(J.NewClass toCheck) {
+    protected Optional getRemovedListTuple(J.NewClass toCheck) {
         return toCheck.getType() != null &&
                 REMOVED_LIST_FROM_INSTANTIATION.containsKey(toCheck.getType().toString()) &&
                 toCheck.getArguments() != null &&
@@ -428,7 +428,7 @@ protected TypeTree updateTypeTreeToTargetInstantiatedType(J.NewClass newClass) {
                 .withType(targetInstantiatedType);
     }
 
-    static class RemovedListTupla {
+    static class RemovedListTuple {
 
         private final String addMethodName;
 
@@ -439,7 +439,7 @@ static class RemovedListTupla {
         private final J.Identifier elementToArrayIdentifier;
         private final J.Identifier addMethodIdentifier;
 
-        public RemovedListTupla(String addMethodName, JavaType elementJavaType) {
+        public RemovedListTuple(String addMethodName, JavaType elementJavaType) {
             this.addMethodName = addMethodName;
             elementIdentifier = new J.Identifier(Tree.randomId(), Space.build(" ", Collections.emptyList()), Markers.EMPTY, elementJavaType.toString(), elementJavaType, null);
             elementArray = new JavaType.Array(null, elementJavaType);
diff --git a/jpmml-migration-recipe/src/test/java/org/kie/openrewrite/recipe/jpmml/JPMMLVisitorTest.java b/jpmml-migration-recipe/src/test/java/org/kie/openrewrite/recipe/jpmml/JPMMLVisitorTest.java
index 3b26c210db5..8fd003771c7 100644
--- a/jpmml-migration-recipe/src/test/java/org/kie/openrewrite/recipe/jpmml/JPMMLVisitorTest.java
+++ b/jpmml-migration-recipe/src/test/java/org/kie/openrewrite/recipe/jpmml/JPMMLVisitorTest.java
@@ -817,7 +817,7 @@ public void replaceInstantiationListRemoved_notReplaced() {
     }
 
     @Test
-    public void getRemovedListTupla_present() {
+    public void getRemovedListTuple_present() {
         String classTested = "package com.yourorg;\n" +
                 "import java.util.List;\n" +
                 "import org.dmg.pmml.DataDictionary;\n" +
@@ -832,12 +832,12 @@ public void getRemovedListTupla_present() {
                 .orElseThrow(() -> new RuntimeException("Failed to find J.NewClass org.dmg.pmml.DataDictionary"));
         assertThat(toTest)
                 .isNotNull();
-        assertThat(jpmmlVisitor.getRemovedListTupla(toTest))
+        assertThat(jpmmlVisitor.getRemovedListTuple(toTest))
                 .isPresent();
     }
 
     @Test
-    public void getRemovedListTupla_notPresent() {
+    public void getRemovedListTuple_notPresent() {
         String classTested = "package com.yourorg;\n" +
                 "import org.dmg.pmml.ScoreDistribution;\n" +
                 "class FooBar {\n" +
@@ -850,7 +850,7 @@ public void getRemovedListTupla_notPresent() {
                 .orElseThrow(() -> new RuntimeException("Failed to find J.NewClass org.dmg.pmml.ScoreDistribution"));
         assertThat(toTest)
                 .isNotNull();
-        assertThat(jpmmlVisitor.getRemovedListTupla(toTest))
+        assertThat(jpmmlVisitor.getRemovedListTuple(toTest))
                 .isNotPresent();
     }
 
@@ -1124,8 +1124,8 @@ public void updateTypeTreeToTargetInstantiatedType() {
     }
 
     @Test
-    public void removedListaTupla_getJMethod() {
-        JPMMLVisitor.RemovedListTupla removedListTupla = new JPMMLVisitor.RemovedListTupla("addDataFields", JavaType.buildType("org.dmg.pmml.DataField"));
+    public void removedListaTuple_getJMethod() {
+        JPMMLVisitor.RemovedListTuple removedListTuple = new JPMMLVisitor.RemovedListTuple("addDataFields", JavaType.buildType("org.dmg.pmml.DataField"));
         String classTested = "package com.yourorg;\n" +
                 "import java.util.List;\n" +
                 "import org.dmg.pmml.DataDictionary;\n" +
@@ -1138,7 +1138,7 @@ public void removedListaTupla_getJMethod() {
         String classInstantiated = "org.dmg.pmml.DataDictionary";
         J.NewClass toTest = getNewClassFromClassSource(classTested, classInstantiated)
                 .orElseThrow(() -> new RuntimeException("Failed to find J.NewClass org.dmg.pmml.DataDictionary"));
-       J.MethodInvocation retrieved = removedListTupla.getJMethod(toTest);
+       J.MethodInvocation retrieved = removedListTuple.getJMethod(toTest);
        String expected = "new DataDictionary().addDataFields(dataFields.toArray(new org.dmg.pmml.DataField[0]))";
        assertThat(retrieved)
                .isNotNull()
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/utils/CommonCodegenUtils.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/utils/CommonCodegenUtils.java
index 4421551f758..783e4a84e90 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/utils/CommonCodegenUtils.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/utils/CommonCodegenUtils.java
@@ -981,25 +981,25 @@ public static void replaceStringLiteralExpressionInStatement(final Statement con
     /**
      * Replace Nodes in the given Statement
      * @param container
-     * @param replacementTuplas
+     * @param replacementTuples
      */
     public static void replaceNodesInStatement(final Statement container,
-                                               final List replacementTuplas) {
-        replacementTuplas.forEach(replacementTupla -> replaceNodeInStatement(container, replacementTupla));
+                                               final List replacementTuples) {
+        replacementTuples.forEach(replacementTuple -> replaceNodeInStatement(container, replacementTuple));
     }
 
     /**
      * Replace Node in the given Statement
      * @param container
-     * @param replacementTupla
+     * @param replacementTuple
      */
     public static void replaceNodeInStatement(final Statement container,
-                                              final ReplacementTupla replacementTupla) {
+                                              final ReplacementTuple replacementTuple) {
         container.walk(node -> {
-            if (node.equals(replacementTupla.toReplace)) {
+            if (node.equals(replacementTuple.toReplace)) {
                 node.getParentNode()
-                        .ifPresent(parentNode -> parentNode.replace(replacementTupla.toReplace,
-                                                                    replacementTupla.replacement));
+                        .ifPresent(parentNode -> parentNode.replace(replacementTuple.toReplace,
+                                                                    replacementTuple.replacement));
             }
         });
     }
@@ -1069,14 +1069,14 @@ public static Optional getVariableInitializer(final BlockStmt blockS
      */
     public static void replaceNameExprWithNullInStatement(final Statement container,
                                                           final List toReplace) {
-        final List replacementTuplas =
+        final List replacementTuples =
                 toReplace.stream()
                         .map(nameExpr -> {
                             NullLiteralExpr toAdd = new NullLiteralExpr();
-                            return new ReplacementTupla(nameExpr, toAdd);
+                            return new ReplacementTuple(nameExpr, toAdd);
                         })
                         .collect(Collectors.toList());
-        replacementTuplas.forEach(replacementTupla -> replaceNodeInStatement(container, replacementTupla));
+        replacementTuples.forEach(replacementTuple -> replaceNodeInStatement(container, replacementTuple));
     }
 
     public static MethodCallExpr getArraysAsListInvocationMethodCall(NodeList arguments) {
@@ -1091,12 +1091,12 @@ public static NodeList getArraysAsListInvocation(NodeList replacementTuplas =
+        final List replacementTuples =
                 retrieved.stream()
                         .map(nameExpr -> {
                             NullLiteralExpr toAdd = new NullLiteralExpr();
                             nullExprs.add(toAdd);
-                            return new CommonCodegenUtils.ReplacementTupla(nameExpr, toAdd);
+                            return new CommonCodegenUtils.ReplacementTuple(nameExpr, toAdd);
                         })
                         .collect(Collectors.toList());
-        CommonCodegenUtils.replaceNodesInStatement(toRead, replacementTuplas);
+        CommonCodegenUtils.replaceNodesInStatement(toRead, replacementTuples);
         final List newRetrieved = CommonCodegenUtils.getNameExprsFromBlock(toRead, "value");
         assertThat(newRetrieved).isEmpty();
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDataDictionaryASTFactory.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDataDictionaryASTFactory.java
index 9e27e0e0f2e..2132658279e 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDataDictionaryASTFactory.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDataDictionaryASTFactory.java
@@ -42,7 +42,7 @@ private KiePMMLDataDictionaryASTFactory(final MapMap<String, KiePMMLOriginalTypeGeneratedType> to be populated with
-     * mapping between original field' name and original type/generated type tupla
+     * mapping between original field' name and original type/generated type tuple
      * @return
      */
     public static KiePMMLDataDictionaryASTFactory factory(final Map fieldTypeMap) {
@@ -52,7 +52,7 @@ public static KiePMMLDataDictionaryASTFactory factory(final MapList<KiePMMLDroolsType> out of original Fields,
      * and populate the fieldNameTypeNameMap with mapping between original field' name and original
-     * type/generated type tupla
+     * type/generated type tuple
      * @param fields
      */
     public List declareTypes(final List> fields) {
@@ -62,7 +62,7 @@ public List declareTypes(final List> fields) {
     /**
      * Create a KiePMMLDroolsType out of original DataField,
      * and populate the fieldNameTypeNameMap with mapping between original field' name and original
-     * type/generated type tupla
+     * type/generated type tuple
      * @param field
      */
     public KiePMMLDroolsType declareType(Field field) {
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDerivedFieldASTFactory.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDerivedFieldASTFactory.java
index 492dfe0f897..3643e1bb731 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDerivedFieldASTFactory.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/ast/factories/KiePMMLDerivedFieldASTFactory.java
@@ -41,7 +41,7 @@ private KiePMMLDerivedFieldASTFactory(final MapMap<String, KiePMMLOriginalTypeGeneratedType> to be populated with mapping between original field' name and original type/generated type tupla
+     * @param fieldTypeMap the Map<String, KiePMMLOriginalTypeGeneratedType> to be populated with mapping between original field' name and original type/generated type tuple
      * @return
      */
     public static KiePMMLDerivedFieldASTFactory factory(final Map fieldTypeMap) {
@@ -50,7 +50,7 @@ public static KiePMMLDerivedFieldASTFactory factory(final MapList<KiePMMLDroolsType> out of original List<DerivedField>s,
-     * and populate the fieldNameTypeNameMap with mapping between original field' name and original type/generated type tupla
+     * and populate the fieldNameTypeNameMap with mapping between original field' name and original type/generated type tuple
      * @param derivedFields
      */
     public List declareTypes(final List derivedFields) {
@@ -59,7 +59,7 @@ public List declareTypes(final List derivedFiel
 
     /**
      * Create a KiePMMLDroolsType out of original DerivedField,
-     * and populate the fieldNameTypeNameMap with mapping between original field' name and original type/generated type tupla
+     * and populate the fieldNameTypeNameMap with mapping between original field' name and original type/generated type tuple
      * @param derivedField
      */
     public KiePMMLDroolsType declareType(DerivedField derivedField) {
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/commons/factories/KiePMMLDescrTypesFactory.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/commons/factories/KiePMMLDescrTypesFactory.java
index 3b66f7b7a87..26581b17fd3 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/commons/factories/KiePMMLDescrTypesFactory.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/commons/factories/KiePMMLDescrTypesFactory.java
@@ -53,7 +53,7 @@ public void declareTypes(final List types) {
 
     /**
      * Create type out of original DataField;
-     * populate the fieldNameTypeNameMap with mapping between original field' name and original type/generated type tupla
+     * populate the fieldNameTypeNameMap with mapping between original field' name and original type/generated type tuple
      * @param type
      */
     protected void declareType(final KiePMMLDroolsType type) {
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/tuples/KiePMMLOperatorValue.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/tuples/KiePMMLOperatorValue.java
index 083b1f98ce5..8c6c64ac96a 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/tuples/KiePMMLOperatorValue.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/tuples/KiePMMLOperatorValue.java
@@ -24,7 +24,7 @@
 import org.kie.pmml.api.enums.OPERATOR;
 
 /**
- * Tupla representing the operator and the value to be applied to a given field
+ * Tuple representing the operator and the value to be applied to a given field
  */
 public class KiePMMLOperatorValue implements Serializable {
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/tuples/KiePMMLOriginalTypeGeneratedType.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/tuples/KiePMMLOriginalTypeGeneratedType.java
index a988ccfb500..4b3f9c5b1d4 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/tuples/KiePMMLOriginalTypeGeneratedType.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/tuples/KiePMMLOriginalTypeGeneratedType.java
@@ -22,7 +22,7 @@
 import java.util.Objects;
 
 /**
- * Class to represent a original type/generated type tupla
+ * Class to represent a original type/generated type tuple
  */
 public class KiePMMLOriginalTypeGeneratedType implements Serializable {
 
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/tuples/KiePMMLReasonCodeAndValue.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/tuples/KiePMMLReasonCodeAndValue.java
index 573c8aba480..0185548bf7d 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/tuples/KiePMMLReasonCodeAndValue.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-common/src/main/java/org/kie/pmml/models/drools/tuples/KiePMMLReasonCodeAndValue.java
@@ -23,7 +23,7 @@
 import java.util.StringJoiner;
 
 /**
- * Tupla representing the Reason Code and its computed value as used inside Scorecard
+ * Tuple representing the Reason Code and its computed value as used inside Scorecard
  *
  * @see Ranking Reason Codes
  */
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-compiler/src/main/java/org/kie/pmml/models/drools/scorecard/compiler/factories/KiePMMLScorecardModelASTFactory.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-compiler/src/main/java/org/kie/pmml/models/drools/scorecard/compiler/factories/KiePMMLScorecardModelASTFactory.java
index c8ede87c4e3..ec7b4af072a 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-compiler/src/main/java/org/kie/pmml/models/drools/scorecard/compiler/factories/KiePMMLScorecardModelASTFactory.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-compiler/src/main/java/org/kie/pmml/models/drools/scorecard/compiler/factories/KiePMMLScorecardModelASTFactory.java
@@ -52,7 +52,7 @@ private KiePMMLScorecardModelASTFactory() {
     /**
      * Returns the KiePMMLDroolsAST built out of the given parameters.
      * It also populate the fieldNameTypeNameMap with mapping between
-     * original field' name and original type/generated type tupla
+     * original field' name and original type/generated type tuple
      *
      * @param fields
      * @param model
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-compiler/src/main/java/org/kie/pmml/models/drools/tree/compiler/factories/KiePMMLTreeModelASTFactory.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-compiler/src/main/java/org/kie/pmml/models/drools/tree/compiler/factories/KiePMMLTreeModelASTFactory.java
index 63b06e245f0..d31bfcbd482 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-compiler/src/main/java/org/kie/pmml/models/drools/tree/compiler/factories/KiePMMLTreeModelASTFactory.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-compiler/src/main/java/org/kie/pmml/models/drools/tree/compiler/factories/KiePMMLTreeModelASTFactory.java
@@ -49,7 +49,7 @@ private KiePMMLTreeModelASTFactory() {
 
     /**
      * Returns the KiePMMLDroolsAST built out of the given parameters.
-     * It also populate the fieldNameTypeNameMap with mapping between original field' name and original type/generated type tupla
+     * It also populate the fieldNameTypeNameMap with mapping between original field' name and original type/generated type tuple
      *
      * @param dataDictionary
      * @param model
diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-model/src/main/java/org/kie/pmml/models/regression/model/tuples/KiePMMLTableSourceCategory.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-model/src/main/java/org/kie/pmml/models/regression/model/tuples/KiePMMLTableSourceCategory.java
index 82aa54b8f5d..2c748416e1e 100644
--- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-model/src/main/java/org/kie/pmml/models/regression/model/tuples/KiePMMLTableSourceCategory.java
+++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-model/src/main/java/org/kie/pmml/models/regression/model/tuples/KiePMMLTableSourceCategory.java
@@ -22,7 +22,7 @@
 import java.util.Objects;
 
 /**
- * Class to represent a table source/table category tupla
+ * Class to represent a table source/table category tuple
  */
 public class KiePMMLTableSourceCategory implements Serializable {
 

From f6d6a5057728a7072ccdf2a06f0ef47ee5addc84 Mon Sep 17 00:00:00 2001
From: Gabriele Cardosi 
Date: Tue, 9 Jan 2024 09:48:45 +0100
Subject: [PATCH 22/29] [incubator-kie-issues#506] DMN - Add support for
 iteration of date ranges (#5626)

* [incubator-kie-issues#506] Implemented Date iteration. Refactored to remove duplicated code and allow easy extension of use cases

* [incubator-kie-issues#506] WIP

* [incubator-kie-issues#506] Update with main. Add unit tests

* [incubator-kie-issues#506] WIP

* [incubator-kie-issues#506] Restored code-level 11 syntax

* [incubator-kie-issues#506] Merged with main

* [incubator-kie-issues#506] Fix as per PR suggestion

---------

Co-authored-by: BAMOE CI 
---
 .../codegen/feel11/CompiledFEELSupport.java   |  44 ++---
 .../EndpointOfRangeNotOfNumberException.java  |  22 +++
 .../EndpointOfRangeNotValidTypeException.java |  23 +++
 ...dpointOfRangeOfDifferentTypeException.java |  23 +++
 .../dmn/feel/lang/ast/ForExpressionNode.java  | 180 ++++--------------
 .../BigDecimalRangeIterator.java              |  69 +++++++
 .../ast/forexpressioniterators/Direction.java |  24 +++
 .../forexpressioniterators/ForIteration.java  |  67 +++++++
 .../ForIterationUtils.java                    |  66 +++++++
 .../LocalDateRangeIterator.java               |  67 +++++++
 .../ZonedDateTimeRangeIterator.java           |  69 +++++++
 .../lang/ast/infixexecutors/AddExecutor.java  |  44 +++--
 .../lang/ast/infixexecutors/AndExecutor.java  |   6 +-
 .../lang/ast/infixexecutors/OrExecutor.java   |   6 +-
 .../main/java/org/kie/dmn/feel/util/Msg.java  |   2 +-
 .../BigDecimalRangeIteratorTest.java          |  81 ++++++++
 .../ForIterationTest.java                     |  80 ++++++++
 .../ForIterationUtilsTest.java                | 154 +++++++++++++++
 .../LocalDateRangeIteratorTest.java           |  83 ++++++++
 .../ZonedDateTimeRangeIteratorTest.java       | 115 +++++++++++
 .../runtime/FEEL12ExtendedForLoopTest.java    |  38 ++--
 21 files changed, 1050 insertions(+), 213 deletions(-)
 create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/exceptions/EndpointOfRangeNotOfNumberException.java
 create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/exceptions/EndpointOfRangeNotValidTypeException.java
 create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/exceptions/EndpointOfRangeOfDifferentTypeException.java
 create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/BigDecimalRangeIterator.java
 create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/Direction.java
 create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ForIteration.java
 create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ForIterationUtils.java
 create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/LocalDateRangeIterator.java
 create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ZonedDateTimeRangeIterator.java
 create mode 100644 kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/BigDecimalRangeIteratorTest.java
 create mode 100644 kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ForIterationTest.java
 create mode 100644 kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ForIterationUtilsTest.java
 create mode 100644 kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/LocalDateRangeIteratorTest.java
 create mode 100644 kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ZonedDateTimeRangeIteratorTest.java

diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/codegen/feel11/CompiledFEELSupport.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/codegen/feel11/CompiledFEELSupport.java
index 99785c45082..4224ad2be27 100644
--- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/codegen/feel11/CompiledFEELSupport.java
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/codegen/feel11/CompiledFEELSupport.java
@@ -18,16 +18,6 @@
  */
 package org.kie.dmn.feel.codegen.feel11;
 
-import java.math.BigDecimal;
-import java.math.MathContext;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-
 import ch.obermuhlner.math.big.BigDecimalMath;
 import com.github.javaparser.ast.Modifier;
 import com.github.javaparser.ast.NodeList;
@@ -46,12 +36,14 @@
 import org.kie.dmn.api.feel.runtime.events.FEELEvent;
 import org.kie.dmn.api.feel.runtime.events.FEELEvent.Severity;
 import org.kie.dmn.api.feel.runtime.events.FEELEventListener;
+import org.kie.dmn.feel.exceptions.EndpointOfRangeNotValidTypeException;
+import org.kie.dmn.feel.exceptions.EndpointOfRangeOfDifferentTypeException;
 import org.kie.dmn.feel.lang.EvaluationContext;
 import org.kie.dmn.feel.lang.ast.ForExpressionNode;
-import org.kie.dmn.feel.lang.ast.ForExpressionNode.ForIteration;
 import org.kie.dmn.feel.lang.ast.QuantifiedExpressionNode;
 import org.kie.dmn.feel.lang.ast.QuantifiedExpressionNode.QEIteration;
 import org.kie.dmn.feel.lang.ast.QuantifiedExpressionNode.Quantifier;
+import org.kie.dmn.feel.lang.ast.forexpressioniterators.ForIteration;
 import org.kie.dmn.feel.lang.impl.SilentWrappingEvaluationContextImpl;
 import org.kie.dmn.feel.lang.types.BuiltInType;
 import org.kie.dmn.feel.runtime.FEELFunction;
@@ -64,8 +56,19 @@
 import org.kie.dmn.feel.util.Msg;
 import org.kie.dmn.feel.util.MsgUtil;
 
+import java.math.BigDecimal;
+import java.math.MathContext;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
 import static com.github.javaparser.StaticJavaParser.parseClassOrInterfaceType;
 import static org.kie.dmn.feel.codegen.feel11.Expressions.compiledFeelSemanticMappingsFQN;
+import static org.kie.dmn.feel.lang.ast.forexpressioniterators.ForIterationUtils.getForIteration;
 
 public class CompiledFEELSupport {
 
@@ -265,7 +268,7 @@ public Object rreturn(Function expression) {
                     ctx.exitFrame(); // last i-th scope unrolled, see also ForExpressionNode.nextIteration(...)
                 }
                 return results;
-            } catch (EndpointOfRangeNotOfNumberException e) {
+            } catch (EndpointOfRangeNotValidTypeException | EndpointOfRangeOfDifferentTypeException e) {
                 // ast error already reported
                 return null;
             } finally {
@@ -296,26 +299,11 @@ private ForIteration createQuantifiedExpressionIterationContext(EvaluationContex
                 Iterable values = result instanceof Iterable ? (Iterable) result : Collections.singletonList(result);
                 fi = new ForIteration(name, values);
             } else {
-                valueMustBeANumber(ctx, result);
-                BigDecimal start = (BigDecimal) result;
-                valueMustBeANumber(ctx, rangeEnd);
-                BigDecimal end = (BigDecimal) rangeEnd;
-                fi = new ForIteration(name, start, end);
+                fi = getForIteration(ctx, name, result, rangeEnd);
             }
             return fi;
         }
 
-        private void valueMustBeANumber(EvaluationContext ctx, Object value) {
-            if (!(value instanceof BigDecimal)) {
-                ctx.notifyEvt(() -> new ASTEventBase(Severity.ERROR, Msg.createMessage(Msg.VALUE_X_NOT_A_VALID_ENDPOINT_FOR_RANGE_BECAUSE_NOT_A_NUMBER, value), null));
-                throw new EndpointOfRangeNotOfNumberException();
-            }
-        }
-
-        private static class EndpointOfRangeNotOfNumberException extends RuntimeException {
-
-            private static final long serialVersionUID = 1L;
-        }
     }
 
     public static class IterationContextCompiled {
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/exceptions/EndpointOfRangeNotOfNumberException.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/exceptions/EndpointOfRangeNotOfNumberException.java
new file mode 100644
index 00000000000..3c6ce52b788
--- /dev/null
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/exceptions/EndpointOfRangeNotOfNumberException.java
@@ -0,0 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.dmn.feel.exceptions;
+
+public class EndpointOfRangeNotOfNumberException extends RuntimeException {
+}
\ No newline at end of file
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/exceptions/EndpointOfRangeNotValidTypeException.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/exceptions/EndpointOfRangeNotValidTypeException.java
new file mode 100644
index 00000000000..f49115f618f
--- /dev/null
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/exceptions/EndpointOfRangeNotValidTypeException.java
@@ -0,0 +1,23 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.dmn.feel.exceptions;
+
+public class EndpointOfRangeNotValidTypeException extends RuntimeException {
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/exceptions/EndpointOfRangeOfDifferentTypeException.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/exceptions/EndpointOfRangeOfDifferentTypeException.java
new file mode 100644
index 00000000000..4c62799beae
--- /dev/null
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/exceptions/EndpointOfRangeOfDifferentTypeException.java
@@ -0,0 +1,23 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.dmn.feel.exceptions;
+
+public class EndpointOfRangeOfDifferentTypeException extends RuntimeException {
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/ForExpressionNode.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/ForExpressionNode.java
index d92fed9c192..9b062179b1e 100644
--- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/ForExpressionNode.java
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/ForExpressionNode.java
@@ -18,34 +18,33 @@
  */
 package org.kie.dmn.feel.lang.ast;
 
-import java.math.BigDecimal;
-import java.math.MathContext;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.function.Supplier;
-
 import org.antlr.v4.runtime.ParserRuleContext;
-import org.kie.dmn.api.feel.runtime.events.FEELEvent.Severity;
+import org.kie.dmn.feel.exceptions.EndpointOfRangeNotValidTypeException;
+import org.kie.dmn.feel.exceptions.EndpointOfRangeOfDifferentTypeException;
 import org.kie.dmn.feel.lang.EvaluationContext;
 import org.kie.dmn.feel.lang.Type;
+import org.kie.dmn.feel.lang.ast.forexpressioniterators.ForIteration;
 import org.kie.dmn.feel.lang.types.BuiltInType;
-import org.kie.dmn.feel.util.Msg;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static org.kie.dmn.feel.lang.ast.forexpressioniterators.ForIterationUtils.getForIteration;
 
 public class ForExpressionNode
         extends BaseNode {
 
+
     private List iterationContexts;
-    private BaseNode                   expression;
+    private BaseNode expression;
 
     public ForExpressionNode(ParserRuleContext ctx, ListNode iterationContexts, BaseNode expression) {
-        super( ctx );
-        this.iterationContexts = new ArrayList<>(  );
+        super(ctx);
+        this.iterationContexts = new ArrayList<>();
         this.expression = expression;
-        for( BaseNode n : iterationContexts.getElements() ) {
-            this.iterationContexts.add( (IterationContextNode) n );
+        for (BaseNode n : iterationContexts.getElements()) {
+            this.iterationContexts.add((IterationContextNode) n);
         }
     }
 
@@ -69,17 +68,17 @@ public void setExpression(BaseNode expression) {
     public Object evaluate(EvaluationContext ctx) {
         try {
             ctx.enterFrame();
-            List results = new ArrayList(  );
+            List results = new ArrayList();
             ctx.setValue("partial", results);
-            ForIteration[] ictx = initializeContexts( ctx, iterationContexts);
+            ForIteration[] ictx = initializeContexts(ctx, iterationContexts);
 
-            while ( nextIteration( ctx, ictx ) ) {
-                Object result = expression.evaluate( ctx );
-                results.add( result );
+            while (nextIteration(ctx, ictx)) {
+                Object result = expression.evaluate(ctx);
+                results.add(result);
                 ctx.exitFrame(); // last i-th scope unrolled, see also ForExpressionNode.nextIteration(...)
             }
             return results;
-        } catch (EndpointOfRangeNotOfNumberException e) {
+        } catch (EndpointOfRangeNotValidTypeException | EndpointOfRangeOfDifferentTypeException e) {
             // ast error already reported
             return null;
         } finally {
@@ -88,18 +87,18 @@ public Object evaluate(EvaluationContext ctx) {
     }
 
     public static boolean nextIteration(EvaluationContext ctx, ForIteration[] ictx) {
-        int i = ictx.length-1;
-        while ( i >= 0 && i < ictx.length ) {
-            if ( ictx[i].hasNextValue() ) {
+        int i = ictx.length - 1;
+        while (i >= 0 && i < ictx.length) {
+            if (ictx[i].hasNextValue()) {
                 ctx.enterFrame(); // on first iter, open last scope frame; or new ones when prev unrolled
-                setValueIntoContext( ctx, ictx[i] );
+                setValueIntoContext(ctx, ictx[i]);
                 i++;
             } else {
-                if ( i > 0 ) {
+                if (i > 0) {
                     // end of iter loop for this i-th scope; i-th scope is always unrolled as part of the 
                     // for-loop cycle, so here must unroll the _prev_ scope;
                     // the if-guard for this code block makes sure NOT to unroll bottom one.
-                    ctx.exitFrame();         
+                    ctx.exitFrame();
                 }
                 i--;
             }
@@ -108,9 +107,9 @@ public static boolean nextIteration(EvaluationContext ctx, ForIteration[] ictx)
     }
 
     public static void setValueIntoContext(EvaluationContext ctx, ForIteration forIteration) {
-        ctx.setValue( forIteration.getName(), forIteration.getNextValue() );
+        ctx.setValue(forIteration.getName(), forIteration.getNextValue());
     }
-    
+
     @Override
     public Type getResultType() {
         return BuiltInType.LIST;
@@ -119,139 +118,36 @@ public Type getResultType() {
     private ForIteration[] initializeContexts(EvaluationContext ctx, List iterationContexts) {
         ForIteration[] ictx = new ForIteration[iterationContexts.size()];
         int i = 0;
-        for ( IterationContextNode icn : iterationContexts ) {
-            ictx[i] = createQuantifiedExpressionIterationContext( ctx, icn );
-            if( i < iterationContexts.size()-1 && ictx[i].hasNextValue() ) {
+        for (IterationContextNode icn : iterationContexts) {
+            ictx[i] = createQuantifiedExpressionIterationContext(ctx, icn);
+            if (i < iterationContexts.size() - 1 && ictx[i].hasNextValue()) {
                 ctx.enterFrame(); // open loop scope frame, for every iter ctx, except last one as guarded by if clause above
-                setValueIntoContext( ctx, ictx[i] );
+                setValueIntoContext(ctx, ictx[i]);
             }
             i++;
         }
         return ictx;
     }
 
-    private static class EndpointOfRangeNotOfNumberException extends RuntimeException {
-        private static final long serialVersionUID = 1L;
-    }
-
     private ForIteration createQuantifiedExpressionIterationContext(EvaluationContext ctx, IterationContextNode icn) {
         ForIteration fi;
-        String name = icn.evaluateName( ctx );
-        Object result = icn.evaluate( ctx );
+        String name = icn.evaluateName(ctx);
+        Object result = icn.evaluate(ctx);
         Object rangeEnd = icn.evaluateRangeEnd(ctx);
         if (rangeEnd == null) {
             Iterable values = result instanceof Iterable ? (Iterable) result : Collections.singletonList(result);
             fi = new ForIteration(name, values);
         } else {
-            valueMustBeANumber(ctx, result);
-            BigDecimal start = (BigDecimal) result;
-            valueMustBeANumber(ctx, rangeEnd);
-            BigDecimal end = (BigDecimal) rangeEnd;
-            fi = new ForIteration(name, start, end);
+            fi = getForIteration(ctx, name, result, rangeEnd);
         }
         return fi;
     }
 
-    private void valueMustBeANumber(EvaluationContext ctx, Object value) {
-        if (!(value instanceof BigDecimal)) {
-            ctx.notifyEvt(astEvent(Severity.ERROR, Msg.createMessage(Msg.VALUE_X_NOT_A_VALID_ENDPOINT_FOR_RANGE_BECAUSE_NOT_A_NUMBER, value), null));
-            throw new EndpointOfRangeNotOfNumberException();
-        }
-    }
-
-    public static class ForIteration {
-        private String   name;
-        private Iterable values;
-
-        private Supplier iteratorGenerator;
-        private Iterator iterator;
-
-        public ForIteration(String name, Iterable values) {
-            this.name = name;
-            this.values = values;
-            this.iteratorGenerator = () -> this.values.iterator();
-        }
-
-        public ForIteration(String name, final BigDecimal start, final BigDecimal end) {
-            this.name = name;
-            this.iteratorGenerator = () -> new BigDecimalRangeIterator(start, end);
-        }
-
-        public boolean hasNextValue() {
-            if( iterator == null ) {
-                iterator = iteratorGenerator.get();
-            }
-            boolean hasValue = this.iterator.hasNext();
-            if( ! hasValue ) {
-                this.iterator = null;
-            }
-            return hasValue;
-        }
-
-        public Object getNextValue() {
-            return iterator != null ? iterator.next() : null;
-        }
-
-        public String getName() {
-            return name;
-        }
-    }
-
-    public static class BigDecimalRangeIterator implements Iterator {
-
-        private enum Direction {
-            ASCENDANT,
-            DESCENDANT;
-        }
-
-        private final BigDecimal start;
-        private final BigDecimal end;
-
-        private BigDecimal cursor;
-        private final Direction direction;
-        private final BigDecimal increment;
-
-        public BigDecimalRangeIterator(BigDecimal start, BigDecimal end) {
-            this.start = start;
-            this.end = end;
-            this.direction = (start.compareTo(end) <= 0) ? Direction.ASCENDANT : Direction.DESCENDANT;
-            this.increment = (direction == Direction.ASCENDANT) ? new BigDecimal(1, MathContext.DECIMAL128) : new BigDecimal(-1, MathContext.DECIMAL128);
-        }
-
-        @Override
-        public boolean hasNext() {
-            if (cursor == null) {
-                return true;
-            } else {
-                BigDecimal lookAhead = cursor.add(increment);
-                if (direction == Direction.ASCENDANT) {
-                    return lookAhead.compareTo(end) <= 0;
-                } else {
-                    return lookAhead.compareTo(end) >= 0;
-                }
-            }
-        }
-
-        @Override
-        public BigDecimal next() {
-            if (!hasNext()) {
-                throw new NoSuchElementException();
-            }
-            if (cursor == null) {
-                cursor = start;
-            } else {
-                cursor = cursor.add(increment);
-            }
-            return cursor;
-        }
-
-    }
-
     @Override
     public ASTNode[] getChildrenNode() {
-        ASTNode[] children = new ASTNode[ iterationContexts.size() + 1 ];
+        ASTNode[] children = new ASTNode[iterationContexts.size() + 1];
         System.arraycopy(iterationContexts.toArray(new ASTNode[]{}), 0, children, 0, iterationContexts.size());
-        children[ children.length-1 ] = expression;
+        children[children.length - 1] = expression;
         return children;
     }
 
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/BigDecimalRangeIterator.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/BigDecimalRangeIterator.java
new file mode 100644
index 00000000000..3e58ff35f54
--- /dev/null
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/BigDecimalRangeIterator.java
@@ -0,0 +1,69 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.dmn.feel.lang.ast.forexpressioniterators;
+
+import java.math.BigDecimal;
+import java.math.MathContext;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+public class BigDecimalRangeIterator implements Iterator {
+
+    private final BigDecimal start;
+    private final BigDecimal end;
+
+    private BigDecimal cursor;
+    private final Direction direction;
+    private final BigDecimal increment;
+
+    public BigDecimalRangeIterator(BigDecimal start, BigDecimal end) {
+        this.start = start;
+        this.end = end;
+        this.direction = (start.compareTo(end) <= 0) ? Direction.ASCENDANT : Direction.DESCENDANT;
+        this.increment = (direction == Direction.ASCENDANT) ? new BigDecimal(1, MathContext.DECIMAL128) : new BigDecimal(-1, MathContext.DECIMAL128);
+    }
+
+    @Override
+    public boolean hasNext() {
+        if (cursor == null) {
+            return true;
+        } else {
+            BigDecimal lookAhead = cursor.add(increment);
+            if (direction == Direction.ASCENDANT) {
+                return lookAhead.compareTo(end) <= 0;
+            } else {
+                return lookAhead.compareTo(end) >= 0;
+            }
+        }
+    }
+
+    @Override
+    public BigDecimal next() {
+        if (!hasNext()) {
+            throw new NoSuchElementException();
+        }
+        if (cursor == null) {
+            cursor = start;
+        } else {
+            cursor = cursor.add(increment);
+        }
+        return cursor;
+    }
+
+}
\ No newline at end of file
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/Direction.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/Direction.java
new file mode 100644
index 00000000000..035a5fc9855
--- /dev/null
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/Direction.java
@@ -0,0 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 

+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 

+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.dmn.feel.lang.ast.forexpressioniterators;
+
+enum Direction {
+    ASCENDANT,
+    DESCENDANT;
+}
\ No newline at end of file
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ForIteration.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ForIteration.java
new file mode 100644
index 00000000000..43f4f576c03
--- /dev/null
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ForIteration.java
@@ -0,0 +1,67 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.dmn.feel.lang.ast.forexpressioniterators;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Iterator;
+import java.util.function.Supplier;
+
+public class ForIteration {
+    private String name;
+    private Iterable values;
+
+    private Supplier iteratorGenerator;
+    private Iterator iterator;
+
+    public ForIteration(String name, Iterable values) {
+        this.name = name;
+        this.values = values;
+        this.iteratorGenerator = () -> this.values.iterator();
+    }
+
+    public ForIteration(String name, final BigDecimal start, final BigDecimal end) {
+        this.name = name;
+        this.iteratorGenerator = () -> new BigDecimalRangeIterator(start, end);
+    }
+
+    public ForIteration(String name, final LocalDate start, final LocalDate end) {
+        this.name = name;
+        this.iteratorGenerator = () -> new LocalDateRangeIterator(start, end);
+    }
+
+    public boolean hasNextValue() {
+        if (iterator == null) {
+            iterator = iteratorGenerator.get();
+        }
+        boolean hasValue = this.iterator.hasNext();
+        if (!hasValue) {
+            this.iterator = null;
+        }
+        return hasValue;
+    }
+
+    public Object getNextValue() {
+        return iterator != null ? iterator.next() : null;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
\ No newline at end of file
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ForIterationUtils.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ForIterationUtils.java
new file mode 100644
index 00000000000..2e02c5df99c
--- /dev/null
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ForIterationUtils.java
@@ -0,0 +1,66 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.dmn.feel.lang.ast.forexpressioniterators;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+import org.kie.dmn.api.feel.runtime.events.FEELEvent;
+import org.kie.dmn.feel.exceptions.EndpointOfRangeNotValidTypeException;
+import org.kie.dmn.feel.exceptions.EndpointOfRangeOfDifferentTypeException;
+import org.kie.dmn.feel.lang.EvaluationContext;
+import org.kie.dmn.feel.runtime.events.ASTEventBase;
+import org.kie.dmn.feel.util.Msg;
+
+public class ForIterationUtils {
+
+    private ForIterationUtils() {
+    }
+
+    public static ForIteration getForIteration(EvaluationContext ctx, String name, Object start, Object end) {
+        validateValues(ctx, start, end);
+        if (start instanceof BigDecimal bigDecimal) {
+            return new ForIteration(name, bigDecimal, (BigDecimal) end);
+        }
+        if (start instanceof LocalDate localDate) {
+            return new ForIteration(name, localDate, (LocalDate) end);
+        }
+        ctx.notifyEvt(() -> new ASTEventBase(FEELEvent.Severity.ERROR,
+                                             Msg.createMessage(Msg.VALUE_X_NOT_A_VALID_ENDPOINT_FOR_RANGE_BECAUSE_NOT_A_NUMBER_NOT_A_DATE, start), null));
+        throw new EndpointOfRangeOfDifferentTypeException();
+    }
+
+    static void validateValues(EvaluationContext ctx, Object start, Object end) {
+        if (start.getClass() != end.getClass()) {
+            ctx.notifyEvt(() -> new ASTEventBase(FEELEvent.Severity.ERROR,
+                    Msg.createMessage(Msg.X_TYPE_INCOMPATIBLE_WITH_Y_TYPE, start, end), null));
+            throw new EndpointOfRangeOfDifferentTypeException();
+        }
+        valueMustBeValid(ctx, start);
+        valueMustBeValid(ctx, end);
+    }
+
+    static void valueMustBeValid(EvaluationContext ctx, Object value) {
+        if (!(value instanceof BigDecimal) && !(value instanceof LocalDate)) {
+            ctx.notifyEvt(() -> new ASTEventBase(FEELEvent.Severity.ERROR, Msg.createMessage(Msg.VALUE_X_NOT_A_VALID_ENDPOINT_FOR_RANGE_BECAUSE_NOT_A_NUMBER_NOT_A_DATE, value), null));
+            throw new EndpointOfRangeNotValidTypeException();
+        }
+    }
+
+}
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/LocalDateRangeIterator.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/LocalDateRangeIterator.java
new file mode 100644
index 00000000000..a7f4ee5e281
--- /dev/null
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/LocalDateRangeIterator.java
@@ -0,0 +1,67 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.dmn.feel.lang.ast.forexpressioniterators;
+
+import java.time.LocalDate;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+public class LocalDateRangeIterator implements Iterator {
+    private final LocalDate start;
+    private final LocalDate end;
+
+    private LocalDate cursor;
+    private final Direction direction;
+    private final int increment;
+
+    public LocalDateRangeIterator(LocalDate start, LocalDate end) {
+        this.start = start;
+        this.end = end;
+        this.direction = (!start.isAfter(end)) ? Direction.ASCENDANT : Direction.DESCENDANT;
+        this.increment = (direction == Direction.ASCENDANT) ? 1 : -1;
+    }
+
+    @Override
+    public boolean hasNext() {
+        if (cursor == null) {
+            return true;
+        } else {
+            LocalDate lookAhead = cursor.plusDays(increment);
+            if (direction == Direction.ASCENDANT) {
+                return !lookAhead.isAfter(end);
+            } else {
+                return !lookAhead.isBefore(end);
+            }
+        }
+    }
+
+    @Override
+    public LocalDate next() {
+        if (!hasNext()) {
+            throw new NoSuchElementException();
+        }
+        if (cursor == null) {
+            cursor = start;
+        } else {
+            cursor = cursor.plusDays(increment);
+        }
+        return cursor;
+    }
+
+}
\ No newline at end of file
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ZonedDateTimeRangeIterator.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ZonedDateTimeRangeIterator.java
new file mode 100644
index 00000000000..49292c6f369
--- /dev/null
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ZonedDateTimeRangeIterator.java
@@ -0,0 +1,69 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.dmn.feel.lang.ast.forexpressioniterators;
+
+import java.time.ZonedDateTime;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+public class ZonedDateTimeRangeIterator implements Iterator {
+
+    private final ZonedDateTime start;
+    private final ZonedDateTime end;
+
+    private ZonedDateTime cursor;
+    private final Direction direction;
+    private final int increment;
+
+    public ZonedDateTimeRangeIterator(ZonedDateTime start, ZonedDateTime end) {
+        // datetime
+        this.start = start;
+        this.end = end;
+        this.direction = (!start.isAfter(end)) ? Direction.ASCENDANT : Direction.DESCENDANT;
+        this.increment = (direction == Direction.ASCENDANT) ? 1 : -1;
+    }
+
+    @Override
+    public boolean hasNext() {
+        if (cursor == null) {
+            return true;
+        } else {
+            ZonedDateTime lookAhead = cursor.plusDays(increment);
+            if (direction == Direction.ASCENDANT) {
+                return !lookAhead.isAfter(end);
+            } else {
+                return !lookAhead.isBefore(end);
+            }
+        }
+    }
+
+    @Override
+    public ZonedDateTime next() {
+        if (!hasNext()) {
+            throw new NoSuchElementException();
+        }
+        if (cursor == null) {
+            cursor = start;
+        } else {
+            cursor = cursor.plusDays(increment);
+        }
+        return cursor;
+    }
+
+}
\ No newline at end of file
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/AddExecutor.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/AddExecutor.java
index 3b3e6d348f8..9f4a6324620 100644
--- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/AddExecutor.java
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/AddExecutor.java
@@ -22,6 +22,7 @@
 import java.math.MathContext;
 import java.time.Duration;
 import java.time.LocalDate;
+import java.time.Period;
 import java.time.chrono.ChronoPeriod;
 import java.time.temporal.Temporal;
 import java.time.temporal.TemporalAmount;
@@ -39,6 +40,10 @@ public class AddExecutor implements InfixExecutor {
 
     private static final AddExecutor INSTANCE = new AddExecutor();
 
+    private AddExecutor() {
+        // Singleton pattern
+    }
+
     public static AddExecutor instance() {
         return INSTANCE;
     }
@@ -65,35 +70,38 @@ private Object add(Object left, Object right, EvaluationContext ctx) {
                     null;
         }
 
-        if (left instanceof String) {
-            return right instanceof String ? left + (String) right : null;
+        if (left instanceof String stringLeft) {
+            return right instanceof String stringRight ? stringLeft + stringRight : null;
         }
 
-        if (left instanceof Duration) {
-            if (right instanceof LocalDate) {
-                return addLocalDateAndDuration((LocalDate) right, (Duration) left);
+        if (left instanceof Duration leftDuration) {
+            if (right instanceof LocalDate localDate) {
+                return addLocalDateAndDuration(localDate, leftDuration);
             }
-            if (right instanceof Duration) {
-                return ((Duration) left).plus((Duration) right);
+            if (right instanceof Duration rightDuration) {
+                return leftDuration.plus(rightDuration);
             }
         }
-        if (right instanceof Duration && left instanceof LocalDate) {
-            return addLocalDateAndDuration((LocalDate) left, (Duration) right);
+        if (right instanceof Duration duration && left instanceof LocalDate localDate) {
+            return addLocalDateAndDuration(localDate, duration);
         }
 
-        if (left instanceof Temporal) {
-            if (right instanceof TemporalAmount) {
-                return ((Temporal) left).plus((TemporalAmount) right);
+        if (left instanceof Temporal temporal) {
+            if (right instanceof TemporalAmount temporalAmount) {
+                return temporal.plus(temporalAmount);
             }
-        } else if (left instanceof TemporalAmount) {
-            if (right instanceof Temporal) {
-                return ((Temporal) right).plus((TemporalAmount) left);
+            if (right instanceof BigDecimal bigDecimal) {
+                Period toAdd = Period.ofDays(bigDecimal.intValue());
+                return temporal.plus(toAdd);
             }
-            if (right instanceof ChronoPeriod) {
-                return ((ChronoPeriod) right).plus((TemporalAmount) left);
+        } else if (left instanceof TemporalAmount temporalAmount) {
+            if (right instanceof Temporal temporal) {
+                return temporal.plus(temporalAmount);
+            }
+            if (right instanceof ChronoPeriod chronoPeriod) {
+                return chronoPeriod.plus(temporalAmount);
             }
         }
-
         ctx.notifyEvt(() -> new InvalidParametersEvent(FEELEvent.Severity.ERROR, Msg.OPERATION_IS_UNDEFINED_FOR_PARAMETERS.getMask()));
         return null;
     }
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/AndExecutor.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/AndExecutor.java
index 766c74ba659..01bc99c19c3 100644
--- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/AndExecutor.java
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/AndExecutor.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 

- * http://www.apache.org/licenses/LICENSE-2.0
- * 

+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/OrExecutor.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/OrExecutor.java
index 8c079bd9c9b..832e472b644 100644
--- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/OrExecutor.java
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/infixexecutors/OrExecutor.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 

- * http://www.apache.org/licenses/LICENSE-2.0
- * 

+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/util/Msg.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/util/Msg.java
index 3630110d435..1eb8b5a01df 100644
--- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/util/Msg.java
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/util/Msg.java
@@ -38,7 +38,7 @@ public final class Msg {
     public static final Message2 INDEX_OUT_OF_BOUND = new Message2("Index out of bound: list of %s elements, index %s; will evaluate as FEEL null");
     public static final Message2 X_TYPE_INCOMPATIBLE_WITH_Y_TYPE = new Message2("%s type incompatible with %s type");
     public static final Message1 INCOMPATIBLE_TYPE_FOR_RANGE = new Message1("Type %s can not be used in a range unary test");
-    public static final Message1 VALUE_X_NOT_A_VALID_ENDPOINT_FOR_RANGE_BECAUSE_NOT_A_NUMBER = new Message1("Value %s is not a valid endpoint for range, because not a feel:number");
+    public static final Message1 VALUE_X_NOT_A_VALID_ENDPOINT_FOR_RANGE_BECAUSE_NOT_A_NUMBER_NOT_A_DATE = new Message1("Value %s is not a valid endpoint for range, because neither a feel:number nor a feel:date");
     public static final Message1 EVALUATED_TO_NULL = new Message1("%s evaluated to null");
     public static final Message1 IS_NULL = new Message1("%s is null");
     public static final Message0 BASE_NODE_EVALUATE_CALLED = new Message0("BaseNode evaluate called");
diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/BigDecimalRangeIteratorTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/BigDecimalRangeIteratorTest.java
new file mode 100644
index 00000000000..cffdd4615f1
--- /dev/null
+++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/BigDecimalRangeIteratorTest.java
@@ -0,0 +1,81 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.dmn.feel.lang.ast.forexpressioniterators;
+
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.IntStream;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class BigDecimalRangeIteratorTest {
+
+    @Test
+    public void hasNextAscendantTest() {
+        BigDecimal start = BigDecimal.valueOf(1);
+        BigDecimal end = BigDecimal.valueOf(3);
+        BigDecimalRangeIterator iterator = new BigDecimalRangeIterator(start, end);
+        assertTrue(iterator.hasNext());
+        BigDecimal next = iterator.next();
+        while (!next.equals(end)) {
+            assertTrue(iterator.hasNext());
+            next = iterator.next();
+        }
+        assertFalse(iterator.hasNext());
+    }
+
+    @Test
+    public void hasNextDescendantTest() {
+        BigDecimal start = BigDecimal.valueOf(3);
+        BigDecimal end = BigDecimal.valueOf(1);
+        BigDecimalRangeIterator iterator = new BigDecimalRangeIterator(start, end);
+        assertTrue(iterator.hasNext());
+        BigDecimal next = iterator.next();
+        while (!next.equals(end)) {
+            assertTrue(iterator.hasNext());
+            next = iterator.next();
+        }
+        assertFalse(iterator.hasNext());
+    }
+
+    @Test
+    public void nextAscendantTest() {
+        BigDecimal start = BigDecimal.valueOf(1);
+        BigDecimal end = BigDecimal.valueOf(3);
+        List expected = Arrays.asList(BigDecimal.valueOf(1), BigDecimal.valueOf(2), BigDecimal.valueOf(3));
+        BigDecimalRangeIterator iterator = new BigDecimalRangeIterator(start, end);
+        IntStream.range(0, 3).forEach(i -> assertEquals(expected.get(i), iterator.next()));
+    }
+
+    @Test
+    public void nextDescendantTest() {
+        BigDecimal start = BigDecimal.valueOf(3);
+        BigDecimal end = BigDecimal.valueOf(1);
+        List expected = Arrays.asList(BigDecimal.valueOf(3), BigDecimal.valueOf(2), BigDecimal.valueOf(1));
+        BigDecimalRangeIterator iterator = new BigDecimalRangeIterator(start, end);
+        IntStream.range(0, 3).forEach(i -> assertEquals(expected.get(i), iterator.next()));
+    }
+
+
+}
\ No newline at end of file
diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ForIterationTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ForIterationTest.java
new file mode 100644
index 00000000000..56512a3c425
--- /dev/null
+++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ForIterationTest.java
@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.dmn.feel.lang.ast.forexpressioniterators;
+
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.IntStream;
+
+import static org.junit.Assert.*;
+
+public class ForIterationTest {
+
+    @Test
+    public void hasNextValueBigDecimalTest() {
+        BigDecimal start = BigDecimal.valueOf(1);
+        BigDecimal end = BigDecimal.valueOf(3);
+        ForIteration iteration = new ForIteration("iteration", start, end);
+        assertTrue(iteration.hasNextValue());
+        BigDecimal next = (BigDecimal) iteration.getNextValue();
+        while (!next.equals(end)) {
+            assertTrue(iteration.hasNextValue());
+            next = (BigDecimal) iteration.getNextValue();
+        }
+        assertFalse(iteration.hasNextValue());
+    }
+
+    @Test
+    public void hasNextValueLocalDateTest() {
+        LocalDate start = LocalDate.of(2021, 1, 1);
+        LocalDate end = LocalDate.of(2021, 1, 3);
+        ForIteration iteration = new ForIteration("iteration", start, end);
+        assertTrue(iteration.hasNextValue());
+        LocalDate next = (LocalDate) iteration.getNextValue();
+        while (!next.equals(end)) {
+            assertTrue(iteration.hasNextValue());
+            next = (LocalDate) iteration.getNextValue();
+        }
+        assertFalse(iteration.hasNextValue());
+    }
+
+    @Test
+    public void getNextValueBigDecimalTest() {
+        BigDecimal start = BigDecimal.valueOf(1);
+        BigDecimal end = BigDecimal.valueOf(3);
+        List expected = Arrays.asList(BigDecimal.valueOf(1), BigDecimal.valueOf(2), BigDecimal.valueOf(3));
+        ForIteration iteration = new ForIteration("iteration", start, end);
+        iteration.hasNextValue();
+        IntStream.range(0, 3).forEach(i -> assertEquals(expected.get(i), iteration.getNextValue()));
+    }
+
+    @Test
+    public void getNextValueLocalDateTest() {
+        LocalDate start = LocalDate.of(2021, 1, 3);
+        LocalDate end = LocalDate.of(2021, 1, 1);
+        List expected = Arrays.asList(LocalDate.of(2021, 1, 3), LocalDate.of(2021, 1, 2), LocalDate.of(2021, 1, 1));
+        ForIteration iteration = new ForIteration("iteration", start, end);
+        iteration.hasNextValue();
+        IntStream.range(0, 3).forEach(i -> assertEquals(expected.get(i), iteration.getNextValue()));
+    }
+}
\ No newline at end of file
diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ForIterationUtilsTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ForIterationUtilsTest.java
new file mode 100644
index 00000000000..bb50aca4146
--- /dev/null
+++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ForIterationUtilsTest.java
@@ -0,0 +1,154 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.dmn.feel.lang.ast.forexpressioniterators;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.kie.dmn.api.feel.runtime.events.FEELEvent;
+import org.kie.dmn.api.feel.runtime.events.FEELEventListener;
+import org.kie.dmn.feel.exceptions.EndpointOfRangeNotValidTypeException;
+import org.kie.dmn.feel.exceptions.EndpointOfRangeOfDifferentTypeException;
+import org.kie.dmn.feel.lang.EvaluationContext;
+import org.kie.dmn.feel.lang.impl.FEELEventListenersManager;
+import org.mockito.ArgumentCaptor;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.kie.dmn.feel.codegen.feel11.CodegenTestUtil.newEmptyEvaluationContext;
+import static org.kie.dmn.feel.lang.ast.forexpressioniterators.ForIterationUtils.getForIteration;
+import static org.kie.dmn.feel.lang.ast.forexpressioniterators.ForIterationUtils.validateValues;
+import static org.kie.dmn.feel.lang.ast.forexpressioniterators.ForIterationUtils.valueMustBeValid;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+public class ForIterationUtilsTest {
+
+    private FEELEventListener listener;
+    private EvaluationContext ctx;
+
+    @Before
+    public void setup() {
+        final FEELEventListenersManager mngr = new FEELEventListenersManager();
+        listener = mock(FEELEventListener.class);
+        mngr.addListener(listener);
+        ctx = newEmptyEvaluationContext(mngr);
+    }
+
+    @Test
+    public void getForIterationValidTest() {
+        ForIteration retrieved = getForIteration(ctx, "iteration", BigDecimal.valueOf(1), BigDecimal.valueOf(3));
+        assertNotNull(retrieved);
+        verify(listener, never()).onEvent(any(FEELEvent.class));
+        retrieved = getForIteration(ctx, "iteration", LocalDate.of(2021, 1, 1), LocalDate.of(2021, 1, 3));
+        assertNotNull(retrieved);
+        verify(listener, never()).onEvent(any(FEELEvent.class));
+    }
+
+    @Test
+    public void getForIterationNotValidTest() {
+        try {
+            getForIteration(ctx, "iteration", "NOT", "VALID");
+        } catch (Exception e) {
+            assertTrue(e instanceof EndpointOfRangeNotValidTypeException);
+            final ArgumentCaptor captor = ArgumentCaptor.forClass(FEELEvent.class);
+            verify(listener, times(1)).onEvent(captor.capture());
+            reset(listener);
+        }
+        try {
+            getForIteration(ctx, "iteration", BigDecimal.valueOf(1), LocalDate.of(2021, 1, 1));
+        } catch (Exception e) {
+            assertTrue(e instanceof EndpointOfRangeOfDifferentTypeException);
+            final ArgumentCaptor captor = ArgumentCaptor.forClass(FEELEvent.class);
+            verify(listener, times(1)).onEvent(captor.capture());
+            reset(listener);
+        }
+        try {
+            getForIteration(ctx, "iteration", LocalDate.of(2021, 1, 1), BigDecimal.valueOf(1));
+        } catch (Exception e) {
+            assertTrue(e instanceof EndpointOfRangeOfDifferentTypeException);
+            final ArgumentCaptor captor = ArgumentCaptor.forClass(FEELEvent.class);
+            verify(listener, times(1)).onEvent(captor.capture());
+            reset(listener);
+        }
+    }
+
+    @Test
+    public void valueMustBeValidTrueTest() {
+        valueMustBeValid(ctx, BigDecimal.valueOf(1));
+        verify(listener, never()).onEvent(any(FEELEvent.class));
+        valueMustBeValid(ctx, LocalDate.of(2021, 1, 3));
+        verify(listener, never()).onEvent(any(FEELEvent.class));
+    }
+
+    @Test
+    public void valueMustBeValidFalseTest() {
+        try {
+            valueMustBeValid(ctx, "INVALID");
+        } catch (Exception e) {
+            assertTrue(e instanceof EndpointOfRangeNotValidTypeException);
+            final ArgumentCaptor captor = ArgumentCaptor.forClass(FEELEvent.class);
+            verify(listener, times(1)).onEvent(captor.capture());
+        }
+    }
+
+    @Test
+    public void validateValuesTrueTest() {
+        validateValues(ctx, BigDecimal.valueOf(1), BigDecimal.valueOf(3));
+        verify(listener, never()).onEvent(any(FEELEvent.class));
+        validateValues(ctx, LocalDate.of(2021, 1, 1), LocalDate.of(2021, 1, 3));
+        verify(listener, never()).onEvent(any(FEELEvent.class));
+    }
+
+    @Test
+    public void validateValuesFalseTest() {
+        try {
+            validateValues(ctx, "INVALID", "INVALID");
+        } catch (Exception e) {
+            assertTrue(e instanceof EndpointOfRangeNotValidTypeException);
+            final ArgumentCaptor captor = ArgumentCaptor.forClass(FEELEvent.class);
+            verify(listener, times(1)).onEvent(captor.capture());
+            reset(listener);
+        }
+        try {
+            validateValues(ctx, BigDecimal.valueOf(1), LocalDate.of(2021, 1, 1));
+        } catch (Exception e) {
+            assertTrue(e instanceof EndpointOfRangeOfDifferentTypeException);
+            final ArgumentCaptor captor = ArgumentCaptor.forClass(FEELEvent.class);
+            verify(listener, times(1)).onEvent(captor.capture());
+            reset(listener);
+        }
+        try {
+            validateValues(ctx, LocalDate.of(2021, 1, 1), BigDecimal.valueOf(1));
+        } catch (Exception e) {
+            assertTrue(e instanceof EndpointOfRangeOfDifferentTypeException);
+            final ArgumentCaptor captor = ArgumentCaptor.forClass(FEELEvent.class);
+            verify(listener, times(1)).onEvent(captor.capture());
+            reset(listener);
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/LocalDateRangeIteratorTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/LocalDateRangeIteratorTest.java
new file mode 100644
index 00000000000..6c40c0813f7
--- /dev/null
+++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/LocalDateRangeIteratorTest.java
@@ -0,0 +1,83 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.dmn.feel.lang.ast.forexpressioniterators;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.time.LocalDate;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.IntStream;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class LocalDateRangeIteratorTest {
+
+    private static LocalDate before;
+    private static LocalDate after;
+
+    @BeforeClass
+    public static void setup() {
+        before = LocalDate.of(2021, 1, 1);
+        after = LocalDate.of(2021, 1, 3);
+    }
+
+    @Test
+    public void hasNextAscendantTest() {
+        LocalDateRangeIterator iterator = new LocalDateRangeIterator(before, after);
+        assertTrue(iterator.hasNext());
+        LocalDate next = iterator.next();
+        while (!next.equals(after)) {
+            assertTrue(iterator.hasNext());
+            next = iterator.next();
+        }
+        assertFalse(iterator.hasNext());
+    }
+
+    @Test
+    public void hasNextDescendantTest() {
+        LocalDateRangeIterator iterator = new LocalDateRangeIterator(after, before);
+        assertTrue(iterator.hasNext());
+        LocalDate next = iterator.next();
+        while (!next.equals(before)) {
+            assertTrue(iterator.hasNext());
+            next = iterator.next();
+        }
+        assertFalse(iterator.hasNext());
+    }
+
+    @Test
+    public void nextAscendantTest() {
+        List expected = Arrays.asList(LocalDate.of(2021, 1, 1), LocalDate.of(2021, 1, 2), LocalDate.of(2021, 1, 3));
+        LocalDateRangeIterator iterator = new LocalDateRangeIterator(before, after);
+        IntStream.range(0, 3).forEach(i -> assertEquals(expected.get(i), iterator.next()));
+    }
+
+    @Test
+    public void nextDescendantTest() {
+        List expected = Arrays.asList(LocalDate.of(2021, 1, 3), LocalDate.of(2021, 1, 2), LocalDate.of(2021, 1, 1));
+        LocalDateRangeIterator iterator = new LocalDateRangeIterator(after, before);
+        IntStream.range(0, 3).forEach(i -> assertEquals(expected.get(i), iterator.next()));
+    }
+
+
+}
\ No newline at end of file
diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ZonedDateTimeRangeIteratorTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ZonedDateTimeRangeIteratorTest.java
new file mode 100644
index 00000000000..fce2e1dda63
--- /dev/null
+++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/lang/ast/forexpressioniterators/ZonedDateTimeRangeIteratorTest.java
@@ -0,0 +1,115 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 

+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 

+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.dmn.feel.lang.ast.forexpressioniterators;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.IntStream;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class ZonedDateTimeRangeIteratorTest {
+
+    private static ZonedDateTime before;
+    private static ZonedDateTime after;
+
+    @BeforeClass
+    public static void setup() {
+        // Tests using on those variables relies on the exact hour/minute, because the ZonedDateTimeRangeIterator is meant to iterate on a full-day base
+        before = getZonedDateTime(2021, 1, 1, 10, 15);
+        after = getZonedDateTime(2021, 1, 3, 10, 15);
+    }
+
+    @Test
+    public void hasNextAscendantTest() {
+        ZonedDateTimeRangeIterator iterator = new ZonedDateTimeRangeIterator(before, after);
+        assertTrue(iterator.hasNext());
+        ZonedDateTime next = iterator.next();
+        while (next.isBefore(after)) {
+            assertTrue(iterator.hasNext());
+            next = iterator.next();
+        }
+        assertFalse(iterator.hasNext());
+    }
+
+    @Test
+    public void hasNextDescendantTest() {
+        ZonedDateTimeRangeIterator iterator = new ZonedDateTimeRangeIterator(after, before);
+        assertTrue(iterator.hasNext());
+        ZonedDateTime next = iterator.next();
+        while (!next.equals(before)) {
+            assertTrue(iterator.hasNext());
+            next = iterator.next();
+        }
+        assertFalse(iterator.hasNext());
+    }
+
+    @Test
+    public void nextAscendantTest() {
+        List expected = Arrays.asList(getZonedDateTime(2021, 1, 1, 10, 15),
+                getZonedDateTime(2021, 1, 2, 10, 15),
+                getZonedDateTime(2021, 1, 3, 10, 15));
+        ZonedDateTimeRangeIterator iterator = new ZonedDateTimeRangeIterator(before, after);
+        IntStream.range(0, 3).forEach(i -> assertEquals(expected.get(i), iterator.next()));
+    }
+
+    @Test
+    public void nextDescendantTest() {
+        List expected = Arrays.asList(getZonedDateTime(2021, 1, 3, 10, 15),
+                getZonedDateTime(2021, 1, 2, 10, 15),
+                getZonedDateTime(2021, 1, 1, 10, 15));
+        ZonedDateTimeRangeIterator iterator = new ZonedDateTimeRangeIterator(after, before);
+        IntStream.range(0, 3).forEach(i -> assertEquals(expected.get(i), iterator.next()));
+    }
+
+
+    @Test
+    public void hasNotNextAscendantTest() {
+        ZonedDateTime start = getZonedDateTime(2021, 1, 1, 10, 15);
+        ZonedDateTime end = getZonedDateTime(2021, 1, 2, 10, 14);
+        ZonedDateTimeRangeIterator iterator = new ZonedDateTimeRangeIterator(start, end);
+        ZonedDateTime retrieved = iterator.next();
+        assertEquals(start, retrieved);
+        assertFalse(iterator.hasNext());
+    }
+    @Test
+    public void hasNotNextDescendantTest() {
+        ZonedDateTime start = getZonedDateTime(2021, 1, 2, 10, 14);
+        ZonedDateTime end = getZonedDateTime(2021, 1, 1, 10, 15);
+        ZonedDateTimeRangeIterator iterator = new ZonedDateTimeRangeIterator(start, end);
+        ZonedDateTime retrieved = iterator.next();
+        assertEquals(start, retrieved);
+        assertFalse(iterator.hasNext());
+    }
+
+    private static ZonedDateTime getZonedDateTime(int year, int month, int dayOfMonth, int hour, int minute) {
+        LocalDateTime startDateTime = LocalDateTime.of(year, month, dayOfMonth, hour, minute);
+        return ZonedDateTime.of(startDateTime, ZoneId.systemDefault());
+    }
+
+
+}
\ No newline at end of file
diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/FEEL12ExtendedForLoopTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/FEEL12ExtendedForLoopTest.java
index fb06b3174f4..df581ad7781 100644
--- a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/FEEL12ExtendedForLoopTest.java
+++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/FEEL12ExtendedForLoopTest.java
@@ -18,7 +18,12 @@
  */
 package org.kie.dmn.feel.runtime;
 
+import org.junit.runners.Parameterized;
+import org.kie.dmn.api.feel.runtime.events.FEELEvent;
+import org.kie.dmn.feel.util.EvalHelper;
+
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -26,10 +31,6 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import org.junit.runners.Parameterized;
-import org.kie.dmn.api.feel.runtime.events.FEELEvent;
-import org.kie.dmn.feel.util.EvalHelper;
-
 import static org.kie.dmn.feel.util.DynamicTypeUtils.entry;
 import static org.kie.dmn.feel.util.DynamicTypeUtils.mapOf;
 
@@ -38,20 +39,21 @@ public class FEEL12ExtendedForLoopTest extends BaseFEELTest {
     @Parameterized.Parameters(name = "{index}: {0} ({1}) = {2}")
     public static Collection data() {
         final Object[][] cases = new Object[][] {
-            //normal:
-            {"for x in [1, 2, 3] return x+1", Stream.of(1, 2, 3 ).map(x -> BigDecimal.valueOf(x + 1 ) ).collect(Collectors.toList() ), null},
-            
-            //extended:
-            {"for x in 1..3 return x+1", Stream.of(1, 2, 3 ).map(x -> BigDecimal.valueOf(x + 1 ) ).collect(Collectors.toList() ), null},
-            {"for x in 1..\"ciao\" return x+1", null, FEELEvent.Severity.ERROR},
-            {"for x in 3..1 return x+1", Stream.of(3, 2, 1 ).map(x -> BigDecimal.valueOf(x + 1 ) ).collect(Collectors.toList() ), null},
-            {"for x in 1..1 return x+1", Stream.of(1 ).map(x -> BigDecimal.valueOf(x + 1 ) ).collect(Collectors.toList() ), null},
-            {"for x in 1..3, y in 4..6 return [x+1, y-1]", l(l(2, 3), l(2, 4), l(2, 5), l(3, 3), l(3, 4), l(3, 5), l(4, 3), l(4, 4), l(4, 5)), null},
-            {"{ a: 1, b : 3, c : for x in a..b return x+1}", mapOf(entry("a", BigDecimal.valueOf(1)), entry("b", BigDecimal.valueOf(3)),  entry("c", Stream.of(1, 2, 3 ).map(x -> BigDecimal.valueOf(x + 1 ) ).collect(Collectors.toList() )) ), null},
-            {"{ a: 1, b : 3, c : for x in a+2..b-2 return x+1}", mapOf(entry("a", BigDecimal.valueOf(1)), entry("b", BigDecimal.valueOf(3)),  entry("c", Stream.of(3, 2, 1 ).map(x -> BigDecimal.valueOf(x + 1 ) ).collect(Collectors.toList() )) ), null},
-            {"{ a: \"ciao\", b : 3, c : for x in a..b return x+1}", mapOf(entry("a", "ciao"), entry("b", BigDecimal.valueOf(3)),  entry("c", null)), FEELEvent.Severity.ERROR},
-            {"for i in 0..10 return if i = 0 then 1 else i * partial[-1]", Stream.of(1, 1, 2, 6, 24, 120, 720, 5040, 40320, 362880, 3628800 ).map(BigDecimal::valueOf).collect(Collectors.toList() ), null},
-            {"{xs: for i in 1..10 return function() i, ys: for f in xs return f()}.ys", IntStream.range(1, 11).boxed().map(BigDecimal::valueOf).collect(Collectors.toList()), null},
+          //normal:
+          {"for x in [1, 2, 3] return x+1", Stream.of(1, 2, 3 ).map(x -> BigDecimal.valueOf(x + 1 ) ).collect(Collectors.toList() ), null},
+          {"for x in @\"2021-01-01\"..@\"2021-01-03\" return x+1", Stream.of("2021-01-02", "2021-01-03", "2021-01-04" ).map(LocalDate::parse).collect(Collectors.toList() ), null},
+
+          //extended:
+          {"for x in 1..3 return x+1", Stream.of(1, 2, 3).map(x -> BigDecimal.valueOf(x + 1)).collect(Collectors.toList()), null},
+          {"for x in 1..\"ciao\" return x+1", null, FEELEvent.Severity.ERROR},
+          {"for x in 3..1 return x+1", Stream.of(3, 2, 1).map(x -> BigDecimal.valueOf(x + 1)).collect(Collectors.toList()), null},
+          {"for x in 1..1 return x+1", Stream.of(1).map(x -> BigDecimal.valueOf(x + 1)).collect(Collectors.toList()), null},
+          {"for x in 1..3, y in 4..6 return [x+1, y-1]", l(l(2, 3), l(2, 4), l(2, 5), l(3, 3), l(3, 4), l(3, 5), l(4, 3), l(4, 4), l(4, 5)), null},
+          {"{ a: 1, b : 3, c : for x in a..b return x+1}", mapOf(entry("a", BigDecimal.valueOf(1)), entry("b", BigDecimal.valueOf(3)), entry("c", Stream.of(1, 2, 3).map(x -> BigDecimal.valueOf(x + 1)).collect(Collectors.toList()))), null},
+          {"{ a: 1, b : 3, c : for x in a+2..b-2 return x+1}", mapOf(entry("a", BigDecimal.valueOf(1)), entry("b", BigDecimal.valueOf(3)), entry("c", Stream.of(3, 2, 1).map(x -> BigDecimal.valueOf(x + 1)).collect(Collectors.toList()))), null},
+          {"{ a: \"ciao\", b : 3, c : for x in a..b return x+1}", mapOf(entry("a", "ciao"), entry("b", BigDecimal.valueOf(3)), entry("c", null)), FEELEvent.Severity.ERROR},
+          {"for i in 0..10 return if i = 0 then 1 else i * partial[-1]", Stream.of(1, 1, 2, 6, 24, 120, 720, 5040, 40320, 362880, 3628800).map(BigDecimal::valueOf).collect(Collectors.toList()), null},
+          {"{xs: for i in 1..10 return function() i, ys: for f in xs return f()}.ys", IntStream.range(1, 11).boxed().map(BigDecimal::valueOf).collect(Collectors.toList()), null},
 
         };
         return addAdditionalParameters(cases, false);

From aa6b67625bd56975169d6d0a9b96ecb8ec8e1a30 Mon Sep 17 00:00:00 2001
From: Gabriele Cardosi 
Date: Tue, 9 Jan 2024 14:44:20 +0100
Subject: [PATCH 23/29] [incubator-kie-issues#804] Fix flaky test (checked with
 2000000 iterations) (#5644)

Co-authored-by: BAMOE CI 
---
 .../core/PMMLRuntimeContextImplTest.java      | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-core/src/test/java/org/kie/pmml/evaluator/core/PMMLRuntimeContextImplTest.java b/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-core/src/test/java/org/kie/pmml/evaluator/core/PMMLRuntimeContextImplTest.java
index ee55a8b19c7..c8bfeca9e5b 100644
--- a/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-core/src/test/java/org/kie/pmml/evaluator/core/PMMLRuntimeContextImplTest.java
+++ b/kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-core/src/test/java/org/kie/pmml/evaluator/core/PMMLRuntimeContextImplTest.java
@@ -22,9 +22,9 @@
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
+import org.apache.commons.math3.util.Precision;
 import org.assertj.core.data.Percentage;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -88,23 +88,27 @@ void getFixedProbabilityMap() {
         AtomicReference totalReference = new AtomicReference<>(initialTotalProbability);
         Random rand = new Random();
         List doubles = IntStream.range(0, 3).mapToDouble(value -> {
-                    double currentTotal = totalReference.get();
-                    int nextInt = Math.abs(rand.nextInt((int) (currentTotal * 100)));
-                    double toReturn = (double) nextInt / 100;
-                    totalReference.set(currentTotal - toReturn);
-                    return toReturn;
-                }).boxed().sorted((f1, f2) -> Double.compare(f2, f1))
-                .collect(Collectors.toList());
+            double remainingProbability = totalReference.get();
+            double toReturn = invalidBound(remainingProbability) ? 0.00 :
+                    Precision.round(rand.nextDouble(remainingProbability), 2);
+            totalReference.set(Precision.round((remainingProbability - toReturn), 2));
+            return toReturn;
+        }).boxed().sorted((f1, f2) -> Double.compare(f2, f1)).toList();
         LinkedHashMap probabilityResultMap = new LinkedHashMap<>();
         int counter = 0;
         for (Double toPut : doubles) {
             probabilityResultMap.put("Element-" + counter, toPut);
             counter++;
         }
-        double initialProbability = probabilityResultMap.values().stream().mapToDouble(x -> x).sum();
+        double initialProbability = Precision.round(probabilityResultMap.values().stream().mapToDouble(x -> x).sum(),
+                                                    2);
         assertThat(initialProbability).isLessThanOrEqualTo(initialTotalProbability);
         LinkedHashMap retrieved = PMMLRuntimeContextImpl.getFixedProbabilityMap(probabilityResultMap);
         double totalProbability = retrieved.values().stream().mapToDouble(x -> x).sum();
         assertThat(totalProbability).isCloseTo(1.0, Percentage.withPercentage(0.01));
     }
+
+    private static boolean invalidBound(double bound) {
+        return (!(0.0 < bound && bound < Double.POSITIVE_INFINITY));
+    }
 }
\ No newline at end of file

From 00e99f1895f0f1e00c5508184e41156ca0cfb0bf Mon Sep 17 00:00:00 2001
From: Toshiya Kobayashi 
Date: Wed, 10 Jan 2024 00:13:53 +0900
Subject: [PATCH 24/29] [KIE-775] drools executable-model fails with a bind
 variable to a calculation result of int and BigDecimal (#5636)

---
 .../ArithmeticCoercedExpression.java          |  4 ++
 .../generator/drlxparse/ConstraintParser.java | 50 +++++++++++++++----
 .../expressiontyper/ExpressionTyper.java      | 30 ++++++++---
 .../bigdecimaltest/BigDecimalTest.java        | 41 +++++++++++++++
 4 files changed, 110 insertions(+), 15 deletions(-)

diff --git a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/generator/drlxparse/ArithmeticCoercedExpression.java b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/generator/drlxparse/ArithmeticCoercedExpression.java
index 3cdea08ab37..765a6b313e2 100644
--- a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/generator/drlxparse/ArithmeticCoercedExpression.java
+++ b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/generator/drlxparse/ArithmeticCoercedExpression.java
@@ -52,6 +52,10 @@ public ArithmeticCoercedExpression(TypedExpression left, TypedExpression right,
         this.operator = operator;
     }
 
+    /*
+     * This coercion only deals with String vs Numeric types.
+     * BigDecimal arithmetic operation is handled by ExpressionTyper.convertArithmeticBinaryToMethodCall()
+     */
     public ArithmeticCoercedExpressionResult coerce() {
 
         if (!requiresCoercion()) {
diff --git a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/generator/drlxparse/ConstraintParser.java b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/generator/drlxparse/ConstraintParser.java
index 2a85da6e2f0..36b8f67a293 100644
--- a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/generator/drlxparse/ConstraintParser.java
+++ b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/generator/drlxparse/ConstraintParser.java
@@ -95,6 +95,9 @@
 import static org.drools.model.codegen.execmodel.generator.ConstraintUtil.GREATER_THAN_PREFIX;
 import static org.drools.model.codegen.execmodel.generator.ConstraintUtil.LESS_OR_EQUAL_PREFIX;
 import static org.drools.model.codegen.execmodel.generator.ConstraintUtil.LESS_THAN_PREFIX;
+import static org.drools.model.codegen.execmodel.generator.expressiontyper.ExpressionTyper.convertArithmeticBinaryToMethodCall;
+import static org.drools.model.codegen.execmodel.generator.expressiontyper.ExpressionTyper.getBinaryTypeAfterConversion;
+import static org.drools.model.codegen.execmodel.generator.expressiontyper.ExpressionTyper.shouldConvertArithmeticBinaryToMethodCall;
 import static org.drools.util.StringUtils.lcFirstForBean;
 import static org.drools.model.codegen.execmodel.generator.DrlxParseUtil.THIS_PLACEHOLDER;
 import static org.drools.model.codegen.execmodel.generator.DrlxParseUtil.createConstraintCompiler;
@@ -197,11 +200,23 @@ private void logWarnIfNoReactOnCausedByVariableFromDifferentPattern(DrlxParseRes
     }
 
     private void addDeclaration(DrlxExpression drlx, SingleDrlxParseSuccess singleResult, String bindId) {
-        DeclarationSpec decl = context.addDeclaration( bindId, singleResult.getLeftExprTypeBeforeCoercion() );
+        DeclarationSpec decl = context.addDeclaration(bindId, getDeclarationType(drlx, singleResult));
         if (drlx.getExpr() instanceof NameExpr) {
             decl.setBoundVariable( PrintUtil.printNode(drlx.getExpr()) );
         } else if (drlx.getExpr() instanceof BinaryExpr) {
-            decl.setBoundVariable(PrintUtil.printNode(drlx.getExpr().asBinaryExpr().getLeft()));
+            Expression leftMostExpression = getLeftMostExpression(drlx.getExpr().asBinaryExpr());
+            decl.setBoundVariable(PrintUtil.printNode(leftMostExpression));
+            if (singleResult.getExpr() instanceof MethodCallExpr) {
+                // BinaryExpr was converted to MethodCallExpr. Create a TypedExpression for the leftmost expression of the BinaryExpr
+                ExpressionTyperContext expressionTyperContext = new ExpressionTyperContext();
+                ExpressionTyper expressionTyper = new ExpressionTyper(context, singleResult.getPatternType(), bindId, false, expressionTyperContext);
+                TypedExpressionResult leftTypedExpressionResult = expressionTyper.toTypedExpression(leftMostExpression);
+                Optional optLeft = leftTypedExpressionResult.getTypedExpression();
+                if (!optLeft.isPresent()) {
+                    throw new IllegalStateException("Cannot create TypedExpression for " + drlx.getExpr().asBinaryExpr().getLeft());
+                }
+                singleResult.setBoundExpr(optLeft.get());
+            }
         }
         decl.setBelongingPatternDescr(context.getCurrentPatternDescr());
         singleResult.setExprBinding( bindId );
@@ -211,6 +226,24 @@ private void addDeclaration(DrlxExpression drlx, SingleDrlxParseSuccess singleRe
         }
     }
 
+    private static Class getDeclarationType(DrlxExpression drlx, SingleDrlxParseSuccess singleResult) {
+        if (drlx.getBind() != null && drlx.getExpr() instanceof EnclosedExpr) {
+            // in case of enclosed, bind type should be the calculation result type
+            // If drlx.getBind() == null, a bind variable is inside the enclosed expression, leave it to the default behavior
+            return (Class)singleResult.getExprType();
+        } else {
+            return singleResult.getLeftExprTypeBeforeCoercion();
+        }
+    }
+
+    private Expression getLeftMostExpression(BinaryExpr binaryExpr) {
+        Expression left = binaryExpr.getLeft();
+        if (left instanceof BinaryExpr) {
+            return getLeftMostExpression((BinaryExpr) left);
+        }
+        return left;
+    }
+
     /*
         This is the entry point for Constraint Transformation from a parsed MVEL constraint
         to a Java Expression
@@ -657,17 +690,16 @@ private DrlxParseResult parseBinaryExpr(BinaryExpr binaryExpr, Class patternT
 
         Expression combo;
 
-        boolean arithmeticExpr = isArithmeticOperator(operator);
         boolean isBetaConstraint = right.getExpression() != null && hasDeclarationFromOtherPattern( expressionTyperContext );
         boolean requiresSplit = operator == BinaryExpr.Operator.AND && binaryExpr.getRight() instanceof HalfBinaryExpr && !isBetaConstraint;
 
+        Type exprType = isBooleanOperator( operator ) ? boolean.class : left.getType();
+
         if (equalityExpr) {
             combo = getEqualityExpression( left, right, operator ).expression;
-        } else if (arithmeticExpr && (left.isBigDecimal())) {
-            ConstraintCompiler constraintCompiler = createConstraintCompiler(this.context, of(patternType));
-            CompiledExpressionResult compiledExpressionResult = constraintCompiler.compileExpression(binaryExpr);
-
-            combo = compiledExpressionResult.getExpression();
+        } else if (shouldConvertArithmeticBinaryToMethodCall(operator, left.getType(), right.getType())) {
+            combo = convertArithmeticBinaryToMethodCall(binaryExpr, of(patternType), this.context);
+            exprType = getBinaryTypeAfterConversion(left.getType(), right.getType());
         } else {
             if (left.getExpression() == null || right.getExpression() == null) {
                 return new DrlxParseFail(new ParseExpressionErrorResult(drlxExpr));
@@ -695,7 +727,7 @@ private DrlxParseResult parseBinaryExpr(BinaryExpr binaryExpr, Class patternT
             constraintType = Index.ConstraintType.FORALL_SELF_JOIN;
         }
 
-        return new SingleDrlxParseSuccess(patternType, bindingId, combo, isBooleanOperator( operator ) ? boolean.class : left.getType())
+        return new SingleDrlxParseSuccess(patternType, bindingId, combo, exprType)
                 .setDecodeConstraintType( constraintType )
                 .setUsedDeclarations( expressionTyperContext.getUsedDeclarations() )
                 .setUsedDeclarationsOnLeft( usedDeclarationsOnLeft )
diff --git a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/generator/expressiontyper/ExpressionTyper.java b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/generator/expressiontyper/ExpressionTyper.java
index 328aa5466e5..8fdfb696c46 100644
--- a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/generator/expressiontyper/ExpressionTyper.java
+++ b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/generator/expressiontyper/ExpressionTyper.java
@@ -235,7 +235,14 @@ private Optional toTypedExpressionRec(Expression drlxExpr) {
             right = coerced.getCoercedRight();
 
             final BinaryExpr combo = new BinaryExpr(left.getExpression(), right.getExpression(), operator);
-            return of(new TypedExpression(combo, left.getType()));
+
+            if (shouldConvertArithmeticBinaryToMethodCall(operator, left.getType(), right.getType())) {
+                Expression expression = convertArithmeticBinaryToMethodCall(combo, of(typeCursor), ruleContext);
+                java.lang.reflect.Type binaryType = getBinaryTypeAfterConversion(left.getType(), right.getType());
+                return of(new TypedExpression(expression, binaryType));
+            } else {
+                return of(new TypedExpression(combo, left.getType()));
+            }
         }
 
         if (drlxExpr instanceof HalfBinaryExpr) {
@@ -806,11 +813,12 @@ private TypedExpressionCursor binaryExpr(BinaryExpr binaryExpr) {
         TypedExpression rightTypedExpression = right.getTypedExpression()
                                                     .orElseThrow(() -> new NoSuchElementException("TypedExpressionResult doesn't contain TypedExpression!"));
         binaryExpr.setRight(rightTypedExpression.getExpression());
-        java.lang.reflect.Type binaryType = getBinaryType(leftTypedExpression, rightTypedExpression, binaryExpr.getOperator());
-        if (shouldConvertArithmeticBinaryToMethodCall(binaryExpr.getOperator(), binaryType)) {
+        if (shouldConvertArithmeticBinaryToMethodCall(binaryExpr.getOperator(), leftTypedExpression.getType(), rightTypedExpression.getType())) {
             Expression compiledExpression = convertArithmeticBinaryToMethodCall(binaryExpr, leftTypedExpression.getOriginalPatternType(), ruleContext);
+            java.lang.reflect.Type binaryType = getBinaryTypeAfterConversion(leftTypedExpression.getType(), rightTypedExpression.getType());
             return new TypedExpressionCursor(compiledExpression, binaryType);
         } else {
+            java.lang.reflect.Type binaryType = getBinaryType(leftTypedExpression, rightTypedExpression, binaryExpr.getOperator());
             return new TypedExpressionCursor(binaryExpr, binaryType);
         }
     }
@@ -819,7 +827,7 @@ private TypedExpressionCursor binaryExpr(BinaryExpr binaryExpr) {
      * Converts arithmetic binary expression (including coercion) to method call using ConstraintCompiler.
      * This method can be generic, so we may centralize the calls in drools-model
      */
-    private static Expression convertArithmeticBinaryToMethodCall(BinaryExpr binaryExpr,  Optional> originalPatternType, RuleContext ruleContext) {
+    public static Expression convertArithmeticBinaryToMethodCall(BinaryExpr binaryExpr,  Optional> originalPatternType, RuleContext ruleContext) {
         ConstraintCompiler constraintCompiler = createConstraintCompiler(ruleContext, originalPatternType);
         CompiledExpressionResult compiledExpressionResult = constraintCompiler.compileExpression(printNode(binaryExpr));
         return compiledExpressionResult.getExpression();
@@ -828,8 +836,15 @@ private static Expression convertArithmeticBinaryToMethodCall(BinaryExpr binaryE
     /*
      * BigDecimal arithmetic operations should be converted to method calls. We may also apply this to BigInteger.
      */
-    private static boolean shouldConvertArithmeticBinaryToMethodCall(BinaryExpr.Operator operator, java.lang.reflect.Type type) {
-        return isArithmeticOperator(operator) && type.equals(BigDecimal.class);
+    public static boolean shouldConvertArithmeticBinaryToMethodCall(BinaryExpr.Operator operator, java.lang.reflect.Type leftType, java.lang.reflect.Type rightType) {
+        return isArithmeticOperator(operator) && (leftType.equals(BigDecimal.class) || rightType.equals(BigDecimal.class));
+    }
+
+    /*
+     * After arithmetic to method call conversion, BigDecimal should take precedence regardless of left or right. We may also apply this to BigInteger.
+     */
+    public static java.lang.reflect.Type getBinaryTypeAfterConversion(java.lang.reflect.Type leftType, java.lang.reflect.Type rightType) {
+        return (leftType.equals(BigDecimal.class) || rightType.equals(BigDecimal.class)) ? BigDecimal.class : leftType;
     }
 
     private java.lang.reflect.Type getBinaryType(TypedExpression leftTypedExpression, TypedExpression rightTypedExpression, Operator operator) {
@@ -936,6 +951,9 @@ private void promoteBigDecimalParameters(MethodCallExpr methodCallExpr, Class[]
                 Expression argumentExpression = methodCallExpr.getArgument(i);
 
                 if (argumentType != actualArgumentType) {
+                    // unbind the original argumentExpression first, otherwise setArgument() will remove the argumentExpression from coercedExpression.childrenNodes
+                    // It will result in failing to find DrlNameExpr in AST at DrlsParseUtil.transformDrlNameExprToNameExpr()
+                    methodCallExpr.replace(argumentExpression, new NameExpr("placeholder"));
                     Expression coercedExpression = new BigDecimalArgumentCoercion().coercedArgument(argumentType, actualArgumentType, argumentExpression);
                     methodCallExpr.setArgument(i, coercedExpression);
                 }
diff --git a/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/bigdecimaltest/BigDecimalTest.java b/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/bigdecimaltest/BigDecimalTest.java
index 0cc90ca3179..407462de392 100644
--- a/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/bigdecimaltest/BigDecimalTest.java
+++ b/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/bigdecimaltest/BigDecimalTest.java
@@ -772,4 +772,45 @@ public void bigDecimalCoercionInNestedMethodArgument_shouldNotFailToBuild() {
     public static String intToString(int value) {
         return Integer.toString(value);
     }
+
+    @Test
+    public void bindVariableToBigDecimalCoercion2Operands_shouldBindCorrectResult() {
+        bindVariableToBigDecimalCoercion("$var : (1000 * value1)");
+    }
+
+    @Test
+    public void bindVariableToBigDecimalCoercion3Operands_shouldBindCorrectResult() {
+        bindVariableToBigDecimalCoercion("$var : (100000 * value1 / 100)");
+    }
+
+    @Test
+    public void bindVariableToBigDecimalCoercion3OperandsWithParentheses_shouldBindCorrectResult() {
+        bindVariableToBigDecimalCoercion("$var : ((100000 * value1) / 100)");
+    }
+
+    private void bindVariableToBigDecimalCoercion(String binding) {
+        // KIE-775
+        String str =
+                "package org.drools.modelcompiler.bigdecimals\n" +
+                        "import " + BDFact.class.getCanonicalName() + ";\n" +
+                        "global java.util.List result;\n" +
+                        "rule R1\n" +
+                        "    when\n" +
+                        "        BDFact( " + binding +  " )\n" +
+                        "    then\n" +
+                        "        result.add($var);\n" +
+                        "end";
+
+        KieSession ksession = getKieSession(str);
+        List result = new ArrayList<>();
+        ksession.setGlobal("result", result);
+
+        BDFact bdFact = new BDFact();
+        bdFact.setValue1(new BigDecimal("80"));
+
+        ksession.insert(bdFact);
+        ksession.fireAllRules();
+
+        assertThat(result).contains(new BigDecimal("80000"));
+    }
 }

From 47183d7e4fe253cbb89d322fdd9c8f0dbdf9af73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Locker?= 
Date: Fri, 12 Jan 2024 09:00:55 +0100
Subject: [PATCH 25/29] Remove redundant jaxb-runtime dependency (#5642)

---
 build-parent/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 1a9c8d4d3fb..bd2c100298f 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -366,11 +366,6 @@
         jaxb-core
         ${version.com.sun.xml.bind}
       
-      
-        org.glassfish.jaxb
-        jaxb-runtime
-        4.0.3
-      
       
         com.sun.xml.bind
         jaxb-xjc

From 2ef59d148018dba47621262c64d96304311ee357 Mon Sep 17 00:00:00 2001
From: Gabriele Cardosi 
Date: Fri, 12 Jan 2024 10:30:53 +0100
Subject: [PATCH 26/29] [incubator-kie-issues#814] Fix NPE on
 BaseKnowledgeBuilderResultImpl.hashCode() (#5647)

Co-authored-by: BAMOE CI 
---
 .../assembler/BayesNetworkAssemblerError.java | 11 +-----
 .../builder/impl/errors/SrcError.java         |  9 +----
 .../drools/compiler/compiler/ActionError.java | 12 +++---
 .../compiler/AnnotationDeclarationError.java  | 11 +-----
 .../compiler/ConfigurableSeverityResult.java  |  4 +-
 .../DeprecatedResourceTypeWarning.java        |  7 +---
 .../compiler/compiler/DescrBuildError.java    | 12 +++---
 .../compiler/compiler/DescrBuildWarning.java  | 13 +++----
 .../compiler/compiler/DroolsErrorWrapper.java |  7 +---
 .../compiler/compiler/DroolsWarning.java      |  4 +-
 .../compiler/DroolsWarningWrapper.java        |  7 +---
 .../compiler/compiler/DuplicateFunction.java  | 32 +++++++--------
 .../compiler/compiler/DuplicateRule.java      | 12 +++---
 .../compiler/compiler/FactTemplateError.java  |  7 +---
 .../compiler/compiler/FieldTemplateError.java |  8 +---
 .../compiler/compiler/FunctionError.java      | 39 +++++++++----------
 .../drools/compiler/compiler/GlobalError.java | 10 +----
 .../drools/compiler/compiler/ImportError.java | 10 ++---
 .../compiler/MissingDependencyError.java      | 12 +-----
 .../compiler/compiler/ProcessLoadError.java   | 10 ++---
 .../ResourceTypeDeclarationWarning.java       | 13 +++----
 .../compiler/SerializableDroolsError.java     | 22 +++++------
 .../compiler/TypeDeclarationError.java        | 12 ++----
 .../compiler/TypeDeclarationWarning.java      |  9 +----
 .../rule/builder/dialect/DialectError.java    | 10 +----
 .../BaseKnowledgeBuilderResultImpl.java       | 22 ++++++++---
 .../org/drools/drl/parser/DroolsError.java    |  8 ++--
 .../org/drools/drl/parser/ParserError.java    | 10 +----
 .../drl/parser/lang/ExpanderException.java    |  9 +----
 .../drl/parser/lang/dsl/MappingError.java     | 21 +++++-----
 .../execmodel/RuleUnitQueryWriter.java        |  6 +--
 .../errors/CompilationProblemErrorResult.java |  7 +---
 .../errors/DuplicatedDeclarationError.java    |  7 +---
 .../errors/GetterOverloadWarning.java         |  7 +---
 .../IncompatibleGetterOverloadError.java      |  7 +---
 .../errors/InvalidExpressionErrorResult.java  |  9 +----
 .../errors/ParseExpressionErrorResult.java    |  7 +---
 .../errors/UnknownDeclarationError.java       |  8 +---
 .../errors/UnsupportedFeatureError.java       |  8 +---
 .../errors/VariableUsedInBindingError.java    | 10 ++---
 .../visitor/accumulate/AccumulateVisitor.java |  6 +--
 .../execmodel/GetterOverloadingTest.java      |  2 +-
 .../execmodel/assembler/TestAssembler.java    | 14 +------
 .../mvel/asm/ClassFieldInspectorImpl.java     |  2 +-
 .../drools/mvel/java/JavaDialectError.java    |  5 +--
 .../IncompatibleGetterOverloadException.java  |  2 +-
 .../core/impl/DMNKnowledgeBuilderError.java   | 11 +-----
 47 files changed, 160 insertions(+), 331 deletions(-)

diff --git a/drools-beliefs/src/main/java/org/drools/beliefs/bayes/assembler/BayesNetworkAssemblerError.java b/drools-beliefs/src/main/java/org/drools/beliefs/bayes/assembler/BayesNetworkAssemblerError.java
index 5c442263d31..b32f68b3279 100644
--- a/drools-beliefs/src/main/java/org/drools/beliefs/bayes/assembler/BayesNetworkAssemblerError.java
+++ b/drools-beliefs/src/main/java/org/drools/beliefs/bayes/assembler/BayesNetworkAssemblerError.java
@@ -22,18 +22,11 @@
 import org.kie.api.io.Resource;
 
 public class BayesNetworkAssemblerError extends DroolsError {
-    private String    message;
+
 
     public BayesNetworkAssemblerError(Resource resource,
                                       final String message) {
-        super( resource );
-        this.message = message;
-    }
-
-
-    @Override
-    public String getMessage() {
-        return message;
+        super( resource, message );
     }
 
     @Override
diff --git a/drools-compiler/src/main/java/org/drools/compiler/builder/impl/errors/SrcError.java b/drools-compiler/src/main/java/org/drools/compiler/builder/impl/errors/SrcError.java
index 92c16e5c2bb..03ac421be06 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/builder/impl/errors/SrcError.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/builder/impl/errors/SrcError.java
@@ -24,14 +24,12 @@
 public class SrcError extends DroolsError {
 
     private Object object;
-    private String message;
     private int[]  errorLines = new int[0];
 
     public SrcError(Object object,
                     String message) {
-        super(null);
+        super(null, message);
         this.object = object;
-        this.message = message;
     }
 
     public Object getObject() {
@@ -42,13 +40,10 @@ public int[] getLines() {
         return this.errorLines;
     }
 
-    public String getMessage() {
-        return this.message;
-    }
 
     public String toString() {
         final StringBuilder buf = new StringBuilder();
-        buf.append(this.message);
+        buf.append(getMessage());
         buf.append(" : ");
         buf.append("\n");
         if (this.object instanceof CompilationProblem[]) {
diff --git a/drools-compiler/src/main/java/org/drools/compiler/compiler/ActionError.java b/drools-compiler/src/main/java/org/drools/compiler/compiler/ActionError.java
index 0f27989d46f..6e975a7664d 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/compiler/ActionError.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/compiler/ActionError.java
@@ -24,15 +24,17 @@
 public class ActionError extends DroolsError {
     private BaseDescr descr;
     private Object    object;
-    private String    message;
     private int[]     errorLines = new int[0];
 
+    private String originalMessage;
+
     public ActionError(final BaseDescr descr,
                      final Object object,
                      final String message) {
+        super(BuilderResultUtils.getProblemMessage( object, message, "\n" ));
         this.descr = descr;
         this.object = object;
-        this.message = message;
+        this.originalMessage = message;
     }
 
     @Override
@@ -60,13 +62,9 @@ public int getLine() {
         return this.descr != null ? this.descr.getLine() : -1;
     }
 
-    public String getMessage() {
-        return BuilderResultUtils.getProblemMessage( this.object, this.message, "\n" );
-    }
-
     public String toString() {
         final StringBuilder builder = new StringBuilder()
-                .append( this.message )
+                .append( originalMessage )
                 .append( " : " )
                 .append( "\n" );
         return BuilderResultUtils.appendProblems( this.object, builder ).toString();
diff --git a/drools-compiler/src/main/java/org/drools/compiler/compiler/AnnotationDeclarationError.java b/drools-compiler/src/main/java/org/drools/compiler/compiler/AnnotationDeclarationError.java
index bf105b7a017..a46a39905fd 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/compiler/AnnotationDeclarationError.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/compiler/AnnotationDeclarationError.java
@@ -23,13 +23,11 @@
 
 public class AnnotationDeclarationError extends DroolsError {
 
-    private String errorMessage;
     private int[]  line;
     private String namespace;
 
     public AnnotationDeclarationError(AnnotationDescr annotationDescr, String errorMessage) {
-        super(annotationDescr.getResource());
-        this.errorMessage = errorMessage;
+        super(annotationDescr.getResource(), errorMessage);
         this.line = new int[0];
         this.namespace = annotationDescr.getNamespace();
     }
@@ -44,14 +42,9 @@ public int[] getLines() {
         return this.line;
     }
 
-    @Override
-    public String getMessage() {
-        return this.errorMessage;
-    }
-
     @Override
     public String toString() {
-        return this.getMessage();
+        return getMessage();
     }
 
 }
diff --git a/drools-compiler/src/main/java/org/drools/compiler/compiler/ConfigurableSeverityResult.java b/drools-compiler/src/main/java/org/drools/compiler/compiler/ConfigurableSeverityResult.java
index c31c24a0bd7..92fd03a27a6 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/compiler/ConfigurableSeverityResult.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/compiler/ConfigurableSeverityResult.java
@@ -31,8 +31,8 @@
  */
 public abstract class ConfigurableSeverityResult extends BaseKnowledgeBuilderResultImpl {
     
-    public ConfigurableSeverityResult(Resource resource, KnowledgeBuilderConfiguration config) {
-        super(resource);
+    public ConfigurableSeverityResult(Resource resource, KnowledgeBuilderConfiguration config, String message) {
+        super(resource, message);
         severity = config.getOption(KBuilderSeverityOption.KEY, getOptionKey()).getSeverity();
     }
     
diff --git a/drools-compiler/src/main/java/org/drools/compiler/compiler/DeprecatedResourceTypeWarning.java b/drools-compiler/src/main/java/org/drools/compiler/compiler/DeprecatedResourceTypeWarning.java
index 8f8199bd6c1..c07d354be6b 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/compiler/DeprecatedResourceTypeWarning.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/compiler/DeprecatedResourceTypeWarning.java
@@ -29,15 +29,10 @@ public DeprecatedResourceTypeWarning(Resource resource) {
     }
 
     public DeprecatedResourceTypeWarning(Resource resource, String deprecatedFormat) {
-        super(resource);
+        super(resource, deprecatedFormat + " format usage detected. This format is deprecated and will be removed in future");
         this.deprecatedFormat = deprecatedFormat;
     }
 
-    @Override
-    public String getMessage() {
-        return deprecatedFormat + " format usage detected. This format is deprecated and will be removed in future";
-    }
-
     @Override
     public int[] getLines() {
         return new int[0];
diff --git a/drools-compiler/src/main/java/org/drools/compiler/compiler/DescrBuildError.java b/drools-compiler/src/main/java/org/drools/compiler/compiler/DescrBuildError.java
index 4969f7231ac..febf4520008 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/compiler/DescrBuildError.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/compiler/DescrBuildError.java
@@ -25,19 +25,20 @@ public class DescrBuildError extends DroolsError {
     private BaseDescr parentDescr;
     private BaseDescr descr;
     private Object    object;
-    private String    message;
     private int[]     errorLines = new int[1];
 
+    private String originalMessage;
+
     public DescrBuildError(final BaseDescr parentDescr,
                            final BaseDescr descr,
                            final Object object,
                            final String message) {
-        super( descr.getResource() != null ? descr.getResource() : ( parentDescr != null ? parentDescr.getResource() : null ) );
+        super( descr.getResource() != null ? descr.getResource() : ( parentDescr != null ? parentDescr.getResource() : null ), BuilderResultUtils.getProblemMessage( object, message, "\n" ) );
         this.parentDescr = parentDescr;
         this.descr = descr;
         this.object = object;
-        this.message = message;
         this.errorLines[0] = getLine();
+        this.originalMessage = message;
     }
 
     @Override
@@ -73,13 +74,10 @@ public int getColumn() {
         return this.descr != null ? this.descr.getColumn() : -1;
     }
 
-    public String getMessage() {
-        return BuilderResultUtils.getProblemMessage( this.object, this.message, "\n" );
-    }
 
     public String toString() {
         final StringBuilder builder = new StringBuilder()
-                .append( this.message )
+                .append( this.originalMessage )
                 .append( " : " )
                 .append( this.parentDescr )
                 .append( "\n" );
diff --git a/drools-compiler/src/main/java/org/drools/compiler/compiler/DescrBuildWarning.java b/drools-compiler/src/main/java/org/drools/compiler/compiler/DescrBuildWarning.java
index fc4d89682b3..e9ab9a1b107 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/compiler/DescrBuildWarning.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/compiler/DescrBuildWarning.java
@@ -24,18 +24,19 @@ public class DescrBuildWarning extends DroolsWarning {
     private BaseDescr parentDescr;
     private BaseDescr descr;
     private Object    object;
-    private String    message;
+    private String    originalMessage;
     private int[]     errorLines = new int[1];
 
     public DescrBuildWarning( final BaseDescr parentDescr,
                               final BaseDescr descr,
                               final Object object,
                               final String message ) {
-        super( descr.getResource() != null ? descr.getResource() : ( parentDescr != null ? parentDescr.getResource() : null ) );
+        super( descr.getResource() != null ? descr.getResource() : ( parentDescr != null ? parentDescr.getResource() : null ),
+               BuilderResultUtils.getProblemMessage( object, message, "\n" ));
         this.parentDescr = parentDescr;
         this.descr = descr;
         this.object = object;
-        this.message = message;
+        this.originalMessage = message;
         this.errorLines[0] = getLine();
     }
 
@@ -67,13 +68,9 @@ public int getColumn() {
         return this.descr != null ? this.descr.getColumn() : -1;
     }
 
-    public String getMessage() {
-        return BuilderResultUtils.getProblemMessage( this.object, this.message, "\n" );
-    }
-
     public String toString() {
         final StringBuilder builder = new StringBuilder()
-                .append( this.message )
+                .append( this.originalMessage )
                 .append( " : " )
                 .append( this.parentDescr )
                 .append( "\n" );
diff --git a/drools-compiler/src/main/java/org/drools/compiler/compiler/DroolsErrorWrapper.java b/drools-compiler/src/main/java/org/drools/compiler/compiler/DroolsErrorWrapper.java
index 3f88e6e0e25..3b263309a14 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/compiler/DroolsErrorWrapper.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/compiler/DroolsErrorWrapper.java
@@ -31,17 +31,12 @@ public class DroolsErrorWrapper extends DroolsError {
     private String namespace = "";
     
     public DroolsErrorWrapper (KnowledgeBuilderResult problem) {
-        super(problem.getResource());
+        super(problem.getResource(), problem.getMessage());
         this.backingProblem = problem;
         if (problem instanceof DroolsError) {
             namespace = ((DroolsError)problem).getNamespace();
         }
     }
-    
-    @Override
-    public String getMessage() {
-        return backingProblem.getMessage();
-    }
 
     @Override
     public int[] getLines() {
diff --git a/drools-compiler/src/main/java/org/drools/compiler/compiler/DroolsWarning.java b/drools-compiler/src/main/java/org/drools/compiler/compiler/DroolsWarning.java
index 6794f4aba7a..18092806c6d 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/compiler/DroolsWarning.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/compiler/DroolsWarning.java
@@ -24,8 +24,8 @@
 
 public abstract class DroolsWarning extends BaseKnowledgeBuilderResultImpl {
 
-    public DroolsWarning(Resource resource) {
-        super(resource);
+    public DroolsWarning(Resource resource, String message) {
+        super(resource, message);
     }
 
     @Override
diff --git a/drools-compiler/src/main/java/org/drools/compiler/compiler/DroolsWarningWrapper.java b/drools-compiler/src/main/java/org/drools/compiler/compiler/DroolsWarningWrapper.java
index 70834cca9be..f0441810a60 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/compiler/DroolsWarningWrapper.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/compiler/DroolsWarningWrapper.java
@@ -25,15 +25,10 @@ public class DroolsWarningWrapper extends DroolsWarning {
     KnowledgeBuilderResult backingProblem;
 
     public DroolsWarningWrapper (KnowledgeBuilderResult problem) {
-        super(problem.getResource());
+        super(problem.getResource(), problem.getMessage());
         this.backingProblem = problem;
     }
 
-    @Override
-    public String getMessage() {
-        return backingProblem.getMessage();
-    }
-
     @Override
     public int[] getLines() {
         return backingProblem.getLines();
diff --git a/drools-compiler/src/main/java/org/drools/compiler/compiler/DuplicateFunction.java b/drools-compiler/src/main/java/org/drools/compiler/compiler/DuplicateFunction.java
index 7babf441215..fbdf1e4f46b 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/compiler/DuplicateFunction.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/compiler/DuplicateFunction.java
@@ -24,31 +24,16 @@
 import org.kie.internal.builder.KnowledgeBuilderConfiguration;
 
 
-
-
 public class DuplicateFunction extends ConfigurableSeverityResult {
     public static final String KEY = "duplicateFunction";
-    
-    private String functionName;
-    private String functionNamespace;
+
     
     public DuplicateFunction(FunctionDescr func, KnowledgeBuilderConfiguration config) {
-        super(func.getResource(), config);
-        functionName = func.getName();
-        functionNamespace = func.getNamespace();
+        super(func.getResource(), config, getSpecificMessage(func));
     }
     
     public DuplicateFunction(Function func, KnowledgeBuilderConfiguration config) {
-        super(func.getResource(), config);
-        functionName = func.getName();
-        functionName = func.getNamespace();
-    }
-
-    @Override
-    public String getMessage() {
-        return functionName 
-        + " in namespace " + functionNamespace 
-        + " is about to be redefined";
+        super(func.getResource(), config, getSpecificMessage(func));
     }
 
     @Override
@@ -61,4 +46,15 @@ protected String getOptionKey() {
         return KEY;
     }
 
+    private static String getSpecificMessage(FunctionDescr func) {
+        return func.getName()
+                + " in namespace " + func.getNamespace()
+                + " is about to be redefined";
+    }
+
+    private static String getSpecificMessage(Function func) {
+        return func.getName()
+                + " in namespace " + func.getNamespace()
+                + " is about to be redefined";
+    }
 }
diff --git a/drools-compiler/src/main/java/org/drools/compiler/compiler/DuplicateRule.java b/drools-compiler/src/main/java/org/drools/compiler/compiler/DuplicateRule.java
index 71c286dbd27..e96ceb090e2 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/compiler/DuplicateRule.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/compiler/DuplicateRule.java
@@ -33,19 +33,13 @@ public class DuplicateRule extends ConfigurableSeverityResult {
     private int[] line;
     
     public DuplicateRule(RuleDescr ruleDescr, PackageDescr pkg, KnowledgeBuilderConfiguration config) {
-        super(ruleDescr.getResource(), config);
+        super(ruleDescr.getResource(), config, getSpecificMessage(ruleDescr, pkg));
         rule = ruleDescr.getName();
         pkgDescr = pkg;
         line = new int[1];
         line[0] = ruleDescr.getLine();
     }
 
-    @Override
-    public String getMessage() {
-        return "Rule name " + rule 
-        + " already exists in package  " + pkgDescr.getName();
-    }
-
     @Override
     public int[] getLines() {
         return line;
@@ -55,5 +49,9 @@ public int[] getLines() {
     protected String getOptionKey() {
         return KEY;
     }
+    private static String getSpecificMessage(RuleDescr ruleDescr, PackageDescr pkg) {
+        return "Rule name " + ruleDescr.getName()
+        + " already exists in package  " + pkg.getName();
+    }
 
 }
diff --git a/drools-compiler/src/main/java/org/drools/compiler/compiler/FactTemplateError.java b/drools-compiler/src/main/java/org/drools/compiler/compiler/FactTemplateError.java
index 0a254f05ee0..33996d979a4 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/compiler/FactTemplateError.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/compiler/FactTemplateError.java
@@ -25,7 +25,6 @@ public class FactTemplateError extends DroolsError {
     private Package   pkg;
     private BaseDescr descr;
     private Object    object;
-    private String    message;
     private int[]     line;
     private String    namespace;
 
@@ -33,12 +32,11 @@ public FactTemplateError(final Package pkg,
                              final BaseDescr descr,
                              final Object object,
                              final String message) {
-        super(descr.getResource());
+        super(descr.getResource(), BuilderResultUtils.getProblemMessage( object, message ));
         this.namespace = pkg.getName();
         this.pkg = pkg;
         this.descr = descr;
         this.object = object;
-        this.message = message;
         this.line = new int[] {this.descr.getLine()};
     }
 
@@ -71,8 +69,5 @@ public int getLine() {
         return this.line[0];
     }
 
-    public String getMessage() {
-        return BuilderResultUtils.getProblemMessage( this.object, this.message );
-    }
 
 }
diff --git a/drools-compiler/src/main/java/org/drools/compiler/compiler/FieldTemplateError.java b/drools-compiler/src/main/java/org/drools/compiler/compiler/FieldTemplateError.java
index 50f6b6ab9bd..30d746f1266 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/compiler/FieldTemplateError.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/compiler/FieldTemplateError.java
@@ -25,7 +25,6 @@ public class FieldTemplateError extends DroolsError {
     private Package   pkg;
     private BaseDescr descr;
     private Object    object;
-    private String    message;
     private int[]     line;
     private String    namespace;
 
@@ -33,12 +32,11 @@ public FieldTemplateError(final Package pkg,
                               final BaseDescr descr,
                               final Object object,
                               final String message) {
-        super(descr.getResource());
+        super(descr.getResource(), BuilderResultUtils.getProblemMessage( object, message ));
         this.namespace = pkg.getName();
         this.pkg = pkg;
         this.descr = descr;
         this.object = object;
-        this.message = message;
         this.line = new int[] {this.descr.getLine()};
     }
 
@@ -71,8 +69,4 @@ public int getLine() {
         return this.line[0];
     }
 
-    public String getMessage() {
-        return BuilderResultUtils.getProblemMessage( this.object, this.message );
-    }
-
 }
diff --git a/drools-compiler/src/main/java/org/drools/compiler/compiler/FunctionError.java b/drools-compiler/src/main/java/org/drools/compiler/compiler/FunctionError.java
index 058e1273d8a..99fdd21ca0e 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/compiler/FunctionError.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/compiler/FunctionError.java
@@ -25,16 +25,16 @@
 public class FunctionError extends DroolsError {
     final private FunctionDescr functionDescr;
     final private Object        object;
-    final private String        message;
     private int[]               errorLines;
 
     public FunctionError(final FunctionDescr functionDescr,
                          final Object object,
                          final String message) {
-        super(functionDescr.getResource());
+        super(functionDescr.getResource(), "");
         this.functionDescr = functionDescr;
         this.object = object;
-        this.message = createMessage( message );
+        setErrorLines();
+        setMessage(createMessage(message));
     }
 
     @Override
@@ -54,21 +54,26 @@ public int[] getLines() {
         return errorLines;
     }
 
-    public String getMessage() {
-        return this.message;
-    }
-    
     public String toString() {
-        return this.message;
+        return getMessage();
+    }
+
+    private void setErrorLines() {
+        if( object instanceof CompilationProblem[] cp) {
+            this.errorLines = new int[cp.length];
+            for( int i = 0; i < cp.length ; i ++ ) {
+                this.errorLines[i] = cp[i].getStartLine() - this.functionDescr.getOffset() + this.getFunctionDescr().getLine() - 1;
+            }
+        } else {
+            this.errorLines = new int[1];
+            this.errorLines[0] = functionDescr.getLine();
+        }
     }
     
     private String createMessage( String message ) {
         StringBuilder detail = new StringBuilder();
-        if( object instanceof CompilationProblem[] ) {
-            CompilationProblem[] cp = (CompilationProblem[]) object;
-            this.errorLines = new int[cp.length];
+        if( object instanceof CompilationProblem[] cp) {
             for( int i = 0; i < cp.length ; i ++ ) {
-               this.errorLines[i] = cp[i].getStartLine() - this.functionDescr.getOffset() + this.getFunctionDescr().getLine() - 1;
                detail.append( this.functionDescr.getName() );
                detail.append( " (line:" );
                detail.append( this.errorLines[i] );
@@ -76,10 +81,7 @@ private String createMessage( String message ) {
                detail.append( cp[i].getMessage() );
                detail.append( "\n" );
             }
-        } else if( object instanceof Exception) {
-            Exception ex = (Exception) object;
-            this.errorLines = new int[1];
-            this.errorLines[0] = functionDescr.getLine();
+        } else if( object instanceof Exception ex) {
             detail.append( " (line:" );
             detail.append( this.errorLines[0] );
             detail.append( "): " );
@@ -90,11 +92,8 @@ private String createMessage( String message ) {
                 detail.append( ": " );
                 detail.append( ex.getMessage() );
             }
-        } else {
-            this.errorLines = new int[1];
-            this.errorLines[0] = functionDescr.getLine();
         }
-        return "[ function "+functionDescr.getName() + detail.toString()+" ]";
+        return "[ function "+ functionDescr.getName() + detail +" ]";
     }
 
 }
diff --git a/drools-compiler/src/main/java/org/drools/compiler/compiler/GlobalError.java b/drools-compiler/src/main/java/org/drools/compiler/compiler/GlobalError.java
index 6b7ee6331c7..9dfe608426a 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/compiler/GlobalError.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/compiler/GlobalError.java
@@ -23,12 +23,10 @@
 
 public class GlobalError extends DroolsError {
     private final GlobalDescr globalDescr;
-    private String message;
 
     public GlobalError(final GlobalDescr globalDescr, final String message) {
-        super(globalDescr.getResource());
+        super(globalDescr.getResource(), message);
         this.globalDescr = globalDescr;
-        this.message = message;
     }
 
     @Override
@@ -44,12 +42,8 @@ public int[] getLines() {
         return new int[] { globalDescr.getLine() };
     }
 
-    public String getMessage() {
-        return message;
-    }
-    
     public String toString() {
-        return "GlobalError: " + getGlobal() + " : " + message;
+        return "GlobalError: " + getGlobal() + " : " + getMessage();
     }
 
 }
diff --git a/drools-compiler/src/main/java/org/drools/compiler/compiler/ImportError.java b/drools-compiler/src/main/java/org/drools/compiler/compiler/ImportError.java
index 5ee127ae9e2..4c12a04f88b 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/compiler/ImportError.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/compiler/ImportError.java
@@ -26,7 +26,7 @@ public class ImportError extends DroolsError {
     private int[]  line;
 
     public ImportError(final ImportDescr importDescr, final int line) {
-        super(importDescr.getResource());
+        super(importDescr.getResource(), getSpecificMessage(importDescr));
         this.importDescr = importDescr;
         this.line = new int[] { line };
     }
@@ -43,13 +43,13 @@ public String getGlobal() {
     public int[] getLines() {
         return this.line;
     }
-
-    public String getMessage() {
-        return "Error importing : '" + getGlobal() + "'";
-    }
     
     public String toString() {
         return getMessage();
     }
 
+    private static String getSpecificMessage(ImportDescr importDescr) {
+        return "Error importing : '" + importDescr.getTarget() + "'";
+    }
+
 }
diff --git a/drools-compiler/src/main/java/org/drools/compiler/compiler/MissingDependencyError.java b/drools-compiler/src/main/java/org/drools/compiler/compiler/MissingDependencyError.java
index eb5818b7044..e88419f62c4 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/compiler/MissingDependencyError.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/compiler/MissingDependencyError.java
@@ -23,20 +23,12 @@
 import org.kie.api.io.Resource;
 
 public class MissingDependencyError extends DroolsError {
-    private final String message;
-
     public MissingDependencyError(String message) {
-        this.message = message;
+        super(message);
     }
 
     public MissingDependencyError(Resource resource, MissingDependencyException ex) {
-        super(resource);
-        message = ex.getMessage();
-    }
-
-    @Override
-    public String getMessage() {
-        return message;
+        super(resource, ex.getMessage());
     }
 
     @Override
diff --git a/drools-compiler/src/main/java/org/drools/compiler/compiler/ProcessLoadError.java b/drools-compiler/src/main/java/org/drools/compiler/compiler/ProcessLoadError.java
index 48cceed33da..bde8037cbf7 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/compiler/ProcessLoadError.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/compiler/ProcessLoadError.java
@@ -19,6 +19,7 @@
 package org.drools.compiler.compiler;
 
 
+import org.drools.drl.ast.descr.ImportDescr;
 import org.drools.drl.parser.DroolsError;
 import org.kie.api.io.Resource;
 
@@ -27,21 +28,20 @@
  */
 public class ProcessLoadError extends DroolsError {
 
-    private String message;
     private Exception exception;
     private static final int[] lines = new int[0];
 
     public ProcessLoadError(Resource resource, String message, Exception nested) {
-        super(resource);
-        this.message = message;
+        super(resource, getSpecificMessage(message, nested));
         this.exception = nested;
     }
     
     public int[] getLines() {
         return this.lines;
     }
-    
-    public String getMessage() {
+
+
+    private static String getSpecificMessage(String message, Exception exception) {
         if (exception != null) {
             return message + " : Exception " + exception.getClass() + " : "+ exception.getMessage();
         } else {
diff --git a/drools-compiler/src/main/java/org/drools/compiler/compiler/ResourceTypeDeclarationWarning.java b/drools-compiler/src/main/java/org/drools/compiler/compiler/ResourceTypeDeclarationWarning.java
index 2e386d7dd6c..98bb638d717 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/compiler/ResourceTypeDeclarationWarning.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/compiler/ResourceTypeDeclarationWarning.java
@@ -27,7 +27,7 @@ public class ResourceTypeDeclarationWarning extends DroolsWarning {
     private ResourceType actualResourceType;
 
     public ResourceTypeDeclarationWarning( Resource resource, ResourceType declaredResourceType, ResourceType actualResourceType ) {
-        super( resource );
+        super( resource, getSpecificMessage(resource, declaredResourceType, actualResourceType) );
         this.declaredResourceType = declaredResourceType;
         this.actualResourceType = actualResourceType;
     }
@@ -38,6 +38,7 @@ public ResourceType getDeclaredResourceType() {
 
     public void setDeclaredResourceType( ResourceType declaredResourceType ) {
         this.declaredResourceType = declaredResourceType;
+        setMessage(getSpecificMessage(getResource(), this.declaredResourceType, this.actualResourceType));
     }
 
     public ResourceType getActualResourceType() {
@@ -46,15 +47,13 @@ public ResourceType getActualResourceType() {
 
     public void setActualResourceType( ResourceType actualResourceType ) {
         this.actualResourceType = actualResourceType;
+        setMessage(getSpecificMessage(getResource(), declaredResourceType, this.actualResourceType));
     }
-
-    @Override
-    public String getMessage() {
-        return "Resource " + getResource().getSourcePath() + " was created with type " + actualResourceType + " but is being added as " + declaredResourceType;
-    }
-
     @Override
     public int[] getLines() {
         return new int[ 0 ];  //To change body of implemented methods use File | Settings | File Templates.
     }
+    private static String getSpecificMessage(Resource resource, ResourceType declaredResourceType, ResourceType actualResourceType) {
+        return "Resource " + resource.getSourcePath() + " was created with type " + actualResourceType + " but is being added as " + declaredResourceType;
+    }
 }
\ No newline at end of file
diff --git a/drools-compiler/src/main/java/org/drools/compiler/compiler/SerializableDroolsError.java b/drools-compiler/src/main/java/org/drools/compiler/compiler/SerializableDroolsError.java
index 8ce502d862d..ff93d9c306e 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/compiler/SerializableDroolsError.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/compiler/SerializableDroolsError.java
@@ -27,15 +27,20 @@
 import org.drools.drl.parser.DroolsError;
 
 public class SerializableDroolsError extends DroolsError implements Externalizable {
-    private String message;
     private int[] errorLines;
     private String errorClassName;
     private String namespace;
 
-    public SerializableDroolsError() { }
+    private String originalMessage;
+
+    public SerializableDroolsError() {
+        super("");
+        this.originalMessage = getMessage();
+    }
     
     public SerializableDroolsError(BaseKnowledgeBuilderResultImpl error) {
-        this.message = error.getMessage();
+        super(error.getMessage());
+        this.originalMessage = getMessage();
         this.errorLines = error.getLines();
         this.errorClassName = error.getClass().getName();
         this.namespace = error instanceof DroolsError ? ((DroolsError)error).getNamespace() : "";
@@ -46,13 +51,6 @@ public String getNamespace() {
         return namespace;
     }
 
-    /**
-     * Classes that extend this must provide a printable message,
-     * which summarises the error.
-     */
-    public String getMessage() {
-        return this.message;
-    }
     
     /**
      * Returns the lines of the error in the source file
@@ -67,7 +65,7 @@ public String toString() {
     }
 
     public void writeExternal(ObjectOutput out) throws IOException {
-        out.writeObject( this.message );
+        out.writeObject(this.originalMessage);
         out.writeObject( this.errorLines );
         out.writeObject( this.errorClassName );
         out.writeObject( this.namespace );
@@ -75,7 +73,7 @@ public void writeExternal(ObjectOutput out) throws IOException {
     
     public void readExternal(ObjectInput in) throws IOException,
                                             ClassNotFoundException {
-        this.message = ( String ) in.readObject();
+        this.originalMessage = ( String ) in.readObject();
         this.errorLines = ( int[] ) in.readObject();
         this.errorClassName = ( String ) in.readObject();
         this.namespace = ( String ) in.readObject();
diff --git a/drools-compiler/src/main/java/org/drools/compiler/compiler/TypeDeclarationError.java b/drools-compiler/src/main/java/org/drools/compiler/compiler/TypeDeclarationError.java
index c0bfe0ccf42..c33e2f641d7 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/compiler/TypeDeclarationError.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/compiler/TypeDeclarationError.java
@@ -23,20 +23,17 @@
 import org.drools.drl.parser.DroolsError;
 
 public class TypeDeclarationError extends DroolsError {
-    private String errorMessage;
     private int[]  line;
     private String namespace;
 
     public TypeDeclarationError(BaseDescr typeDescr, String errorMessage) {
-        super(typeDescr.getResource());
-        this.errorMessage = errorMessage;
+        super(typeDescr.getResource(), errorMessage);
         this.line = new int[] { typeDescr.getLine() };
         this.namespace = typeDescr.getNamespace();
     }
 
     public TypeDeclarationError(TypeDeclaration typeDeclaration, String errorMessage) {
-        super(typeDeclaration.getResource());
-        this.errorMessage = errorMessage;
+        super(typeDeclaration.getResource(), errorMessage);
         this.line = new int[0];
         this.namespace = typeDeclaration.getNamespace();
     }
@@ -50,12 +47,9 @@ public int[] getLines() {
         return this.line;
     }
 
-    public String getMessage() {
-        return this.errorMessage;
-    }
     
     public String toString() {
-        return this.getMessage();
+        return getMessage();
     }
 
 }
diff --git a/drools-compiler/src/main/java/org/drools/compiler/compiler/TypeDeclarationWarning.java b/drools-compiler/src/main/java/org/drools/compiler/compiler/TypeDeclarationWarning.java
index 1cb145fd4ff..81cebb7ab17 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/compiler/TypeDeclarationWarning.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/compiler/TypeDeclarationWarning.java
@@ -22,12 +22,11 @@
 import org.kie.internal.builder.ResultSeverity;
 
 public class TypeDeclarationWarning extends BaseKnowledgeBuilderResultImpl {
-    private String message;
+
     private int[]  line;
 
     public TypeDeclarationWarning(final String message, final int line) {
-        super(null);
-        this.message = message;
+        super(null, message);
         this.line = new int[] { line };
     }
 
@@ -35,10 +34,6 @@ public int[] getLines() {
         return this.line;
     }
 
-    public String getMessage() {
-        return this.message;
-    }
-
     public String toString() {
         return this.getMessage();
     }
diff --git a/drools-compiler/src/main/java/org/drools/compiler/rule/builder/dialect/DialectError.java b/drools-compiler/src/main/java/org/drools/compiler/rule/builder/dialect/DialectError.java
index edcd53101de..c0d6f553e58 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/rule/builder/dialect/DialectError.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/rule/builder/dialect/DialectError.java
@@ -22,24 +22,18 @@
 import org.kie.api.io.Resource;
 
 public class DialectError extends DroolsError {
-    private String message;
     private static final int[] line = new int[0];
 
     public DialectError(final Resource resource, final String message) {
-        super(resource);
-        this.message = message;
+        super(resource, message);
     }
 
     public int[] getLines() {
         return line;
     }
-    
-    public String getMessage() {
-        return this.message;
-    }
 
     public String toString() {
-        return "[DialectError message='" + this.message + "']";
+        return "[DialectError message='" + getMessage() + "']";
     }
 
 }
diff --git a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/BaseKnowledgeBuilderResultImpl.java b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/BaseKnowledgeBuilderResultImpl.java
index 4dced22444c..a464598b881 100644
--- a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/BaseKnowledgeBuilderResultImpl.java
+++ b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/BaseKnowledgeBuilderResultImpl.java
@@ -32,8 +32,10 @@
 public abstract class BaseKnowledgeBuilderResultImpl implements KnowledgeBuilderResult {
 
     private Resource resource;
+    private String message;
 
-    protected BaseKnowledgeBuilderResultImpl(Resource resource) {
+    protected BaseKnowledgeBuilderResultImpl(Resource resource, String message) {
+        this.message = message != null ? message : "";
         this.resource = resource;
     }
 
@@ -55,7 +57,17 @@ public boolean isError() {
      * Classes that extend this must provide a printable message,
      * which summarises the error.
      */
-    public abstract String getMessage();
+    public final String getMessage() {
+        return message;
+    }
+
+    /**
+     * Needed when the message depends on status of mutable classes
+     * @param message
+     */
+    public final void setMessage(String message) {
+        this.message = message;
+    }
 
     /**
      * Returns the lines of the error in the source file
@@ -79,18 +91,18 @@ public boolean equals(Object o) {
             return false;
         }
 
-        KnowledgeBuilderResult that = (KnowledgeBuilderResult) o;
+        BaseKnowledgeBuilderResultImpl that = (BaseKnowledgeBuilderResultImpl) o;
 
         if (resource != null ? !resource.equals(that.getResource()) : that.getResource() != null) {
             return false;
         }
 
-        return getMessage().equals(that.getMessage()) && Arrays.equals(getLines(), that.getLines());
+        return message.equals(that.message) && Arrays.equals(getLines(), that.getLines());
     }
 
     @Override
     public int hashCode() {
-        int hash = (29 * getMessage().hashCode()) + (31 * Arrays.hashCode(getLines()));
+        int hash = (29 * message.hashCode()) + (31 * Arrays.hashCode(getLines()));
         return resource != null ? hash + (37 * resource.hashCode()) : hash;
     }
 
diff --git a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/DroolsError.java b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/DroolsError.java
index 64330403d87..c7b5d6e2219 100644
--- a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/DroolsError.java
+++ b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/DroolsError.java
@@ -24,12 +24,12 @@
 
 public abstract class DroolsError extends BaseKnowledgeBuilderResultImpl implements KnowledgeBuilderError {
 
-    public DroolsError() {
-        this(null);
+    public DroolsError(String message) {
+        this(null, message);
     }
 
-    public DroolsError(Resource resource) {
-        super(resource);
+    public DroolsError(Resource resource, String message) {
+        super(resource, message);
     }
 
     public ResultSeverity getSeverity() {
diff --git a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/ParserError.java b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/ParserError.java
index 90e228f592d..2178bb3c46d 100644
--- a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/ParserError.java
+++ b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/ParserError.java
@@ -23,7 +23,6 @@
 public class ParserError extends DroolsError {
     private final int    row;
     private final int    col;
-    private final String message;
     private final String namespace;
 
     public ParserError(final String message,
@@ -44,17 +43,12 @@ public ParserError(final Resource resource,
                        final int row,
                        final int col,
                        final String namespace) {
-        super(resource);
-        this.message = message;
+        super(resource, message);
         this.row = row;
         this.col = col;
         this.namespace = namespace;
     }
 
-    public String getMessage() {
-        return this.message;
-    }
-
     @Override
     public String getNamespace() {
         return namespace;
@@ -73,7 +67,7 @@ public int getRow() {
     }
 
     public String toString() {
-        return "[" + this.row + "," + this.col + "]: " + this.message;
+        return "[" + this.row + "," + this.col + "]: " + getMessage();
     }
 
 }
diff --git a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/lang/ExpanderException.java b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/lang/ExpanderException.java
index ecc203bdce3..5b4fdcf06bb 100644
--- a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/lang/ExpanderException.java
+++ b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/lang/ExpanderException.java
@@ -25,29 +25,24 @@ public class ExpanderException extends DroolsError {
 
     private static final long serialVersionUID = 510l;
 
-    private String            message;
     private int[]             line;
 
     public ExpanderException(final String message,
                              final int line) {
-        this.message = message;
+        super("[" + line + "] " + message);
         this.line = new int[] { line };
     }
     
     public int[] getLines() {
         return this.line;
     }
-
-    public String getMessage() {
-        return "[" + this.line[0] + "] " + this.message;
-    }
     
     public int getLine() {
         return this.line[0];
     }
     
     public String toString() {
-        return this.getMessage();
+        return getMessage();
     }
 
 }
diff --git a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/lang/dsl/MappingError.java b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/lang/dsl/MappingError.java
index 4f08b4d9fd8..e852aab5ee8 100755
--- a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/lang/dsl/MappingError.java
+++ b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/lang/dsl/MappingError.java
@@ -50,6 +50,7 @@ public MappingError(final int errorCode,
                         final String token,
                         final String templateText,
                         final int line ) {
+        super(getSpecificMessage(errorCode, offset, token));
         this.errorCode = errorCode;
         this.template = template;
         this.token = token;
@@ -91,23 +92,19 @@ public String getTemplateText() {
         return this.templateText;
     }
 
-    /**
-     * @inheritDoc 
-     *
-     * @see org.kie.compiler.DroolsError#getMessage()
-     */
-    public String getMessage() {
-        switch ( this.errorCode ) {
+    private static String getSpecificMessage(int errorCode, int offset,
+                                             String token) {
+        switch ( errorCode ) {
             case ERROR_UNUSED_TOKEN :
-                return "Warning, the token " + this.token + " not used in the mapping.";
+                return "Warning, the token " + token + " not used in the mapping.";
             case ERROR_UNDECLARED_TOKEN :
-                return "Warning, the token " + this.token + " not found in the expression. (May not be a problem).";
+                return "Warning, the token " + token + " not found in the expression. (May not be a problem).";
             case ERROR_INVALID_TOKEN :
-                return "Invalid token declaration at offset " + this.offset + ": " + this.token;
+                return "Invalid token declaration at offset " + offset + ": " + token;
             case ERROR_UNMATCHED_BRACES :
-                return "Unexpected } found at offset " + this.offset;
+                return "Unexpected } found at offset " + offset;
             default :
-                return "Unkown error at offset: " + this.offset;
+                return "Unkown error at offset: " + offset;
         }
     }
 }
diff --git a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/RuleUnitQueryWriter.java b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/RuleUnitQueryWriter.java
index b64864a9abc..4182d7181c0 100644
--- a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/RuleUnitQueryWriter.java
+++ b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/RuleUnitQueryWriter.java
@@ -196,14 +196,10 @@ public static class NoBindingQuery extends DroolsError {
         private final QueryModel query;
 
         public NoBindingQuery(QueryModel query) {
+            super("Query " + query.getName() + " has no bound variable. At least one binding is required to determine the value returned by this query");
             this.query = query;
         }
 
-        @Override
-        public String getMessage() {
-            return "Query " + query.getName() + " has no bound variable. At least one binding is required to determine the value returned by this query";
-        }
-
         @Override
         public int[] getLines() {
             return ERROR_LINES;
diff --git a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/CompilationProblemErrorResult.java b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/CompilationProblemErrorResult.java
index 9a4b716822c..eb3f9e0c989 100644
--- a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/CompilationProblemErrorResult.java
+++ b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/CompilationProblemErrorResult.java
@@ -27,7 +27,7 @@ public class CompilationProblemErrorResult extends DroolsError {
     private CompilationProblem compilationProblem;
 
     public CompilationProblemErrorResult(CompilationProblem compilationProblem) {
-        super();
+        super(compilationProblem.getMessage());
         this.compilationProblem = compilationProblem;
     }
 
@@ -36,11 +36,6 @@ public ResultSeverity getSeverity() {
         return ResultSeverity.ERROR;
     }
 
-    @Override
-    public String getMessage() {
-        return compilationProblem.getMessage();
-    }
-
     @Override
     public int[] getLines() {
         return new int[]{compilationProblem.getStartLine(), compilationProblem.getEndLine()};
diff --git a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/DuplicatedDeclarationError.java b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/DuplicatedDeclarationError.java
index f794fe1edb3..a6ca22d3472 100644
--- a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/DuplicatedDeclarationError.java
+++ b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/DuplicatedDeclarationError.java
@@ -26,7 +26,7 @@ public class DuplicatedDeclarationError extends DroolsError {
     private String declaration;
 
     public DuplicatedDeclarationError( String declaration) {
-        super();
+        super("Duplicated declaration: " + declaration);
         this.declaration = declaration;
     }
 
@@ -35,11 +35,6 @@ public ResultSeverity getSeverity() {
         return ResultSeverity.ERROR;
     }
 
-    @Override
-    public String getMessage() {
-        return "Duplicated declaration: " + declaration;
-    }
-
     @Override
     public int[] getLines() {
         return new int[0];
diff --git a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/GetterOverloadWarning.java b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/GetterOverloadWarning.java
index c8d67ddf968..65219209d18 100644
--- a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/GetterOverloadWarning.java
+++ b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/GetterOverloadWarning.java
@@ -30,6 +30,7 @@ public class GetterOverloadWarning extends DroolsError {
     private Class newType;
 
     public GetterOverloadWarning( Class klass, String oldName, Class oldType, String newName, Class newType ) {
+        super( " Getter overloading detected in class " + klass.getName() + " : " + oldName + " (" + oldType + ") vs " + newName + " (" + newType + ") ");
         this.klass = klass;
         this.oldName = oldName;
         this.oldType = oldType;
@@ -43,12 +44,6 @@ public ResultSeverity getSeverity() {
     }
 
 
-    @Override
-    public String getMessage() {
-        return " Getter overloading detected in class " + klass.getName() + " : " + oldName + " (" + oldType + ") vs " + newName + " (" + newType + ") ";
-    }
-
-
     @Override
     public int[] getLines() {
         return new int[ 0 ];
diff --git a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/IncompatibleGetterOverloadError.java b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/IncompatibleGetterOverloadError.java
index cdf406f90ec..c3111539b40 100644
--- a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/IncompatibleGetterOverloadError.java
+++ b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/IncompatibleGetterOverloadError.java
@@ -30,6 +30,7 @@ public class IncompatibleGetterOverloadError extends DroolsError {
     private Class newType;
 
     public IncompatibleGetterOverloadError( Class klass, String oldName, Class oldType, String newName, Class newType ) {
+        super(" Incompatible Getter overloading detected in class " + klass.getName() + " : " + oldName + " (" + oldType + ") vs " + newName + " (" + newType + ") ");
         this.klass = klass;
         this.oldName = oldName;
         this.oldType = oldType;
@@ -43,12 +44,6 @@ public ResultSeverity getSeverity() {
     }
 
 
-    @Override
-    public String getMessage() {
-        return " Imcompatible Getter overloading detected in class " + klass.getName() + " : " + oldName + " (" + oldType + ") vs " + newName + " (" + newType + ") ";
-    }
-
-
     @Override
     public int[] getLines() {
         return new int[ 0 ];
diff --git a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/InvalidExpressionErrorResult.java b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/InvalidExpressionErrorResult.java
index c956e13eda7..72e43fea0a6 100644
--- a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/InvalidExpressionErrorResult.java
+++ b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/InvalidExpressionErrorResult.java
@@ -26,13 +26,10 @@
 
 public class InvalidExpressionErrorResult extends DroolsError {
 
-    private String message;
-
     private int[] errorLines = new int[1];
 
     public InvalidExpressionErrorResult(String message) {
-        super();
-        this.message = message;
+        super(message);
         this.errorLines[0] = -1;
     }
 
@@ -46,10 +43,6 @@ public ResultSeverity getSeverity() {
         return ResultSeverity.ERROR;
     }
 
-    @Override
-    public String getMessage() {
-        return message;
-    }
 
     @Override
     public int[] getLines() {
diff --git a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/ParseExpressionErrorResult.java b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/ParseExpressionErrorResult.java
index b08c306ed19..cebe93aeece 100644
--- a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/ParseExpressionErrorResult.java
+++ b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/ParseExpressionErrorResult.java
@@ -33,7 +33,7 @@ public class ParseExpressionErrorResult extends DroolsError {
     private int[] errorLines = new int[1];
 
     public ParseExpressionErrorResult(Expression expr) {
-        super();
+        super("Unable to Analyse Expression " + PrintUtil.printNode(expr) + ":");
         this.expr = expr;
         this.errorLines[0] = -1;
     }
@@ -48,11 +48,6 @@ public ResultSeverity getSeverity() {
         return ResultSeverity.ERROR;
     }
 
-    @Override
-    public String getMessage() {
-        return "Unable to Analyse Expression " + PrintUtil.printNode(expr) + ":";
-    }
-
     @Override
     public int[] getLines() {
         return errorLines;
diff --git a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/UnknownDeclarationError.java b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/UnknownDeclarationError.java
index 4dbc2608776..d00e12dce59 100644
--- a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/UnknownDeclarationError.java
+++ b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/UnknownDeclarationError.java
@@ -23,11 +23,9 @@
 
 public class UnknownDeclarationError extends DroolsError {
 
-    private String declaration;
 
     public UnknownDeclarationError(String declaration) {
-        super();
-        this.declaration = declaration;
+        super("Unknown declaration: " + declaration);
     }
 
     @Override
@@ -35,10 +33,6 @@ public ResultSeverity getSeverity() {
         return ResultSeverity.ERROR;
     }
 
-    @Override
-    public String getMessage() {
-        return "Unknown declaration: " + declaration;
-    }
 
     @Override
     public int[] getLines() {
diff --git a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/UnsupportedFeatureError.java b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/UnsupportedFeatureError.java
index 8137f93b315..437a72c40d7 100644
--- a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/UnsupportedFeatureError.java
+++ b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/UnsupportedFeatureError.java
@@ -23,11 +23,9 @@
 
 public class UnsupportedFeatureError extends DroolsError {
 
-    private String message;
 
     public UnsupportedFeatureError(String message) {
-        super();
-        this.message = message;
+        super(message);
     }
 
     @Override
@@ -35,10 +33,6 @@ public ResultSeverity getSeverity() {
         return ResultSeverity.ERROR;
     }
 
-    @Override
-    public String getMessage() {
-        return message;
-    }
 
     @Override
     public int[] getLines() {
diff --git a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/VariableUsedInBindingError.java b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/VariableUsedInBindingError.java
index 745863980e8..917bcd9e3ea 100644
--- a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/VariableUsedInBindingError.java
+++ b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/errors/VariableUsedInBindingError.java
@@ -29,7 +29,9 @@ public class VariableUsedInBindingError extends DroolsError {
     private int[] errorLines = new int[1];
 
     public VariableUsedInBindingError(String usedDeclaration, String constraintExpressionString) {
-        super();
+        super(String.format("Variables can not be used inside bindings. Variable [%s] is being used in binding '%s'",
+                            usedDeclaration,
+                            constraintExpressionString));
         this.usedDeclaration = usedDeclaration;
         this.constraintExpressionString = constraintExpressionString;
         this.errorLines[0] = -1;
@@ -40,12 +42,6 @@ public ResultSeverity getSeverity() {
         return ResultSeverity.ERROR;
     }
 
-    @Override
-    public String getMessage() {
-        return String.format("Variables can not be used inside bindings. Variable [%s] is being used in binding '%s'",
-                             usedDeclaration,
-                             constraintExpressionString);
-    }
 
     @Override
     public int[] getLines() {
diff --git a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/generator/visitor/accumulate/AccumulateVisitor.java b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/generator/visitor/accumulate/AccumulateVisitor.java
index 746722bb7c0..7b202abedb4 100644
--- a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/generator/visitor/accumulate/AccumulateVisitor.java
+++ b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/generator/visitor/accumulate/AccumulateVisitor.java
@@ -217,8 +217,7 @@ private Optional parseFirstParameter(PatternDescr basePattern, BaseD
         } else if (accumulateFunctionParameter instanceof LiteralExpr) {
             literalExprParameter(basePattern, function, functionDSL, bindingId, accumulateFunctionParameter);
         } else {
-            context.addCompilationError(new InvalidExpressionErrorResult("Invalid expression " + accumulateFunctionParameterStr, Optional.of(context.getRuleDescr())));
-            throw new AccumulateParsingFailedException();
+            throw new AccumulateParsingFailedException("Invalid expression " + accumulateFunctionParameterStr);
         }
 
         return Optional.empty();
@@ -662,9 +661,6 @@ static class NewBinding {
 
     private class AccumulateParsingFailedException extends RuntimeException {
 
-        AccumulateParsingFailedException() {
-        }
-
         AccumulateParsingFailedException(String message) {
             super(message);
         }
diff --git a/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/GetterOverloadingTest.java b/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/GetterOverloadingTest.java
index 0eb78b22b49..5c72aa7700a 100644
--- a/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/GetterOverloadingTest.java
+++ b/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/GetterOverloadingTest.java
@@ -61,7 +61,7 @@ public void testDuplicateDifferentPropertyInClassHierarchy() {
 
         KieBuilder kieBuilder = createKieBuilder(str);
         List messages = kieBuilder.getResults().getMessages(Level.ERROR);
-        assertThat(messages.get(0).getText()).contains("Imcompatible Getter overloading detected");
+        assertThat(messages.get(0).getText()).contains("Incompatible Getter overloading detected");
     }
 
     public static class ClassA {
diff --git a/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/assembler/TestAssembler.java b/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/assembler/TestAssembler.java
index 18098808eda..d1151a07dd5 100644
--- a/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/assembler/TestAssembler.java
+++ b/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/assembler/TestAssembler.java
@@ -56,18 +56,13 @@ public void addResourceAfterRules(Object kbuilder, Resource resource, ResourceTy
 
     }
 
-    public static final KnowledgeBuilderResult AFTER_RULES = new DroolsError(null) {
+    public static final KnowledgeBuilderResult AFTER_RULES = new DroolsError( "AFTER_RULES") {
 
         @Override
         public ResultSeverity getSeverity() {
             return ResultSeverity.WARNING;
         }
 
-        @Override
-        public String getMessage() {
-            return "AFTER_RULES";
-        }
-
         @Override
         public int[] getLines() {
             return new int[0];
@@ -75,18 +70,13 @@ public int[] getLines() {
 
     };
 
-    public static final KnowledgeBuilderResult BEFORE_RULES = new DroolsError(null) {
+    public static final KnowledgeBuilderResult BEFORE_RULES = new DroolsError("BEFORE_RULES") {
 
         @Override
         public ResultSeverity getSeverity() {
             return ResultSeverity.WARNING;
         }
 
-        @Override
-        public String getMessage() {
-            return "BEFORE_RULES";
-        }
-
         @Override
         public int[] getLines() {
             return new int[0];
diff --git a/drools-mvel/src/main/java/org/drools/mvel/asm/ClassFieldInspectorImpl.java b/drools-mvel/src/main/java/org/drools/mvel/asm/ClassFieldInspectorImpl.java
index 6026e7724f9..a46c1bafe14 100644
--- a/drools-mvel/src/main/java/org/drools/mvel/asm/ClassFieldInspectorImpl.java
+++ b/drools-mvel/src/main/java/org/drools/mvel/asm/ClassFieldInspectorImpl.java
@@ -574,7 +574,7 @@ public ResultSeverity getSeverity() {
 
 
         public String getMessage() {
-            return " Imcompatible Getter overloading detected in class " + klass.getName() + " : " + oldName + " (" + oldType + ") vs " + newName + " (" + newType + ") ";
+            return " Incompatible Getter overloading detected in class " + klass.getName() + " : " + oldName + " (" + oldType + ") vs " + newName + " (" + newType + ") ";
         }
 
 
diff --git a/drools-mvel/src/main/java/org/drools/mvel/java/JavaDialectError.java b/drools-mvel/src/main/java/org/drools/mvel/java/JavaDialectError.java
index 53b3c9cf2e3..e61a021721a 100644
--- a/drools-mvel/src/main/java/org/drools/mvel/java/JavaDialectError.java
+++ b/drools-mvel/src/main/java/org/drools/mvel/java/JavaDialectError.java
@@ -25,16 +25,13 @@ public class JavaDialectError extends DroolsError {
     private static final int[] line = new int[0];
 
     public JavaDialectError(final String message) {
+        super(message);
         this.message = message;
     }
 
     public int[] getLines() {
         return line;
     }
-    
-    public String getMessage() {
-        return this.message;
-    }
 
     public String toString() {
         return "[JavaDialectError message='" + this.message + "']";
diff --git a/drools-util/src/main/java/org/drools/util/IncompatibleGetterOverloadException.java b/drools-util/src/main/java/org/drools/util/IncompatibleGetterOverloadException.java
index 51cdc58c0ce..3ab83915071 100644
--- a/drools-util/src/main/java/org/drools/util/IncompatibleGetterOverloadException.java
+++ b/drools-util/src/main/java/org/drools/util/IncompatibleGetterOverloadException.java
@@ -28,7 +28,7 @@ public class IncompatibleGetterOverloadException extends RuntimeException {
     private Class newType;
 
     public IncompatibleGetterOverloadException(Class klass, String oldName, Class oldType, String newName, Class newType) {
-        super(" Imcompatible Getter overloading detected in class " + klass.getName() + " : " + oldName + " (" + oldType + ") vs " + newName + " (" + newType + ") ");
+        super(" Incompatible Getter overloading detected in class " + klass.getName() + " : " + oldName + " (" + oldType + ") vs " + newName + " (" + newType + ") ");
         this.klass = klass;
         this.oldName = oldName;
         this.oldType = oldType;
diff --git a/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/impl/DMNKnowledgeBuilderError.java b/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/impl/DMNKnowledgeBuilderError.java
index 2ea40e55cfe..1073f944c64 100644
--- a/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/impl/DMNKnowledgeBuilderError.java
+++ b/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/impl/DMNKnowledgeBuilderError.java
@@ -28,16 +28,14 @@
 public class DMNKnowledgeBuilderError extends DroolsError {
 
     private int[] lines = new int[0];
-    private String message;
     private String namespace;
     private ResultSeverity severity;
     private DMNMessage dmnMessage;
     
     public DMNKnowledgeBuilderError(ResultSeverity severity, Resource resource, String namespace, String message) {
-        super(resource);
+        super(resource, message);
         this.severity = severity;
         this.namespace = namespace;
-        this.message = message;
     }
     
     public DMNKnowledgeBuilderError(ResultSeverity severity, Resource resource, String message) {
@@ -78,11 +76,6 @@ public ResultSeverity getSeverity() {
         return this.severity;
     }
 
-    @Override
-    public String getMessage() {
-        return this.message;
-    }
-
     @Override
     public int[] getLines() {
         return lines;
@@ -101,7 +94,7 @@ public DMNMessage getDmnMessage() {
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("DMNKnowledgeBuilderError [message=");
-        sb.append(message);
+        sb.append(getMessage());
         sb.append(", namespace=");
         sb.append(namespace);
         sb.append(", dmnMessage=");

From 19ee7f1691e0e601ee02b4571d1e2fbf98efbb36 Mon Sep 17 00:00:00 2001
From: Mario Fusco 
Date: Mon, 15 Jan 2024 09:20:32 +0100
Subject: [PATCH 27/29] [KIE-820] add timestamp for reproducible builds (#5650)

* [KIE-820] add timestamp for reproducible builds

* upgrade plugin version
---
 pom.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pom.xml b/pom.xml
index d3c126a785e..0452164ca74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,6 +140,26 @@
     
   
 
+  
+    2024-01-12T00:00:00Z
+    3.4.1
+  
+
+  
+    
+      
+        
+          org.apache.maven.plugins
+          maven-artifact-plugin
+          ${version.maven.artifact.plugin}
+          
+            ${project.build.outputTimestamp}
+          
+        
+      
+    
+  
+
   
     
       default

From 58cb93f52ae60d6109aadca88b77f7a7bf42aa23 Mon Sep 17 00:00:00 2001
From: Gabriele Cardosi 
Date: Mon, 15 Jan 2024 15:24:29 +0100
Subject: [PATCH 28/29] [incubator-kie-issues#507] DMN - Add a new "list
 replace" function  (#5645)

* [incubator-kie-issues#507] Implement FEEL list replace

* [incubator-kie-issues#507] Fixed as per PR suggestion

* [incubator-kie-issues#507] Fix typo

---------

Co-authored-by: BAMOE CI 
---
 .../runtime/functions/BuiltInFunctions.java   |   3 +-
 .../functions/ListReplaceFunction.java        |  86 +++++++++++
 .../org.kie/kie-dmn-feel/reflect-config.json  |   9 ++
 .../codegen/feel11/DirectCompilerTest.java    |  38 +----
 .../dmn/feel/runtime/FEELFunctionsTest.java   |   7 +
 .../functions/ListReplaceFunctionTest.java    | 136 ++++++++++++++++++
 .../org/kie/dmn/feel/util/CompilerUtils.java  |  73 ++++++++++
 7 files changed, 316 insertions(+), 36 deletions(-)
 create mode 100644 kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/ListReplaceFunction.java
 create mode 100644 kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/functions/ListReplaceFunctionTest.java
 create mode 100644 kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/util/CompilerUtils.java

diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/BuiltInFunctions.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/BuiltInFunctions.java
index 9595d13caba..9495c984974 100644
--- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/BuiltInFunctions.java
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/BuiltInFunctions.java
@@ -118,7 +118,8 @@ public class BuiltInFunctions {
             OverlapsBeforeFunction.INSTANCE,
             OverlapsAfterFunction.INSTANCE,
             MeetsFunction.INSTANCE,
-            MetByFunction.INSTANCE
+            MetByFunction.INSTANCE,
+            ListReplaceFunction.INSTANCE
     };
 
     public static FEELFunction[] getFunctions() {
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/ListReplaceFunction.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/ListReplaceFunction.java
new file mode 100644
index 00000000000..1ef80e1cbd1
--- /dev/null
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/ListReplaceFunction.java
@@ -0,0 +1,86 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 

+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 

+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.dmn.feel.runtime.functions;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.kie.dmn.api.feel.runtime.events.FEELEvent.Severity;
+import org.kie.dmn.feel.runtime.events.InvalidParametersEvent;
+import org.kie.dmn.feel.util.EvalHelper;
+
+public class ListReplaceFunction
+        extends BaseFEELFunction {
+
+    public static final ListReplaceFunction INSTANCE = new ListReplaceFunction();
+
+    private static final String CANNOT_BE_NULL = "cannot be null";
+
+    private ListReplaceFunction() {
+        super("list replace");
+    }
+
+    public FEELFnResult invoke(@ParameterName("list") List list, @ParameterName("position") BigDecimal position,
+                                     @ParameterName("newItem") Object newItem) {
+        if (list == null) {
+            return FEELFnResult.ofError(new InvalidParametersEvent(Severity.ERROR, "list", CANNOT_BE_NULL));
+        }
+        if (position == null) {
+            return FEELFnResult.ofError(new InvalidParametersEvent(Severity.ERROR, "position", CANNOT_BE_NULL));
+        }
+        int intPosition = position.intValue();
+        if (intPosition == 0 || Math.abs(intPosition) > list.size()) {
+            String paramProblem = String.format("%s outside valid boundaries (1-%s)", intPosition, list.size());
+            return FEELFnResult.ofError(new InvalidParametersEvent(Severity.ERROR, "position", paramProblem));
+        }
+        Object e = EvalHelper.coerceNumber(newItem);
+        List toReturn = new ArrayList(list);
+        int replacementPosition = intPosition > 0 ? intPosition -1 : list.size() - Math.abs(intPosition);
+        toReturn.set(replacementPosition, e);
+        return FEELFnResult.ofResult(toReturn);
+    }
+
+    public FEELFnResult invoke(@ParameterName("list") List list,
+                                     @ParameterName("match") AbstractCustomFEELFunction match,
+                                     @ParameterName("newItem") Object newItem) {
+        if (list == null) {
+            return FEELFnResult.ofError(new InvalidParametersEvent(Severity.ERROR, "list", CANNOT_BE_NULL));
+        }
+        if (match == null) {
+            return FEELFnResult.ofError(new InvalidParametersEvent(Severity.ERROR, "match", CANNOT_BE_NULL));
+        }
+        Object e = EvalHelper.coerceNumber(newItem);
+        List toReturn = new ArrayList();
+        for (Object o : list) {
+            Object matched = match.invokeReflectively(match.getEvaluationContext(), new Object[]{o, e});
+            if (matched instanceof Boolean isMatch) {
+                if (isMatch) {
+                    toReturn.add(e);
+                } else {
+                    toReturn.add(o);
+                }
+            } else {
+                String paramProblem = String.format("%s returns '%s' instead of boolean", match, matched);
+                return FEELFnResult.ofError(new InvalidParametersEvent(Severity.ERROR, "match", paramProblem));
+            }
+        }
+        return FEELFnResult.ofResult(toReturn);
+    }
+}
diff --git a/kie-dmn/kie-dmn-feel/src/main/resources/META-INF/native-image/org.kie/kie-dmn-feel/reflect-config.json b/kie-dmn/kie-dmn-feel/src/main/resources/META-INF/native-image/org.kie/kie-dmn-feel/reflect-config.json
index fc3ff9ad2d2..c6b830b456f 100644
--- a/kie-dmn/kie-dmn-feel/src/main/resources/META-INF/native-image/org.kie/kie-dmn-feel/reflect-config.json
+++ b/kie-dmn/kie-dmn-feel/src/main/resources/META-INF/native-image/org.kie/kie-dmn-feel/reflect-config.json
@@ -296,6 +296,15 @@
         "allDeclaredClasses": true,
         "allPublicClasses": true
     },
+    {
+        "name": "org.kie.dmn.feel.runtime.functions.ListReplaceFunction",
+        "allDeclaredConstructors": true,
+        "allPublicConstructors": true,
+        "allDeclaredMethods": true,
+        "allPublicMethods": true,
+        "allDeclaredClasses": true,
+        "allPublicClasses": true
+    },
     {
         "name": "org.kie.dmn.feel.runtime.functions.LogFunction",
         "allDeclaredConstructors": true,
diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/codegen/feel11/DirectCompilerTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/codegen/feel11/DirectCompilerTest.java
index 32de44e2d99..edf20396a04 100644
--- a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/codegen/feel11/DirectCompilerTest.java
+++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/codegen/feel11/DirectCompilerTest.java
@@ -21,44 +21,30 @@
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.Collections;
-import java.util.Map;
 
-import com.github.javaparser.ast.expr.Expression;
-import org.antlr.v4.runtime.tree.ParseTree;
 import org.junit.Test;
 import org.kie.dmn.feel.lang.EvaluationContext;
 import org.kie.dmn.feel.lang.FEELProperty;
 import org.kie.dmn.feel.lang.Type;
-import org.kie.dmn.feel.lang.ast.BaseNode;
 import org.kie.dmn.feel.lang.impl.JavaBackedType;
 import org.kie.dmn.feel.lang.impl.MapBackedType;
 import org.kie.dmn.feel.lang.types.BuiltInType;
-import org.kie.dmn.feel.parser.feel11.ASTBuilderVisitor;
-import org.kie.dmn.feel.parser.feel11.FEELParser;
 import org.kie.dmn.feel.parser.feel11.FEELParserTest;
-import org.kie.dmn.feel.parser.feel11.FEEL_1_1Parser;
 import org.kie.dmn.feel.runtime.FEELConditionsAndLoopsTest;
 import org.kie.dmn.feel.runtime.FEELTernaryLogicTest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.kie.dmn.feel.util.CompilerUtils.parse;
+import static org.kie.dmn.feel.util.CompilerUtils.parseCompileEvaluate;
 import static org.kie.dmn.feel.util.DynamicTypeUtils.entry;
 import static org.kie.dmn.feel.util.DynamicTypeUtils.mapOf;
 
 public class DirectCompilerTest {
 
     public static final Logger LOG = LoggerFactory.getLogger(DirectCompilerTest.class);
-    
-    private Object parseCompileEvaluate(String feelLiteralExpression) {
-        CompiledFEELExpression compiledExpression = parse( feelLiteralExpression );
-        LOG.debug("{}", compiledExpression);
-        
-        EvaluationContext emptyContext = CodegenTestUtil.newEmptyEvaluationContext();
-        Object result = compiledExpression.apply(emptyContext);
-        LOG.debug("{}", result);
-        return result;
-    }
+
 
     @Test
     public void test_FEEL_number() {
@@ -470,24 +456,6 @@ public void testQualifiedName3() {
         assertThat(result).isEqualTo(BigDecimal.valueOf(2016));
     }
 
-    private CompiledFEELExpression parse(String input) {
-        return parse( input, Collections.emptyMap() );
-    }
-
-    private CompiledFEELExpression parse(String input, Map inputTypes) {
-        FEEL_1_1Parser parser = FEELParser.parse(null, input, inputTypes, Collections.emptyMap(), Collections.emptyList(), Collections.emptyList(), null);
-
-        ParseTree tree = parser.compilation_unit();
-
-        ASTBuilderVisitor v = new ASTBuilderVisitor(inputTypes, null);
-        BaseNode node = v.visit(tree);
-        DirectCompilerResult directResult = node.accept(new ASTCompilerVisitor());
-        
-        Expression expr = directResult.getExpression();
-        CompiledFEELExpression cu = new CompilerBytecodeLoader().makeFromJPExpression(input, expr, directResult.getFieldDeclarations());
-
-        return cu;
-    }
     
 
 }
diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/FEELFunctionsTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/FEELFunctionsTest.java
index bb709bbdb40..5478e9a575f 100644
--- a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/FEELFunctionsTest.java
+++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/FEELFunctionsTest.java
@@ -237,6 +237,13 @@ public static Collection data() {
                 { "{a: -2, r: -sum( 1, -abs(a), 3 )}.r", BigDecimal.valueOf( -2 ) , null},
                 { "if list contains ([2.2, 3.0, 4.0], 3) then \"OK\" else \"NOT_OK\"", "OK" , null},
                 { "if list contains ([2.2, 3, 4], 3.000) then \"OK\" else \"NOT_OK\"", "OK" , null},
+                {"list replace ( null, 3, 6)", null , FEELEvent.Severity.ERROR},
+                {"list replace ( [2, 4, 7, 8], null, 6)", null , FEELEvent.Severity.ERROR},
+                {"list replace ( [2, 4, 7, 8], 3, 6)", Arrays.asList(BigDecimal.valueOf(2), BigDecimal.valueOf(4), BigDecimal.valueOf(6), BigDecimal.valueOf(8)), null},
+                {"list replace ( [2, 4, 7, 8], -3, 6)", Arrays.asList(BigDecimal.valueOf(2), BigDecimal.valueOf(6), BigDecimal.valueOf(7), BigDecimal.valueOf(8)), null},
+                {"list replace ( [2, 4, 7, 8], function(item, newItem) item + newItem, 6)", null , FEELEvent.Severity.ERROR},
+                {"list replace ( [\"El-1\", \"El-2\", \"El-3\", \"El-4\"], function(item, newItem) item = \"El-2\", null)", Arrays.asList("El-1", null, "El-3", "El-4"), null},
+                {"list replace ( [2, 4, 7, 8], function(item, newItem) item < newItem, 5)", Arrays.asList(BigDecimal.valueOf(5), BigDecimal.valueOf(5), BigDecimal.valueOf(7), BigDecimal.valueOf(8)), null}
         };
         return addAdditionalParameters(cases, false);
     }
diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/functions/ListReplaceFunctionTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/functions/ListReplaceFunctionTest.java
new file mode 100644
index 00000000000..ff85207cb06
--- /dev/null
+++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/functions/ListReplaceFunctionTest.java
@@ -0,0 +1,136 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.dmn.feel.runtime.functions;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.IntStream;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.kie.dmn.feel.runtime.events.InvalidParametersEvent;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.kie.dmn.feel.util.CompilerUtils.parseCompileEvaluate;
+
+public class ListReplaceFunctionTest {
+
+    private ListReplaceFunction listReplaceFunction;
+
+    @Before
+    public void setUp() {
+        listReplaceFunction = ListReplaceFunction.INSTANCE;
+    }
+
+    @Test
+    public void invokeListNull() {
+        FunctionTestUtil.assertResultError(listReplaceFunction.invoke(null, BigDecimal.ONE, ""), InvalidParametersEvent.class);
+    }
+
+    @Test
+    public void invokePositionNull() {
+        FunctionTestUtil.assertResultError(listReplaceFunction.invoke(new ArrayList(), (BigDecimal) null, ""), InvalidParametersEvent.class);
+    }
+
+    @Test
+    public void invokePositionInvalid() {
+        FunctionTestUtil.assertResultError(listReplaceFunction.invoke(Collections.emptyList(), BigDecimal.ONE, ""), InvalidParametersEvent.class);
+        List list = getList();
+        FunctionTestUtil.assertResultError(listReplaceFunction.invoke(list, BigDecimal.ZERO, ""), InvalidParametersEvent.class);
+        FunctionTestUtil.assertResultError(listReplaceFunction.invoke(list, BigDecimal.valueOf(4), ""), InvalidParametersEvent.class);
+    }
+
+    @Test
+    public void invokeReplaceByPositionWithNull() {
+        List list = getList();
+        List expected = new ArrayList<>(list);
+        expected.set(1, null);
+        FunctionTestUtil.assertResult(listReplaceFunction.invoke(list, BigDecimal.valueOf(2), null), expected);
+    }
+
+    @Test
+    public void invokeReplaceByNegativePositionWithNotNull() {
+        List list = getList();
+        List expected = new ArrayList<>(list);
+        expected.set(2, "test");
+        FunctionTestUtil.assertResult(listReplaceFunction.invoke(list, BigDecimal.valueOf(-1), "test"), expected);
+    }
+
+    @Test
+    public void invokeReplaceByNegativePositionWithNull() {
+        List list = getList();
+        List expected = new ArrayList<>(list);
+        expected.set(2, null);
+        FunctionTestUtil.assertResult(listReplaceFunction.invoke(list, BigDecimal.valueOf(-1), null), expected);
+    }
+
+    @Test
+    public void invokeReplaceByPositionWithNotNull() {
+        List list = getList();
+        List expected = new ArrayList<>(list);
+        expected.set(1, "test");
+        FunctionTestUtil.assertResult(listReplaceFunction.invoke(list, BigDecimal.valueOf(2), "test"), expected);
+    }
+
+
+    @Test
+    public void invokeMatchNull() {
+        FunctionTestUtil.assertResultError(listReplaceFunction.invoke(new ArrayList(), (AbstractCustomFEELFunction) null, ""), InvalidParametersEvent.class);
+    }
+
+    @Test
+    public void invokeMatchInvalid() {
+        List list = Arrays.asList(2, 4, 7, 8);
+        String validMatchFunction = "function(item, newItem) item + newItem";
+        Object expressionObject = parseCompileEvaluate(validMatchFunction);
+        assertThat(expressionObject).isInstanceOf(AbstractCustomFEELFunction.class);
+        FunctionTestUtil.assertResultError(listReplaceFunction.invoke(list, (AbstractCustomFEELFunction)expressionObject, 3), InvalidParametersEvent.class);
+    }
+
+    @Test
+    public void invokeReplaceByMatchWithNull() {
+        List list = getList();
+        List expected = new ArrayList<>(list);
+        expected.set(1, null);
+        String validMatchFunction = "function(item, newItem) item = \"Element-1\"";
+        Object expressionObject = parseCompileEvaluate(validMatchFunction);
+        assertThat(expressionObject).isInstanceOf(AbstractCustomFEELFunction.class);
+        FunctionTestUtil.assertResult(listReplaceFunction.invoke(list, (AbstractCustomFEELFunction)expressionObject, null), expected);
+    }
+
+    @Test
+    public void invokeReplaceByMatchWithNotNull() {
+        String validMatchFunction = "function(item, newItem) item < newItem";
+        Object expressionObject = parseCompileEvaluate(validMatchFunction);
+        assertThat(expressionObject).isInstanceOf(AbstractCustomFEELFunction.class);
+        List list = Arrays.asList(BigDecimal.valueOf(2), BigDecimal.valueOf(4), BigDecimal.valueOf(7), BigDecimal.valueOf(8));
+        List expected = new ArrayList<>(list);
+        expected.set(0, BigDecimal.valueOf(5));
+        expected.set(1, BigDecimal.valueOf(5));
+        FunctionTestUtil.assertResult(listReplaceFunction.invoke(list, (AbstractCustomFEELFunction)expressionObject, 5), expected);
+    }
+
+    private List getList() {
+        return IntStream.range(0, 3).mapToObj(i -> "Element-"+i).toList();
+    }
+
+}
\ No newline at end of file
diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/util/CompilerUtils.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/util/CompilerUtils.java
new file mode 100644
index 00000000000..df1b63559d0
--- /dev/null
+++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/util/CompilerUtils.java
@@ -0,0 +1,73 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.dmn.feel.util;
+
+import java.util.Collections;
+import java.util.Map;
+
+import com.github.javaparser.ast.expr.Expression;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.kie.dmn.feel.codegen.feel11.ASTCompilerVisitor;
+import org.kie.dmn.feel.codegen.feel11.CodegenTestUtil;
+import org.kie.dmn.feel.codegen.feel11.CompiledFEELExpression;
+import org.kie.dmn.feel.codegen.feel11.CompilerBytecodeLoader;
+import org.kie.dmn.feel.codegen.feel11.DirectCompilerResult;
+import org.kie.dmn.feel.lang.EvaluationContext;
+import org.kie.dmn.feel.lang.Type;
+import org.kie.dmn.feel.lang.ast.BaseNode;
+import org.kie.dmn.feel.parser.feel11.ASTBuilderVisitor;
+import org.kie.dmn.feel.parser.feel11.FEELParser;
+import org.kie.dmn.feel.parser.feel11.FEEL_1_1Parser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CompilerUtils {
+
+    public static final Logger LOG = LoggerFactory.getLogger(CompilerUtils.class);
+
+    public static Object parseCompileEvaluate(String feelLiteralExpression) {
+        CompiledFEELExpression compiledExpression = parse( feelLiteralExpression );
+        LOG.debug("{}", compiledExpression);
+
+        EvaluationContext emptyContext = CodegenTestUtil.newEmptyEvaluationContext();
+        Object result = compiledExpression.apply(emptyContext);
+        LOG.debug("{}", result);
+        return result;
+    }
+
+    public static CompiledFEELExpression parse(String input) {
+        return parse(input, Collections.emptyMap() );
+    }
+
+    public static CompiledFEELExpression parse(String input, Map inputTypes) {
+        FEEL_1_1Parser parser = FEELParser.parse(null, input, inputTypes, Collections.emptyMap(), Collections.emptyList(), Collections.emptyList(), null);
+
+        ParseTree tree = parser.compilation_unit();
+
+        ASTBuilderVisitor v = new ASTBuilderVisitor(inputTypes, null);
+        BaseNode node = v.visit(tree);
+        DirectCompilerResult directResult = node.accept(new ASTCompilerVisitor());
+
+        Expression expr = directResult.getExpression();
+        CompiledFEELExpression cu = new CompilerBytecodeLoader().makeFromJPExpression(input, expr, directResult.getFieldDeclarations());
+
+        return cu;
+    }
+
+}
\ No newline at end of file

From 9028fc5100bd324537e40bce776990163f75c5f0 Mon Sep 17 00:00:00 2001
From: Roberto Oliveira 
Date: Tue, 16 Jan 2024 16:22:09 +0100
Subject: [PATCH 29/29] [kie-drools#5653] Remove productized profile (#5654)

* remove modules from productized profile

* remove jandex workaround used to workaround Quarkus 2.13.x

Most of those changes were introduced as part of commit d15e51c7a9816eaa6755b1231f1a2924ab455bc0

* remove not used KieMeta class
---
 build-parent/pom.xml                          |  65 +------
 .../drools-persistence-jpa/pom.xml            |   2 +-
 .../drools-quarkus/pom.xml                    |   2 +-
 drools-quarkus-extension/pom.xml              |  27 +--
 drools-traits/pom.xml                         |   2 +-
 kie-dmn/kie-dmn-core/pom.xml                  |   2 +-
 kie-dmn/kie-dmn-feel/pom.xml                  |   2 +-
 kie-dmn/kie-dmn-model/pom.xml                 |   2 +-
 kie-dmn/pom.xml                               |  33 ++--
 kie-drl/kie-drl-implementations/pom.xml       |  16 +-
 kie-drl/pom.xml                               |  18 +-
 .../org/kie/internal/utils/kieMeta.properties |  21 ---
 .../java/org/kie/internal/utils/KieMeta.java  |  44 -----
 .../org/kie/internal/utils/KieMetaTest.java   |  32 ----
 pom.xml                                       | 165 ++++++------------
 15 files changed, 84 insertions(+), 349 deletions(-)
 delete mode 100644 kie-internal/src/main/filtered-resources/org/kie/internal/utils/kieMeta.properties
 delete mode 100644 kie-internal/src/main/java/org/kie/internal/utils/KieMeta.java
 delete mode 100644 kie-internal/src/test/java/org/kie/internal/utils/KieMetaTest.java

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index bd2c100298f..4ca61fe604d 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -156,9 +156,6 @@
     
     1.21
 
-    
-    false
-
     yyyyMMddHHmm
 
     
-    io.smallrye
-    ${jandex.group-id}
-
     
     3.3.0
     3.4.0
@@ -1198,7 +1190,7 @@
 
       
       
-        ${jandex.group-id}
+        io.smallrye
         jandex
         ${version.io.smallrye.jandex}
       
@@ -1840,9 +1832,9 @@
           1.0
         
         
-          ${jandex-maven-plugin.group-id}
+          io.smallrye
           jandex-maven-plugin
-          ${version.io.smallrye.jandex-maven-plugin}
+          ${version.io.smallrye.jandex}
         
         
           org.asciidoctor
@@ -2292,21 +2284,6 @@
         
       
     
-    
-      productizedProfile
-      
-        
-          productized
-        
-      
-      
-        true
-        org.jboss
-        2.4.3.Final
-        org.jboss.jandex
-        1.2.3
-      
-    
     
@@ -2546,42 +2523,6 @@
         
       
     
-    
-      default
-      
-        
-          !productized
-        
-      
-      
-        
-          
-            
-              org.apache.maven.plugins
-              maven-enforcer-plugin
-              
-                
-                
-                  ban-blacklisted-dependencies
-                  
-                    
-                      
-                        
-                        
-                          org.jboss:jandex 
-                          org.jboss.jandex:jandex-maven-plugin 
-                          
-                        
-                      
-                    
-                  
-                
-              
-            
-          
-        
-      
-    
   
 
 
diff --git a/drools-persistence/drools-persistence-jpa/pom.xml b/drools-persistence/drools-persistence-jpa/pom.xml
index b8ca48cc45a..2192238f8c4 100644
--- a/drools-persistence/drools-persistence-jpa/pom.xml
+++ b/drools-persistence/drools-persistence-jpa/pom.xml
@@ -178,7 +178,7 @@
       
     
     
-      ${jandex.group-id}
+      io.smallrye
       jandex
       test
     
diff --git a/drools-quarkus-extension/drools-quarkus/pom.xml b/drools-quarkus-extension/drools-quarkus/pom.xml
index fc40ab6777f..240bc88c395 100644
--- a/drools-quarkus-extension/drools-quarkus/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus/pom.xml
@@ -144,7 +144,7 @@
                 
             
             
-                ${jandex-maven-plugin.group-id}
+                io.smallrye
                 jandex-maven-plugin
             
         
diff --git a/drools-quarkus-extension/pom.xml b/drools-quarkus-extension/pom.xml
index ddb0533f432..832ba1ffe73 100644
--- a/drools-quarkus-extension/pom.xml
+++ b/drools-quarkus-extension/pom.xml
@@ -37,6 +37,13 @@
 
   
     drools-quarkus-util-deployment
+    drools-quarkus
+    drools-quarkus-deployment
+    drools-quarkus-integration-test
+    drools-quarkus-integration-test-hotreload
+    drools-quarkus-ruleunit-integration-test
+    drools-quarkus-quickstart-test
+    drools-quarkus-examples
   
 
   
@@ -51,24 +58,4 @@
     
   
 
-  
-    
-      default
-      
-        
-          !productized
-        
-      
-      
-        drools-quarkus
-        drools-quarkus-deployment
-        drools-quarkus-integration-test
-        drools-quarkus-integration-test-hotreload
-        drools-quarkus-ruleunit-integration-test
-        drools-quarkus-quickstart-test
-        drools-quarkus-examples
-      
-    
-  
-
 
\ No newline at end of file
diff --git a/drools-traits/pom.xml b/drools-traits/pom.xml
index 9386b4ff1b8..09f4e5a7875 100644
--- a/drools-traits/pom.xml
+++ b/drools-traits/pom.xml
@@ -174,7 +174,7 @@
       
     
     
-      ${jandex.group-id}
+      io.smallrye
       jandex
       test
     
diff --git a/kie-dmn/kie-dmn-core/pom.xml b/kie-dmn/kie-dmn-core/pom.xml
index b617fa75445..cd5b62edf9d 100644
--- a/kie-dmn/kie-dmn-core/pom.xml
+++ b/kie-dmn/kie-dmn-core/pom.xml
@@ -180,7 +180,7 @@
       test
     
     
-      ${jandex.group-id}
+      io.smallrye
       jandex
       test
     
diff --git a/kie-dmn/kie-dmn-feel/pom.xml b/kie-dmn/kie-dmn-feel/pom.xml
index 6648b65ba52..19e72a32d2e 100644
--- a/kie-dmn/kie-dmn-feel/pom.xml
+++ b/kie-dmn/kie-dmn-feel/pom.xml
@@ -112,7 +112,7 @@
       test
     
     
-      ${jandex.group-id}
+      io.smallrye
       jandex
       test
     
diff --git a/kie-dmn/kie-dmn-model/pom.xml b/kie-dmn/kie-dmn-model/pom.xml
index b100d06055a..04915150eb6 100644
--- a/kie-dmn/kie-dmn-model/pom.xml
+++ b/kie-dmn/kie-dmn-model/pom.xml
@@ -71,7 +71,7 @@
       test
     
     
-      ${jandex.group-id}
+      io.smallrye
       jandex
       test
     
diff --git a/kie-dmn/pom.xml b/kie-dmn/pom.xml
index 641934c6efe..bcab3a39dd5 100644
--- a/kie-dmn/pom.xml
+++ b/kie-dmn/pom.xml
@@ -44,6 +44,16 @@
     kie-dmn-backend
     kie-dmn-validation-bootstrap
     kie-dmn-validation
+    kie-dmn-openapi
+    kie-dmn-tck
+    kie-dmn-legacy-tests
+    kie-dmn-trisotech
+    kie-dmn-signavio
+    kie-dmn-pmml-tests-parent
+    kie-dmn-xls2dmn-cli
+    kie-dmn-core-jsr223-jq
+    kie-dmn-core-jsr223
+    kie-dmn-ruleset2dmn-parent
   
 
   
@@ -58,27 +68,4 @@
     
   
 
-  
-    
-      default
-      
-        
-          !productized
-        
-      
-      
-        kie-dmn-openapi
-        kie-dmn-tck
-        kie-dmn-legacy-tests
-        kie-dmn-trisotech
-        kie-dmn-signavio
-        kie-dmn-pmml-tests-parent
-        kie-dmn-xls2dmn-cli
-        kie-dmn-core-jsr223-jq
-        kie-dmn-core-jsr223
-        kie-dmn-ruleset2dmn-parent
-      
-    
-  
-
 
diff --git a/kie-drl/kie-drl-implementations/pom.xml b/kie-drl/kie-drl-implementations/pom.xml
index e2cbbde632b..8c0ced49dfd 100644
--- a/kie-drl/kie-drl-implementations/pom.xml
+++ b/kie-drl/kie-drl-implementations/pom.xml
@@ -38,21 +38,7 @@
 
     
         kie-drl-map-input
+        kie-drl-kiesession-local
     
 
-    
-        
-        default
-        
-            
-            !productized
-            
-        
-        
-            kie-drl-kiesession-local
-        
-        
-    
-
-    
 
\ No newline at end of file
diff --git a/kie-drl/pom.xml b/kie-drl/pom.xml
index 9a41c500675..9b671bc1e77 100644
--- a/kie-drl/pom.xml
+++ b/kie-drl/pom.xml
@@ -42,6 +42,8 @@
     kie-drl-compilation-common
     kie-drl-implementations
     kie-drl-runtime-common
+    kie-drl-tests
+    kie-drl-tests-without-index-file
   
 
   
@@ -122,21 +124,5 @@
       test
     
   
-
-  
-    
-      default
-      
-        
-          !productized
-        
-      
-      
-        kie-drl-tests
-        kie-drl-tests-without-index-file
-      
-    
-  
-
 
 
diff --git a/kie-internal/src/main/filtered-resources/org/kie/internal/utils/kieMeta.properties b/kie-internal/src/main/filtered-resources/org/kie/internal/utils/kieMeta.properties
deleted file mode 100644
index 2f9c57eab26..00000000000
--- a/kie-internal/src/main/filtered-resources/org/kie/internal/utils/kieMeta.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# There is a productizedProfile that is enabled if -Dproductized is specified on the command line
-productized=${org.kie.productized}
diff --git a/kie-internal/src/main/java/org/kie/internal/utils/KieMeta.java b/kie-internal/src/main/java/org/kie/internal/utils/KieMeta.java
deleted file mode 100644
index de99bf10441..00000000000
--- a/kie-internal/src/main/java/org/kie/internal/utils/KieMeta.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.kie.internal.utils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-public class KieMeta {
-
-    private final static boolean productized;
-
-    static {
-        Properties properties = new Properties();
-        try {
-            InputStream in = KieMeta.class.getResourceAsStream("kieMeta.properties");
-            properties.load(in);
-        } catch (IOException e) {
-            throw new IllegalStateException("The classpath file kieMeta.properties is missing.");
-        }
-        productized = Boolean.valueOf(properties.getProperty("productized"));
-    }
-
-    public static boolean isProductized() {
-        return productized;
-    }
-
-}
diff --git a/kie-internal/src/test/java/org/kie/internal/utils/KieMetaTest.java b/kie-internal/src/test/java/org/kie/internal/utils/KieMetaTest.java
deleted file mode 100644
index 6e3c6938ee6..00000000000
--- a/kie-internal/src/test/java/org/kie/internal/utils/KieMetaTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.kie.internal.utils;
-
-import org.junit.Test;
-
-public class KieMetaTest {
-
-    @Test
-    public void isProductized() {
-        // Check if the class static constructor behaves correctly.
-        // Both return types are valid (otherwise we break productized tests)
-        KieMeta.isProductized();
-    }
-
-}
diff --git a/pom.xml b/pom.xml
index 0452164ca74..581c84bf958 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,69 +160,62 @@
     
   
 
+  
+    bom
+    build-parent
+    kie-api
+    kie-internal
+    kie-util
+    kie-memory-compiler
+    drools-ruleunits
+    drools-wiring
+    kie-test-util
+    drools-util
+    drools-io
+    drools-core
+    drools-base
+    drools-commands
+    drools-kiesession
+    drools-ecj
+    drools-drl
+    drools-compiler
+    drools-mvel
+    drools-xml-support
+    drools-legacy-test-util
+    drools-tms
+    drools-beliefs
+    drools-serialization-protobuf
+    drools-traits
+    drools-verifier
+    drools-persistence
+    drools-templates
+    drools-decisiontables
+    drools-examples
+    kie-ci
+    drools-model
+    drools-examples-api
+    drools-test-coverage
+    drools-scenario-simulation
+    drools-metric
+    drools-alphanetwork-compiler
+    drools-engine
+    drools-engine-classic
+    drools-impact-analysis
+    drools-retediagram
+    drools-fastutil
+    efesto
+    kie-drl
+    kie-dmn
+    kie-pmml-trusty
+    kie-maven-plugin
+    kie-archetypes
+    drools-quarkus-extension
+    jpmml-migration-recipe
+    drools-reliability
+    drools-drlonyaml-parent
+  
+
   
-    
-      default
-      
-        
-          !productized
-        
-      
-      
-        bom
-        build-parent
-        kie-api
-        kie-internal
-        kie-util
-        kie-memory-compiler
-        drools-ruleunits
-        drools-wiring
-        kie-test-util
-        drools-util
-        drools-io
-        drools-core
-        drools-base
-        drools-commands
-        drools-kiesession
-        drools-ecj
-        drools-drl
-        drools-compiler
-        drools-mvel
-        drools-xml-support
-        drools-legacy-test-util
-        drools-tms
-        drools-beliefs
-        drools-serialization-protobuf
-        drools-traits
-        drools-verifier
-        drools-persistence
-        drools-templates
-        drools-decisiontables
-        drools-examples
-        kie-ci
-        drools-model
-        drools-examples-api
-        drools-test-coverage
-        drools-scenario-simulation
-        drools-metric
-        drools-alphanetwork-compiler
-        drools-engine
-        drools-engine-classic
-        drools-impact-analysis
-        drools-retediagram
-        drools-fastutil
-        efesto
-        kie-drl
-        kie-dmn
-        kie-pmml-trusty
-        kie-maven-plugin
-        kie-archetypes
-        drools-quarkus-extension
-        jpmml-migration-recipe
-        drools-reliability
-        drools-drlonyaml-parent
-      
-    
     
       fullProfile
       
@@ -267,54 +260,6 @@
         
       
     
-    
-      productized
-      
-        
-          productized
-        
-      
-      
-        bom
-        build-parent
-        kie-api
-        kie-util
-        kie-memory-compiler
-        kie-ci
-        efesto
-        drools-util
-        drools-io
-        drools-serialization-protobuf
-        drools-legacy-test-util
-        drools-commands
-        drools-wiring
-        drools-model
-        drools-ruleunits
-        drools-core
-        drools-base
-        drools-compiler
-        drools-mvel
-        drools-kiesession
-        drools-xml-support
-        drools-tms
-        drools-ecj
-        drools-drl-ast
-        drools-drl-parser
-        drools-drl-extensions
-        drools-templates
-        drools-decisiontables
-        drools-alphanetwork-compiler
-        drools-engine
-        drools-engine-classic
-        kie-dmn
-        kie-drl
-        kie-pmml-trusty
-        kie-internal
-        kie-test-util
-        drools-quarkus-extension
-        drools-reliability
-      
-