From 32546ec93fe064db7852febb5d6384b6bd6049b8 Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Wed, 17 Jan 2024 21:34:51 -0500 Subject: [PATCH] [Quarkus 3] Updated rewrite data --- .../quarkus-3/patches/0001_before_sh.patch | 6845 +---------------- .ci/environments/quarkus-3/quarkus3.yml | 12 +- 2 files changed, 58 insertions(+), 6799 deletions(-) diff --git a/.ci/environments/quarkus-3/patches/0001_before_sh.patch b/.ci/environments/quarkus-3/patches/0001_before_sh.patch index 5aee00ec142..42b24a6a4e1 100644 --- a/.ci/environments/quarkus-3/patches/0001_before_sh.patch +++ b/.ci/environments/quarkus-3/patches/0001_before_sh.patch @@ -1,10 +1,17 @@ diff --git a/build-parent/pom.xml b/build-parent/pom.xml -index ef2b4a4197..1379477ada 100644 +index 4ca61fe604..3bb7e3358e 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml -@@ -60,22 +60,22 @@ +@@ -55,27 +55,27 @@ + - Version properties must be sorted alphabetically (other form of sorting were found to be unclear and ambiguous). + --> + 1.2.13 +- 1.16.0 ++ 1.15 + 3.2.2 1.1.1 - 2.11.0 +- 2.13.0 ++ 2.11.0 1.10.0 - 2.15.2 - 2.15.2 @@ -22,89 +29,54 @@ index ef2b4a4197..1379477ada 100644 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 ++ 4.7.1 + 1.10.5 + 3.0.0.Final + 3.3.2 8.5.11 4.13.1 1.8.0 -@@ -88,42 +88,42 @@ - 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 +@@ -98,17 +98,17 @@ + 4.0.4 1.3 -- 5.6.12.Final +- 6.2.13.Final + 6.2.0.Final 2.3.0 14.0.13.Final 3.26.0-GA -- 5.13.1.Final +- 6.0.1.Final + 6.0.0.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 + 3.0.2 -+ 4.0.1 + 4.0.1 +- 2.0.1 +- 2.1.2 + 2.0.0 + 2.1.1 -+ 2.0.1 -+ 2.1.1 + 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 -+ 2.0.1 -+ 3.1.0 -+ 4.0.1 -+ 3.1.0 -+ 6.0.0 -+ 4.0.0 -+ 3.0.0 +@@ -121,10 +121,10 @@ + 6.0.0 + 4.0.0 + 3.0.0 +- 1.1.2 +- 2.1.2 + 1.1.1 + 2.1.1 -+ 1.6.4 - 5.9.2 - 2.5.0.Final + 1.6.4 +- 5.9.3 ++ 5.9.2 + 2.5.1.Final 2.0.7 -@@ -138,7 +138,7 @@ - - - -- 4.13.0 -+ 4.10.1 - 3.13.0 - 4.15.0.Final - 1.1.0 + 1.7.30 @@ -152,7 +152,7 @@ 2.2.0 1.5.0 @@ -114,12 +86,8 @@ index ef2b4a4197..1379477ada 100644 1.21 -@@ -171,10 +171,10 @@ - 2.22.1 - - 3.6.4 -- 3.6.0 -+ 3.7.1 +@@ -171,7 +171,7 @@ + 3.7.1 0.9.1 3.3.4 - 1.24.0 @@ -127,6747 +95,38 @@ index ef2b4a4197..1379477ada 100644 1.3 -@@ -202,16 +202,16 @@ +@@ -197,17 +197,17 @@ + 3.8.1 + 3.3.0 - 1.12.18 +- 1.14.7 ++ 1.12.18 -- 42.5.4 -+ 42.6.0 + 42.6.0 2.0.1 - 3.0.5 - ${version.io.smallrye.jandex} -- 1.0.11 + 3.1.2 +- 3.0.3 + 3.0.2 -- 3.24.2 +- 3.25.3 + 3.25.1 -- 32.0.1-jre +- 32.0.0-jre + 31.1-jre -@@ -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.2 - - - 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 - - -diff --git a/drools-base/pom.xml b/drools-base/pom.xml -index 68468e2a45..a6dd884113 100644 ---- a/drools-base/pom.xml -+++ b/drools-base/pom.xml -@@ -83,9 +83,10 @@ - provided - - -- com.sun.xml.bind -- jaxb-impl -+ org.glassfish.jaxb -+ jaxb-runtime - provided -+ 4.0.4 - - - jakarta.xml.bind -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 5fc6fea50e..55f012280b 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 2ef2899704..102e011254 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.HashSet; - 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 3731c9cedf..fab61b1b75 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 0086b7b657..413d2595b4 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.LinkedHashMap; - 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 4eed12a05b..3d76ab5f2a 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 cdbd169168..0b95499a29 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 176f5a6e0f..3c28fa5670 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; - 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 6406f23fe1..b243b5191a 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 38df33a7f8..56276dd5c5 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 4970214a04..e11edabef1 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 @@ package org.drools.commands.runtime; - - 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 be75a9796a..62154e0afb 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 7bd405dc16..4b3b07309e 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.io.Serializable; - 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 0056413ec4..7d4be781ab 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 @@ package org.drools.commands.runtime; - 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 d853414697..997333593a 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.HashSet; - 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 cab731bc8f..29063bbc69 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 27b4865b69..71c9b28373 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 983a6bcfce..c0972f2fa8 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 032e7b4eb9..87b0b3d821 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 458b82e164..c78c199adc 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 b89d48c644..bb4631870b 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 986a392085..21c5b0b9f5 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 45487d20b1..0afdc97077 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 @@ package org.drools.commands.runtime.pmml; - 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 b198432940..e08edd6530 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 8a1acc9175..20617cda7a 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 5f063d2cc9..5e770ecfc0 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 @@ package org.drools.commands.runtime.process; - 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 28df02f2bd..088a6dce46 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 @@ package org.drools.commands.runtime.process; - 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 4b6249c07d..aea9aa29d9 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 @@ package org.drools.commands.runtime.process; - 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 718504c30e..1d96fd6fdc 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 f3b25ddfe7..fc1c8196b9 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 @@ package org.drools.commands.runtime.process; - - 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 57e4771a89..7cc196e4b4 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 04359a2174..116b6c8a36 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 81eea32909..32c6e91af2 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 @@ package org.drools.commands.runtime.process; - - 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 cdebb4536e..8edc6eb7bd 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 52d3faf9f5..e13dad8421 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 @@ package org.drools.commands.runtime.process; - 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 3e56206305..33bf5f1239 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 f1092a1f36..a98b83314f 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 @@ package org.drools.commands.runtime.process; - 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 efa4b6c9b9..d30993a3e8 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 853bdf5626..96d113d426 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 @@ package org.drools.commands.runtime.process; - 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 927298a7c2..b5867b5636 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 f96051e049..37140e853b 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 @@ package org.drools.commands.runtime.process; - 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 7d60ff3ab8..2aa2fa1fe5 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 @@ package org.drools.commands.runtime.process; - 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 69cd161651..99f96c11b9 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 @@ package org.drools.commands.runtime.process; - - 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 5a7239447d..24598b5605 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 cc8d5328e9..0ada06b0a7 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 0a3ac21740..ab62bd194a 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 7fa3ec0720..c75db60817 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 59ff66b145..f894f9ca16 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 75aa16956d..3c3b31461c 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 e7b813a991..2671b4521d 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 dbdb2275b5..c93c83b1c8 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 6e2d286e42..88f585b200 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 812fc30baf..5055346beb 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 4d41b24de6..6ed31da31d 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 bc4545d39b..d4fb71df07 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 d138313dcb..787878bf6d 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 55b5fa7ecb..6c0b549a26 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 d0667678ea..4f6cb06d74 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 @@ package org.drools.commands.runtime.rule; - - 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 4e3f871dc9..05b34f4423 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 419e108ba3..cddfbf37d2 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 8507d5836e..9b4373b2f0 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 @@ package org.drools.commands.runtime.rule; - - 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 0c42b31768..a9e78c4bd0 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 bcead60ab8..09429c6000 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 5f0df58eae..41214fcccf 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 @@ package org.drools.commands.runtime.rule; - 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 fdd9184caf..add47b6171 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 @@ package org.drools.commands.runtime.rule; - 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 d310d5b770..f7d42e08bc 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 @@ package org.drools.commands.runtime.rule; - 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 f6712f538d..40c21a187f 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 682f17534a..bf0226eb34 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 19eb642aed..d437e09b76 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 @@ package org.drools.commands.runtime.rule; - 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 43dc943295..e58a43fe69 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 f1393f83aa..888d0bf5af 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 @@ package org.drools.commands.runtime.rule; - 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 59e46cce81..d14df73251 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 @@ package org.drools.commands.runtime.rule; - - 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 752e90bb27..ab29649f32 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 @@ package org.drools.commands.runtime.rule; - - 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 2e6f8099db..b875115625 100644 ---- a/drools-compiler/pom.xml -+++ b/drools-compiler/pom.xml -@@ -129,9 +129,10 @@ - provided - - -- com.sun.xml.bind -- jaxb-impl -+ org.glassfish.jaxb -+ jaxb-runtime - provided -+ 4.0.4 - - - jakarta.xml.bind -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 6b8db5a093..60be4ac0b6 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.List; - 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 42092de797..59973acc7d 100644 ---- a/drools-core/pom.xml -+++ b/drools-core/pom.xml -@@ -96,9 +96,10 @@ - provided - - -- com.sun.xml.bind -- jaxb-impl -+ org.glassfish.jaxb -+ jaxb-runtime - provided -+ 4.0.4 - - - jakarta.xml.bind -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 1dbb032c7e..8330b82548 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 9301d93da1..09535a5ce9 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 @@ package org.drools.core.base; - - 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 50ea110d72..3f838d1258 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 @@ package org.drools.core.base; - - 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 398651d824..aa7388b8e7 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 @@ package org.drools.core.base; - - 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 55a226bd99..8512f85eac 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.io.Serializable; - 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 285b260267..8b9c211c9e 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 @@ package org.drools.core.base; - - 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 649d119b36..3e5cd249ec 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.Consumer; - 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 f3b76bf144..4eae2aafa3 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.io.ObjectOutput; - 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 d3c1b5d3e7..52799274d7 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 97be135e6f..04f6eef60d 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.Arrays; - 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 e37c37fc31..a9aec456b6 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-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 64eb8809ad..dc8e7e8d69 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 @@ package org.drools.mvel.compiler; - - 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-mvel/pom.xml b/drools-mvel/pom.xml -index 32920b00fc..e91bd9e3d5 100644 ---- a/drools-mvel/pom.xml -+++ b/drools-mvel/pom.xml -@@ -90,9 +90,10 @@ - provided - - -- com.sun.xml.bind -- jaxb-impl -+ org.glassfish.jaxb -+ jaxb-runtime - provided -+ 4.0.4 - - - jakarta.xml.bind -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 13641acfe0..a1b4bda3fb 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 @@ package org.drools.mvel.compiler; - - 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 c5b6465541..2dbe9a78a9 100644 ---- a/drools-persistence/drools-persistence-api/pom.xml -+++ b/drools-persistence/drools-persistence-api/pom.xml -@@ -61,9 +61,10 @@ - drools-commands - - -- com.sun.xml.bind -- jaxb-impl -+ org.glassfish.jaxb -+ jaxb-runtime - provided -+ 4.0.4 - - - com.sun.xml.bind -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 1037ab3c35..5a20fa88f6 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.runtime.ExecutableRunner; - 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 647c178f2b..74654794cf 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 967365339f..8f08330a74 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.HashMap; - 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; -@@ -72,7 +72,7 @@ public class JtaTransactionManager - - UserTransaction ut; - Object tsr; -- javax.transaction.TransactionManager tm; -+ jakarta.transaction.TransactionManager tm; - - public JtaTransactionManager(Object ut, - Object tsr, -@@ -83,20 +83,20 @@ public class JtaTransactionManager - 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 @@ public class JtaTransactionManager - 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 @@ public class JtaTransactionManager - } - - protected Object findTransactionSynchronizationRegistry(UserTransaction ut, -- javax.transaction.TransactionManager tm) { -+ jakarta.transaction.TransactionManager tm) { - - if ( transactionSynchronizationRegistryClass == null ) { - // JTA 1.1 API not present - skip. -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 e7c3b5eb52..e99fe58afd 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 class JtaTransactionManagerFactory extends TransactionManagerFactory { - } - - /** -- * 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 fa387cd3a4..79247df16e 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 7673604692..e1dc0b573f 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 @@ package org.drools.persistence.jta; - 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 7706d4c655..2137f38925 100644 ---- a/drools-persistence/drools-persistence-jpa/pom.xml -+++ b/drools-persistence/drools-persistence-jpa/pom.xml -@@ -123,9 +123,10 @@ - drools-mvel - - -- com.sun.xml.bind -- jaxb-impl -+ org.glassfish.jaxb -+ jaxb-runtime - provided -+ 4.0.4 - - - com.sun.xml.bind -@@ -167,13 +168,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 82114ee564..71bc7749ff 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 ec5069ad65..54fd6cc38a 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 @@ package org.drools.persistence.info; - - 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 3db72569d3..ce26c9d2f8 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.ByteArrayOutputStream; - 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 0e2bf94fd7..415ce0724c 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 08c24f246f..4ae16e7ed5 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 @@ package org.drools.persistence.jpa; - - 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 2663169c07..7dc6f58be9 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 ec5e1d68a5..9148566757 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.kie.api.runtime.RequestContext; - 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 31c97addfb..80544087bd 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 @@ package org.drools.persistence.jpa.marshaller; - 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 9e4b4469f6..98c9a5b745 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.io.Serializable; - 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 5448b4c2eb..7f9072b9fc 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 1cbe51e322..abc061e965 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 @@ package org.drools.persistence.jpa.marshaller; - 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 36800ba01f..845fcc9f72 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 137814bbcf..d8d57b2d3c 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 @@ package org.drools.persistence.jta; - - 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 399a743730..449fc7759a 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.HashMap; - 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 973d928459..42df2e5504 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 b06c96053c..c9930291c8 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 @@ package org.drools.persistence.jta; - - 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 0f5b11a2b2..0863d2fdfa 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.Properties; - 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 6a001acc5c..730575a1a4 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.kie.internal.persistence.jpa.JPAKnowledgeService; - 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 d7e3a61ae4..f61559f90b 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.concurrent.atomic.AtomicInteger; - 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 67d4e42d62..b49aff7838 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.Arrays; - 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 563b210269..a61ec15cbe 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.GLOBALS; - 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-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 1ac349f63e..51aa2e792b 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.kie.api.io.Resource; - 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/src/test/java/org/drools/quarkus/ruleunit/examples/multiunit/RuntimeTest.java b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/src/test/java/org/drools/quarkus/ruleunit/examples/multiunit/RuntimeTest.java -index 532ee58bf1..4122df9325 100644 ---- a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/src/test/java/org/drools/quarkus/ruleunit/examples/multiunit/RuntimeTest.java -+++ b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/src/test/java/org/drools/quarkus/ruleunit/examples/multiunit/RuntimeTest.java -@@ -19,7 +19,7 @@ - package org.drools.quarkus.ruleunit.examples.multiunit; - - import java.util.concurrent.atomic.AtomicReference; --import javax.inject.Inject; -+import jakarta.inject.Inject; - - import io.quarkus.test.junit.QuarkusTest; - import org.drools.ruleunits.api.DataHandle; -diff --git a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/main/java/org/drools/quarkus/ruleunit/examples/reactive/Adaptor.java b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/main/java/org/drools/quarkus/ruleunit/examples/reactive/Adaptor.java -index ff8e3f9091..799f21622a 100644 ---- a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/main/java/org/drools/quarkus/ruleunit/examples/reactive/Adaptor.java -+++ b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/main/java/org/drools/quarkus/ruleunit/examples/reactive/Adaptor.java -@@ -18,10 +18,10 @@ - */ - package org.drools.quarkus.ruleunit.examples.reactive; - --import javax.annotation.PostConstruct; --import javax.enterprise.context.ApplicationScoped; --import javax.inject.Inject; -+import jakarta.enterprise.context.ApplicationScoped; -+import jakarta.inject.Inject; - -+import jakarta.annotation.PostConstruct; - import org.eclipse.microprofile.reactive.messaging.Channel; - import org.eclipse.microprofile.reactive.messaging.Emitter; - import org.eclipse.microprofile.reactive.messaging.Incoming; -diff --git a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/test/java/org/drools/quarkus/ruleunit/examples/reactive/KafkaTestResourceLifecycleManager.java b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/test/java/org/drools/quarkus/ruleunit/examples/reactive/KafkaTestResourceLifecycleManager.java -index bbed58452e..da927c5ab0 100644 ---- a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/test/java/org/drools/quarkus/ruleunit/examples/reactive/KafkaTestResourceLifecycleManager.java -+++ b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/test/java/org/drools/quarkus/ruleunit/examples/reactive/KafkaTestResourceLifecycleManager.java -@@ -22,7 +22,7 @@ import java.util.HashMap; - import java.util.Map; - - import io.quarkus.test.common.QuarkusTestResourceLifecycleManager; --import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector; -+import io.smallrye.reactive.messaging.memory.InMemoryConnector; - - public class KafkaTestResourceLifecycleManager implements QuarkusTestResourceLifecycleManager { - -diff --git a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/test/java/org/drools/quarkus/ruleunit/examples/reactive/RuntimeTest.java b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/test/java/org/drools/quarkus/ruleunit/examples/reactive/RuntimeTest.java -index 52f998f55f..9771b03d80 100644 ---- a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/test/java/org/drools/quarkus/ruleunit/examples/reactive/RuntimeTest.java -+++ b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/test/java/org/drools/quarkus/ruleunit/examples/reactive/RuntimeTest.java -@@ -18,13 +18,13 @@ - */ - package org.drools.quarkus.ruleunit.examples.reactive; - --import javax.inject.Inject; -+import jakarta.inject.Inject; - - import io.quarkus.test.common.QuarkusTestResource; - import io.quarkus.test.junit.QuarkusTest; --import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector; --import io.smallrye.reactive.messaging.providers.connectors.InMemorySink; --import io.smallrye.reactive.messaging.providers.connectors.InMemorySource; -+import io.smallrye.reactive.messaging.memory.InMemoryConnector; -+import io.smallrye.reactive.messaging.memory.InMemorySink; -+import io.smallrye.reactive.messaging.memory.InMemorySource; - import org.eclipse.microprofile.reactive.messaging.spi.Connector; - import org.junit.jupiter.api.Test; - -diff --git a/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/src/main/java/org/drools/quarkus/test/hotreload/FindAdultEndpoint.java b/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/src/main/java/org/drools/quarkus/test/hotreload/FindAdultEndpoint.java -index 28cd4eb6d1..8cea5670cf 100644 ---- a/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/src/main/java/org/drools/quarkus/test/hotreload/FindAdultEndpoint.java -+++ b/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/src/main/java/org/drools/quarkus/test/hotreload/FindAdultEndpoint.java -@@ -20,12 +20,12 @@ package org.drools.quarkus.test.hotreload; - - import java.util.ArrayList; - import java.util.List; --import javax.inject.Inject; --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.inject.Inject; -+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.kie.api.runtime.KieRuntimeBuilder; - import org.kie.api.runtime.KieSession; -diff --git a/drools-quarkus-extension/drools-quarkus-integration-test/src/main/java/org/drools/quarkus/test/TestableResource.java b/drools-quarkus-extension/drools-quarkus-integration-test/src/main/java/org/drools/quarkus/test/TestableResource.java -index 9cb7dd190f..a7f5aad7fe 100644 ---- a/drools-quarkus-extension/drools-quarkus-integration-test/src/main/java/org/drools/quarkus/test/TestableResource.java -+++ b/drools-quarkus-extension/drools-quarkus-integration-test/src/main/java/org/drools/quarkus/test/TestableResource.java -@@ -23,10 +23,10 @@ import java.util.List; - import java.util.concurrent.TimeUnit; - import java.util.stream.Collectors; - --import javax.inject.Inject; --import javax.ws.rs.GET; --import javax.ws.rs.Path; --import javax.ws.rs.core.Response; -+import jakarta.inject.Inject; -+import jakarta.ws.rs.GET; -+import jakarta.ws.rs.Path; -+import jakarta.ws.rs.core.Response; - - import org.kie.api.KieBase; - import org.kie.api.definition.KiePackage; -diff --git a/drools-quarkus-extension/drools-quarkus-integration-test/src/test/java/org/drools/quarkus/test/RuntimeTest.java b/drools-quarkus-extension/drools-quarkus-integration-test/src/test/java/org/drools/quarkus/test/RuntimeTest.java -index 602a4064d0..1213dab026 100644 ---- a/drools-quarkus-extension/drools-quarkus-integration-test/src/test/java/org/drools/quarkus/test/RuntimeTest.java -+++ b/drools-quarkus-extension/drools-quarkus-integration-test/src/test/java/org/drools/quarkus/test/RuntimeTest.java -@@ -21,7 +21,7 @@ package org.drools.quarkus.test; - import java.util.List; - import java.util.stream.Collectors; - --import javax.inject.Inject; -+import jakarta.inject.Inject; - - import io.quarkus.test.junit.QuarkusTest; - import org.junit.jupiter.api.Test; -diff --git a/drools-quarkus-extension/drools-quarkus-quickstart-test/src/main/java/org/drools/quarkus/quickstart/test/HomeAlertsBean.java b/drools-quarkus-extension/drools-quarkus-quickstart-test/src/main/java/org/drools/quarkus/quickstart/test/HomeAlertsBean.java -index a58bbabd5c..8f8ecf910c 100644 ---- a/drools-quarkus-extension/drools-quarkus-quickstart-test/src/main/java/org/drools/quarkus/quickstart/test/HomeAlertsBean.java -+++ b/drools-quarkus-extension/drools-quarkus-quickstart-test/src/main/java/org/drools/quarkus/quickstart/test/HomeAlertsBean.java -@@ -21,8 +21,8 @@ package org.drools.quarkus.quickstart.test; - import java.util.Collection; - import java.util.stream.Collectors; - --import javax.enterprise.context.ApplicationScoped; --import javax.inject.Inject; -+import jakarta.enterprise.context.ApplicationScoped; -+import jakarta.inject.Inject; - - import org.drools.quarkus.quickstart.test.model.Alert; - import org.drools.quarkus.quickstart.test.model.CCTV; -diff --git a/drools-quarkus-extension/drools-quarkus-quickstart-test/src/test/java/org/drools/quarkus/quickstart/test/BeanTest.java b/drools-quarkus-extension/drools-quarkus-quickstart-test/src/test/java/org/drools/quarkus/quickstart/test/BeanTest.java -index 4896b42524..0aa6285eb0 100644 ---- a/drools-quarkus-extension/drools-quarkus-quickstart-test/src/test/java/org/drools/quarkus/quickstart/test/BeanTest.java -+++ b/drools-quarkus-extension/drools-quarkus-quickstart-test/src/test/java/org/drools/quarkus/quickstart/test/BeanTest.java -@@ -18,7 +18,7 @@ - */ - package org.drools.quarkus.quickstart.test; - --import javax.inject.Inject; -+import jakarta.inject.Inject; - - import io.quarkus.test.junit.QuarkusTest; - -diff --git a/drools-quarkus-extension/drools-quarkus-quickstart-test/src/test/java/org/drools/quarkus/quickstart/test/RuntimeIT.java b/drools-quarkus-extension/drools-quarkus-quickstart-test/src/test/java/org/drools/quarkus/quickstart/test/RuntimeIT.java -index 6bcc7afc17..21ce175faa 100644 ---- a/drools-quarkus-extension/drools-quarkus-quickstart-test/src/test/java/org/drools/quarkus/quickstart/test/RuntimeIT.java -+++ b/drools-quarkus-extension/drools-quarkus-quickstart-test/src/test/java/org/drools/quarkus/quickstart/test/RuntimeIT.java -@@ -18,7 +18,7 @@ - */ - package org.drools.quarkus.quickstart.test; - --import javax.inject.Inject; -+import jakarta.inject.Inject; - - import io.quarkus.test.junit.QuarkusTest; - import org.drools.quarkus.quickstart.test.model.Alert; -diff --git a/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/src/main/java/org/drools/quarkus/ruleunit/test/TestableResource.java b/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/src/main/java/org/drools/quarkus/ruleunit/test/TestableResource.java -index 471c3c33a9..99e2c9da1b 100644 ---- a/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/src/main/java/org/drools/quarkus/ruleunit/test/TestableResource.java -+++ b/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/src/main/java/org/drools/quarkus/ruleunit/test/TestableResource.java -@@ -20,10 +20,10 @@ package org.drools.quarkus.ruleunit.test; - - import static org.assertj.core.api.Assertions.assertThat; - --import javax.inject.Inject; --import javax.ws.rs.GET; --import javax.ws.rs.Path; --import javax.ws.rs.core.Response; -+import jakarta.inject.Inject; -+import jakarta.ws.rs.GET; -+import jakarta.ws.rs.Path; -+import jakarta.ws.rs.core.Response; - - import org.drools.ruleunits.api.RuleUnit; - import org.drools.ruleunits.api.RuleUnitInstance; -diff --git a/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/src/test/java/org/drools/quarkus/ruleunit/test/RuntimeDslRuleUnitTest.java b/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/src/test/java/org/drools/quarkus/ruleunit/test/RuntimeDslRuleUnitTest.java -index e3b9d48e5a..ba13c358f3 100644 ---- a/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/src/test/java/org/drools/quarkus/ruleunit/test/RuntimeDslRuleUnitTest.java -+++ b/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/src/test/java/org/drools/quarkus/ruleunit/test/RuntimeDslRuleUnitTest.java -@@ -23,7 +23,7 @@ import org.drools.ruleunits.api.RuleUnit; - import org.drools.ruleunits.api.RuleUnitInstance; - import org.junit.jupiter.api.Test; - --import javax.inject.Inject; -+import jakarta.inject.Inject; - - import static org.assertj.core.api.Assertions.assertThat; - -diff --git a/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/src/test/java/org/drools/quarkus/ruleunit/test/RuntimeTest.java b/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/src/test/java/org/drools/quarkus/ruleunit/test/RuntimeTest.java -index 48aaf17201..873e112e29 100644 ---- a/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/src/test/java/org/drools/quarkus/ruleunit/test/RuntimeTest.java -+++ b/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/src/test/java/org/drools/quarkus/ruleunit/test/RuntimeTest.java -@@ -23,7 +23,7 @@ import org.drools.ruleunits.api.RuleUnit; - import org.drools.ruleunits.api.RuleUnitInstance; - import org.junit.jupiter.api.Test; - --import javax.inject.Inject; -+import jakarta.inject.Inject; - - import static org.junit.jupiter.api.Assertions.assertEquals; - -diff --git a/drools-quarkus-extension/drools-quarkus/pom.xml b/drools-quarkus-extension/drools-quarkus/pom.xml -index a7691b98b5..43896cb6db 100644 ---- a/drools-quarkus-extension/drools-quarkus/pom.xml -+++ b/drools-quarkus-extension/drools-quarkus/pom.xml -@@ -103,7 +103,7 @@ - - - io.quarkus -- quarkus-bootstrap-maven-plugin -+ quarkus-extension-maven-plugin - ${version.io.quarkus} - - -diff --git a/drools-reliability/drools-reliability-infinispan/pom.xml b/drools-reliability/drools-reliability-infinispan/pom.xml -index 1e735e0b82..e3703b0a77 100644 ---- a/drools-reliability/drools-reliability-infinispan/pom.xml -+++ b/drools-reliability/drools-reliability-infinispan/pom.xml -@@ -52,7 +52,7 @@ - - - org.infinispan -- infinispan-core -+ infinispan-core-jakarta - - - org.infinispan.protostream -@@ -61,7 +61,7 @@ - - - org.infinispan -- infinispan-client-hotrod -+ infinispan-client-hotrod-jakarta - - - org.drools -diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/Person.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/Person.java -index 13641acfe0..a1b4bda3fb 100644 ---- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/Person.java -+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/Person.java -@@ -20,8 +20,8 @@ package org.drools.mvel.compiler; - - 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-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/QueryTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/QueryTest.java -index fa47533cfe..008f664410 100644 ---- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/QueryTest.java -+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/QueryTest.java -@@ -58,7 +58,7 @@ import org.kie.api.runtime.rule.Row; - import org.kie.api.runtime.rule.Variable; - import org.kie.api.runtime.rule.ViewChangedEventListener; - --import javax.xml.bind.JAXBContext; -+import jakarta.xml.bind.JAXBContext; - import java.io.ByteArrayInputStream; - import java.io.IOException; - import java.io.StringWriter; -diff --git a/drools-test-coverage/test-integration-nomvel/pom.xml b/drools-test-coverage/test-integration-nomvel/pom.xml -index 5ff7b47f21..3032adafbd 100644 ---- a/drools-test-coverage/test-integration-nomvel/pom.xml -+++ b/drools-test-coverage/test-integration-nomvel/pom.xml -@@ -107,9 +107,10 @@ - test - - -- com.sun.xml.bind -- jaxb-impl -+ org.glassfish.jaxb -+ jaxb-runtime - test -+ 4.0.4 - - - jakarta.xml.bind -diff --git a/drools-traits/pom.xml b/drools-traits/pom.xml -index b717b85385..45ee0b7038 100644 ---- a/drools-traits/pom.xml -+++ b/drools-traits/pom.xml -@@ -158,8 +158,8 @@ - - - -- -- 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 36800ba01f..845fcc9f72 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 2adf906eee..126aa6a7bf 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 @@ package org.drools.traits.persistence; - - 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-wiring/drools-wiring-dynamic/pom.xml b/drools-wiring/drools-wiring-dynamic/pom.xml -index b207771d95..1472be38f5 100755 ---- a/drools-wiring/drools-wiring-dynamic/pom.xml -+++ b/drools-wiring/drools-wiring-dynamic/pom.xml -@@ -54,9 +54,10 @@ - provided - - -- com.sun.xml.bind -- jaxb-impl -+ org.glassfish.jaxb -+ jaxb-runtime - provided -+ 4.0.4 - - - jakarta.xml.bind -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 8f867a445d..eb2f89ed19 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.Random; - 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/kie-api/src/main/java/org/kie/api/pmml/AbstractOutput.java b/kie-api/src/main/java/org/kie/api/pmml/AbstractOutput.java -index 9c727454ac..6c41a29dfb 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 54fbc05305..73a2b9ce6e 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 eebb975416..82d2a1fb5c 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 63515db55a..ebe972d861 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 cf5a119103..8424cea547 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 d3421b3bff..530096a9fe 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.HashMap; - 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 235999635f..88cef27806 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.List; - 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 2f83078daa..9bea0c17b2 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 f21eb8951a..d52c9a9e3f 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 024a918763..77968f77a3 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 @@ package org.kie.api.runtime.query; - - 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 57a6b11146..7dc485aa7d 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-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 cf32659cdc..bf47f624c0 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 class DMNImportPMMLInfo extends PMMLInfo { - 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 @@ public class DMNImportPMMLInfo extends PMMLInfo { - // 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 e51f9a16ce..179cbf1d2a 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.HashMap; - 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 class PMMLInfo { - 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/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 d5bc785f51..046555611e 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.Map; - 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 9b630cd5d8..5cc9d73009 100644 ---- a/kie-dmn/kie-dmn-legacy-tests/pom.xml -+++ b/kie-dmn/kie-dmn-legacy-tests/pom.xml -@@ -124,9 +124,10 @@ - provided - - -- com.sun.xml.bind -- jaxb-impl -+ org.glassfish.jaxb -+ jaxb-runtime - provided -+ 4.0.4 - - - jakarta.xml.bind -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 73c6e9a0dc..5afed613ea 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 @@ package org.kie.dmn.model.v1_2.dmndi; - 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 6c7d93324b..7d0166c1cf 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 @@ package org.kie.dmn.model.v1_2.dmndi; - 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 07d10ee3b7..56c12fed1f 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 @@ package org.kie.dmn.model.v1_3.dmndi; - 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 3a1d68e30e..a05148e753 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 @@ package org.kie.dmn.model.v1_3.dmndi; - 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 fec094247e..44999d32c3 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.Map; - 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 9f0f46d211..0ae7cc4b56 100644 ---- a/kie-dmn/kie-dmn-openapi/pom.xml -+++ b/kie-dmn/kie-dmn-openapi/pom.xml -@@ -82,9 +82,10 @@ - provided - - -- com.sun.xml.bind -- jaxb-impl -+ org.glassfish.jaxb -+ jaxb-runtime - provided -+ 4.0.4 - - - jakarta.xml.bind -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 6751b8fa07..aaa6d2d031 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 -@@ -86,9 +86,10 @@ - provided - - -- com.sun.xml.bind -- jaxb-impl -+ org.glassfish.jaxb -+ jaxb-runtime - provided -+ 4.0.4 - - - jakarta.xml.bind -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 fcfde77a26..06dd73a239 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 javax.xml.namespace.QName; - 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 class Converter { - 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 class Converter { - } - - 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 @@ public class Converter { - } - - private static String feelTypeFromDD(DataDictionary dd, String id) { -- FieldName lookup = FieldName.create(id); -+ String lookup =id; - Optional 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 b5fd23ed65..9d789df4a4 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 class SimpleRuleRow { - 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 class SimpleRuleRow { - } - 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-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 c9ef7d523d..a33228f2c2 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.LinkedHashSet; - 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 2bf017df45..096c084b79 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 cbed707d7f..8d47bb9773 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 bad57fe70d..963513552e 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.HashMap; - 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 4d9b58d9a1..e06798a5f0 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.HashMap; - 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 feed0d6196..8c9014422e 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 -@@ -22,4 +22,4 @@ - 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-internal/pom.xml b/kie-internal/pom.xml -index b73b247766..5ca4c195b6 100644 ---- a/kie-internal/pom.xml -+++ b/kie-internal/pom.xml -@@ -96,9 +96,10 @@ - provided - - -- com.sun.xml.bind -- jaxb-impl -+ org.glassfish.jaxb -+ jaxb-runtime - provided -+ 4.0.4 - - - -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 5a70bf3a03..63f6154f20 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 @@ package org.kie.internal.builder.help; - 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 d60aa2bccc..7772825081 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.io.IOException; - 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 a66ab3e155..c859e47bf8 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.Collections; - 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 b74e99d2f5..880169eef4 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.DateTimeFormatter; - 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 fb733055ac..4ae10ef641 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 @@ package org.kie.internal.jaxb; - 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 9c9f66d618..b269f3fd6c 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.DateTimeFormatter; - 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 705641b07c..52e5d2933c 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.DateTimeFormatter; - 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 f74cfffc61..967d0070a4 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 @@ package org.kie.internal.jaxb; - - 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 df560c3a85..6436952334 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.List; - 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 bb2aa1f32a..34807c6d2a 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.HashMap; - 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 88c9abcd74..6a3bc0a122 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 8561a4f266..cac273d126 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.List; - 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 e996b22b08..ec05798634 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.HashMap; - 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 de305a5d93..125af0455a 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 2e514b2534..5967f78393 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.HashMap; - 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 3196813c53..6460e83543 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 c68575a784..b6d2272d67 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.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.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 65a8711225..1a893de336 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 @@ package org.kie.internal.runtime.conf; - - 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 1ac2d744d3..97c512830d 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 8421eeda8e..6e7d6ebfb3 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 71306f0345..6268d19d31 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.ArrayList; - 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 7356288e5e..3389c78f73 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 87ff5dd215..d9917b3d1b 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.io.StringWriter; - 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 a93615ec76..d5281d43e9 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.List; - 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 572cc4412a..9026d35f5d 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 406ddf4e70..3caaedb165 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 b79d5bc55c..209a283f4f 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 4cbd3f3192..5038a1806f 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 @@ package org.kie.internal.runtime.manager.deploy; - - 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-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 b4d12b531b..505d54d07a 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 @@ public class CommonCompilationDTO implements CompilationDTO - 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 45015d4b37..6a404100e9 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.TargetValue; - 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 class ModelUtils { - 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 class ModelUtils { - 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 class ModelUtils { - 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 class ModelUtils { - 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 class ModelUtils { - 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 class ModelUtils { - 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 class ModelUtils { - */ - 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 class ModelUtils { - */ - 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 class ModelUtils { - */ - 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 class ModelUtils { - 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 32c3b862ca..aab45ac852 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 class TestModel extends Model { - 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 c668e1a6ff..8f919c3e92 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.Apply; - 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.DiscretizeBin; - 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.NumericPredictor; - 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 class PMMLModelTestUtils { - 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 class PMMLModelTestUtils { - 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 class PMMLModelTestUtils { - - 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 class PMMLModelTestUtils { - - 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 class PMMLModelTestUtils { - - 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 class PMMLModelTestUtils { - - 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 class PMMLModelTestUtils { - - 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 class PMMLModelTestUtils { - - 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 class PMMLModelTestUtils { - - 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 class PMMLModelTestUtils { - - 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 class PMMLModelTestUtils { - } - - 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 class PMMLModelTestUtils { - 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 class PMMLModelTestUtils { - - 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 class PMMLModelTestUtils { - 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 class PMMLModelTestUtils { - 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 class PMMLModelTestUtils { - - 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 class PMMLModelTestUtils { - 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 class PMMLModelTestUtils { - - 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 class PMMLModelTestUtils { - 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 class PMMLModelTestUtils { - } - - 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 class PMMLModelTestUtils { - } - - 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 class PMMLModelTestUtils { - 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 class PMMLModelTestUtils { - 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 class PMMLModelTestUtils { - } - - 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 class PMMLModelTestUtils { - - 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 class PMMLModelTestUtils { - } - - 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 class PMMLModelTestUtils { - } - - 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 cbf3518fac..a5ee7e7868 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.DataField; - 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.Row; - 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 @@ public class ModelUtilsTest { - 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 @@ public class ModelUtilsTest { - 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 @@ public class ModelUtilsTest { - 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 @@ public class ModelUtilsTest { - 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 @@ public class ModelUtilsTest { - 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 @@ public class ModelUtilsTest { - 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 @@ public class ModelUtilsTest { - 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 @@ public class ModelUtilsTest { - 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 @@ public class ModelUtilsTest { - 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 @@ public class ModelUtilsTest { - 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 @@ public class ModelUtilsTest { - 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 @@ public class ModelUtilsTest { - 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 @@ public class ModelUtilsTest { - 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 @@ public class ModelUtilsTest { - 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 @@ public class ModelUtilsTest { - }); - 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 @@ public class ModelUtilsTest { - 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 @@ public class ModelUtilsTest { - .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 @@ public class ModelUtilsTest { - .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 @@ public class ModelUtilsTest { - }); - 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 @@ public class ModelUtilsTest { - 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 @@ public class ModelUtilsTest { - 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/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 0267b4f905..4cc3591f28 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 @@ public class KiePMMLDerivedFieldFactory { - 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 302047678f..0a3e7e371f 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 @@ public class KiePMMLDiscretizeFactory { - .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 727090cd0b..d948a4bc93 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 @@ public class KiePMMLFieldColumnPairFactory { - 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 33b40939dc..11276c4ce6 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 @@ public class KiePMMLFieldRefFactory { - 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 9f68eeeba6..7e9865ed1d 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 @@ public class KiePMMLMiningFieldFactory { - 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 @@ public class KiePMMLMiningFieldFactory { - } 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 @@ public class KiePMMLMiningFieldFactory { - 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 32b0378c4d..ae7296e360 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 @@ public class KiePMMLModelFactoryUtils { - 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 @@ public class KiePMMLModelFactoryUtils { - 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 c060b2b834..5dbee1419c 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 @@ public class KiePMMLNormContinuousFactory { - 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 4db24f7ac2..c3aa7ee0cb 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 @@ public class KiePMMLNormDiscreteFactory { - 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 3f375480d1..e14ccbce9b 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 @@ public class KiePMMLOutputFieldFactory { - .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 c7d22413fa..b99982cd7b 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 @@ public class KiePMMLParameterFieldFactory { - .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 544619f337..1c45d74aa2 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 @@ public class KiePMMLSimplePredicateFactory { - .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 d8e41815bd..b70c5d89e3 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 @@ public class KiePMMLSimpleSetPredicateFactory { - .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 45d387b36f..a9121d02fe 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 @@ public class KiePMMLTextIndexFactory { - 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 836c102204..a25397bd89 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 @@ public class KiePMMLDerivedFieldInstanceFactory { - - static KiePMMLDerivedField getKiePMMLDerivedField(final DerivedField derivedField, - 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 43cbb224b8..2f862a685d 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 @@ public class KiePMMLDiscretizeInstanceFactory { - 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 5ba7d7924d..d70badd561 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 @@ public class KiePMMLFieldColumnPairInstanceFactory { - } - - static KiePMMLFieldColumnPair getKiePMMLFieldColumnPair(final FieldColumnPair fieldColumnPair) { -- return new KiePMMLFieldColumnPair(fieldColumnPair.getField().getValue(), -+ return new KiePMMLFieldColumnPair(fieldColumnPair.getField(), - getKiePMMLExtensions(fieldColumnPair.getExtensions()), - fieldColumnPair.getColumn()); - } -diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLFieldRefInstanceFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLFieldRefInstanceFactory.java -index a7d5881828..6c856f6cab 100644 ---- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLFieldRefInstanceFactory.java -+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLFieldRefInstanceFactory.java -@@ -32,7 +32,7 @@ public class KiePMMLFieldRefInstanceFactory { - } - - static KiePMMLFieldRef getKiePMMLFieldRef(final FieldRef fieldRef) { -- return new KiePMMLFieldRef(fieldRef.getField().getValue(), -+ return new KiePMMLFieldRef(fieldRef.getField(), - KiePMMLExtensionInstanceFactory.getKiePMMLExtensions(fieldRef.getExtensions()), - fieldRef.getMapMissingTo()); - } -diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLMiningFieldInstanceFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLMiningFieldInstanceFactory.java -index 30e28dfe79..93f626718d 100644 ---- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLMiningFieldInstanceFactory.java -+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/factories/KiePMMLMiningFieldInstanceFactory.java -@@ -45,7 +45,7 @@ public class KiePMMLMiningFieldInstanceFactory { - } - - public static KiePMMLMiningField getKiePMMLMiningField(final MiningField toConvert, final Field 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 d659f76aae..1fd3cb11cd 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 @@ public class KiePMMLNormContinuousInstanceFactory { - 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 f887761703..2c63c82f3f 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 @@ public class 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 91804ffa9e..21f7080d22 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 @@ public class 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 5b946d1d61..a2abeb7306 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 @@ public class KiePMMLParameterFieldInstanceFactory { - 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 922bbbc043..8ce616753d 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 @@ public class 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 b5bec302aa..9d23fb0b55 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 @@ public class 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 5aa4483c38..fae20d1f3c 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 class KiePMMLTargetInstanceFactory { - .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 e946b3b40a..3a814d5209 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 @@ public class KiePMMLTextIndexInstanceFactory { - 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 ee967bc5c3..62bc2580d7 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.List; - 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 @@ public class KiePMMLUtil { - 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 @@ public class KiePMMLUtil { - .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 @@ public class KiePMMLUtil { - 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 6ff7acc2c1..d9c225cee1 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.BlockStmt; - 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 @@ public class KiePMMLApplyFactoryTest { - 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 @@ public class KiePMMLApplyFactoryTest { - 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 d136aa7b63..b54f075e5c 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.Apply; - 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 @@ public class KiePMMLDefineFunctionFactoryTest { - 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 83cf1f84aa..4bd5621a83 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.Apply; - 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 @@ public class KiePMMLDerivedFieldFactoryTest { - 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 @@ public class KiePMMLDerivedFieldFactoryTest { - 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 @@ public class KiePMMLDerivedFieldFactoryTest { - 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 @@ public class KiePMMLDerivedFieldFactoryTest { - 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 @@ public class KiePMMLDerivedFieldFactoryTest { - 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 @@ public class KiePMMLDerivedFieldFactoryTest { - 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 3bb53dc323..414ae4fc3e 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 com.github.javaparser.ast.stmt.Statement; - 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 class KiePMMLDiscretizeFactoryTest { - 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 f361583818..7e5c892ebe 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 java.util.List; - 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 @@ public class KiePMMLFieldColumnPairFactoryTest { - 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 d7231b5780..359e3e36df 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 java.util.List; - - 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 @@ public class KiePMMLFieldRefFactoryTest { - 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 4fb84d0b43..a86e50c013 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 class KiePMMLInlineTableFactoryTest { - 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 12bf81ccb8..2660518d6b 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 com.github.javaparser.ast.stmt.Statement; - 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 @@ public class KiePMMLLocalTransformationsFactoryTest { - 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 b01a9b7a97..c3221ab11d 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 class KiePMMLMapValuesFactoryTest { - 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 e3d14fc03b..141a7a2240 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 @@ public class KiePMMLMiningFieldFactoryTest { - 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 @@ public class KiePMMLMiningFieldFactoryTest { - 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 @@ public class KiePMMLMiningFieldFactoryTest { - 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 3c0d1aa142..56f78bdd17 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 @@ public class KiePMMLNormContinuousFactoryTest { - 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 fc0fe288b8..25be272ac8 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 java.util.List; - - 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 @@ public class KiePMMLNormDiscreteFactoryTest { - 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 62d6b45392..05831bc068 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 java.util.List; - 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 4315879f7b..d999c4c36b 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 class KiePMMLRowFactoryTest { - 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 ef278cbe93..23d5d30c4a 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 com.github.javaparser.ast.stmt.Statement; - 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 @@ public class KiePMMLSimplePredicateFactoryTest { - - 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 ed4c46efff..3ee849e0e5 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.Array; - 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 @@ public class KiePMMLSimpleSetPredicateFactoryTest { - 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 class KiePMMLSimpleSetPredicateFactoryTest { - 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 e9874f34d6..938a29d9c8 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 @@ public class KiePMMLTextIndexFactoryTest { - 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 bd4374a478..d78a9ced33 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.Constant; - 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 @@ public class KiePMMLTransformationDictionaryFactoryTest { - } - - 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 @@ public class KiePMMLTransformationDictionaryFactoryTest { - 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 23927ed5e4..cb339230e0 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 @@ public class InstanceFactoriesTestCommon { - 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 @@ public class InstanceFactoriesTestCommon { - 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 @@ public class InstanceFactoriesTestCommon { - 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 @@ public class InstanceFactoriesTestCommon { - - 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 @@ public class InstanceFactoriesTestCommon { - - 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 @@ public class InstanceFactoriesTestCommon { - - 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 @@ public class InstanceFactoriesTestCommon { - - 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 @@ public class InstanceFactoriesTestCommon { - - 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 @@ public class InstanceFactoriesTestCommon { - - 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 @@ public class InstanceFactoriesTestCommon { - 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 1d55b0229e..4f1b09f22f 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 @@ public class KiePMMLLocalTransformationsInstanceFactoryTest { - 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 ed87c68309..df58cc39f9 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 @@ public class KiePMMLTransformationDictionaryInstanceFactoryTest { - 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/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 46ce5d7bee..df844bcf3a 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.Random; - 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 @@ public class KiePMMLUtilTest { - 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 @@ public class KiePMMLUtilTest { - @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 @@ public class KiePMMLUtilTest { - 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 @@ public class KiePMMLUtilTest { - .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 @@ public class KiePMMLUtilTest { - 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 @@ public class KiePMMLUtilTest { - 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/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 feb38f91b9..4d7c7c5834 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 class TestingModel extends Model { - return modelName; - } - -+ @Override -+ public MiningFunction requireMiningFunction() { -+ return null; -+ } -+ -+ @Override -+ public MiningSchema requireMiningSchema() { -+ return null; -+ } -+ - - } -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 5570464de9..fd2bfeaab6 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 @@ public class KiePMMLClusteringModelFactory { - 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 @@ public class KiePMMLClusteringModelFactory { - 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 a8b06c8f09..23f30fe19f 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.DataDictionary; - 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 class KiePMMLClusteringModelFactoryTest { - 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 @@ public class KiePMMLClusteringModelFactoryTest { - 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 @@ public class KiePMMLClusteringModelFactoryTest { - - 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 @@ public class KiePMMLClusteringModelFactoryTest { - 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-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 a748a0e59c..9e27e0e0f2 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 class KiePMMLDataDictionaryASTFactory { - * @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 84de887ede..492dfe0f89 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 class KiePMMLDerivedFieldASTFactory { - * @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 83d01f66f0..48eb2adbb0 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 class KiePMMLSimplePredicateASTFactory extends KiePMMLAbstractPredicateAS - 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 class KiePMMLSimplePredicateASTFactory extends KiePMMLAbstractPredicateAS - 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 @@ public class KiePMMLSimplePredicateASTFactory extends KiePMMLAbstractPredicateAS - 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 10656ad316..0e9a561efb 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 @@ public class KiePMMLSimpleSetPredicateASTFactory extends KiePMMLAbstractPredicat - 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 b8b150adce..b36131729b 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 class KiePMMLASTFactoryUtils { - } - 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 class KiePMMLASTFactoryUtils { - .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 class KiePMMLASTFactoryUtils { - } - - 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 22ffee44d5..0fed2e969f 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 @@ public class KiePMMLCompoundPredicateASTFactoryTest { - .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 @@ public class KiePMMLCompoundPredicateASTFactoryTest { - .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 5b3642abbc..3d222c3bf2 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 @@ public class KiePMMLDataDictionaryASTFactoryTest { - } - - 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 4f7b725f82..f83d4f22dd 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 java.util.stream.IntStream; - - 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 @@ public class KiePMMLDerivedFieldASTFactoryTest { - } - - 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 @@ public class KiePMMLDerivedFieldASTFactoryTest { - - 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 ebc557fb9b..0ec409c52d 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 @@ public class KiePMMLSimplePredicateASTFactoryTest { - 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 @@ public class KiePMMLSimplePredicateASTFactoryTest { - 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 013f6edf63..86261e8153 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.Collections; - 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 @@ public class KiePMMLDescrRhsFactoryTest { - 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 @@ public class KiePMMLDescrRhsFactoryTest { - 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 666154816d..232e38f76b 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 @@ public class DroolsModelProviderTest { - 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 @@ public class DroolsModelProviderTest { - 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 7fd20b7b30..5dd81dc878 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 class KiePMMLASTFactoryUtilsTest { - 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 class KiePMMLASTFactoryUtilsTest { - - 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 @@ public class KiePMMLASTFactoryUtilsTest { - 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 b5ec2ce14d..e18a931351 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 java.util.Map; - 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 class KiePMMLASTTestUtils { - 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 class KiePMMLASTTestUtils { - 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 18d6ac33f7..d74bd8f7a5 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 com.github.javaparser.ast.stmt.Statement; - 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 class KiePMMLDroolsModelFactoryUtilsTest { - 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/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 486f873b80..0823492a5b 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 @@ public class KiePMMLScorecardModelCharacteristicASTFactoryTest { - 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-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 e5e1a37343..6f9f7f833c 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 @@ public class KiePMMLTreeModelFactoryTest { - 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-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 2bbd9df084..d6cadfc321 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.FileInputStream; - 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 16c99b6297..935a576397 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.HashMap; - 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 df6b84623a..0ff476d12f 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.HashMap; - 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 413c7bfec9..05b1117e15 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.ArrayList; - 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-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 a74071da45..3630b255e1 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 @@ public class RegressionModelImplementationProvider implements ModelImplementatio - 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 @@ public class RegressionModelImplementationProvider implements ModelImplementatio - 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 @@ public class RegressionModelImplementationProvider implements ModelImplementatio - 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 131e786ce6..c24e4bf06a 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 class KiePMMLRegressionTableFactory { - */ - 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 @@ public class KiePMMLRegressionTableFactory { - */ - 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 @@ public class KiePMMLRegressionTableFactory { - 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 @@ public class KiePMMLRegressionTableFactory { - 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 @@ public class KiePMMLRegressionTableFactory { - */ - 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 @@ public class KiePMMLRegressionTableFactory { - */ - 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 @@ public class KiePMMLRegressionTableFactory { - 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, - getPredictorTermFunction(predictorTerm)); -@@ -630,7 +630,7 @@ public class KiePMMLRegressionTableFactory { - .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 a2d17ca5d0..2d3983495d 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 @@ public abstract class AbstractKiePMMLRegressionTableRegressionFactoryTest { - 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 9d9d2172f7..950c91cb91 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.Expression; - 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 @@ public class KiePMMLClassificationTableFactoryTest extends AbstractKiePMMLRegres - - 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 @@ public class KiePMMLClassificationTableFactoryTest extends AbstractKiePMMLRegres - 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 @@ public class KiePMMLClassificationTableFactoryTest extends AbstractKiePMMLRegres - - 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 @@ public class KiePMMLClassificationTableFactoryTest extends AbstractKiePMMLRegres - - 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 @@ public class KiePMMLClassificationTableFactoryTest extends AbstractKiePMMLRegres - - 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 @@ public class KiePMMLClassificationTableFactoryTest extends AbstractKiePMMLRegres - - 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 fa15492aca..715d8fcb36 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 @@ public class KiePMMLRegressionModelFactoryTest { - 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 @@ public class KiePMMLRegressionModelFactoryTest { - 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 @@ public class KiePMMLRegressionModelFactoryTest { - 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 a856508042..def6548dc5 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 com.github.javaparser.ast.stmt.ExpressionStmt; - 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 @@ public class KiePMMLRegressionTableFactoryTest extends AbstractKiePMMLRegression - 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 @@ public class KiePMMLRegressionTableFactoryTest extends AbstractKiePMMLRegression - 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 @@ public class KiePMMLRegressionTableFactoryTest extends AbstractKiePMMLRegression - 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 @@ public class KiePMMLRegressionTableFactoryTest extends AbstractKiePMMLRegression - 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 @@ public class KiePMMLRegressionTableFactoryTest extends AbstractKiePMMLRegression - 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 @@ public class KiePMMLRegressionTableFactoryTest extends AbstractKiePMMLRegression - 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 @@ public class KiePMMLRegressionTableFactoryTest extends AbstractKiePMMLRegression - 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 @@ public class KiePMMLRegressionTableFactoryTest extends AbstractKiePMMLRegression - "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 @@ public class KiePMMLRegressionTableFactoryTest extends AbstractKiePMMLRegression - 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 @@ public class KiePMMLRegressionTableFactoryTest extends AbstractKiePMMLRegression - 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-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 5ca0f0c5c4..7e162bec99 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.BlockStmt; - 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 @@ public class KiePMMLComplexPartialScoreFactoryTest { - 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 @@ public class KiePMMLComplexPartialScoreFactoryTest { - 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 @@ public class KiePMMLComplexPartialScoreFactoryTest { - 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-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 121d08ea24..dd77595701 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.HashMap; - 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 8e9f686db3..5332680489 100644 +index 1db19a25e7..5332680489 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,9 +28,9 @@ import javax.sql.ConnectionEventListener; - import javax.sql.DataSource; - import javax.sql.XAConnection; +@@ -30,7 +30,7 @@ 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 jakarta.transaction.TransactionManager; -+import jakarta.transaction.TransactionSynchronizationRegistry; +import jakarta.transaction.xa.XAResource; import com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule; import com.arjuna.ats.jta.recovery.XAResourceRecoveryHelper; -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 71d6cf6b9e..1e194adeaa 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 java.util.logging.Logger; - 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/.ci/environments/quarkus-3/quarkus3.yml b/.ci/environments/quarkus-3/quarkus3.yml index 4a61a781709..1ceb1b86793 100644 --- a/.ci/environments/quarkus-3/quarkus3.yml +++ b/.ci/environments/quarkus-3/quarkus3.yml @@ -3,8 +3,8 @@ description: Update Quarkus version and refactor imports and resources if needed type: specs.openrewrite.org/v1beta/recipe recipeList: - org.openrewrite.maven.ChangePropertyValue: { - key: version.io.quarkus, - newValue: 3.0.0.Final + newValue: 3.0.0.Final, + key: version.io.quarkus } - org.kie.drools.Quarkus3Migration - org.kie.ManagedDependencies @@ -117,10 +117,6 @@ recipeList: } - org.kie.openrewrite.recipe.jpmml.JPMMLRecipe --- -type: specs.openrewrite.org/v1beta/recipe -description: Update all managed dependencies based on dependency updates from Quarkus. -name: org.kie.ManagedDependencies -displayName: Update Managed Dependencies recipeList: - org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId: { oldGroupId: javax.activation, @@ -505,6 +501,10 @@ recipeList: newGroupId: org.keycloak, newArtifactId: keycloak-admin-client-jakarta } +displayName: Update Managed Dependencies +name: org.kie.ManagedDependencies +description: Update all managed dependencies based on dependency updates from Quarkus. +type: specs.openrewrite.org/v1beta/recipe --- type: specs.openrewrite.org/v1beta/recipe name: io.quarkus.updates.core.quarkus30.UpgradeQuarkiverse