From 411879f6c1b91f1e0fb36ed32560bb15ee8808c7 Mon Sep 17 00:00:00 2001 From: mariofusco Date: Tue, 21 Nov 2023 11:56:28 +0100 Subject: [PATCH 1/6] Bump to Quarkus 3.5.2 --- .ci/environments/quarkus-3/before.sh | 2 +- ...reateKieQuarkusProjectMigrationRecipe.java | 10 +- .../quarkus-3/patches/0001_before_sh.patch | 742 +++++++++--------- .../patches/0004_hardcoded-javax-string.patch | 4 +- .../quarkus-3/patches/0006_package-info.patch | 2 +- .../0010_remaining_javax_jakarta.patch | 15 +- .ci/environments/quarkus-3/quarkus3.yml | 8 +- bom/drools-bom/pom.xml | 2 +- bom/kie-core-bom/pom.xml | 2 +- bom/kie-dmn-bom/pom.xml | 2 +- bom/kie-efesto-bom/pom.xml | 2 +- bom/kie-pmml-bom/pom.xml | 2 +- bom/pom.xml | 2 +- build-parent/pom.xml | 135 ++-- drools-alphanetwork-compiler/pom.xml | 2 +- drools-base/pom.xml | 7 +- drools-beliefs/pom.xml | 2 +- drools-commands/pom.xml | 2 +- .../drools/commands/GetVariableCommand.java | 10 +- .../drools/commands/jaxb/JaxbListAdapter.java | 2 +- .../drools/commands/jaxb/JaxbListWrapper.java | 10 +- .../drools/commands/jaxb/JaxbMapAdapter.java | 2 +- .../commands/jaxb/JaxbObjectObjectPair.java | 10 +- .../commands/jaxb/JaxbStringObjectPair.java | 12 +- .../commands/jaxb/JaxbUnknownAdapter.java | 2 +- .../drools/commands/jaxb/ObjectFactory.java | 2 +- .../runtime/AdvanceSessionTimeCommand.java | 8 +- .../runtime/BatchExecutionCommandImpl.java | 14 +- .../commands/runtime/DisposeCommand.java | 6 +- .../commands/runtime/ExecutionResultImpl.java | 10 +- .../commands/runtime/ExecutionResultsMap.java | 2 +- .../commands/runtime/FlatQueryResults.java | 14 +- .../commands/runtime/GetFactCountCommand.java | 8 +- .../commands/runtime/GetGlobalCommand.java | 8 +- .../drools/commands/runtime/GetIdCommand.java | 8 +- .../runtime/GetSessionTimeCommand.java | 8 +- .../commands/runtime/ObjectFactory.java | 2 +- .../runtime/QueryResultsJaxbAdapter.java | 2 +- .../commands/runtime/SetGlobalCommand.java | 12 +- .../runtime/pmml/ApplyPmmlModelCommand.java | 12 +- .../process/AbortProcessInstanceCommand.java | 8 +- .../runtime/process/AbortWorkItemCommand.java | 8 +- .../process/CompleteWorkItemCommand.java | 12 +- ...reateCorrelatedProcessInstanceCommand.java | 12 +- .../process/CreateProcessInstanceCommand.java | 12 +- .../GetProcessEventListenersCommand.java | 6 +- .../runtime/process/GetProcessIdsCommand.java | 8 +- ...rocessInstanceByCorrelationKeyCommand.java | 12 +- .../process/GetProcessInstanceCommand.java | 8 +- .../process/GetProcessInstancesCommand.java | 8 +- .../runtime/process/GetWorkItemCommand.java | 8 +- .../process/GetWorkItemIdsCommand.java | 8 +- .../runtime/process/ObjectFactory.java | 2 +- .../runtime/process/ReTryWorkItemCommand.java | 10 +- .../RegisterWorkItemHandlerCommand.java | 8 +- .../SetProcessInstanceVariablesCommand.java | 12 +- .../runtime/process/SignalEventCommand.java | 12 +- .../StartCorrelatedProcessCommand.java | 14 +- .../runtime/process/StartProcessCommand.java | 16 +- .../StartProcessFromNodeIdsCommand.java | 12 +- .../process/StartProcessInstanceCommand.java | 6 +- .../rule/AgendaGroupSetFocusCommand.java | 8 +- .../rule/ClearActivationGroupCommand.java | 8 +- .../runtime/rule/ClearAgendaCommand.java | 6 +- .../runtime/rule/ClearAgendaGroupCommand.java | 8 +- .../rule/ClearRuleFlowGroupCommand.java | 8 +- .../commands/runtime/rule/DeleteCommand.java | 8 +- .../rule/DeleteFromEntryPointCommand.java | 8 +- .../runtime/rule/DeleteObjectCommand.java | 8 +- .../runtime/rule/EnableAuditLogCommand.java | 8 +- .../runtime/rule/FireAllRulesCommand.java | 12 +- .../runtime/rule/FireUntilHaltCommand.java | 10 +- .../rule/GetAgendaEventListenersCommand.java | 2 +- .../runtime/rule/GetEntryPointCommand.java | 2 +- .../runtime/rule/GetEntryPointsCommand.java | 2 +- .../runtime/rule/GetFactHandleCommand.java | 2 +- .../GetFactHandleInEntryPointCommand.java | 2 +- .../runtime/rule/GetFactHandlesCommand.java | 6 +- .../runtime/rule/GetObjectCommand.java | 12 +- .../rule/GetObjectInEntryPointCommand.java | 8 +- .../runtime/rule/GetObjectsCommand.java | 8 +- .../rule/GetObjectsInEntryPointCommand.java | 6 +- .../runtime/rule/InsertElementsCommand.java | 10 +- .../runtime/rule/InsertObjectCommand.java | 12 +- .../rule/InsertObjectInEntryPointCommand.java | 8 +- .../commands/runtime/rule/ModifyCommand.java | 10 +- .../commands/runtime/rule/ObjectFactory.java | 2 +- .../commands/runtime/rule/QueryCommand.java | 8 +- .../commands/runtime/rule/UpdateCommand.java | 12 +- .../rule/UpdateInEntryPointCommand.java | 4 +- drools-compiler/pom.xml | 7 +- .../kproject/models/KieBaseModelImpl.java | 2 +- .../impl/DroolsJaxbHelperProviderImpl.java | 4 +- drools-core/pom.xml | 7 +- .../core/ClassObjectSerializationFilter.java | 8 +- .../org/drools/core/base/ArrayElements.java | 8 +- .../base/RuleNameEndsWithAgendaFilter.java | 8 +- .../core/base/RuleNameEqualsAgendaFilter.java | 8 +- .../base/RuleNameMatchesAgendaFilter.java | 8 +- .../base/RuleNameStartsWithAgendaFilter.java | 8 +- .../drools/core/common/DefaultFactHandle.java | 8 +- .../core/common/DisconnectedFactHandle.java | 14 +- .../org/drools/core/common/ObjectFactory.java | 2 +- .../core/common/QueryElementFactHandle.java | 6 +- .../core/util/AbstractBaseLinkedListNode.java | 6 +- drools-decisiontables/pom.xml | 2 +- drools-distribution/pom.xml | 2 +- drools-docs/pom.xml | 2 +- ...ogito-migrate-drl-implement-ruleunits.adoc | 2 +- drools-drl/drools-drl-ast/pom.xml | 2 +- drools-drl/drools-drl-extensions/pom.xml | 2 +- drools-drl/drools-drl-parser/pom.xml | 2 +- drools-drl/pom.xml | 2 +- .../drools-drlonyaml-cli-tests/pom.xml | 2 +- .../drools-drlonyaml-cli/pom.xml | 2 +- .../drools-drlonyaml-model/pom.xml | 2 +- .../drools-drlonyaml-schemagen/pom.xml | 2 +- .../drools-drlonyaml-todrl/pom.xml | 2 +- drools-drlonyaml-parent/pom.xml | 2 +- drools-ecj/pom.xml | 2 +- drools-engine-classic/pom.xml | 2 +- drools-engine/pom.xml | 2 +- .../default-kiesession-from-file/pom.xml | 2 +- .../default-kiesession/pom.xml | 2 +- .../kie-module-from-multiple-files/pom.xml | 2 +- drools-examples-api/kiebase-inclusion/pom.xml | 2 +- .../kiecontainer-from-kierepo/pom.xml | 2 +- .../kiefilesystem-example/pom.xml | 2 +- .../kiemodulemodel-example/pom.xml | 2 +- drools-examples-api/multiple-kbases/pom.xml | 2 +- .../named-kiesession-from-file/pom.xml | 2 +- drools-examples-api/named-kiesession/pom.xml | 2 +- drools-examples-api/pom.xml | 2 +- .../reactive-kiesession/pom.xml | 2 +- drools-examples/pom.xml | 2 +- drools-fastutil/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../drools-impact-analysis-graph/pom.xml | 2 +- .../drools-impact-analysis-itests/pom.xml | 2 +- .../drools-impact-analysis-model/pom.xml | 2 +- .../drools-impact-analysis-parser/pom.xml | 2 +- drools-impact-analysis/pom.xml | 2 +- drools-io/pom.xml | 2 +- drools-kiesession/pom.xml | 2 +- drools-legacy-test-util/pom.xml | 2 +- .../java/org/drools/mvel/compiler/Person.java | 4 +- .../src/test/resources/META-INF/kmodule.xml | 2 +- drools-metric/pom.xml | 2 +- drools-model/drools-canonical-model/pom.xml | 2 +- drools-model/drools-codegen-common/pom.xml | 2 +- .../QuarkusDroolsModelBuildContext.java | 4 +- drools-model/drools-model-codegen/pom.xml | 2 +- .../config/RuleConfigQuarkusTemplate.java | 6 +- .../rules/ProjectRuntimeQuarkusTemplate.java | 2 +- .../RestObjectMapperQuarkusTemplate.java | 2 +- .../ruleunits/RestQueryJavaTemplate.java | 10 +- .../ruleunits/RestQueryQuarkusTemplate.java | 12 +- .../ruleunits/RuleUnitQuarkusTemplate.java | 6 +- drools-model/drools-model-compiler/pom.xml | 2 +- drools-model/drools-mvel-compiler/pom.xml | 2 +- drools-model/drools-mvel-parser/pom.xml | 2 +- .../org/drools/mvel/parser/MvelParser.java | 6 +- .../src/main/javacc/mvel.jj | 32 +- drools-model/pom.xml | 2 +- drools-mvel/pom.xml | 7 +- .../java/org/drools/mvel/compiler/Person.java | 4 +- .../drools-persistence-api/pom.xml | 7 +- .../api/PersistenceContextManager.java | 2 +- ...nsactionSynchronizationRegistryHelper.java | 2 +- .../jta/JtaTransactionManager.java | 30 +- .../jta/JtaTransactionManagerFactory.java | 4 +- .../JtaTransactionSynchronizationAdapter.java | 4 +- .../jta/TransactionLockInterceptor.java | 2 +- .../drools-persistence-jpa/pom.xml | 16 +- ...iggerUpdateTransactionSynchronization.java | 2 +- .../drools/persistence/info/SessionInfo.java | 18 +- .../drools/persistence/info/WorkItemInfo.java | 18 +- .../AbstractPersistenceContextManager.java | 4 +- .../jpa/JpaPersistenceContext.java | 4 +- .../jpa/JpaPersistenceContextManager.java | 2 +- .../jpa/OptimisticLockRetryInterceptor.java | 2 +- .../jpa/marshaller/EntityPersister.java | 2 +- .../JPAPlaceholderResolverStrategy.java | 10 +- .../jpa/marshaller/MappedVariable.java | 14 +- .../jpa/marshaller/VariableEntity.java | 10 +- .../META-INF/persistence.xml | 6 +- .../jta/JtaTransactionManagerFactoryTest.java | 14 +- .../jta/JtaTransactionManagerTest.java | 8 +- .../jta/TransactionTestCommand.java | 4 +- .../jta/TransactionTestObject.java | 14 +- .../JpaPersistentStatefulSessionTest.java | 2 +- .../map/impl/JpaBasedPersistenceTest.java | 2 +- .../JpaPersistentStatefulSessionTest.java | 2 +- .../session/ReloadSessionTest.java | 4 +- .../util/DroolsPersistenceUtil.java | 2 +- drools-persistence/pom.xml | 2 +- .../drools-quarkus-deployment/pom.xml | 2 +- .../deployment/DroolsAssetsProcessor.java | 2 +- .../drools-quarkus-examples-multiunit/pom.xml | 2 +- .../examples/multiunit/RuntimeTest.java | 2 +- .../drools-quarkus-examples-reactive/pom.xml | 2 +- .../ruleunit/examples/reactive/Adaptor.java | 6 +- .../KafkaTestResourceLifecycleManager.java | 2 +- .../examples/reactive/RuntimeTest.java | 8 +- .../drools-quarkus-examples/pom.xml | 2 +- .../pom.xml | 2 +- .../test/hotreload/FindAdultEndpoint.java | 12 +- .../drools-quarkus-integration-test/pom.xml | 2 +- .../drools/quarkus/test/TestableResource.java | 8 +- .../org/drools/quarkus/test/RuntimeTest.java | 2 +- .../drools-quarkus-quickstart-test/pom.xml | 2 +- .../quickstart/test/HomeAlertsBean.java | 4 +- .../quarkus/quickstart/test/BeanTest.java | 2 +- .../quarkus/quickstart/test/RuntimeIT.java | 2 +- .../pom.xml | 2 +- .../ruleunit/test/TestableResource.java | 8 +- .../ruleunit/test/RuntimeDslRuleUnitTest.java | 2 +- .../quarkus/ruleunit/test/RuntimeTest.java | 2 +- .../drools-quarkus-util-deployment/pom.xml | 2 +- .../DroolsQuarkusResourceUtils.java | 4 +- .../drools-quarkus/pom.xml | 4 +- drools-quarkus-extension/pom.xml | 2 +- .../drools-reliability-core/pom.xml | 2 +- .../drools-reliability-h2mvstore/pom.xml | 2 +- .../drools-reliability-infinispan/pom.xml | 6 +- .../drools-reliability-tests/pom.xml | 2 +- drools-reliability/pom.xml | 2 +- drools-retediagram/pom.xml | 2 +- drools-ruleunits/drools-ruleunits-api/pom.xml | 2 +- drools-ruleunits/drools-ruleunits-dsl/pom.xml | 2 +- .../drools-ruleunits-engine/pom.xml | 2 +- .../drools-ruleunits-impl/pom.xml | 2 +- .../impl/SimpleRuleUnitVariable.java | 14 +- drools-ruleunits/pom.xml | 2 +- .../drools-scenario-simulation-api/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- drools-scenario-simulation/pom.xml | 2 +- drools-serialization-protobuf/pom.xml | 2 +- drools-templates/pom.xml | 2 +- drools-test-coverage/pom.xml | 2 +- .../standalone/kie-ci-with-domain/pom.xml | 2 +- .../kie-ci-with-domain/test-domain/pom.xml | 2 +- .../kie-ci-with-domain/test-kjar/pom.xml | 2 +- .../kie-ci-with-domain/tests/pom.xml | 2 +- .../standalone/kie-ci-without-domain/pom.xml | 2 +- .../kie-ci-without-domain/test-domain/pom.xml | 2 +- .../kie-ci-without-domain/test-kjar/pom.xml | 2 +- .../kie-ci-without-domain/tests/pom.xml | 2 +- drools-test-coverage/standalone/pom.xml | 2 +- .../test-compiler-integration/pom.xml | 2 +- .../java/org/drools/mvel/compiler/Person.java | 4 +- .../mvel/integrationtests/KieBuilderTest.java | 4 +- .../mvel/integrationtests/QueryTest.java | 2 +- .../src/test/resources/META-INF/kmodule.xml | 2 +- .../test-integration-nomvel/pom.xml | 7 +- .../test-integration-notms/pom.xml | 2 +- .../test-integration-noxml/pom.xml | 2 +- .../test-integration-ruleunits/pom.xml | 2 +- .../test-integration-ruleunits-jar/pom.xml | 2 +- .../test-integration-ruleunits-tests/pom.xml | 2 +- drools-test-coverage/test-suite/pom.xml | 2 +- drools-tms/pom.xml | 2 +- drools-traits/pom.xml | 11 +- .../META-INF/persistence.xml | 6 +- .../persistence/DroolsPersistenceUtil.java | 2 +- drools-util/pom.xml | 2 +- drools-verifier/drools-verifier-api/pom.xml | 2 +- drools-verifier/drools-verifier-core/pom.xml | 2 +- drools-verifier/drools-verifier-drl/pom.xml | 2 +- drools-verifier/pom.xml | 2 +- drools-wiring/drools-wiring-api/pom.xml | 2 +- drools-wiring/drools-wiring-dynamic/pom.xml | 7 +- drools-wiring/drools-wiring-static/pom.xml | 2 +- drools-wiring/pom.xml | 2 +- drools-xml-support/pom.xml | 2 +- .../xml/support/CommandSerializationTest.java | 6 +- efesto/efesto-common-utils/pom.xml | 2 +- efesto/efesto-core/efesto-common-api/pom.xml | 2 +- efesto/efesto-core/efesto-common-core/pom.xml | 2 +- .../efesto-compilation-manager-api/pom.xml | 2 +- .../efesto-compilation-manager-core/pom.xml | 2 +- .../efesto-compilation-manager/pom.xml | 2 +- .../efesto-runtime-manager-api/pom.xml | 2 +- .../efesto-runtime-manager-core/pom.xml | 2 +- .../efesto-runtime-manager/pom.xml | 2 +- efesto/efesto-core/pom.xml | 2 +- efesto/efesto-dependencies/pom.xml | 2 +- efesto/pom.xml | 2 +- jpmml-migration-recipe/pom.xml | 2 +- kie-api/pom.xml | 2 +- .../kie/api/builder/model/KieBaseModel.java | 2 +- .../api/builder/model/KieSessionModel.java | 2 +- .../api/internal/utils/KieServiceLoader.java | 2 +- .../java/org/kie/api/pmml/AbstractOutput.java | 10 +- .../org/kie/api/pmml/DoubleFieldOutput.java | 6 +- .../org/kie/api/pmml/IntegerFieldOutput.java | 6 +- .../java/org/kie/api/pmml/PMML4DataField.java | 8 +- .../org/kie/api/pmml/PMML4OutputField.java | 10 +- .../java/org/kie/api/pmml/PMML4Result.java | 14 +- .../org/kie/api/pmml/PMMLRequestData.java | 12 +- .../java/org/kie/api/pmml/ParameterInfo.java | 12 +- .../org/kie/api/pmml/StringFieldOutput.java | 6 +- .../kie/api/runtime/query/QueryContext.java | 10 +- .../java/org/kie/api/task/model/Status.java | 2 +- .../src/test/resources/org/kie/api/kmod1.xml | 6 +- .../kie-drools-dmn-archetype/pom.xml | 2 +- .../kie-drools-exec-model-archetype/pom.xml | 2 +- .../pom.xml | 2 +- kie-archetypes/pom.xml | 2 +- kie-ci/pom.xml | 2 +- kie-dmn/kie-dmn-api/pom.xml | 2 +- kie-dmn/kie-dmn-backend/pom.xml | 2 +- kie-dmn/kie-dmn-core-jsr223-jq/pom.xml | 2 +- kie-dmn/kie-dmn-core-jsr223/pom.xml | 2 +- kie-dmn/kie-dmn-core/pom.xml | 2 +- .../kie/dmn/core/pmml/DMNImportPMMLInfo.java | 4 +- .../java/org/kie/dmn/core/pmml/PMMLInfo.java | 8 +- kie-dmn/kie-dmn-feel/pom.xml | 2 +- .../java/org/kie/dmn/feel/util/Generated.java | 2 +- .../dmn/feel/jandex/AbstractJandexTest.java | 6 +- kie-dmn/kie-dmn-legacy-tests/pom.xml | 7 +- kie-dmn/kie-dmn-model/pom.xml | 2 +- .../kie/dmn/model/v1_2/dmndi/DMNDiagram.java | 2 +- .../dmn/model/v1_2/dmndi/DiagramElement.java | 2 +- .../kie/dmn/model/v1_3/dmndi/DMNDiagram.java | 2 +- .../dmn/model/v1_3/dmndi/DiagramElement.java | 2 +- .../model/jandex/KieDMNModelJandexTest.java | 6 +- kie-dmn/kie-dmn-openapi/pom.xml | 7 +- .../kie-dmn-pmml-tests-trusty/pom.xml | 2 +- .../kie-dmn-pmml-tests/pom.xml | 7 +- kie-dmn/kie-dmn-pmml-tests-parent/pom.xml | 2 +- .../kie-dmn-ruleset2dmn-cli/pom.xml | 2 +- .../kie-dmn-ruleset2dmn/pom.xml | 2 +- .../org/kie/dmn/ruleset2dmn/Converter.java | 9 +- .../kie/dmn/ruleset2dmn/SimpleRuleRow.java | 4 +- kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml | 2 +- kie-dmn/kie-dmn-signavio/pom.xml | 2 +- kie-dmn/kie-dmn-tck/pom.xml | 2 +- kie-dmn/kie-dmn-trisotech/pom.xml | 2 +- kie-dmn/kie-dmn-validation-bootstrap/pom.xml | 2 +- kie-dmn/kie-dmn-validation/pom.xml | 2 +- .../dtanalysis/mcdc/MCDC2TCKGenerator.java | 8 +- .../dtanalysis/mcdc/dmntck/ObjectFactory.java | 6 +- .../dtanalysis/mcdc/dmntck/TestCaseType.java | 6 +- .../dtanalysis/mcdc/dmntck/TestCases.java | 20 +- .../dtanalysis/mcdc/dmntck/ValueType.java | 22 +- .../dtanalysis/mcdc/dmntck/package-info.java | 6 +- kie-dmn/kie-dmn-xls2dmn-cli/pom.xml | 2 +- kie-dmn/pom.xml | 2 +- kie-drl/kie-drl-api/pom.xml | 2 +- kie-drl/kie-drl-compilation-common/pom.xml | 2 +- .../kie-drl-kiesession-local-runtime/pom.xml | 2 +- .../kie-drl-kiesession-local/pom.xml | 2 +- .../kie-drl-map-input-runtime/pom.xml | 2 +- .../kie-drl-map-input/pom.xml | 2 +- kie-drl/kie-drl-implementations/pom.xml | 2 +- kie-drl/kie-drl-runtime-common/pom.xml | 2 +- .../kie-drl-tests-without-index-file/pom.xml | 2 +- kie-drl/kie-drl-tests/pom.xml | 2 +- kie-drl/pom.xml | 2 +- kie-internal/pom.xml | 14 +- .../help/DroolsJaxbHelperProvider.java | 4 +- .../builder/help/KnowledgeBuilderHelper.java | 4 +- .../jaxb/CorrelationKeyXmlAdapter.java | 2 +- .../jaxb/LocalDateTimeXmlAdapter.java | 2 +- .../internal/jaxb/LocalDateXmlAdapter.java | 2 +- .../internal/jaxb/LocalTimeXmlAdapter.java | 2 +- .../jaxb/OffsetDateTimeXmlAdapter.java | 2 +- .../jaxb/StringKeyObjectValueEntry.java | 12 +- .../jaxb/StringKeyObjectValueMap.java | 8 +- .../StringKeyObjectValueMapXmlAdapter.java | 2 +- .../jaxb/StringKeyStringValueEntry.java | 8 +- .../jaxb/StringKeyStringValueMap.java | 8 +- .../StringKeyStringValueMapXmlAdapter.java | 2 +- .../org/kie/internal/query/QueryContext.java | 6 +- .../org/kie/internal/query/QueryFilter.java | 6 +- .../kie/internal/query/data/QueryData.java | 8 +- .../internal/query/data/QueryParameters.java | 12 +- .../runtime/conf/DeploymentDescriptor.java | 4 +- .../kie/internal/runtime/conf/MergeMode.java | 2 +- .../runtime/conf/NamedObjectModel.java | 10 +- .../internal/runtime/conf/ObjectModel.java | 12 +- .../runtime/conf/RuntimeStrategy.java | 2 +- .../deploy/DeploymentDescriptorIO.java | 8 +- .../deploy/DeploymentDescriptorImpl.java | 14 +- .../manager/deploy/TransientObjectModel.java | 2 +- .../internal/task/api/model/AccessType.java | 2 +- .../task/api/model/SubTasksStrategy.java | 2 +- .../manager/deploy/JaxbMarshalingTest.java | 6 +- kie-maven-plugin/pom.xml | 2 +- kie-memory-compiler/pom.xml | 2 +- kie-pmml-trusty/kie-pmml-api/pom.xml | 2 +- kie-pmml-trusty/kie-pmml-commons/pom.xml | 2 +- .../kie-pmml-compiler-api/pom.xml | 2 +- .../api/dto/CommonCompilationDTO.java | 2 +- .../pmml/compiler/api/utils/ModelUtils.java | 30 +- .../pmml/compiler/api/mocks/TestModel.java | 10 + .../api/testutils/PMMLModelTestUtils.java | 66 +- .../compiler/api/utils/ModelUtilsTest.java | 61 +- .../kie-pmml-compiler-commons/pom.xml | 2 +- .../KiePMMLDerivedFieldFactory.java | 2 +- .../KiePMMLDiscretizeFactory.java | 2 +- .../KiePMMLFieldColumnPairFactory.java | 2 +- .../KiePMMLFieldRefFactory.java | 2 +- .../KiePMMLMiningFieldFactory.java | 8 +- .../KiePMMLModelFactoryUtils.java | 4 +- .../KiePMMLNormContinuousFactory.java | 2 +- .../KiePMMLNormDiscreteFactory.java | 2 +- .../KiePMMLOutputFieldFactory.java | 4 +- .../KiePMMLParameterFieldFactory.java | 2 +- .../KiePMMLSimplePredicateFactory.java | 4 +- .../KiePMMLSimpleSetPredicateFactory.java | 2 +- .../KiePMMLTextIndexFactory.java | 2 +- .../KiePMMLDerivedFieldInstanceFactory.java | 5 +- .../KiePMMLDiscretizeInstanceFactory.java | 2 +- ...KiePMMLFieldColumnPairInstanceFactory.java | 2 +- .../KiePMMLFieldRefInstanceFactory.java | 2 +- .../KiePMMLMiningFieldInstanceFactory.java | 2 +- .../KiePMMLNormContinuousInstanceFactory.java | 2 +- .../KiePMMLNormDiscreteInstanceFactory.java | 2 +- .../KiePMMLOutputFieldInstanceFactory.java | 4 +- .../KiePMMLParameterFieldInstanceFactory.java | 2 +- ...KiePMMLSimplePredicateInstanceFactory.java | 4 +- ...PMMLSimpleSetPredicateInstanceFactory.java | 2 +- .../KiePMMLTargetInstanceFactory.java | 2 +- .../KiePMMLTextIndexInstanceFactory.java | 2 +- .../compiler/commons/utils/KiePMMLUtil.java | 9 +- .../KiePMMLApplyFactoryTest.java | 9 +- .../KiePMMLDefineFunctionFactoryTest.java | 16 +- .../KiePMMLDerivedFieldFactoryTest.java | 25 +- .../KiePMMLDiscretizeFactoryTest.java | 3 +- .../KiePMMLFieldColumnPairFactoryTest.java | 3 +- .../KiePMMLFieldRefFactoryTest.java | 3 +- .../KiePMMLInlineTableFactoryTest.java | 2 +- ...iePMMLLocalTransformationsFactoryTest.java | 3 +- .../KiePMMLMapValuesFactoryTest.java | 2 +- .../KiePMMLMiningFieldFactoryTest.java | 9 +- .../KiePMMLNormContinuousFactoryTest.java | 3 +- .../KiePMMLNormDiscreteFactoryTest.java | 3 +- .../KiePMMLParameterFieldFactoryTest.java | 3 +- .../KiePMMLRowFactoryTest.java | 4 +- .../KiePMMLSimplePredicateFactoryTest.java | 6 +- .../KiePMMLSimpleSetPredicateFactoryTest.java | 6 +- .../KiePMMLTextIndexFactoryTest.java | 3 +- ...MLTransformationDictionaryFactoryTest.java | 9 +- .../InstanceFactoriesTestCommon.java | 32 +- ...calTransformationsInstanceFactoryTest.java | 2 +- ...ormationDictionaryInstanceFactoryTest.java | 2 +- .../commons/utils/JavaParserUtilsTest.java | 3 +- .../commons/utils/KiePMMLUtilTest.java | 35 +- .../kie-pmml-compiler-core/pom.xml | 2 +- .../compiler/testingutils/TestingModel.java | 10 + kie-pmml-trusty/kie-pmml-compiler/pom.xml | 2 +- kie-pmml-trusty/kie-pmml-dependencies/pom.xml | 2 +- .../kie-pmml-evaluator-api/pom.xml | 2 +- .../kie-pmml-evaluator-core/pom.xml | 2 +- .../kie-pmml-evaluator-utils/pom.xml | 2 +- kie-pmml-trusty/kie-pmml-evaluator/pom.xml | 2 +- .../pom.xml | 2 +- .../KiePMMLClusteringModelFactory.java | 4 +- .../KiePMMLClusteringModelFactoryTest.java | 9 +- .../pom.xml | 2 +- .../kie-pmml-models-clustering-model/pom.xml | 2 +- .../kie-pmml-models-clustering-tests/pom.xml | 2 +- .../kie-pmml-models-clustering/pom.xml | 2 +- .../kie-pmml-models-drools-common/pom.xml | 2 +- .../KiePMMLDataDictionaryASTFactory.java | 4 +- .../KiePMMLDerivedFieldASTFactory.java | 4 +- .../KiePMMLSimplePredicateASTFactory.java | 6 +- .../KiePMMLSimpleSetPredicateASTFactory.java | 4 +- .../drools/utils/KiePMMLASTFactoryUtils.java | 6 +- ...iePMMLCompoundPredicateASTFactoryTest.java | 4 +- .../KiePMMLDataDictionaryASTFactoryTest.java | 8 +- .../KiePMMLDerivedFieldASTFactoryTest.java | 5 +- .../KiePMMLSimplePredicateASTFactoryTest.java | 4 +- .../factories/KiePMMLDescrRhsFactoryTest.java | 5 +- .../provider/DroolsModelProviderTest.java | 6 +- .../utils/KiePMMLASTFactoryUtilsTest.java | 6 +- .../drools/utils/KiePMMLASTTestUtils.java | 5 +- .../KiePMMLDroolsModelFactoryUtilsTest.java | 3 +- .../pom.xml | 2 +- ...cardModelCharacteristicASTFactoryTest.java | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../kie-pmml-models-drools-scorecard/pom.xml | 2 +- .../pom.xml | 2 +- .../KiePMMLTreeModelFactoryTest.java | 2 +- .../pom.xml | 2 +- .../kie-pmml-models-drools-tree-model/pom.xml | 2 +- .../kie-pmml-models-drools-tree-tests/pom.xml | 2 +- .../kie-pmml-models-drools-tree/pom.xml | 2 +- .../kie-pmml-models-drools/pom.xml | 2 +- .../kie-pmml-models-mining-compiler/pom.xml | 2 +- .../factories/AbstractKiePMMLFactoryTest.java | 2 +- .../KiePMMLMiningModelFactoryTest.java | 2 +- .../factories/KiePMMLSegmentFactoryTest.java | 2 +- .../KiePMMLSegmentationFactoryTest.java | 2 +- .../kie-pmml-models-mining-evaluator/pom.xml | 2 +- .../kie-pmml-models-mining-model/pom.xml | 2 +- .../kie-pmml-models-mining-tests/pom.xml | 2 +- .../kie-pmml-models-mining/pom.xml | 2 +- .../pom.xml | 2 +- ...RegressionModelImplementationProvider.java | 6 +- .../KiePMMLRegressionTableFactory.java | 16 +- ...LRegressionTableRegressionFactoryTest.java | 3 +- ...KiePMMLClassificationTableFactoryTest.java | 15 +- .../KiePMMLRegressionModelFactoryTest.java | 10 +- .../KiePMMLRegressionTableFactoryTest.java | 25 +- .../pom.xml | 2 +- .../kie-pmml-models-regression-model/pom.xml | 2 +- .../kie-pmml-models-regression-tests/pom.xml | 2 +- .../kie-pmml-models-regression/pom.xml | 2 +- .../pom.xml | 2 +- ...KiePMMLComplexPartialScoreFactoryTest.java | 10 +- .../pom.xml | 2 +- .../kie-pmml-models-scorecard-model/pom.xml | 2 +- .../kie-pmml-models-scorecard-tests/pom.xml | 2 +- .../kie-pmml-models-scorecard/pom.xml | 2 +- .../kie-pmml-models-tests/pom.xml | 2 +- .../kie-pmml-models-tree-compiler/pom.xml | 2 +- .../kie-pmml-models-tree-evaluator/pom.xml | 2 +- .../kie-pmml-models-tree-model/pom.xml | 2 +- .../kie-pmml-models-tree-tests/pom.xml | 2 +- .../kie-pmml-models-tree/pom.xml | 2 +- kie-pmml-trusty/kie-pmml-models/pom.xml | 2 +- kie-pmml-trusty/pom.xml | 2 +- kie-test-util/pom.xml | 2 +- .../org/kie/test/util/db/PersistenceUtil.java | 4 +- .../db/internal/PoolingDataSourceFactory.java | 4 +- .../PoolingDataSourceWrapperImpl.java | 4 +- kie-util/kie-util-maven-integration/pom.xml | 2 +- kie-util/kie-util-maven-support/pom.xml | 2 +- kie-util/kie-util-xml/pom.xml | 2 +- kie-util/pom.xml | 2 +- pom.xml | 2 +- 538 files changed, 1733 insertions(+), 1808 deletions(-) diff --git a/.ci/environments/quarkus-3/before.sh b/.ci/environments/quarkus-3/before.sh index 14e515aa973..c96f652e20c 100755 --- a/.ci/environments/quarkus-3/before.sh +++ b/.ci/environments/quarkus-3/before.sh @@ -6,7 +6,7 @@ mvn_cmd="mvn ${BUILD_MVN_OPTS:-} ${BUILD_MVN_OPTS_QUARKUS_UPDATE:-}" ci="${CI:-false}" rewrite_plugin_version=4.43.0 -quarkus_version=${QUARKUS_VERSION:-3.0.0.Final} +quarkus_version=${QUARKUS_VERSION:-3.5.2} quarkus_recipe_file="${script_dir_path}/quarkus3.yml" patch_file="${script_dir_path}"/patches/0001_before_sh.patch diff --git a/.ci/environments/quarkus-3/jbang/CreateKieQuarkusProjectMigrationRecipe.java b/.ci/environments/quarkus-3/jbang/CreateKieQuarkusProjectMigrationRecipe.java index ef4a67020b2..0ffe64d58e6 100755 --- a/.ci/environments/quarkus-3/jbang/CreateKieQuarkusProjectMigrationRecipe.java +++ b/.ci/environments/quarkus-3/jbang/CreateKieQuarkusProjectMigrationRecipe.java @@ -12,16 +12,16 @@ import org.apache.commons.io.IOUtils; import io.quarkus.devtools.project.BuildTool; -import io.quarkus.devtools.project.update.QuarkusUpdateRecipe; -import io.quarkus.devtools.project.update.QuarkusUpdateRecipeIO; -import io.quarkus.devtools.project.update.operations.UpdatePropertyOperation; +import io.quarkus.devtools.project.update.rewrite.QuarkusUpdateRecipe; +import io.quarkus.devtools.project.update.rewrite.QuarkusUpdateRecipeIO; +import io.quarkus.devtools.project.update.rewrite.operations.UpdatePropertyOperation; import picocli.CommandLine; import picocli.CommandLine.Command; import picocli.CommandLine.Option; ///usr/bin/env jbang "$0" "$@" ; exit $? // Version to be changed when needed -//DEPS io.quarkus:quarkus-devtools-common:3.0.0.Final +//DEPS io.quarkus:quarkus-devtools-common:3.5.2 //DEPS info.picocli:picocli:4.5.0 /* @@ -45,7 +45,7 @@ class CreateKieQuarkusProjectMigrationRecipeCli implements Callable { @Option(names={ "-v", "--property-version"}, description = "(multi). Add a dynamic property version to the final recipe") private Map versionProperties = new HashMap<>(); - static final String QUARKUS_UPDATES_BASE_URL = "https://raw.githubusercontent.com/quarkusio/quarkus-updates/1.0.0/recipes/src/main/resources/quarkus-updates/core/3alpha.yaml"; + static final String QUARKUS_UPDATES_BASE_URL = "https://github.com/quarkusio/quarkus-updates/blob/main/recipes/src/main/resources/quarkus-updates/core/3.5.yaml"; static final Path quarkus3DownloadedRecipePath = Paths.get("quarkus3-base-recipe.yml"); static final Path quarkus3GeneratedRecipePath = Paths.get("quarkus3.yml"); diff --git a/.ci/environments/quarkus-3/patches/0001_before_sh.patch b/.ci/environments/quarkus-3/patches/0001_before_sh.patch index 69853c6ce92..8ec9a004f79 100644 --- a/.ci/environments/quarkus-3/patches/0001_before_sh.patch +++ b/.ci/environments/quarkus-3/patches/0001_before_sh.patch @@ -1,38 +1,46 @@ diff --git a/build-parent/pom.xml b/build-parent/pom.xml -index 0758c53eef..312d76a4f5 100644 +index 445879b659..6f6bb67823 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.9 +- 1.15 ++ 1.16.0 + 3.2.2 1.1.1 - 2.11.0 +- 2.11.0 ++ 2.13.0 1.10.0 - 2.15.2 - 2.15.2 - 2.15.2 -+ 2.14.2 -+ 2.14.2 -+ 2.14.2 ++ 2.15.3 ++ 2.15.3 ++ 2.15.3 4.31.0 3.7.4 1.0.1 3.22.0 - 2.2.220 -+ 2.1.214 ++ 2.2.224 1.0.86 2.3.0 1.4.20 0.18.0 - 4.7.1 +- 4.7.1 - 1.10.2 -- 2.16.10.Final +- 2.16.12.Final - 3.1.1 -+ 1.10.5 -+ 3.0.0.Final -+ 3.3.2 ++ 4.7.5 ++ 1.11.1 ++ 3.5.2 ++ 3.7.0 8.5.11 4.13.1 1.8.0 -@@ -88,42 +88,42 @@ +@@ -88,43 +88,43 @@ 4.4.15 3.8.6 1.7.3 @@ -46,16 +54,16 @@ index 0758c53eef..312d76a4f5 100644 3.33.0 2.3.32 - 2.3.6 -+ 4.0.3 ++ 4.0.4 1.3 - 5.6.12.Final -+ 6.2.0.Final ++ 6.2.13.Final 2.3.0 14.0.13.Final 3.26.0-GA - 5.13.1.Final -+ 6.0.0.Final ++ 7.0.0.Final 7.6.1.Final 3.1.6.Final - 2.0.1 @@ -64,10 +72,10 @@ index 0758c53eef..312d76a4f5 100644 - 1.2.1 - 1.0 - 1.3.5 -+ 3.0.2 ++ 3.0.3 + 4.0.1 -+ 2.0.0 -+ 2.1.1 ++ 2.0.1 ++ 2.1.2 + 2.0.1 + 2.1.1 3.2.6 @@ -83,29 +91,31 @@ index 0758c53eef..312d76a4f5 100644 - 1.1.6 - 1.1.6 - 1.5.1 +- 5.9.2 + 2.0.1 + 3.1.0 -+ 4.0.0 ++ 4.0.1 + 3.1.0 + 6.0.0 -+ 4.0.0 ++ 4.0.1 + 3.0.0 -+ 1.1.1 -+ 2.1.1 ++ 1.1.5 ++ 2.1.2 + 1.6.4 - 5.9.2 ++ 5.10.0 2.5.0.Final 2.0.7 -@@ -152,7 +152,7 @@ - 2.2.0 - 1.5.0 - 2.3.0-jaxb-1.0.6 -- 4.11.0 -+ 5.2.0 - - 1.21 - -@@ -171,10 +171,10 @@ + 1.7.30 +@@ -138,7 +138,7 @@ + + + +- 4.13.0 ++ 4.10.1 + 3.13.0 + 4.15.0.Final + 1.1.0 +@@ -171,7 +171,7 @@ 2.22.1 3.6.4 @@ -113,33 +123,33 @@ index 0758c53eef..312d76a4f5 100644 + 3.7.1 0.9.1 3.3.4 -- 1.22 -+ 1.23.0 - 1.3 - - -@@ -202,16 +202,16 @@ + 1.24.0 +@@ -200,18 +200,18 @@ + 3.8.1 + 3.3.0 - 1.12.18 +- 1.12.18 ++ 1.14.7 - 42.5.4 + 42.6.0 2.0.1 - 3.0.5 +- 3.0.5 ++ 3.1.5 ${version.io.smallrye.jandex} - 1.0.11 -+ 3.0.2 ++ 3.0.3 - 3.24.2 -+ 3.25.1 ++ 3.25.5 - 32.0.1-jre -+ 31.1-jre ++ 32.1.2-jre -@@ -287,7 +287,7 @@ +@@ -283,7 +283,7 @@ com.fasterxml.jackson.module @@ -148,7 +158,7 @@ index 0758c53eef..312d76a4f5 100644 ${version.com.fasterxml.jackson.annotations} -@@ -296,8 +296,8 @@ +@@ -292,8 +292,8 @@ ${version.com.fasterxml.jackson} @@ -159,7 +169,7 @@ index 0758c53eef..312d76a4f5 100644 ${version.com.fasterxml.jackson} -@@ -371,9 +371,9 @@ +@@ -367,9 +367,9 @@ ${version.com.sun.xml.bind} @@ -168,11 +178,11 @@ index 0758c53eef..312d76a4f5 100644 - ${version.com.sun.xml.bind} + org.glassfish.jaxb + jaxb-runtime -+ 4.0.2 ++ 4.0.3 com.sun.xml.bind -@@ -423,8 +423,8 @@ +@@ -419,8 +419,8 @@ @@ -183,7 +193,7 @@ index 0758c53eef..312d76a4f5 100644 ${version.jakarta.json} -@@ -459,8 +459,8 @@ +@@ -455,8 +455,8 @@ @@ -194,7 +204,7 @@ index 0758c53eef..312d76a4f5 100644 ${version.jakarta.activation} -@@ -795,12 +795,12 @@ +@@ -791,12 +791,12 @@ @@ -209,7 +219,7 @@ index 0758c53eef..312d76a4f5 100644 hibernate-jpamodelgen ${version.org.hibernate} -@@ -1119,7 +1119,7 @@ +@@ -1113,7 +1113,7 @@ @@ -218,7 +228,7 @@ index 0758c53eef..312d76a4f5 100644 hibernate-core ${version.org.hibernate} -@@ -1141,31 +1141,16 @@ +@@ -1135,31 +1135,16 @@ @@ -257,7 +267,7 @@ index 0758c53eef..312d76a4f5 100644 diff --git a/drools-base/pom.xml b/drools-base/pom.xml -index 68468e2a45..8773e29d79 100644 +index 68468e2a45..a6dd884113 100644 --- a/drools-base/pom.xml +++ b/drools-base/pom.xml @@ -83,9 +83,10 @@ @@ -269,7 +279,7 @@ index 68468e2a45..8773e29d79 100644 + org.glassfish.jaxb + jaxb-runtime provided -+ 4.0.3 ++ 4.0.4 jakarta.xml.bind @@ -1309,22 +1319,22 @@ 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; + */ + 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 @@ -1640,10 +1650,10 @@ index 752e90bb27..ab29649f32 100644 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 5e08c4dbc8..8c58653b77 100644 +index 2e6f8099db..b875115625 100644 --- a/drools-compiler/pom.xml +++ b/drools-compiler/pom.xml -@@ -128,9 +128,10 @@ +@@ -129,9 +129,10 @@ provided @@ -1652,18 +1662,18 @@ index 5e08c4dbc8..8c58653b77 100644 + org.glassfish.jaxb + jaxb-runtime provided -+ 4.0.3 ++ 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 e6f93ed5ec..f7a32d89de 100644 +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 -@@ -30,8 +30,8 @@ import java.util.LinkedHashMap; - import java.util.List; +@@ -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; @@ -1672,7 +1682,7 @@ index e6f93ed5ec..f7a32d89de 100644 import com.sun.codemodel.CodeWriter; import com.sun.codemodel.JCodeModel; diff --git a/drools-core/pom.xml b/drools-core/pom.xml -index 42092de797..08beb7b1f4 100644 +index 42092de797..59973acc7d 100644 --- a/drools-core/pom.xml +++ b/drools-core/pom.xml @@ -96,9 +96,10 @@ @@ -1684,7 +1694,7 @@ index 42092de797..08beb7b1f4 100644 + org.glassfish.jaxb + jaxb-runtime provided -+ 4.0.3 ++ 4.0.4 jakarta.xml.bind @@ -1708,13 +1718,13 @@ index 1dbb032c7e..8330b82548 100644 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 6c17e910f7..99d3531bc2 100644 +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 -@@ -19,10 +19,10 @@ - package org.drools.core.base; +@@ -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; @@ -1727,7 +1737,7 @@ index 6c17e910f7..99d3531bc2 100644 @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 6b5556a52c..09590dd508 100644 +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; @@ -1742,11 +1752,11 @@ index 6b5556a52c..09590dd508 100644 +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 3401e22816..d8baa266dc 100644 +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; @@ -1761,11 +1771,11 @@ index 3401e22816..d8baa266dc 100644 +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 d535a3be94..c3c0a75b42 100644 +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; @@ -1780,11 +1790,11 @@ index d535a3be94..c3c0a75b42 100644 +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 53047b62f3..ad510a5643 100644 +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; @@ -1799,16 +1809,16 @@ index 53047b62f3..ad510a5643 100644 +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 c3a8820eec..7be2b8f319 100644 +index f78edfeecd..609fd60b9e 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 -@@ -31,10 +31,10 @@ import org.drools.core.util.AbstractBaseLinkedListNode; - import org.drools.util.StringUtils; - import org.kie.api.runtime.rule.FactHandle; +@@ -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; @@ -1818,16 +1828,16 @@ index c3a8820eec..7be2b8f319 100644 +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; - import java.util.Objects; - import java.util.function.Consumer; - import java.util.function.Predicate; + + 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 2710924f63..2b0cb81678 100644 +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 -@@ -28,13 +28,13 @@ import org.drools.core.reteoo.RightTuple; - import org.drools.core.reteoo.Tuple; - import org.kie.api.runtime.rule.FactHandle; +@@ -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; @@ -1843,9 +1853,9 @@ index 2710924f63..2b0cb81678 100644 +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlSeeAlso; - import java.io.Externalizable; - import java.io.IOException; - import java.io.ObjectInput; + + 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 @@ -1860,12 +1870,12 @@ index d3c1b5d3e7..52799274d7 100644 @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 7bbb6e16bc..dd47f2a724 100644 +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 -@@ -25,9 +25,9 @@ import org.drools.core.reteoo.LeftTuple; - import org.drools.core.reteoo.RightTuple; - import org.drools.core.reteoo.Tuple; +@@ -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; @@ -1873,9 +1883,9 @@ index 7bbb6e16bc..dd47f2a724 100644 +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; - import java.util.Arrays; - import java.util.function.Consumer; - import java.util.function.Predicate; + + 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 @@ -1893,239 +1903,6 @@ index e37c37fc31..a9aec456b6 100644 /** * Provides a abstract base implementation that an object can extend so that it can be used in a LinkedList. -diff --git a/drools-quarkus-extension/drools-quarkus-deployment/src/main/java/org/drools/drl/quarkus/deployment/DroolsAssetsProcessor.java b/drools-quarkus-extension/drools-quarkus-deployment/src/main/java/org/drools/drl/quarkus/deployment/DroolsAssetsProcessor.java -index c679cb7bcd..5a19341206 100644 ---- a/drools-quarkus-extension/drools-quarkus-deployment/src/main/java/org/drools/drl/quarkus/deployment/DroolsAssetsProcessor.java -+++ b/drools-quarkus-extension/drools-quarkus-deployment/src/main/java/org/drools/drl/quarkus/deployment/DroolsAssetsProcessor.java -@@ -26,7 +26,7 @@ import java.util.Optional; - import java.util.Set; - import java.util.stream.Collectors; - --import javax.inject.Inject; -+import jakarta.inject.Inject; - - import io.quarkus.arc.deployment.GeneratedBeanBuildItem; - import io.quarkus.deployment.annotations.BuildProducer; -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 cc47c1a1e3..cd52e85e0f 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 -@@ -25,10 +25,10 @@ import org.kie.api.runtime.KieSession; - import org.kie.api.runtime.rule.FactHandle; - import org.kie.api.time.SessionPseudoClock; - --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 java.util.Collection; - import java.util.List; - import java.util.concurrent.TimeUnit; -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 76cedc9fb6..203de60e6b 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 -@@ -24,7 +24,7 @@ import org.kie.api.definition.KiePackage; - import org.kie.api.runtime.KieRuntimeBuilder; - import org.kie.api.runtime.KieSession; - --import javax.inject.Inject; -+import jakarta.inject.Inject; - import java.util.List; - import java.util.stream.Collectors; - -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 8205e8d898..84c941d52b 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-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 @@ -2142,7 +1919,7 @@ index 64eb8809ad..dc8e7e8d69 100644 import java.math.BigDecimal; import java.math.BigInteger; diff --git a/drools-mvel/pom.xml b/drools-mvel/pom.xml -index 32920b00fc..755633ec43 100644 +index 32920b00fc..e91bd9e3d5 100644 --- a/drools-mvel/pom.xml +++ b/drools-mvel/pom.xml @@ -90,9 +90,10 @@ @@ -2154,7 +1931,7 @@ index 32920b00fc..755633ec43 100644 + org.glassfish.jaxb + jaxb-runtime provided -+ 4.0.3 ++ 4.0.4 jakarta.xml.bind @@ -2174,7 +1951,7 @@ index 13641acfe0..a1b4bda3fb 100644 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..6387089e97 100644 +index c5b6465541..2dbe9a78a9 100644 --- a/drools-persistence/drools-persistence-api/pom.xml +++ b/drools-persistence/drools-persistence-api/pom.xml @@ -61,9 +61,10 @@ @@ -2186,7 +1963,7 @@ index c5b6465541..6387089e97 100644 + org.glassfish.jaxb + jaxb-runtime provided -+ 4.0.3 ++ 4.0.4 com.sun.xml.bind @@ -2333,7 +2110,7 @@ index 7673604692..e1dc0b573f 100644 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..1cfd38fa65 100644 +index 7706d4c655..2137f38925 100644 --- a/drools-persistence/drools-persistence-jpa/pom.xml +++ b/drools-persistence/drools-persistence-jpa/pom.xml @@ -123,9 +123,10 @@ @@ -2345,7 +2122,7 @@ index 7706d4c655..1cfd38fa65 100644 + org.glassfish.jaxb + jaxb-runtime provided -+ 4.0.3 ++ 4.0.4 com.sun.xml.bind @@ -2741,6 +2518,239 @@ index 563b210269..a61ec15cbe 100644 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 cc47c1a1e3..cd52e85e0f 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 +@@ -25,10 +25,10 @@ import org.kie.api.runtime.KieSession; + import org.kie.api.runtime.rule.FactHandle; + import org.kie.api.time.SessionPseudoClock; + +-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 java.util.Collection; + import java.util.List; + import java.util.concurrent.TimeUnit; +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 76cedc9fb6..203de60e6b 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 +@@ -24,7 +24,7 @@ import org.kie.api.definition.KiePackage; + import org.kie.api.runtime.KieRuntimeBuilder; + import org.kie.api.runtime.KieSession; + +-import javax.inject.Inject; ++import jakarta.inject.Inject; + import java.util.List; + import java.util.stream.Collectors; + +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 @@ -2792,7 +2802,7 @@ index fa47533cfe..008f664410 100644 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..e7dc861938 100644 +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 @@ @@ -2804,12 +2814,12 @@ index 5ff7b47f21..e7dc861938 100644 + org.glassfish.jaxb + jaxb-runtime test -+ 4.0.3 ++ 4.0.4 jakarta.xml.bind diff --git a/drools-traits/pom.xml b/drools-traits/pom.xml -index 4f4a128fc4..e64e44949b 100644 +index b717b85385..45ee0b7038 100644 --- a/drools-traits/pom.xml +++ b/drools-traits/pom.xml @@ -158,8 +158,8 @@ @@ -2867,7 +2877,7 @@ index 2adf906eee..126aa6a7bf 100644 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..e654092670 100755 +index b207771d95..1472be38f5 100755 --- a/drools-wiring/drools-wiring-dynamic/pom.xml +++ b/drools-wiring/drools-wiring-dynamic/pom.xml @@ -54,9 +54,10 @@ @@ -2879,7 +2889,7 @@ index b207771d95..e654092670 100755 + org.glassfish.jaxb + jaxb-runtime provided -+ 4.0.3 ++ 4.0.4 jakarta.xml.bind @@ -3189,10 +3199,10 @@ index d5bc785f51..046555611e 100644 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 d8fd3fb209..3494e8924e 100644 +index 9b630cd5d8..5cc9d73009 100644 --- a/kie-dmn/kie-dmn-legacy-tests/pom.xml +++ b/kie-dmn/kie-dmn-legacy-tests/pom.xml -@@ -120,9 +120,10 @@ +@@ -124,9 +124,10 @@ provided @@ -3201,7 +3211,7 @@ index d8fd3fb209..3494e8924e 100644 + org.glassfish.jaxb + jaxb-runtime provided -+ 4.0.3 ++ 4.0.4 jakarta.xml.bind @@ -3275,7 +3285,7 @@ index fec094247e..44999d32c3 100644 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..d282dc46c3 100644 +index 9f0f46d211..0ae7cc4b56 100644 --- a/kie-dmn/kie-dmn-openapi/pom.xml +++ b/kie-dmn/kie-dmn-openapi/pom.xml @@ -82,9 +82,10 @@ @@ -3287,15 +3297,15 @@ index 9f0f46d211..d282dc46c3 100644 + org.glassfish.jaxb + jaxb-runtime provided -+ 4.0.3 ++ 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 5c3b3ebe87..2c5331a1f4 100644 +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 -@@ -82,9 +82,10 @@ +@@ -86,9 +86,10 @@ provided @@ -3304,7 +3314,7 @@ index 5c3b3ebe87..2c5331a1f4 100644 + org.glassfish.jaxb + jaxb-runtime provided -+ 4.0.3 ++ 4.0.4 jakarta.xml.bind @@ -3500,7 +3510,7 @@ index feed0d6196..8c9014422e 100644 -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..2c20438303 100644 +index b73b247766..5ca4c195b6 100644 --- a/kie-internal/pom.xml +++ b/kie-internal/pom.xml @@ -96,9 +96,10 @@ @@ -3512,7 +3522,7 @@ index b73b247766..2c20438303 100644 + org.glassfish.jaxb + jaxb-runtime provided -+ 4.0.3 ++ 4.0.4 diff --git a/.ci/environments/quarkus-3/patches/0004_hardcoded-javax-string.patch b/.ci/environments/quarkus-3/patches/0004_hardcoded-javax-string.patch index aef3a0cfa4e..2dbb0f0ec8a 100644 --- a/.ci/environments/quarkus-3/patches/0004_hardcoded-javax-string.patch +++ b/.ci/environments/quarkus-3/patches/0004_hardcoded-javax-string.patch @@ -6,8 +6,8 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/drools-quarkus-extension/drools-quarkus-util-deployment/src/main/java/org/drools/drl/quarkus/util/deployment/DroolsQuarkusResourceUtils.java b/drools-quarkus-extension/drools-quarkus-util-deployment/src/main/java/org/drools/drl/quarkus/util/deployment/DroolsQuarkusResourceUtils.java ---- a/drools-quarkus-extension/drools-quarkus-util-deployment/src/main/java/org/drools/drl/quarkus/util/deployment/DroolsQuarkusResourceUtils.java (revision 4eb6d59aefa1df16a286666f75ead10d8b77746f) -+++ b/drools-quarkus-extension/drools-quarkus-util-deployment/src/main/java/org/drools/drl/quarkus/util/deployment/DroolsQuarkusResourceUtils.java (date 1677837541284) +--- a/drools-quarkus-extension/drools-quarkus-util-deployment/src/main/java/org/drools/quarkus/util/deployment/DroolsQuarkusResourceUtils.java (revision 4eb6d59aefa1df16a286666f75ead10d8b77746f) ++++ b/drools-quarkus-extension/drools-quarkus-util-deployment/src/main/java/org/drools/quarkus/util/deployment/DroolsQuarkusResourceUtils.java (date 1677837541284) @@ -222,8 +222,8 @@ } diff --git a/.ci/environments/quarkus-3/patches/0006_package-info.patch b/.ci/environments/quarkus-3/patches/0006_package-info.patch index a021d15ee51..82e33a08b8a 100644 --- a/.ci/environments/quarkus-3/patches/0006_package-info.patch +++ b/.ci/environments/quarkus-3/patches/0006_package-info.patch @@ -8,7 +8,7 @@ diff --git a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dta index 9b27fa3be2..9fb6a6eafb 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 -@@ -1,6 +1,6 @@ +@@ -19,6 +19,6 @@ // Copied under Apache License from https://github.com/dmn-tck/tck/blob/8c23dc13caa508a33d11b47cca318d7c3a3ca2fc/LICENSE-ASL-2.0.txt -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.omg.org/spec/DMN/20160719/testcase", - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED, diff --git a/.ci/environments/quarkus-3/patches/0010_remaining_javax_jakarta.patch b/.ci/environments/quarkus-3/patches/0010_remaining_javax_jakarta.patch index 1ee291c7174..3056f6023f8 100644 --- a/.ci/environments/quarkus-3/patches/0010_remaining_javax_jakarta.patch +++ b/.ci/environments/quarkus-3/patches/0010_remaining_javax_jakarta.patch @@ -38,20 +38,19 @@ index ef384a6d20..ac6e1c76b0 100644 diff --git a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/context/QuarkusDroolsModelBuildContext.java b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/context/QuarkusDroolsModelBuildContext.java -index 45f736f73a..7c1d82f696 100644 ---- a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/context/QuarkusDroolsModelBuildContext.java -+++ b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/context/QuarkusDroolsModelBuildContext.java -@@ -18,8 +18,8 @@ package org.drools.codegen.common.context; +--- a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/context/QuarkusDroolsModelBuildContext.java (revision 0c82d00654f33847bd2f1f4723933142a45e311a) ++++ b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/context/QuarkusDroolsModelBuildContext.java (date 1700572026783) +@@ -24,8 +24,8 @@ public class QuarkusDroolsModelBuildContext extends AbstractDroolsModelBuildContext { - + public static final String CONTEXT_NAME = "Quarkus"; - public static final String QUARKUS_REST = "javax.ws.rs.Path"; - public static final String QUARKUS_DI = "javax.inject.Inject"; + public static final String QUARKUS_REST = "jakarta.ws.rs.Path"; + public static final String QUARKUS_DI = "jakarta.inject.Inject"; - - protected QuarkusDroolsModelBuildContext(QuarkusKogitoBuildContextBuilder builder) { - super(builder, /*new CDIDependencyInjectionAnnotator(), new CDIRestAnnotator(), */ CONTEXT_NAME); + + public final boolean hasRest; + public final boolean hasDI; diff --git a/drools-model/drools-model-codegen/src/main/resources/class-templates/config/RuleConfigQuarkusTemplate.java b/drools-model/drools-model-codegen/src/main/resources/class-templates/config/RuleConfigQuarkusTemplate.java index 0cfb0ca4b6..e9f4d6bbad 100644 --- a/drools-model/drools-model-codegen/src/main/resources/class-templates/config/RuleConfigQuarkusTemplate.java diff --git a/.ci/environments/quarkus-3/quarkus3.yml b/.ci/environments/quarkus-3/quarkus3.yml index a2664acb7c5..601486c545f 100644 --- a/.ci/environments/quarkus-3/quarkus3.yml +++ b/.ci/environments/quarkus-3/quarkus3.yml @@ -3,7 +3,7 @@ description: Update Quarkus version and refactor imports and resources if needed type: specs.openrewrite.org/v1beta/recipe recipeList: - org.openrewrite.maven.ChangePropertyValue: { - newValue: 3.0.0.Final, + newValue: 3.5.2, key: version.io.quarkus } - org.kie.drools.Quarkus3Migration @@ -117,7 +117,6 @@ recipeList: } - org.kie.openrewrite.recipe.jpmml.JPMMLRecipe --- -displayName: Update Managed Dependencies recipeList: - org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId: { oldGroupId: javax.activation, @@ -502,9 +501,10 @@ recipeList: newGroupId: org.keycloak, newArtifactId: keycloak-admin-client-jakarta } -type: specs.openrewrite.org/v1beta/recipe -description: Update all managed dependencies based on dependency updates from Quarkus. +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 diff --git a/bom/drools-bom/pom.xml b/bom/drools-bom/pom.xml index 4219a530d3b..b1d41898bd3 100644 --- a/bom/drools-bom/pom.xml +++ b/bom/drools-bom/pom.xml @@ -6,7 +6,7 @@ org.kie kie-core-bom - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../kie-core-bom/pom.xml diff --git a/bom/kie-core-bom/pom.xml b/bom/kie-core-bom/pom.xml index ae8a394988a..2748a31a0d2 100644 --- a/bom/kie-core-bom/pom.xml +++ b/bom/kie-core-bom/pom.xml @@ -6,7 +6,7 @@ org.kie drools-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../../pom.xml diff --git a/bom/kie-dmn-bom/pom.xml b/bom/kie-dmn-bom/pom.xml index 89d21bdfb26..2c1c35fae9b 100644 --- a/bom/kie-dmn-bom/pom.xml +++ b/bom/kie-dmn-bom/pom.xml @@ -6,7 +6,7 @@ org.kie kie-core-bom - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../kie-core-bom/pom.xml diff --git a/bom/kie-efesto-bom/pom.xml b/bom/kie-efesto-bom/pom.xml index cc0668ba5d0..840ec7e43f5 100644 --- a/bom/kie-efesto-bom/pom.xml +++ b/bom/kie-efesto-bom/pom.xml @@ -6,7 +6,7 @@ org.kie kie-core-bom - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../kie-core-bom/pom.xml diff --git a/bom/kie-pmml-bom/pom.xml b/bom/kie-pmml-bom/pom.xml index dd93396cd03..ede6b26d5ca 100644 --- a/bom/kie-pmml-bom/pom.xml +++ b/bom/kie-pmml-bom/pom.xml @@ -6,7 +6,7 @@ org.kie kie-core-bom - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../kie-core-bom/pom.xml diff --git a/bom/pom.xml b/bom/pom.xml index 0b46d81e8b8..880bc6d3adf 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -5,7 +5,7 @@ drools-parent org.kie - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT 4.0.0 diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 445879b659a..737da61673e 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -25,7 +25,7 @@ drools-parent org.kie - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT 4.0.0 @@ -55,27 +55,27 @@ - Version properties must be sorted alphabetically (other form of sorting were found to be unclear and ambiguous). --> 1.2.9 - 1.15 + 1.16.0 3.2.2 1.1.1 - 2.11.0 + 2.13.0 1.10.0 - 2.15.2 - 2.15.2 - 2.15.2 + 2.15.3 + 2.15.3 + 2.15.3 4.31.0 3.7.4 1.0.1 3.22.0 - 2.2.220 + 2.2.224 1.0.86 2.3.0 1.4.20 0.18.0 - 4.7.1 - 1.10.2 - 2.16.12.Final - 3.1.1 + 4.7.5 + 1.11.1 + 3.5.2 + 3.7.0 8.5.11 4.13.1 1.8.0 @@ -88,43 +88,43 @@ 4.4.15 3.8.6 1.7.3 - 3.5.1 + 3.5.3 2.0.28 5.1.0 - 9.0.21 + 10.1.7 3.23.1 3.33.0 2.3.32 - 2.3.6 + 4.0.4 1.3 - 5.6.12.Final + 6.2.13.Final 2.3.0 14.0.13.Final 3.26.0-GA - 5.13.1.Final + 7.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 + 4.0.1 + 2.0.1 + 2.1.2 + 2.0.1 + 2.1.1 3.2.6 2.3.6 2.0.0 - 1.3.3 - 2.1.6 - 2.3.3 - 2.2.3 - 4.0.3 - 2.3.3 - 1.0.2 - 1.1.6 - 1.1.6 - 1.5.1 - 5.9.2 + 2.0.1 + 3.1.0 + 4.0.1 + 3.1.0 + 6.0.0 + 4.0.1 + 3.0.0 + 1.1.5 + 2.1.2 + 1.6.4 + 5.10.0 2.5.0.Final 2.0.7 1.7.30 @@ -138,7 +138,7 @@ - 4.13.0 + 4.10.1 3.13.0 4.15.0.Final 1.1.0 @@ -171,7 +171,7 @@ 2.22.1 3.6.4 - 3.6.0 + 3.7.1 0.9.1 3.3.4 1.24.0 @@ -200,18 +200,18 @@ 3.8.1 3.3.0 - 1.12.18 + 1.14.7 - 42.5.4 + 42.6.0 2.0.1 - 3.0.5 + 3.1.5 ${version.io.smallrye.jandex} - 1.0.11 + 3.0.3 - 3.24.2 + 3.25.5 - 32.0.1-jre + 32.1.2-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.3 com.sun.xml.bind @@ -419,8 +419,8 @@ - org.glassfish - jakarta.json + org.eclipse.parsson + parsson ${version.jakarta.json} @@ -455,8 +455,8 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation ${version.jakarta.activation} @@ -791,12 +791,12 @@ - org.hibernate + org.hibernate.orm hibernate-envers ${version.org.hibernate} - org.hibernate + org.hibernate.orm hibernate-jpamodelgen ${version.org.hibernate} @@ -1113,7 +1113,7 @@ - org.hibernate + org.hibernate.orm hibernate-core ${version.org.hibernate} @@ -1135,31 +1135,16 @@ - - org.hibernate - hibernate-entitymanager - ${version.org.hibernate} - - - javax.persistence - javax.persistence-api - - - org.jboss.spec.javax.transaction - jboss-transaction-api_1.2_spec - - - - javax.validation - validation-api - ${version.javax.validation} + jakarta.validation + jakarta.validation-api + 3.0.2 - javax.validation - validation-api - ${version.javax.validation} + jakarta.validation + jakarta.validation-api + 3.0.2 sources diff --git a/drools-alphanetwork-compiler/pom.xml b/drools-alphanetwork-compiler/pom.xml index 1075b38644d..7a67aa694cc 100644 --- a/drools-alphanetwork-compiler/pom.xml +++ b/drools-alphanetwork-compiler/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-base/pom.xml b/drools-base/pom.xml index 68468e2a459..abc5b9aca48 100644 --- a/drools-base/pom.xml +++ b/drools-base/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build-parent/pom.xml @@ -82,11 +82,6 @@ jaxb-core provided - - com.sun.xml.bind - jaxb-impl - provided - jakarta.xml.bind jakarta.xml.bind-api diff --git a/drools-beliefs/pom.xml b/drools-beliefs/pom.xml index 5465e504ddd..32afdb268be 100644 --- a/drools-beliefs/pom.xml +++ b/drools-beliefs/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-commands/pom.xml b/drools-commands/pom.xml index ec180aca458..a4dc5f014e9 100644 --- a/drools-commands/pom.xml +++ b/drools-commands/pom.xml @@ -27,7 +27,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-commands/src/main/java/org/drools/commands/GetVariableCommand.java b/drools-commands/src/main/java/org/drools/commands/GetVariableCommand.java index 5fc6fea50ef..55f012280bf 100644 --- a/drools-commands/src/main/java/org/drools/commands/GetVariableCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/GetVariableCommand.java @@ -18,11 +18,11 @@ */ package org.drools.commands; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListAdapter.java b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListAdapter.java index 2ef2899704a..102e011254c 100644 --- a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListAdapter.java +++ b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListAdapter.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Set; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.drools.commands.jaxb.JaxbListWrapper.JaxbWrapperType; import org.slf4j.Logger; diff --git a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListWrapper.java b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListWrapper.java index 3731c9cedf2..fab61b1b75f 100644 --- a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListWrapper.java +++ b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListWrapper.java @@ -18,11 +18,11 @@ */ package org.drools.commands.jaxb; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * This is actually a wrapper for the following collections: diff --git a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbMapAdapter.java b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbMapAdapter.java index 0086b7b657a..413d2595b44 100644 --- a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbMapAdapter.java +++ b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbMapAdapter.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbObjectObjectPair.java b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbObjectObjectPair.java index 4eed12a05b1..3d76ab5f2a0 100644 --- a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbObjectObjectPair.java +++ b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbObjectObjectPair.java @@ -18,11 +18,11 @@ */ package org.drools.commands.jaxb; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; @XmlAccessorType(XmlAccessType.NONE) public class JaxbObjectObjectPair { diff --git a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbStringObjectPair.java b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbStringObjectPair.java index cdbd1691683..0b95499a295 100644 --- a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbStringObjectPair.java +++ b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbStringObjectPair.java @@ -18,12 +18,12 @@ */ package org.drools.commands.jaxb; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; @XmlAccessorType(XmlAccessType.NONE) @XmlSeeAlso({JaxbListWrapper.class}) diff --git a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbUnknownAdapter.java b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbUnknownAdapter.java index 176f5a6e0f5..3c28fa5670b 100644 --- a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbUnknownAdapter.java +++ b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbUnknownAdapter.java @@ -31,7 +31,7 @@ import java.util.Map.Entry; import java.util.Set; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.drools.core.QueryResultsImpl; import org.drools.core.common.DisconnectedFactHandle; diff --git a/drools-commands/src/main/java/org/drools/commands/jaxb/ObjectFactory.java b/drools-commands/src/main/java/org/drools/commands/jaxb/ObjectFactory.java index 6406f23fe13..b243b5191ab 100644 --- a/drools-commands/src/main/java/org/drools/commands/jaxb/ObjectFactory.java +++ b/drools-commands/src/main/java/org/drools/commands/jaxb/ObjectFactory.java @@ -18,7 +18,7 @@ */ package org.drools.commands.jaxb; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; @XmlRegistry public class ObjectFactory { diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/AdvanceSessionTimeCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/AdvanceSessionTimeCommand.java index 38df33a7f85..56276dd5c5d 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/AdvanceSessionTimeCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/AdvanceSessionTimeCommand.java @@ -19,10 +19,10 @@ package org.drools.commands.runtime; import java.util.concurrent.TimeUnit; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.drools.commands.IdentifiableResult; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/BatchExecutionCommandImpl.java b/drools-commands/src/main/java/org/drools/commands/runtime/BatchExecutionCommandImpl.java index 4970214a046..e11edabef1a 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/BatchExecutionCommandImpl.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/BatchExecutionCommandImpl.java @@ -20,13 +20,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import org.drools.commands.fluent.Batch; import org.drools.commands.runtime.pmml.ApplyPmmlModelCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/DisposeCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/DisposeCommand.java index be75a9796ad..62154e0afb7 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/DisposeCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/DisposeCommand.java @@ -18,9 +18,9 @@ */ package org.drools.commands.runtime; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.drools.commands.impl.NotTransactionalCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultImpl.java b/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultImpl.java index 7bd405dc160..4b3b07309e8 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultImpl.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultImpl.java @@ -22,11 +22,11 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.jaxb.JaxbMapAdapter; import org.kie.api.runtime.ExecutionResults; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultsMap.java b/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultsMap.java index 0056413ec4b..7d4be781abc 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultsMap.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultsMap.java @@ -21,7 +21,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.jaxb.JaxbMapAdapter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/FlatQueryResults.java b/drools-commands/src/main/java/org/drools/commands/runtime/FlatQueryResults.java index d853414697d..997333593a5 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/FlatQueryResults.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/FlatQueryResults.java @@ -25,13 +25,13 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.jaxb.JaxbListAdapter; import org.drools.commands.jaxb.JaxbListWrapper; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/GetFactCountCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/GetFactCountCommand.java index cab731bc8f4..29063bbc693 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/GetFactCountCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/GetFactCountCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/GetGlobalCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/GetGlobalCommand.java index 27b4865b694..71c9b28373a 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/GetGlobalCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/GetGlobalCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.drools.commands.IdentifiableResult; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/GetIdCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/GetIdCommand.java index 983a6bcfce0..c0972f2fa81 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/GetIdCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/GetIdCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/GetSessionTimeCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/GetSessionTimeCommand.java index 032e7b4eb97..87b0b3d821b 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/GetSessionTimeCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/GetSessionTimeCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.drools.commands.IdentifiableResult; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/ObjectFactory.java b/drools-commands/src/main/java/org/drools/commands/runtime/ObjectFactory.java index 458b82e1644..c78c199adc6 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/ObjectFactory.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/ObjectFactory.java @@ -18,7 +18,7 @@ */ package org.drools.commands.runtime; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; @XmlRegistry diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/QueryResultsJaxbAdapter.java b/drools-commands/src/main/java/org/drools/commands/runtime/QueryResultsJaxbAdapter.java index b89d48c644f..bb4631870bd 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/QueryResultsJaxbAdapter.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/QueryResultsJaxbAdapter.java @@ -18,7 +18,7 @@ */ package org.drools.commands.runtime; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.drools.core.QueryResultsImpl; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/SetGlobalCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/SetGlobalCommand.java index 986a3920854..21c5b0b9f53 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/SetGlobalCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/SetGlobalCommand.java @@ -18,12 +18,12 @@ */ package org.drools.commands.runtime; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.IdentifiableResult; import org.drools.commands.jaxb.JaxbUnknownAdapter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/pmml/ApplyPmmlModelCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/pmml/ApplyPmmlModelCommand.java index 45487d20b14..0afdc97077d 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/pmml/ApplyPmmlModelCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/pmml/ApplyPmmlModelCommand.java @@ -21,12 +21,12 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlRootElement; import org.drools.commands.IdentifiableResult; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortProcessInstanceCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortProcessInstanceCommand.java index b198432940f..e08edd6530c 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortProcessInstanceCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortProcessInstanceCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.process; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortWorkItemCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortWorkItemCommand.java index 8a1acc9175f..20617cda7a5 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortWorkItemCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortWorkItemCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.process; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/CompleteWorkItemCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/CompleteWorkItemCommand.java index 5f063d2cc9d..5e770ecfc07 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/CompleteWorkItemCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/CompleteWorkItemCommand.java @@ -21,12 +21,12 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.jaxb.JaxbMapAdapter; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateCorrelatedProcessInstanceCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateCorrelatedProcessInstanceCommand.java index 28df02f2bd3..088a6dce463 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateCorrelatedProcessInstanceCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateCorrelatedProcessInstanceCommand.java @@ -21,12 +21,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.IdentifiableResult; import org.drools.commands.jaxb.JaxbMapAdapter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateProcessInstanceCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateProcessInstanceCommand.java index 4b6249c07d9..aea9aa29d92 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateProcessInstanceCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateProcessInstanceCommand.java @@ -21,12 +21,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.IdentifiableResult; import org.drools.commands.jaxb.JaxbMapAdapter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessEventListenersCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessEventListenersCommand.java index 718504c30e1..1d96fd6fdcc 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessEventListenersCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessEventListenersCommand.java @@ -19,9 +19,9 @@ package org.drools.commands.runtime.process; import java.util.Collection; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; import org.kie.api.command.ExecutableCommand; import org.kie.api.event.process.ProcessEventListener; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessIdsCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessIdsCommand.java index f3b25ddfe74..fc1c8196b99 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessIdsCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessIdsCommand.java @@ -20,10 +20,10 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.command.ExecutableCommand; import org.kie.api.definition.process.Process; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceByCorrelationKeyCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceByCorrelationKeyCommand.java index 57e4771a89a..7cc196e4b46 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceByCorrelationKeyCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceByCorrelationKeyCommand.java @@ -18,12 +18,12 @@ */ package org.drools.commands.runtime.process; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceCommand.java index 04359a21741..116b6c8a367 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.process; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstancesCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstancesCommand.java index 81eea329090..32c6e91af2f 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstancesCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstancesCommand.java @@ -20,10 +20,10 @@ import java.util.ArrayList; import java.util.Collection; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemCommand.java index cdebb4536e1..8edc6eb7bdc 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.process; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.drools.core.process.WorkItem; import org.drools.core.process.WorkItemManager; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemIdsCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemIdsCommand.java index 52d3faf9f5e..e13dad84214 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemIdsCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemIdsCommand.java @@ -21,10 +21,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.drools.core.process.WorkItem; import org.drools.core.process.WorkItemManager; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/ObjectFactory.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/ObjectFactory.java index 3e562063057..33bf5f12390 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/ObjectFactory.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/ObjectFactory.java @@ -19,7 +19,7 @@ package org.drools.commands.runtime.process; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; @XmlRegistry diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/ReTryWorkItemCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/ReTryWorkItemCommand.java index f1092a1f369..a98b83314f5 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/ReTryWorkItemCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/ReTryWorkItemCommand.java @@ -21,11 +21,11 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.core.process.WorkItemManager; import org.drools.commands.jaxb.JaxbMapAdapter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/RegisterWorkItemHandlerCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/RegisterWorkItemHandlerCommand.java index efa4b6c9b91..d30993a3e89 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/RegisterWorkItemHandlerCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/RegisterWorkItemHandlerCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.process; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.jaxb.JaxbUnknownAdapter; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/SetProcessInstanceVariablesCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/SetProcessInstanceVariablesCommand.java index 853bdf56262..96d113d426a 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/SetProcessInstanceVariablesCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/SetProcessInstanceVariablesCommand.java @@ -21,12 +21,12 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.jaxb.JaxbMapAdapter; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/SignalEventCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/SignalEventCommand.java index 927298a7c29..b5867b56362 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/SignalEventCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/SignalEventCommand.java @@ -18,12 +18,12 @@ */ package org.drools.commands.runtime.process; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.jaxb.JaxbUnknownAdapter; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartCorrelatedProcessCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartCorrelatedProcessCommand.java index f96051e049b..37140e853b2 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartCorrelatedProcessCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartCorrelatedProcessCommand.java @@ -21,13 +21,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.IdentifiableResult; import org.drools.commands.jaxb.JaxbMapAdapter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessCommand.java index 7d60ff3ab80..2aa2fa1fe51 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessCommand.java @@ -21,14 +21,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.IdentifiableResult; import org.drools.commands.jaxb.JaxbMapAdapter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessFromNodeIdsCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessFromNodeIdsCommand.java index 69cd161651b..99f96c11b9d 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessFromNodeIdsCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessFromNodeIdsCommand.java @@ -20,12 +20,12 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.kie.api.runtime.Context; import org.kie.api.runtime.ExecutionResults; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessInstanceCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessInstanceCommand.java index 5a7239447de..24598b5605a 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessInstanceCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessInstanceCommand.java @@ -18,9 +18,9 @@ */ package org.drools.commands.runtime.process; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/AgendaGroupSetFocusCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/AgendaGroupSetFocusCommand.java index cc8d5328e9d..0ada06b0a74 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/AgendaGroupSetFocusCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/AgendaGroupSetFocusCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearActivationGroupCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearActivationGroupCommand.java index 0a3ac217400..ab62bd194ad 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearActivationGroupCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearActivationGroupCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaCommand.java index 7fa3ec07208..c75db608176 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaCommand.java @@ -18,9 +18,9 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaGroupCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaGroupCommand.java index 59ff66b1454..f894f9ca163 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaGroupCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaGroupCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearRuleFlowGroupCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearRuleFlowGroupCommand.java index 75aa16956df..3c3b31461c1 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearRuleFlowGroupCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearRuleFlowGroupCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.drools.core.common.ReteEvaluator; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteCommand.java index e7b813a9916..2671b4521d7 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.drools.core.common.DisconnectedFactHandle; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteFromEntryPointCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteFromEntryPointCommand.java index dbdb2275b53..c93c83b1c8c 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteFromEntryPointCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteFromEntryPointCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; import org.drools.core.common.DisconnectedFactHandle; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteObjectCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteObjectCommand.java index 6e2d286e426..88f585b2003 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteObjectCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteObjectCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.util.StringUtils; import org.drools.commands.jaxb.JaxbUnknownAdapter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/EnableAuditLogCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/EnableAuditLogCommand.java index 812fc30baf1..5055346bebb 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/EnableAuditLogCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/EnableAuditLogCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.KieServices; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireAllRulesCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireAllRulesCommand.java index 4d41b24de69..6ed31da31d0 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireAllRulesCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireAllRulesCommand.java @@ -18,12 +18,12 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.IdentifiableResult; import org.drools.commands.jaxb.JaxbUnknownAdapter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireUntilHaltCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireUntilHaltCommand.java index bc4545d39b3..d4fb71df07e 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireUntilHaltCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireUntilHaltCommand.java @@ -18,11 +18,11 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.core.common.InternalWorkingMemory; import org.drools.commands.jaxb.JaxbUnknownAdapter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetAgendaEventListenersCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetAgendaEventListenersCommand.java index d138313dcbf..787878bf6d0 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetAgendaEventListenersCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetAgendaEventListenersCommand.java @@ -19,7 +19,7 @@ package org.drools.commands.runtime.rule; import java.util.Collection; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; import org.kie.api.command.ExecutableCommand; import org.kie.api.event.rule.AgendaEventListener; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointCommand.java index 55b5fa7ecb9..6c0b549a265 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointCommand.java @@ -18,7 +18,7 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; import org.drools.commands.EntryPointCreator; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointsCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointsCommand.java index d0667678ea9..4f6cb06d74f 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointsCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointsCommand.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collection; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; import org.drools.commands.EntryPointCreator; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleCommand.java index 4e3f871dc92..05b34f44233 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleCommand.java @@ -18,7 +18,7 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; import org.drools.core.common.InternalFactHandle; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleInEntryPointCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleInEntryPointCommand.java index 419e108ba31..cddfbf37d25 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleInEntryPointCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleInEntryPointCommand.java @@ -18,7 +18,7 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; import org.drools.core.common.InternalFactHandle; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandlesCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandlesCommand.java index 8507d5836e0..9b4373b2f06 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandlesCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandlesCommand.java @@ -20,9 +20,9 @@ import java.util.ArrayList; import java.util.Collection; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; import org.drools.core.common.InternalFactHandle; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectCommand.java index 0c42b317686..a9e78c4bd0d 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectCommand.java @@ -18,12 +18,12 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; import org.drools.commands.IdentifiableResult; import org.drools.core.common.DefaultFactHandle; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectInEntryPointCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectInEntryPointCommand.java index bcead60ab85..09429c60006 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectInEntryPointCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectInEntryPointCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; import org.drools.commands.IdentifiableResult; import org.drools.core.common.DefaultFactHandle; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsCommand.java index 5f0df58eaec..41214fcccf7 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsCommand.java @@ -21,10 +21,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; import org.drools.commands.IdentifiableResult; import org.drools.core.ClassObjectSerializationFilter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsInEntryPointCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsInEntryPointCommand.java index fdd9184caf1..add47b6171b 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsInEntryPointCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsInEntryPointCommand.java @@ -21,9 +21,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; import org.drools.commands.IdentifiableResult; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertElementsCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertElementsCommand.java index d310d5b7701..f7d42e08bc5 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertElementsCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertElementsCommand.java @@ -21,11 +21,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.IdentifiableResult; import org.drools.commands.runtime.ExecutionResultImpl; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectCommand.java index f6712f538df..40c21a187f6 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectCommand.java @@ -18,12 +18,12 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.commands.IdentifiableResult; import org.drools.core.common.DefaultFactHandle; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectInEntryPointCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectInEntryPointCommand.java index 682f17534a1..bf0226eb346 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectInEntryPointCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectInEntryPointCommand.java @@ -18,10 +18,10 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; import org.drools.commands.IdentifiableResult; import org.drools.core.common.DefaultFactHandle; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ModifyCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ModifyCommand.java index 19eb642aed2..d437e09b76d 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ModifyCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ModifyCommand.java @@ -21,11 +21,11 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.drools.base.base.CoreComponentsBuilder; import org.drools.core.common.DisconnectedFactHandle; import org.kie.api.command.ExecutableCommand; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ObjectFactory.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ObjectFactory.java index 43dc943295d..e58a43fe698 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ObjectFactory.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ObjectFactory.java @@ -18,7 +18,7 @@ */ package org.drools.commands.runtime.rule; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; import org.drools.commands.runtime.rule.ModifyCommand.SetterImpl; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/QueryCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/QueryCommand.java index f1393f83aa2..888d0bf5af1 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/QueryCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/QueryCommand.java @@ -21,10 +21,10 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; import org.drools.commands.IdentifiableResult; import org.drools.commands.runtime.FlatQueryResults; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateCommand.java index 59e46cce81e..d14df732516 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateCommand.java @@ -20,12 +20,12 @@ import java.util.Arrays; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.drools.core.common.DisconnectedFactHandle; import org.drools.commands.jaxb.JaxbUnknownAdapter; diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateInEntryPointCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateInEntryPointCommand.java index 752e90bb275..ab29649f32a 100644 --- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateInEntryPointCommand.java +++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateInEntryPointCommand.java @@ -20,8 +20,8 @@ import java.util.Arrays; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; import org.drools.core.common.DisconnectedFactHandle; import org.kie.api.command.ExecutableCommand; diff --git a/drools-compiler/pom.xml b/drools-compiler/pom.xml index 2e6f8099db3..ef0321cb06b 100644 --- a/drools-compiler/pom.xml +++ b/drools-compiler/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build-parent/pom.xml @@ -128,11 +128,6 @@ jaxb-core provided - - com.sun.xml.bind - jaxb-impl - provided - jakarta.xml.bind jakarta.xml.bind-api diff --git a/drools-compiler/src/main/java/org/drools/compiler/kproject/models/KieBaseModelImpl.java b/drools-compiler/src/main/java/org/drools/compiler/kproject/models/KieBaseModelImpl.java index c64a98e84ba..c4c1361de06 100644 --- a/drools-compiler/src/main/java/org/drools/compiler/kproject/models/KieBaseModelImpl.java +++ b/drools-compiler/src/main/java/org/drools/compiler/kproject/models/KieBaseModelImpl.java @@ -73,7 +73,7 @@ public class KieBaseModelImpl private KieModuleModel kModule; - private String scope = "javax.enterprise.context.ApplicationScoped"; + private String scope = "jakarta.enterprise.context.ApplicationScoped"; private List ruleTemplates = new ArrayList<>(); diff --git a/drools-compiler/src/main/java/org/drools/compiler/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java b/drools-compiler/src/main/java/org/drools/compiler/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java index 6b8db5a0935..60be4ac0b66 100644 --- a/drools-compiler/src/main/java/org/drools/compiler/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java +++ b/drools-compiler/src/main/java/org/drools/compiler/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java @@ -31,8 +31,8 @@ import java.util.Map; import java.util.Map.Entry; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import com.sun.codemodel.CodeWriter; import com.sun.codemodel.JCodeModel; diff --git a/drools-core/pom.xml b/drools-core/pom.xml index 42092de7979..7d1a086d9a5 100644 --- a/drools-core/pom.xml +++ b/drools-core/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build-parent/pom.xml @@ -95,11 +95,6 @@ jaxb-core provided - - com.sun.xml.bind - jaxb-impl - provided - jakarta.xml.bind jakarta.xml.bind-api diff --git a/drools-core/src/main/java/org/drools/core/ClassObjectSerializationFilter.java b/drools-core/src/main/java/org/drools/core/ClassObjectSerializationFilter.java index 1dbb032c7e7..8330b82548f 100644 --- a/drools-core/src/main/java/org/drools/core/ClassObjectSerializationFilter.java +++ b/drools-core/src/main/java/org/drools/core/ClassObjectSerializationFilter.java @@ -18,10 +18,10 @@ */ package org.drools.core; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.runtime.ClassObjectFilter; import org.kie.api.runtime.ObjectFilter; diff --git a/drools-core/src/main/java/org/drools/core/base/ArrayElements.java b/drools-core/src/main/java/org/drools/core/base/ArrayElements.java index 9301d93da1a..09535a5ce9d 100644 --- a/drools-core/src/main/java/org/drools/core/base/ArrayElements.java +++ b/drools-core/src/main/java/org/drools/core/base/ArrayElements.java @@ -20,10 +20,10 @@ import java.util.Arrays; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; @XmlType(name="array-elements") @XmlAccessorType(XmlAccessType.NONE) diff --git a/drools-core/src/main/java/org/drools/core/base/RuleNameEndsWithAgendaFilter.java b/drools-core/src/main/java/org/drools/core/base/RuleNameEndsWithAgendaFilter.java index 50ea110d72a..3f838d12589 100644 --- a/drools-core/src/main/java/org/drools/core/base/RuleNameEndsWithAgendaFilter.java +++ b/drools-core/src/main/java/org/drools/core/base/RuleNameEndsWithAgendaFilter.java @@ -20,10 +20,10 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.runtime.rule.AgendaFilter; import org.kie.api.runtime.rule.Match; diff --git a/drools-core/src/main/java/org/drools/core/base/RuleNameEqualsAgendaFilter.java b/drools-core/src/main/java/org/drools/core/base/RuleNameEqualsAgendaFilter.java index 398651d8249..aa7388b8e7d 100644 --- a/drools-core/src/main/java/org/drools/core/base/RuleNameEqualsAgendaFilter.java +++ b/drools-core/src/main/java/org/drools/core/base/RuleNameEqualsAgendaFilter.java @@ -20,10 +20,10 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.runtime.rule.AgendaFilter; import org.kie.api.runtime.rule.Match; diff --git a/drools-core/src/main/java/org/drools/core/base/RuleNameMatchesAgendaFilter.java b/drools-core/src/main/java/org/drools/core/base/RuleNameMatchesAgendaFilter.java index 55a226bd99e..8512f85eac6 100644 --- a/drools-core/src/main/java/org/drools/core/base/RuleNameMatchesAgendaFilter.java +++ b/drools-core/src/main/java/org/drools/core/base/RuleNameMatchesAgendaFilter.java @@ -22,10 +22,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.runtime.rule.AgendaFilter; import org.kie.api.runtime.rule.Match; diff --git a/drools-core/src/main/java/org/drools/core/base/RuleNameStartsWithAgendaFilter.java b/drools-core/src/main/java/org/drools/core/base/RuleNameStartsWithAgendaFilter.java index 285b2602674..8b9c211c9ea 100644 --- a/drools-core/src/main/java/org/drools/core/base/RuleNameStartsWithAgendaFilter.java +++ b/drools-core/src/main/java/org/drools/core/base/RuleNameStartsWithAgendaFilter.java @@ -20,10 +20,10 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.kie.api.runtime.rule.AgendaFilter; import org.kie.api.runtime.rule.Match; diff --git a/drools-core/src/main/java/org/drools/core/common/DefaultFactHandle.java b/drools-core/src/main/java/org/drools/core/common/DefaultFactHandle.java index f78edfeecd1..609fd60b9ea 100644 --- a/drools-core/src/main/java/org/drools/core/common/DefaultFactHandle.java +++ b/drools-core/src/main/java/org/drools/core/common/DefaultFactHandle.java @@ -23,10 +23,10 @@ import java.util.function.Predicate; import java.util.stream.Stream; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.drools.base.factmodel.traits.TraitTypeEnum; import org.drools.base.rule.EntryPointId; diff --git a/drools-core/src/main/java/org/drools/core/common/DisconnectedFactHandle.java b/drools-core/src/main/java/org/drools/core/common/DisconnectedFactHandle.java index f3b76bf1444..4eae2aafa38 100644 --- a/drools-core/src/main/java/org/drools/core/common/DisconnectedFactHandle.java +++ b/drools-core/src/main/java/org/drools/core/common/DisconnectedFactHandle.java @@ -25,13 +25,13 @@ import java.util.function.Consumer; import java.util.function.Predicate; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlSeeAlso; import org.drools.base.factmodel.traits.TraitTypeEnum; import org.drools.base.rule.EntryPointId; diff --git a/drools-core/src/main/java/org/drools/core/common/ObjectFactory.java b/drools-core/src/main/java/org/drools/core/common/ObjectFactory.java index d3c1b5d3e70..52799274d7e 100644 --- a/drools-core/src/main/java/org/drools/core/common/ObjectFactory.java +++ b/drools-core/src/main/java/org/drools/core/common/ObjectFactory.java @@ -18,7 +18,7 @@ */ package org.drools.core.common; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; @XmlRegistry public class ObjectFactory { diff --git a/drools-core/src/main/java/org/drools/core/common/QueryElementFactHandle.java b/drools-core/src/main/java/org/drools/core/common/QueryElementFactHandle.java index 97be135e6f2..04f6eef60d0 100644 --- a/drools-core/src/main/java/org/drools/core/common/QueryElementFactHandle.java +++ b/drools-core/src/main/java/org/drools/core/common/QueryElementFactHandle.java @@ -22,9 +22,9 @@ import java.util.function.Consumer; import java.util.function.Predicate; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; import org.drools.base.factmodel.traits.TraitTypeEnum; import org.drools.base.rule.EntryPointId; diff --git a/drools-core/src/main/java/org/drools/core/util/AbstractBaseLinkedListNode.java b/drools-core/src/main/java/org/drools/core/util/AbstractBaseLinkedListNode.java index e37c37fc310..a9aec456b6a 100644 --- a/drools-core/src/main/java/org/drools/core/util/AbstractBaseLinkedListNode.java +++ b/drools-core/src/main/java/org/drools/core/util/AbstractBaseLinkedListNode.java @@ -18,9 +18,9 @@ */ package org.drools.core.util; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; /** * Provides a abstract base implementation that an object can extend so that it can be used in a LinkedList. diff --git a/drools-decisiontables/pom.xml b/drools-decisiontables/pom.xml index 8e619b0b2da..13170327dfc 100644 --- a/drools-decisiontables/pom.xml +++ b/drools-decisiontables/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-distribution/pom.xml b/drools-distribution/pom.xml index ca2607bcc57..d2ca5bc9700 100644 --- a/drools-distribution/pom.xml +++ b/drools-distribution/pom.xml @@ -6,7 +6,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-docs/pom.xml b/drools-docs/pom.xml index 138a53dc190..eb7e5afd670 100755 --- a/drools-docs/pom.xml +++ b/drools-docs/pom.xml @@ -7,7 +7,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-docs/src/modules/ROOT/pages/migration-guide/migration-v7-to-kogito/_proc-kogito-migrate-drl-implement-ruleunits.adoc b/drools-docs/src/modules/ROOT/pages/migration-guide/migration-v7-to-kogito/_proc-kogito-migrate-drl-implement-ruleunits.adoc index 111c12b6c3c..4cc2968027d 100644 --- a/drools-docs/src/modules/ROOT/pages/migration-guide/migration-v7-to-kogito/_proc-kogito-migrate-drl-implement-ruleunits.adoc +++ b/drools-docs/src/modules/ROOT/pages/migration-guide/migration-v7-to-kogito/_proc-kogito-migrate-drl-implement-ruleunits.adoc @@ -127,7 +127,7 @@ The following is an example of a REST endpoint that takes a rule unit as input a @Path("/find-approved") public class LoanUnitQueryFindApprovedEndpoint { - @javax.inject.Inject + @jakarta.inject.Inject RuleUnit ruleUnit; public LoanUnitQueryFindApprovedEndpoint() { diff --git a/drools-drl/drools-drl-ast/pom.xml b/drools-drl/drools-drl-ast/pom.xml index d57333c2b26..0ed5987f04b 100644 --- a/drools-drl/drools-drl-ast/pom.xml +++ b/drools-drl/drools-drl-ast/pom.xml @@ -26,7 +26,7 @@ org.drools drools-drl - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT org.drools diff --git a/drools-drl/drools-drl-extensions/pom.xml b/drools-drl/drools-drl-extensions/pom.xml index 8a14241f9d8..ce7b3f5b340 100644 --- a/drools-drl/drools-drl-extensions/pom.xml +++ b/drools-drl/drools-drl-extensions/pom.xml @@ -26,7 +26,7 @@ org.drools drools-drl - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT org.drools diff --git a/drools-drl/drools-drl-parser/pom.xml b/drools-drl/drools-drl-parser/pom.xml index 922a78b4f34..3a7a72de361 100644 --- a/drools-drl/drools-drl-parser/pom.xml +++ b/drools-drl/drools-drl-parser/pom.xml @@ -26,7 +26,7 @@ org.drools drools-drl - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT org.drools diff --git a/drools-drl/pom.xml b/drools-drl/pom.xml index 8b13481d07f..cfba7fdfb8d 100644 --- a/drools-drl/pom.xml +++ b/drools-drl/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml index 9ebf47d3e7a..4843787eee6 100644 --- a/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml +++ b/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml @@ -23,7 +23,7 @@ org.drools drools-drlonyaml-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT drools-drlonyaml-cli-tests Drools :: DRL on YAML :: CLI tests diff --git a/drools-drlonyaml-parent/drools-drlonyaml-cli/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-cli/pom.xml index f3a7784cb23..20afc38304e 100644 --- a/drools-drlonyaml-parent/drools-drlonyaml-cli/pom.xml +++ b/drools-drlonyaml-parent/drools-drlonyaml-cli/pom.xml @@ -23,7 +23,7 @@ org.drools drools-drlonyaml-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT drools-drlonyaml-cli Drools :: DRL on YAML :: CLI diff --git a/drools-drlonyaml-parent/drools-drlonyaml-model/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-model/pom.xml index c49ce93592d..ac5bc54272b 100644 --- a/drools-drlonyaml-parent/drools-drlonyaml-model/pom.xml +++ b/drools-drlonyaml-parent/drools-drlonyaml-model/pom.xml @@ -23,7 +23,7 @@ org.drools drools-drlonyaml-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT drools-drlonyaml-model Drools :: DRL on YAML :: model diff --git a/drools-drlonyaml-parent/drools-drlonyaml-schemagen/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-schemagen/pom.xml index 50a56ef4bdf..cf1e1eba16d 100644 --- a/drools-drlonyaml-parent/drools-drlonyaml-schemagen/pom.xml +++ b/drools-drlonyaml-parent/drools-drlonyaml-schemagen/pom.xml @@ -23,7 +23,7 @@ org.drools drools-drlonyaml-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT drools-drlonyaml-schemagen Drools :: DRL on YAML :: schema generator diff --git a/drools-drlonyaml-parent/drools-drlonyaml-todrl/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-todrl/pom.xml index ca6a18e6e48..fc2123bb2b4 100644 --- a/drools-drlonyaml-parent/drools-drlonyaml-todrl/pom.xml +++ b/drools-drlonyaml-parent/drools-drlonyaml-todrl/pom.xml @@ -23,7 +23,7 @@ org.drools drools-drlonyaml-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT drools-drlonyaml-todrl Drools :: DRL on YAML :: to DRL emitter diff --git a/drools-drlonyaml-parent/pom.xml b/drools-drlonyaml-parent/pom.xml index 66f2239ee3a..970e81affb9 100644 --- a/drools-drlonyaml-parent/pom.xml +++ b/drools-drlonyaml-parent/pom.xml @@ -23,7 +23,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build-parent/pom.xml org.drools diff --git a/drools-ecj/pom.xml b/drools-ecj/pom.xml index ec0bdd20958..52278fc07a5 100644 --- a/drools-ecj/pom.xml +++ b/drools-ecj/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-engine-classic/pom.xml b/drools-engine-classic/pom.xml index 8207bbfd45b..ab08b6d484a 100644 --- a/drools-engine-classic/pom.xml +++ b/drools-engine-classic/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-engine/pom.xml b/drools-engine/pom.xml index db6ce44e7b2..ef5cafdc78a 100644 --- a/drools-engine/pom.xml +++ b/drools-engine/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-examples-api/default-kiesession-from-file/pom.xml b/drools-examples-api/default-kiesession-from-file/pom.xml index d41a54fc876..64ebf18a596 100644 --- a/drools-examples-api/default-kiesession-from-file/pom.xml +++ b/drools-examples-api/default-kiesession-from-file/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT default-kiesession-from-file diff --git a/drools-examples-api/default-kiesession/pom.xml b/drools-examples-api/default-kiesession/pom.xml index 2b6f916be02..68270c2f57a 100644 --- a/drools-examples-api/default-kiesession/pom.xml +++ b/drools-examples-api/default-kiesession/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT default-kiesession diff --git a/drools-examples-api/kie-module-from-multiple-files/pom.xml b/drools-examples-api/kie-module-from-multiple-files/pom.xml index 02c31972a5a..44a84b2a24b 100644 --- a/drools-examples-api/kie-module-from-multiple-files/pom.xml +++ b/drools-examples-api/kie-module-from-multiple-files/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT kie-module-from-multiple-files diff --git a/drools-examples-api/kiebase-inclusion/pom.xml b/drools-examples-api/kiebase-inclusion/pom.xml index caf5f4f3c53..80248ce3317 100644 --- a/drools-examples-api/kiebase-inclusion/pom.xml +++ b/drools-examples-api/kiebase-inclusion/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT kiebase-inclusion diff --git a/drools-examples-api/kiecontainer-from-kierepo/pom.xml b/drools-examples-api/kiecontainer-from-kierepo/pom.xml index 065fca8fae9..8432bd7e3ac 100644 --- a/drools-examples-api/kiecontainer-from-kierepo/pom.xml +++ b/drools-examples-api/kiecontainer-from-kierepo/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT kiecontainer-from-kierepo diff --git a/drools-examples-api/kiefilesystem-example/pom.xml b/drools-examples-api/kiefilesystem-example/pom.xml index c3db7cf436e..71fc5786f25 100644 --- a/drools-examples-api/kiefilesystem-example/pom.xml +++ b/drools-examples-api/kiefilesystem-example/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT kiefilesystem-example diff --git a/drools-examples-api/kiemodulemodel-example/pom.xml b/drools-examples-api/kiemodulemodel-example/pom.xml index 8deb710a98b..3ef5eee8cbb 100644 --- a/drools-examples-api/kiemodulemodel-example/pom.xml +++ b/drools-examples-api/kiemodulemodel-example/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT kiemodulemodel-example diff --git a/drools-examples-api/multiple-kbases/pom.xml b/drools-examples-api/multiple-kbases/pom.xml index 9636a806d8a..f987d210133 100644 --- a/drools-examples-api/multiple-kbases/pom.xml +++ b/drools-examples-api/multiple-kbases/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT multiple-kbases diff --git a/drools-examples-api/named-kiesession-from-file/pom.xml b/drools-examples-api/named-kiesession-from-file/pom.xml index 411bec642f3..79d18655cd7 100644 --- a/drools-examples-api/named-kiesession-from-file/pom.xml +++ b/drools-examples-api/named-kiesession-from-file/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT Drools :: API examples :: Named KieSession from File diff --git a/drools-examples-api/named-kiesession/pom.xml b/drools-examples-api/named-kiesession/pom.xml index 84cd75d19e8..5d89250609e 100644 --- a/drools-examples-api/named-kiesession/pom.xml +++ b/drools-examples-api/named-kiesession/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT named-kiesession diff --git a/drools-examples-api/pom.xml b/drools-examples-api/pom.xml index 81bd07d20f3..4853b62c545 100644 --- a/drools-examples-api/pom.xml +++ b/drools-examples-api/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-examples-api/reactive-kiesession/pom.xml b/drools-examples-api/reactive-kiesession/pom.xml index 6ec8a00ef5e..804e1b8e4dd 100644 --- a/drools-examples-api/reactive-kiesession/pom.xml +++ b/drools-examples-api/reactive-kiesession/pom.xml @@ -26,7 +26,7 @@ org.drools drools-examples-api - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT reactive-kiesession diff --git a/drools-examples/pom.xml b/drools-examples/pom.xml index 0c29bff3b2f..4320813f43c 100644 --- a/drools-examples/pom.xml +++ b/drools-examples/pom.xml @@ -25,7 +25,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-fastutil/pom.xml b/drools-fastutil/pom.xml index e32492dab64..6d309510262 100644 --- a/drools-fastutil/pom.xml +++ b/drools-fastutil/pom.xml @@ -27,7 +27,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-common/pom.xml b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-common/pom.xml index 0f27e9eb2d3..9f4be9ce63f 100644 --- a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-common/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-common/pom.xml @@ -25,7 +25,7 @@ drools-impact-analysis-graph org.drools - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT 4.0.0 diff --git a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/pom.xml b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/pom.xml index 7eda96fad51..399b057b87c 100644 --- a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/pom.xml @@ -25,7 +25,7 @@ drools-impact-analysis-graph org.drools - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT 4.0.0 diff --git a/drools-impact-analysis/drools-impact-analysis-graph/pom.xml b/drools-impact-analysis/drools-impact-analysis-graph/pom.xml index 911f98e191a..a881079c0c0 100644 --- a/drools-impact-analysis/drools-impact-analysis-graph/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-graph/pom.xml @@ -25,7 +25,7 @@ drools-impact-analysis org.drools - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT 4.0.0 diff --git a/drools-impact-analysis/drools-impact-analysis-itests/pom.xml b/drools-impact-analysis/drools-impact-analysis-itests/pom.xml index f75835377ad..90888a6974c 100644 --- a/drools-impact-analysis/drools-impact-analysis-itests/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-itests/pom.xml @@ -25,7 +25,7 @@ drools-impact-analysis org.drools - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT 4.0.0 diff --git a/drools-impact-analysis/drools-impact-analysis-model/pom.xml b/drools-impact-analysis/drools-impact-analysis-model/pom.xml index aadc2e5492c..f3aaaad461c 100644 --- a/drools-impact-analysis/drools-impact-analysis-model/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-model/pom.xml @@ -25,7 +25,7 @@ drools-impact-analysis org.drools - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT 4.0.0 diff --git a/drools-impact-analysis/drools-impact-analysis-parser/pom.xml b/drools-impact-analysis/drools-impact-analysis-parser/pom.xml index daa671a78cd..c5feff6e971 100644 --- a/drools-impact-analysis/drools-impact-analysis-parser/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-parser/pom.xml @@ -25,7 +25,7 @@ drools-impact-analysis org.drools - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT 4.0.0 diff --git a/drools-impact-analysis/pom.xml b/drools-impact-analysis/pom.xml index a59f6e20b97..591127c7d1f 100644 --- a/drools-impact-analysis/pom.xml +++ b/drools-impact-analysis/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-io/pom.xml b/drools-io/pom.xml index cb1d5638663..e9cd2c6e874 100644 --- a/drools-io/pom.xml +++ b/drools-io/pom.xml @@ -27,7 +27,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-kiesession/pom.xml b/drools-kiesession/pom.xml index d3f459e0430..eef429e68e5 100644 --- a/drools-kiesession/pom.xml +++ b/drools-kiesession/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-legacy-test-util/pom.xml b/drools-legacy-test-util/pom.xml index ea166eb7e66..6623fcc1f38 100644 --- a/drools-legacy-test-util/pom.xml +++ b/drools-legacy-test-util/pom.xml @@ -26,7 +26,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-legacy-test-util/src/test/java/org/drools/mvel/compiler/Person.java b/drools-legacy-test-util/src/test/java/org/drools/mvel/compiler/Person.java index 64eb8809ad9..dc8e7e8d69d 100644 --- a/drools-legacy-test-util/src/test/java/org/drools/mvel/compiler/Person.java +++ b/drools-legacy-test-util/src/test/java/org/drools/mvel/compiler/Person.java @@ -20,8 +20,8 @@ import org.drools.base.factmodel.traits.Traitable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; import java.io.Serializable; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/drools-legacy-test-util/src/test/resources/META-INF/kmodule.xml b/drools-legacy-test-util/src/test/resources/META-INF/kmodule.xml index ba432d56502..5c4fd952307 100644 --- a/drools-legacy-test-util/src/test/resources/META-INF/kmodule.xml +++ b/drools-legacy-test-util/src/test/resources/META-INF/kmodule.xml @@ -32,7 +32,7 @@ - + diff --git a/drools-metric/pom.xml b/drools-metric/pom.xml index b309eb91868..3bdcf393fb6 100644 --- a/drools-metric/pom.xml +++ b/drools-metric/pom.xml @@ -27,7 +27,7 @@ org.kie drools-build-parent - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drools-model/drools-canonical-model/pom.xml b/drools-model/drools-canonical-model/pom.xml index bf5edab4f4b..0cb6057bfe1 100644 --- a/drools-model/drools-canonical-model/pom.xml +++ b/drools-model/drools-canonical-model/pom.xml @@ -27,7 +27,7 @@ org.drools drools-model - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT Drools :: Canonical Model diff --git a/drools-model/drools-codegen-common/pom.xml b/drools-model/drools-codegen-common/pom.xml index 19e95a2cdb6..fce3d798019 100644 --- a/drools-model/drools-codegen-common/pom.xml +++ b/drools-model/drools-codegen-common/pom.xml @@ -27,7 +27,7 @@ org.drools drools-model - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT org.drools diff --git a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/context/QuarkusDroolsModelBuildContext.java b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/context/QuarkusDroolsModelBuildContext.java index 9a4b9005f7b..ff25830536c 100644 --- a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/context/QuarkusDroolsModelBuildContext.java +++ b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/context/QuarkusDroolsModelBuildContext.java @@ -24,8 +24,8 @@ public class QuarkusDroolsModelBuildContext extends AbstractDroolsModelBuildContext { public static final String CONTEXT_NAME = "Quarkus"; - public static final String QUARKUS_REST = "javax.ws.rs.Path"; - public static final String QUARKUS_DI = "javax.inject.Inject"; + public static final String QUARKUS_REST = "jakarta.ws.rs.Path"; + public static final String QUARKUS_DI = "jakarta.inject.Inject"; public final boolean hasRest; public final boolean hasDI; diff --git a/drools-model/drools-model-codegen/pom.xml b/drools-model/drools-model-codegen/pom.xml index 0d836c6499a..e308acaf98e 100644 --- a/drools-model/drools-model-codegen/pom.xml +++ b/drools-model/drools-model-codegen/pom.xml @@ -27,7 +27,7 @@ org.drools drools-model - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT org.drools diff --git a/drools-model/drools-model-codegen/src/main/resources/class-templates/config/RuleConfigQuarkusTemplate.java b/drools-model/drools-model-codegen/src/main/resources/class-templates/config/RuleConfigQuarkusTemplate.java index b9850908b87..c54f3c8d7a9 100644 --- a/drools-model/drools-model-codegen/src/main/resources/class-templates/config/RuleConfigQuarkusTemplate.java +++ b/drools-model/drools-model-codegen/src/main/resources/class-templates/config/RuleConfigQuarkusTemplate.java @@ -18,17 +18,17 @@ */ package $Package$; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.kie.kogito.drools.core.config.AbstractRuleConfig; import org.kie.api.event.rule.AgendaEventListener; import org.kie.api.event.rule.RuleRuntimeEventListener; import org.kie.kogito.rules.RuleEventListenerConfig; -@javax.inject.Singleton +@jakarta.inject.Singleton class RuleConfig extends AbstractRuleConfig implements org.kie.kogito.rules.RuleConfig { - @javax.inject.Inject + @jakarta.inject.Inject public RuleConfig( Instance ruleEventListenerConfigs, Instance agendaEventListeners, diff --git a/drools-model/drools-model-codegen/src/main/resources/class-templates/rules/ProjectRuntimeQuarkusTemplate.java b/drools-model/drools-model-codegen/src/main/resources/class-templates/rules/ProjectRuntimeQuarkusTemplate.java index 6bad1995aa1..ee69deb295e 100644 --- a/drools-model/drools-model-codegen/src/main/resources/class-templates/rules/ProjectRuntimeQuarkusTemplate.java +++ b/drools-model/drools-model-codegen/src/main/resources/class-templates/rules/ProjectRuntimeQuarkusTemplate.java @@ -27,7 +27,7 @@ import org.kie.api.runtime.KieRuntimeBuilder; import org.drools.modelcompiler.KieBaseBuilder; -@javax.enterprise.context.ApplicationScoped +@jakarta.enterprise.context.ApplicationScoped public class ProjectRuntime implements KieRuntimeBuilder { private static final ProjectModel model = new ProjectModel(); diff --git a/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestObjectMapperQuarkusTemplate.java b/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestObjectMapperQuarkusTemplate.java index 6bc3c5e4050..36fc0b8ec40 100644 --- a/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestObjectMapperQuarkusTemplate.java +++ b/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestObjectMapperQuarkusTemplate.java @@ -23,7 +23,7 @@ import java.io.IOException; import com.fasterxml.jackson.databind.JavaType; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestQueryJavaTemplate.java b/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestQueryJavaTemplate.java index 3cd2a6b68d1..c441dfd850e 100644 --- a/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestQueryJavaTemplate.java +++ b/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestQueryJavaTemplate.java @@ -19,11 +19,11 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.drools.ruleunits.api.RuleUnit; import org.drools.ruleunits.api.RuleUnitInstance; diff --git a/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestQueryQuarkusTemplate.java b/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestQueryQuarkusTemplate.java index 338697d185f..7780623f58b 100644 --- a/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestQueryQuarkusTemplate.java +++ b/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestQueryQuarkusTemplate.java @@ -19,11 +19,11 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.drools.ruleunits.api.RuleUnit; import org.drools.ruleunits.api.RuleUnitInstance; @@ -32,7 +32,7 @@ @Path("/$endpointName$") public class $unit$Query$name$Endpoint { - @javax.inject.Inject + @jakarta.inject.Inject RuleUnit<$UnitType$> ruleUnit; public $unit$Query$name$Endpoint() { } diff --git a/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RuleUnitQuarkusTemplate.java b/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RuleUnitQuarkusTemplate.java index faf8610793a..aabad8800ea 100644 --- a/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RuleUnitQuarkusTemplate.java +++ b/drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RuleUnitQuarkusTemplate.java @@ -28,7 +28,7 @@ import org.drools.ruleunits.impl.ReteEvaluatorBasedRuleUnitInstance; import org.drools.ruleunits.impl.sessions.RuleUnitExecutorImpl; -@javax.enterprise.context.ApplicationScoped +@jakarta.enterprise.context.ApplicationScoped public class CLASS_NAME extends AbstractRuleUnit { private static final InternalRuleBase ruleBase = KieBaseBuilder.createKieBaseFromModel(new RULE_UNIT_MODEL(), $KieBaseOptions$); @@ -43,8 +43,8 @@ public CLASS_NAME() { this((RuleUnits) null); } - @javax.inject.Inject - public CLASS_NAME(javax.enterprise.inject.Instance ruleUnits) { + @jakarta.inject.Inject + public CLASS_NA(jakarta.enterprise.inject.Instance ruleUnits) { this(ruleUnits == null || ruleUnits.isUnsatisfied() ? AbstractRuleUnits.DummyRuleUnits.INSTANCE : ruleUnits.get()); } diff --git a/drools-model/drools-model-compiler/pom.xml b/drools-model/drools-model-compiler/pom.xml index 37904eb7c5a..863bf622787 100644 --- a/drools-model/drools-model-compiler/pom.xml +++ b/drools-model/drools-model-compiler/pom.xml @@ -27,7 +27,7 @@ org.drools drools-model - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT Drools :: Model :: Compiler diff --git a/drools-model/drools-mvel-compiler/pom.xml b/drools-model/drools-mvel-compiler/pom.xml index 4ffd852c401..f0204639a62 100644 --- a/drools-model/drools-mvel-compiler/pom.xml +++ b/drools-model/drools-mvel-compiler/pom.xml @@ -27,7 +27,7 @@ org.drools drools-model - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT Drools :: MVEL Compiler diff --git a/drools-model/drools-mvel-parser/pom.xml b/drools-model/drools-mvel-parser/pom.xml index a18102dc4ea..6ca144c30fa 100644 --- a/drools-model/drools-mvel-parser/pom.xml +++ b/drools-model/drools-mvel-parser/pom.xml @@ -24,7 +24,7 @@ org.drools drools-model - 8.45.0-SNAPSHOT + 9.45.0-SNAPSHOT Drools :: MVEL Parser diff --git a/drools-model/drools-mvel-parser/src/main/java/org/drools/mvel/parser/MvelParser.java b/drools-model/drools-mvel-parser/src/main/java/org/drools/mvel/parser/MvelParser.java index 00edf488ce4..e641bda95ba 100644 --- a/drools-model/drools-mvel-parser/src/main/java/org/drools/mvel/parser/MvelParser.java +++ b/drools-model/drools-mvel-parser/src/main/java/org/drools/mvel/parser/MvelParser.java @@ -80,7 +80,7 @@ public MvelParser(ParserConfiguration configuration) { public MvelParser(ParserConfiguration configuration, boolean optionalSemicolon) { this.configuration = configuration; - configuration.getPostProcessors().clear(); + configuration.getProcessors().clear(); this.optionalSemicolon = optionalSemicolon; } @@ -140,8 +140,8 @@ public ParseResult parse(ParseStart start, Provider provi N resultNode = start.parse(parser); ParseResult result = new ParseResult<>(resultNode, parser.problems, parser.getCommentsCollection()); - configuration.getPostProcessors().forEach(postProcessor -> - postProcessor.process(result, configuration)); + configuration.getProcessors().forEach(processor -> + processor.get().postProcess(result, configuration)); result.getProblems().sort(PROBLEM_BY_BEGIN_POSITION); diff --git a/drools-model/drools-mvel-parser/src/main/javacc/mvel.jj b/drools-model/drools-mvel-parser/src/main/javacc/mvel.jj index 615512de3f8..d4752e980d5 100644 --- a/drools-model/drools-mvel-parser/src/main/javacc/mvel.jj +++ b/drools-model/drools-mvel-parser/src/main/javacc/mvel.jj @@ -1370,13 +1370,14 @@ ModifierHolder Modifiers(): * Also note that JavaParser handles the hierarchy/specialisations of classes, interfaces, and enums differently to the JLS. *
    *
  • This {@code ClassOrInterfaceDeclaration} refers to the {@code NormalClassDeclaration} and {@code NormalInterfaceDeclaration},
    • - *
  • while {@code AnnotationTypeDeclaration} and {@code EnumDeclaration} are handled separately within this grammar.
    • + *
  • while {@code AnnotationTypeDeclaration}, {@code EnumDeclaration}, and {@code RecordDeclaration} are handled separately within this grammar.
    • *
- * https://docs.oracle.com/javase/specs/jls/se15/html/jls-8.html#jls-8.1 + * https://docs.oracle.com/javase/specs/jls/se17/html/jls-8.html#jls-8.1 * 
{@code
  *     ClassDeclaration:
  *         NormalClassDeclaration
  *         EnumDeclaration
+ *         RecordDeclaration
  *     NormalClassDeclaration:
  *         {ClassModifier} class TypeIdentifier [TypeParameters] [Superclass] [Superinterfaces] ClassBody
  * }
@@ -1396,6 +1397,7 @@ ClassOrInterfaceDeclaration ClassOrInterfaceDeclaration(ModifierHolder modifier) RangedList typePar = new RangedList(emptyNodeList()); NodeList extList = emptyNodeList(); NodeList impList = emptyNodeList(); + NodeList permittedTypes = emptyNodeList(); NodeList> members = emptyNodeList(); JavaToken begin = modifier.begin; } @@ -1413,15 +1415,15 @@ ClassOrInterfaceDeclaration ClassOrInterfaceDeclaration(ModifierHolder modifier) members = ClassOrInterfaceBody() - { return new ClassOrInterfaceDeclaration(range(begin, token()), modifier.modifiers, modifier.annotations, isInterface, name, typePar.list, extList, impList, members); } + { return new ClassOrInterfaceDeclaration(range(begin, token()), modifier.modifiers, modifier.annotations, isInterface, name, typePar.list, extList, impList, permittedTypes, members); } } /** - * https://openjdk.java.net/jeps/395#Java-grammar + * https://docs.oracle.com/javase/specs/jls/se17/html/jls-8.html#jls-8.10 * 
{@code
  *     RecordDeclaration:
  *        {ClassModifier} `record` TypeIdentifier [TypeParameters]
- *          RecordHeader [SuperInterfaces] RecordBody
+ *          RecordHeader [ClassImplements] RecordBody
  *
  *      RecordHeader:
  *       `(` [RecordComponentList] `)`
@@ -1430,11 +1432,15 @@ ClassOrInterfaceDeclaration ClassOrInterfaceDeclaration(ModifierHolder modifier)
  *       RecordComponent { `,` RecordComponent}
  *
  *      RecordComponent:
- *       {Annotation} UnannType Identifier
+ *       {RecordComponentModifier} UnannType Identifier
  *       VariableArityRecordComponent
  *
  *      VariableArityRecordComponent:
  *       {Annotation} UnannType {Annotation} `...` Identifier
+ *       {RecordComponentModifier} UnannType {Annotation} `...` Identifier
+ *
+ *      RecordComponentModifier:
+ *       Annotation
  *
  *      RecordBody:
  *        `{` {RecordBodyDeclaration} `}`
@@ -1859,6 +1865,9 @@ BodyDeclaration RecordBodyDeclaration():
          |
             LOOKAHEAD("enum")
             ret = EnumDeclaration(modifiers)
+         |
+            LOOKAHEAD("record")
+            ret = RecordDeclaration(modifiers)
          |
             LOOKAHEAD("@" "interface")
             ret = AnnotationTypeDeclaration(modifiers)
@@ -3365,13 +3374,15 @@ Expression EqualityExpression():
  */
 PatternExpr PatternExpression():
 {
+    ModifierHolder modifier;
     ReferenceType type;
     SimpleName name;
 }
 {
-    type = AnnotatedReferenceType()
+    modifier = Modifiers()
+    type = ReferenceType(modifier.annotations)
     name = SimpleName()
-    { return new PatternExpr(range(type, token()), type, name); }
+    { return new PatternExpr(range(type, token()), modifier.modifiers, type, name); }
 }
 
 
@@ -4527,6 +4538,11 @@ Statement BlockStatement():
             LOOKAHEAD( Modifiers() "record" SimpleName() [ TypeParameters() ] Parameters() )
             modifier = Modifiers()
             recordDeclaration = RecordDeclaration(modifier) { ret = new LocalRecordDeclarationStmt(range(recordDeclaration, token()), recordDeclaration); }
+         |
+            // try yield statement separate from more general Statement() because yield is not a keyword but
+            // just a restricted identifier and a yield statement can be confused with VariableDeclarationExpression sometimes
+            LOOKAHEAD( YieldStatement() )
+            ret = YieldStatement()
          |
             LOOKAHEAD( VariableDeclarationExpression() )
             expr = VariableDeclarationExpression()
diff --git a/drools-model/pom.xml b/drools-model/pom.xml
index a6d6fe71d2e..3974c0cddfa 100644
--- a/drools-model/pom.xml
+++ b/drools-model/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-mvel/pom.xml b/drools-mvel/pom.xml
index 32920b00fc6..29aced03e4a 100644
--- a/drools-mvel/pom.xml
+++ b/drools-mvel/pom.xml
@@ -26,7 +26,7 @@
     
         org.kie
         drools-build-parent
-        8.45.0-SNAPSHOT
+        9.45.0-SNAPSHOT
         ../build-parent/pom.xml
     
 
@@ -89,11 +89,6 @@
             jaxb-core
             provided
         
-        
-            com.sun.xml.bind
-            jaxb-impl
-            provided
-        
         
             jakarta.xml.bind
             jakarta.xml.bind-api
diff --git a/drools-mvel/src/test/java/org/drools/mvel/compiler/Person.java b/drools-mvel/src/test/java/org/drools/mvel/compiler/Person.java
index 13641acfe0b..a1b4bda3fb8 100644
--- a/drools-mvel/src/test/java/org/drools/mvel/compiler/Person.java
+++ b/drools-mvel/src/test/java/org/drools/mvel/compiler/Person.java
@@ -20,8 +20,8 @@
 
 import org.drools.base.factmodel.traits.Traitable;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/drools-persistence/drools-persistence-api/pom.xml b/drools-persistence/drools-persistence-api/pom.xml
index c5b64655419..3be86650401 100644
--- a/drools-persistence/drools-persistence-api/pom.xml
+++ b/drools-persistence/drools-persistence-api/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-persistence
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   drools-persistence-api
@@ -60,11 +60,6 @@
       org.drools
       drools-commands
     
-    
-      com.sun.xml.bind
-      jaxb-impl
-      provided
-    
     
       com.sun.xml.bind
       jaxb-xjc
diff --git a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/PersistenceContextManager.java b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/PersistenceContextManager.java
index 1037ab3c35d..5a20fa88f64 100644
--- a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/PersistenceContextManager.java
+++ b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/PersistenceContextManager.java
@@ -22,7 +22,7 @@
 import org.kie.api.command.Command;
 import org.kie.api.runtime.KieSession;
 
-import javax.transaction.Synchronization;
+import jakarta.transaction.Synchronization;
 
 public interface PersistenceContextManager {
     
diff --git a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/TransactionSynchronizationRegistryHelper.java b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/TransactionSynchronizationRegistryHelper.java
index 647c178f2b2..74654794cf9 100644
--- a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/TransactionSynchronizationRegistryHelper.java
+++ b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/TransactionSynchronizationRegistryHelper.java
@@ -18,7 +18,7 @@
  */
 package org.drools.persistence.api;
 
-import javax.transaction.TransactionSynchronizationRegistry;
+import jakarta.transaction.TransactionSynchronizationRegistry;
 
 import org.drools.persistence.jta.JtaTransactionSynchronizationAdapter;
 import org.slf4j.Logger;
diff --git a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionManager.java b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionManager.java
index 967365339f9..7b7869f2ade 100644
--- a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionManager.java
+++ b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionManager.java
@@ -23,10 +23,10 @@
 import java.util.Map;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.TransactionSynchronizationRegistry;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.Status;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.TransactionSynchronizationRegistry;
+import jakarta.transaction.UserTransaction;
 
 import org.drools.persistence.api.TransactionManager;
 import org.drools.persistence.api.TransactionSynchronization;
@@ -50,7 +50,7 @@ public class JtaTransactionManager
      */
     public static final String           DEFAULT_TRANSACTION_SYNCHRONIZATION_REGISTRY_NAME = "java:comp/TransactionSynchronizationRegistry";
 
-    private static final String          TRANSACTION_SYNCHRONIZATION_REGISTRY_CLASS_NAME   = "javax.transaction.TransactionSynchronizationRegistry";
+    private static final String          TRANSACTION_SYNCHRONIZATION_REGISTRY_CLASS_NAME   = "jakarta.transaction.TransactionSynchronizationRegistry";
 
     private static Class< ? >            transactionSynchronizationRegistryClass;
 
@@ -72,7 +72,7 @@ protected Map initialValue() {
 
     UserTransaction                      ut;
     Object                               tsr;
-    javax.transaction.TransactionManager tm;
+    jakarta.transaction.TransactionManager tm;
     
     public JtaTransactionManager(Object ut,
                                  Object tsr,
@@ -83,20 +83,20 @@ public JtaTransactionManager(Object ut,
             this.ut = ( UserTransaction ) ( (ut != null) ? ut : findUserTransaction() );
         }
         
-        if ( tm instanceof javax.transaction.TransactionManager ) {
-            this.tm = ( javax.transaction.TransactionManager ) tm;
+        if ( tm instanceof jakarta.transaction.TransactionManager ) {
+            this.tm = ( jakarta.transaction.TransactionManager ) tm;
         } else {
-            this.tm = ( javax.transaction.TransactionManager ) ( (tm != null) ? tm : findTransactionManager( this.ut ) );
+            this.tm = ( jakarta.transaction.TransactionManager ) ( (tm != null) ? tm : findTransactionManager( this.ut ) );
         }
         this.tsr = (tsr != null) ? tsr : findTransactionSynchronizationRegistry( this.ut,
                                                                                  this.tm );
     }
 
-    protected javax.transaction.TransactionManager findTransactionManager(UserTransaction ut) {
-        if ( ut instanceof javax.transaction.TransactionManager ) {
+    protected jakarta.transaction.TransactionManager findTransactionManager(UserTransaction ut) {
+        if ( ut instanceof jakarta.transaction.TransactionManager ) {
             logger.debug( "JTA UserTransaction object [{}] implements TransactionManager",
                           ut );
-            return (javax.transaction.TransactionManager) ut;
+            return (jakarta.transaction.TransactionManager) ut;
         }
 
         InitialContext context;
@@ -115,7 +115,7 @@ protected javax.transaction.TransactionManager findTransactionManager(UserTransa
                 continue;
             }
             try {
-                javax.transaction.TransactionManager tm = (javax.transaction.TransactionManager) context.lookup( jndiName );
+                jakarta.transaction.TransactionManager tm = (jakarta.transaction.TransactionManager) context.lookup( jndiName );
                 logger.debug( "JTA TransactionManager found at fallback JNDI location [{}]",
                               jndiName );
                 return tm;
@@ -149,7 +149,7 @@ protected UserTransaction findUserTransaction() {
     }
 
     protected Object findTransactionSynchronizationRegistry(UserTransaction ut,
-                                                            javax.transaction.TransactionManager tm) {
+                                                            jakarta.transaction.TransactionManager tm) {
 
         if ( transactionSynchronizationRegistryClass == null ) {
             // JTA 1.1 API not present - skip.
@@ -219,7 +219,7 @@ public boolean begin() {
                 return true;
             } catch ( Exception e ) {
                 // special WAS handling for cached UserTrnsactions
-                if (e.getClass().getName().equals("javax.ejb.EJBException")) {
+                if (e.getClass().getName().equals("jakarta.ejb.EJBException")) {
                     // reinitialize all fields
                     this.ut = findUserTransaction();
                     this.tm = findTransactionManager(this.ut);
diff --git a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionManagerFactory.java b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionManagerFactory.java
index e7c3b5eb52f..e99fe58afd7 100644
--- a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionManagerFactory.java
+++ b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionManagerFactory.java
@@ -36,8 +36,8 @@ public TransactionManager newTransactionManager() {
     }
 
     /**
-     * Creates a {@link JtaTransactionManager} instance using any of the {@link javax.transaction.UserTransaction},
-     * {@link javax.transaction.TransactionSynchronizationRegistry}, and {@link javax.transaction.TransactionManager}
+     * Creates a {@link JtaTransactionManager} instance using any of the {@link jakarta.transaction.UserTransaction},
+     * {@link jakarta.transaction.TransactionSynchronizationRegistry}, and {@link jakarta.transaction.TransactionManager}
      * present in {@code env}.
      * 
      * @param env
diff --git a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionSynchronizationAdapter.java b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionSynchronizationAdapter.java
index fa387cd3a4d..79247df16e3 100644
--- a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionSynchronizationAdapter.java
+++ b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionSynchronizationAdapter.java
@@ -18,8 +18,8 @@
  */
 package org.drools.persistence.jta;
 
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
+import jakarta.transaction.Status;
+import jakarta.transaction.Synchronization;
 
 import org.drools.persistence.api.TransactionManager;
 import org.drools.persistence.api.TransactionSynchronization;
diff --git a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/TransactionLockInterceptor.java b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/TransactionLockInterceptor.java
index 7673604692a..e1dc0b573f0 100644
--- a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/TransactionLockInterceptor.java
+++ b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/TransactionLockInterceptor.java
@@ -21,7 +21,7 @@
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.locks.ReentrantLock;
-import javax.transaction.Status;
+import jakarta.transaction.Status;
 
 import org.drools.commands.impl.AbstractInterceptor;
 import org.drools.persistence.api.OrderedTransactionSynchronization;
diff --git a/drools-persistence/drools-persistence-jpa/pom.xml b/drools-persistence/drools-persistence-jpa/pom.xml
index 7706d4c6556..3bfa2e0a132 100644
--- a/drools-persistence/drools-persistence-jpa/pom.xml
+++ b/drools-persistence/drools-persistence-jpa/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-persistence
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   drools-persistence-jpa
@@ -122,11 +122,6 @@
       org.drools
       drools-mvel
     
-    
-      com.sun.xml.bind
-      jaxb-impl
-      provided
-    
     
       com.sun.xml.bind
       jaxb-xjc
@@ -167,13 +162,8 @@
     
 
     
-    
-      org.hibernate
-      hibernate-entitymanager
-      test
-    
-    
-      org.hibernate
+    
+      org.hibernate.orm
       hibernate-core
       test
       
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/TriggerUpdateTransactionSynchronization.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/TriggerUpdateTransactionSynchronization.java
index 82114ee5644..71bc7749ffe 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/TriggerUpdateTransactionSynchronization.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/TriggerUpdateTransactionSynchronization.java
@@ -19,7 +19,7 @@
 package org.drools.persistence;
 
 import java.util.Set;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import org.drools.persistence.api.TransactionManager;
 import org.drools.persistence.api.TransactionManagerHelper;
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/SessionInfo.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/SessionInfo.java
index ec5069ad65a..54fd6cc38ad 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/SessionInfo.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/SessionInfo.java
@@ -20,15 +20,15 @@
 
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Transient;
-import javax.persistence.Version;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Lob;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Transient;
+import jakarta.persistence.Version;
 
 import org.drools.persistence.api.PersistentSession;
 import org.drools.persistence.SessionMarshallingHelper;
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/WorkItemInfo.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/WorkItemInfo.java
index 3db72569d34..ce26c9d2f87 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/WorkItemInfo.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/WorkItemInfo.java
@@ -23,15 +23,15 @@
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Transient;
-import javax.persistence.Version;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Lob;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Transient;
+import jakarta.persistence.Version;
 
 import org.drools.core.marshalling.MarshallerReaderContext;
 import org.drools.core.marshalling.MarshallerWriteContext;
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/AbstractPersistenceContextManager.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/AbstractPersistenceContextManager.java
index 0e2bf94fd71..415ce0724c6 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/AbstractPersistenceContextManager.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/AbstractPersistenceContextManager.java
@@ -18,8 +18,8 @@
  */
  package org.drools.persistence.jpa;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
 
 import org.drools.persistence.api.TransactionManager;
 import org.kie.api.runtime.Environment;
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContext.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContext.java
index 08c24f246f3..4ae16e7ed56 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContext.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContext.java
@@ -20,8 +20,8 @@
 
 import java.lang.reflect.Field;
 
-import javax.persistence.EntityManager;
-import javax.persistence.LockModeType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.LockModeType;
 
 import org.drools.persistence.api.PersistenceContext;
 import org.drools.persistence.api.PersistentSession;
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContextManager.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContextManager.java
index 2663169c075..7dc6f58be9b 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContextManager.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContextManager.java
@@ -18,7 +18,7 @@
  */
  package org.drools.persistence.jpa;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import org.drools.persistence.api.PersistenceContext;
 import org.drools.persistence.api.PersistenceContextManager;
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/OptimisticLockRetryInterceptor.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/OptimisticLockRetryInterceptor.java
index ec5e1d68a5b..91485667576 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/OptimisticLockRetryInterceptor.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/OptimisticLockRetryInterceptor.java
@@ -24,7 +24,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.persistence.OptimisticLockException;
+import jakarta.persistence.OptimisticLockException;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/EntityPersister.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/EntityPersister.java
index 31c97addfb7..80544087bdf 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/EntityPersister.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/EntityPersister.java
@@ -21,7 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 public class EntityPersister {
 
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/JPAPlaceholderResolverStrategy.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/JPAPlaceholderResolverStrategy.java
index 9e4b4469f6b..98c9a5b745c 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/JPAPlaceholderResolverStrategy.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/JPAPlaceholderResolverStrategy.java
@@ -27,11 +27,11 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.Metamodel;
 import org.drools.base.common.DroolsObjectInputStream;
 import org.drools.persistence.api.TransactionAware;
 import org.drools.persistence.api.TransactionManager;
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/MappedVariable.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/MappedVariable.java
index 5448b4c2ebb..7f9072b9fcb 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/MappedVariable.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/MappedVariable.java
@@ -19,13 +19,13 @@
 package org.drools.persistence.jpa.marshaller;
 
 import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Version;
 
 @Entity
 @SequenceGenerator(name="mappedVarIdSeq", sequenceName="MAPPED_VAR_ID_SEQ")
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/VariableEntity.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/VariableEntity.java
index 1cbe51e3229..abc061e965a 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/VariableEntity.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/VariableEntity.java
@@ -21,11 +21,11 @@
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.JoinColumn;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.OneToMany;
-import javax.persistence.FetchType;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.FetchType;
 
 @MappedSuperclass
 public abstract class VariableEntity implements Serializable {
diff --git a/drools-persistence/drools-persistence-jpa/src/test/filtered-resources/META-INF/persistence.xml b/drools-persistence/drools-persistence-jpa/src/test/filtered-resources/META-INF/persistence.xml
index 36800ba01f5..845fcc9f72a 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/filtered-resources/META-INF/persistence.xml
+++ b/drools-persistence/drools-persistence-jpa/src/test/filtered-resources/META-INF/persistence.xml
@@ -19,10 +19,10 @@
     under the License.
 
 -->
-
+             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
 
     
       org.hibernate.jpa.HibernatePersistenceProvider
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerFactoryTest.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerFactoryTest.java
index 137814bbcf2..d8d57b2d3c5 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerFactoryTest.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerFactoryTest.java
@@ -20,13 +20,13 @@
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.HeuristicMixedException;
+import jakarta.transaction.HeuristicRollbackException;
+import jakarta.transaction.NotSupportedException;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.TransactionManager;
+import jakarta.transaction.UserTransaction;
 import org.drools.core.impl.EnvironmentFactory;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerTest.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerTest.java
index 399a7437300..449fc7759ae 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerTest.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerTest.java
@@ -23,10 +23,10 @@
 import java.util.Map;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.transaction.RollbackException;
-import javax.transaction.UserTransaction;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.UserTransaction;
 
 import org.drools.commands.impl.CommandBasedStatefulKnowledgeSessionImpl;
 import org.drools.kiesession.rulebase.InternalKnowledgeBase;
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestCommand.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestCommand.java
index 973d928459a..42df2e5504d 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestCommand.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestCommand.java
@@ -19,8 +19,8 @@
 package org.drools.persistence.jta;
 
 import java.util.HashMap;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
 
 import com.arjuna.ats.jta.TransactionManager;
 import org.drools.core.base.MapGlobalResolver;
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestObject.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestObject.java
index b06c96053c2..c9930291c87 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestObject.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestObject.java
@@ -20,13 +20,13 @@
 
 import java.io.Serializable;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.SequenceGenerator;
 
 /**
  * This class is used to test transactions. 
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/kie/persistence/session/JpaPersistentStatefulSessionTest.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/kie/persistence/session/JpaPersistentStatefulSessionTest.java
index 0f5b11a2b2e..0863d2fdfae 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/kie/persistence/session/JpaPersistentStatefulSessionTest.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/kie/persistence/session/JpaPersistentStatefulSessionTest.java
@@ -29,7 +29,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.naming.InitialContext;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.UserTransaction;
 
 import org.drools.core.FlowSessionConfiguration;
 import org.drools.core.SessionConfiguration;
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/map/impl/JpaBasedPersistenceTest.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/map/impl/JpaBasedPersistenceTest.java
index 6a001acc5c1..730575a1a4d 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/map/impl/JpaBasedPersistenceTest.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/map/impl/JpaBasedPersistenceTest.java
@@ -34,7 +34,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/JpaPersistentStatefulSessionTest.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/JpaPersistentStatefulSessionTest.java
index d7e3a61ae4e..f61559f90b1 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/JpaPersistentStatefulSessionTest.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/JpaPersistentStatefulSessionTest.java
@@ -29,7 +29,7 @@
 import java.util.stream.IntStream;
 
 import javax.naming.InitialContext;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.UserTransaction;
 
 import org.drools.commands.ChainableRunner;
 import org.drools.commands.impl.CommandBasedStatefulKnowledgeSessionImpl;
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/ReloadSessionTest.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/ReloadSessionTest.java
index 67d4e42d621..b49aff78383 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/ReloadSessionTest.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/ReloadSessionTest.java
@@ -23,8 +23,8 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.Random;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 
 import org.drools.core.common.DefaultFactHandle;
 import org.drools.kiesession.rulebase.InternalKnowledgeBase;
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/util/DroolsPersistenceUtil.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/util/DroolsPersistenceUtil.java
index 563b210269f..a61ec15cbe6 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/util/DroolsPersistenceUtil.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/util/DroolsPersistenceUtil.java
@@ -22,7 +22,7 @@
 import static org.kie.api.runtime.EnvironmentName.TRANSACTION;
 
 import java.util.Map;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.UserTransaction;
 import org.drools.core.base.MapGlobalResolver;
 import org.drools.core.impl.EnvironmentFactory;
 import org.kie.api.runtime.Environment;
diff --git a/drools-persistence/pom.xml b/drools-persistence/pom.xml
index 00bef440d26..943b575f803 100644
--- a/drools-persistence/pom.xml
+++ b/drools-persistence/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-quarkus-extension/drools-quarkus-deployment/pom.xml b/drools-quarkus-extension/drools-quarkus-deployment/pom.xml
index 423625403da..20fe8a88e59 100644
--- a/drools-quarkus-extension/drools-quarkus-deployment/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-deployment/pom.xml
@@ -26,7 +26,7 @@
     
         org.drools
       drools-quarkus-extension
-      8.45.0-SNAPSHOT
+      9.45.0-SNAPSHOT
     
 
   Drools :: Quarkus Extension :: Deployment
diff --git a/drools-quarkus-extension/drools-quarkus-deployment/src/main/java/org/drools/quarkus/deployment/DroolsAssetsProcessor.java b/drools-quarkus-extension/drools-quarkus-deployment/src/main/java/org/drools/quarkus/deployment/DroolsAssetsProcessor.java
index 1ac349f63e5..51aa2e792bb 100644
--- a/drools-quarkus-extension/drools-quarkus-deployment/src/main/java/org/drools/quarkus/deployment/DroolsAssetsProcessor.java
+++ b/drools-quarkus-extension/drools-quarkus-deployment/src/main/java/org/drools/quarkus/deployment/DroolsAssetsProcessor.java
@@ -44,7 +44,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.Collection;
 import java.util.Set;
 import java.util.stream.Collectors;
diff --git a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml
index 2eb787ebc6b..927d0a2f3fe 100644
--- a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-quarkus-examples
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   Drools :: Quarkus Extension :: Examples :: Reactive
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 532ee58bf1c..4122df9325f 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/pom.xml b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/pom.xml
index afae02b4aa9..348ece3db83 100644
--- a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-quarkus-examples
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   Drools :: Quarkus Extension :: Examples :: Reactive
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 ff8e3f9091d..799f21622af 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 bbed58452e9..da927c5ab08 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.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 52f998f55f4..9771b03d800 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-examples/pom.xml b/drools-quarkus-extension/drools-quarkus-examples/pom.xml
index 22470a5c070..3603bddd1a5 100644
--- a/drools-quarkus-extension/drools-quarkus-examples/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-examples/pom.xml
@@ -26,7 +26,7 @@
     
         org.drools
         drools-quarkus-extension
-        8.45.0-SNAPSHOT
+        9.45.0-SNAPSHOT
     
 
     Drools :: Quarkus Extension :: Examples
diff --git a/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/pom.xml b/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/pom.xml
index 472853de637..0d84ebc548e 100644
--- a/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-quarkus-extension
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   Drools :: Quarkus Extension :: Integration Test :: Hotreload
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 28cd4eb6d15..8cea5670cfe 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 @@
 
 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/pom.xml b/drools-quarkus-extension/drools-quarkus-integration-test/pom.xml
index ad4c2de0ab0..00e8a4e1ed8 100644
--- a/drools-quarkus-extension/drools-quarkus-integration-test/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-integration-test/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-quarkus-extension
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   Drools :: Quarkus Extension :: Integration Test
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 cc47c1a1e36..cd52e85e0fe 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
@@ -25,10 +25,10 @@
 import org.kie.api.runtime.rule.FactHandle;
 import org.kie.api.time.SessionPseudoClock;
 
-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 java.util.Collection;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
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 76cedc9fb6c..203de60e6b6 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
@@ -24,7 +24,7 @@
 import org.kie.api.runtime.KieRuntimeBuilder;
 import org.kie.api.runtime.KieSession;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.List;
 import java.util.stream.Collectors;
 
diff --git a/drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml b/drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml
index b5a5eb028dd..38fbe522ec9 100644
--- a/drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-quarkus-extension
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   Drools :: Quarkus Extension :: Quickstart Integration 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 a58bbabd5c2..8f8ecf910c8 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 @@
 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 4896b42524c..0aa6285eb04 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 6bcc7afc179..21ce175faa9 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/pom.xml b/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/pom.xml
index 5eace980cfe..2ad1a5a92d7 100644
--- a/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-quarkus-extension
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   Drools :: Quarkus Extension :: Integration Test with Rule Unit
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 471c3c33a99..99e2c9da1bb 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 @@
 
 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 e3b9d48e5ab..ba13c358f3f 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.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 48aaf172010..873e112e293 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.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-util-deployment/pom.xml b/drools-quarkus-extension/drools-quarkus-util-deployment/pom.xml
index 8d48b47cfe4..69278aa57c2 100644
--- a/drools-quarkus-extension/drools-quarkus-util-deployment/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-util-deployment/pom.xml
@@ -26,7 +26,7 @@
     
         org.drools
         drools-quarkus-extension
-        8.45.0-SNAPSHOT
+        9.45.0-SNAPSHOT
     
 
     Drools :: Quarkus Extension :: Util :: Deployment
diff --git a/drools-quarkus-extension/drools-quarkus-util-deployment/src/main/java/org/drools/quarkus/util/deployment/DroolsQuarkusResourceUtils.java b/drools-quarkus-extension/drools-quarkus-util-deployment/src/main/java/org/drools/quarkus/util/deployment/DroolsQuarkusResourceUtils.java
index 9ebcb26c6de..66d34d6222b 100644
--- a/drools-quarkus-extension/drools-quarkus-util-deployment/src/main/java/org/drools/quarkus/util/deployment/DroolsQuarkusResourceUtils.java
+++ b/drools-quarkus-extension/drools-quarkus-util-deployment/src/main/java/org/drools/quarkus/util/deployment/DroolsQuarkusResourceUtils.java
@@ -218,8 +218,8 @@ public static List getRuleUnitDefProducerSource(IndexView indexVi
     }
 
     private static final String RULE_UNIT_DEF_PRODUCER =
-            "import javax.enterprise.context.Dependent;\n" +
-                    "import javax.enterprise.inject.Produces;\n" +
+            "import jakarta.enterprise.context.Dependent;\n" +
+                    "import jakarta.enterprise.inject.Produces;\n" +
                     "\n" +
                     "import org.drools.ruleunits.api.RuleUnit;\n" +
                     "import org.drools.ruleunits.api.RuleUnitProvider;\n" +
diff --git a/drools-quarkus-extension/drools-quarkus/pom.xml b/drools-quarkus-extension/drools-quarkus/pom.xml
index a7691b98b52..06cb2a331e8 100644
--- a/drools-quarkus-extension/drools-quarkus/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus/pom.xml
@@ -26,7 +26,7 @@
     
         org.drools
         drools-quarkus-extension
-        8.45.0-SNAPSHOT
+        9.45.0-SNAPSHOT
     
 
     Drools :: Quarkus Extension :: Runtime
@@ -103,7 +103,7 @@
         
             
                 io.quarkus
-                quarkus-bootstrap-maven-plugin
+                quarkus-extension-maven-plugin
                 ${version.io.quarkus}
                 
                     
diff --git a/drools-quarkus-extension/pom.xml b/drools-quarkus-extension/pom.xml
index 7cf6b3e871f..8ade23da169 100644
--- a/drools-quarkus-extension/pom.xml
+++ b/drools-quarkus-extension/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-reliability/drools-reliability-core/pom.xml b/drools-reliability/drools-reliability-core/pom.xml
index c7068938535..cff44f3335c 100644
--- a/drools-reliability/drools-reliability-core/pom.xml
+++ b/drools-reliability/drools-reliability-core/pom.xml
@@ -25,7 +25,7 @@
   
     org.drools
     drools-reliability
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-reliability/drools-reliability-h2mvstore/pom.xml b/drools-reliability/drools-reliability-h2mvstore/pom.xml
index 46125f79c37..68c23e9e933 100644
--- a/drools-reliability/drools-reliability-h2mvstore/pom.xml
+++ b/drools-reliability/drools-reliability-h2mvstore/pom.xml
@@ -25,7 +25,7 @@
   
     org.drools
     drools-reliability
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-reliability/drools-reliability-infinispan/pom.xml b/drools-reliability/drools-reliability-infinispan/pom.xml
index 1e735e0b826..13d20b36685 100644
--- a/drools-reliability/drools-reliability-infinispan/pom.xml
+++ b/drools-reliability/drools-reliability-infinispan/pom.xml
@@ -25,7 +25,7 @@
   
     org.drools
     drools-reliability
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   4.0.0
 
@@ -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-reliability/drools-reliability-tests/pom.xml b/drools-reliability/drools-reliability-tests/pom.xml
index 270bbb193fb..fe3e1a445a6 100644
--- a/drools-reliability/drools-reliability-tests/pom.xml
+++ b/drools-reliability/drools-reliability-tests/pom.xml
@@ -25,7 +25,7 @@
   
     org.drools
     drools-reliability
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-reliability/pom.xml b/drools-reliability/pom.xml
index e9ac51adab6..4de43247f10 100644
--- a/drools-reliability/pom.xml
+++ b/drools-reliability/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     drools-build-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
     ../build-parent/pom.xml
   
   4.0.0
diff --git a/drools-retediagram/pom.xml b/drools-retediagram/pom.xml
index 0b01f7ff5c0..cc5cbc1143c 100644
--- a/drools-retediagram/pom.xml
+++ b/drools-retediagram/pom.xml
@@ -24,7 +24,7 @@
   
     org.kie
     drools-build-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-ruleunits/drools-ruleunits-api/pom.xml b/drools-ruleunits/drools-ruleunits-api/pom.xml
index 136a88a3ab5..50a42248f34 100755
--- a/drools-ruleunits/drools-ruleunits-api/pom.xml
+++ b/drools-ruleunits/drools-ruleunits-api/pom.xml
@@ -26,7 +26,7 @@
     
         org.drools
         drools-ruleunits
-        8.45.0-SNAPSHOT
+        9.45.0-SNAPSHOT
     
 
     org.drools
diff --git a/drools-ruleunits/drools-ruleunits-dsl/pom.xml b/drools-ruleunits/drools-ruleunits-dsl/pom.xml
index 7441a9b54dc..47a0f0cd87c 100755
--- a/drools-ruleunits/drools-ruleunits-dsl/pom.xml
+++ b/drools-ruleunits/drools-ruleunits-dsl/pom.xml
@@ -26,7 +26,7 @@
     
         org.drools
         drools-ruleunits
-        8.45.0-SNAPSHOT
+        9.45.0-SNAPSHOT
     
 
     org.drools
diff --git a/drools-ruleunits/drools-ruleunits-engine/pom.xml b/drools-ruleunits/drools-ruleunits-engine/pom.xml
index bff104e553b..becda7d1add 100644
--- a/drools-ruleunits/drools-ruleunits-engine/pom.xml
+++ b/drools-ruleunits/drools-ruleunits-engine/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-ruleunits
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   drools-ruleunits-engine
diff --git a/drools-ruleunits/drools-ruleunits-impl/pom.xml b/drools-ruleunits/drools-ruleunits-impl/pom.xml
index 0c3d6198967..803017799e5 100755
--- a/drools-ruleunits/drools-ruleunits-impl/pom.xml
+++ b/drools-ruleunits/drools-ruleunits-impl/pom.xml
@@ -26,7 +26,7 @@
     
         org.drools
         drools-ruleunits
-        8.45.0-SNAPSHOT
+        9.45.0-SNAPSHOT
     
 
     org.drools
diff --git a/drools-ruleunits/drools-ruleunits-impl/src/main/java/org/drools/ruleunits/impl/SimpleRuleUnitVariable.java b/drools-ruleunits/drools-ruleunits-impl/src/main/java/org/drools/ruleunits/impl/SimpleRuleUnitVariable.java
index f3f4aca02fa..b492c0cda60 100644
--- a/drools-ruleunits/drools-ruleunits-impl/src/main/java/org/drools/ruleunits/impl/SimpleRuleUnitVariable.java
+++ b/drools-ruleunits/drools-ruleunits-impl/src/main/java/org/drools/ruleunits/impl/SimpleRuleUnitVariable.java
@@ -18,12 +18,12 @@
  */
 package org.drools.ruleunits.impl;
 
+import java.lang.reflect.Type;
+
 import org.drools.ruleunits.api.DataSource;
 import org.drools.ruleunits.api.DataStore;
 import org.kie.internal.ruleunit.RuleUnitVariable;
 
-import java.lang.reflect.Type;
-
 import static org.drools.util.ClassUtils.rawType;
 import static org.drools.util.StringUtils.ucFirst;
 import static org.drools.wiring.api.util.ClassUtils.convertFromPrimitiveType;
@@ -47,7 +47,15 @@ public SimpleRuleUnitVariable(String name, Type type, Class dataSourceParamet
         this.setter = setter;
         this.type = type;
         this.dataSourceParameterType = dataSourceParameterType;
-        this.boxedVarType = type instanceof Class ? convertFromPrimitiveType((Class)type) : rawType(type);
+
+        Class varType = type instanceof Class ? convertFromPrimitiveType((Class)type) : rawType(type);
+        try {
+            this.boxedVarType = varType.getClassLoader() == null || varType.getClassLoader() == DataSource.class.getClassLoader() ?
+                    varType :
+                    DataSource.class.getClassLoader().loadClass(varType.getCanonicalName());
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     public SimpleRuleUnitVariable(String name, Class type) {
diff --git a/drools-ruleunits/pom.xml b/drools-ruleunits/pom.xml
index dddaf5a5184..23ee632a6c0 100644
--- a/drools-ruleunits/pom.xml
+++ b/drools-ruleunits/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-scenario-simulation/drools-scenario-simulation-api/pom.xml b/drools-scenario-simulation/drools-scenario-simulation-api/pom.xml
index 1e98db0011c..603307c111e 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-api/pom.xml
+++ b/drools-scenario-simulation/drools-scenario-simulation-api/pom.xml
@@ -25,7 +25,7 @@
   
     drools-scenario-simulation
     org.drools
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/pom.xml b/drools-scenario-simulation/drools-scenario-simulation-backend/pom.xml
index 1f0d8a2434b..c02be2d08b0 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-backend/pom.xml
+++ b/drools-scenario-simulation/drools-scenario-simulation-backend/pom.xml
@@ -25,7 +25,7 @@
   
     drools-scenario-simulation
     org.drools
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/pom.xml b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/pom.xml
index 65565db0f34..3a851785616 100644
--- a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/pom.xml
+++ b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/pom.xml
@@ -25,7 +25,7 @@
   
     drools-scenario-simulation
     org.drools
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-scenario-simulation/pom.xml b/drools-scenario-simulation/pom.xml
index 8e7cc26bcc3..60848bcd2ce 100644
--- a/drools-scenario-simulation/pom.xml
+++ b/drools-scenario-simulation/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-serialization-protobuf/pom.xml b/drools-serialization-protobuf/pom.xml
index 3c8814f2d05..726ce7349f4 100644
--- a/drools-serialization-protobuf/pom.xml
+++ b/drools-serialization-protobuf/pom.xml
@@ -26,7 +26,7 @@
     
         org.kie
         drools-build-parent
-        8.45.0-SNAPSHOT
+        9.45.0-SNAPSHOT
         ../build-parent/pom.xml
     
 
diff --git a/drools-templates/pom.xml b/drools-templates/pom.xml
index d6152f764d9..14e0c2fbb19 100644
--- a/drools-templates/pom.xml
+++ b/drools-templates/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-test-coverage/pom.xml b/drools-test-coverage/pom.xml
index 231f37b49d5..f7d1439db46 100644
--- a/drools-test-coverage/pom.xml
+++ b/drools-test-coverage/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     drools-build-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-test-coverage/standalone/kie-ci-with-domain/pom.xml b/drools-test-coverage/standalone/kie-ci-with-domain/pom.xml
index 114d021fac1..9d2687283c1 100644
--- a/drools-test-coverage/standalone/kie-ci-with-domain/pom.xml
+++ b/drools-test-coverage/standalone/kie-ci-with-domain/pom.xml
@@ -28,7 +28,7 @@
   
     org.drools.testcoverage
     drools-standalone-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   drools-kie-ci-with-domain-parent
diff --git a/drools-test-coverage/standalone/kie-ci-with-domain/test-domain/pom.xml b/drools-test-coverage/standalone/kie-ci-with-domain/test-domain/pom.xml
index 203dd83f3b0..e4151e9bb98 100644
--- a/drools-test-coverage/standalone/kie-ci-with-domain/test-domain/pom.xml
+++ b/drools-test-coverage/standalone/kie-ci-with-domain/test-domain/pom.xml
@@ -28,7 +28,7 @@
   
     org.drools.testcoverage
     drools-kie-ci-with-domain-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   drools-kie-ci-with-domain-test-domain
diff --git a/drools-test-coverage/standalone/kie-ci-with-domain/test-kjar/pom.xml b/drools-test-coverage/standalone/kie-ci-with-domain/test-kjar/pom.xml
index 128837f36bc..dccd93b782e 100644
--- a/drools-test-coverage/standalone/kie-ci-with-domain/test-kjar/pom.xml
+++ b/drools-test-coverage/standalone/kie-ci-with-domain/test-kjar/pom.xml
@@ -28,7 +28,7 @@
   
     org.drools.testcoverage
     drools-kie-ci-with-domain-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   drools-kie-ci-with-domain-test-kjar
diff --git a/drools-test-coverage/standalone/kie-ci-with-domain/tests/pom.xml b/drools-test-coverage/standalone/kie-ci-with-domain/tests/pom.xml
index cf6ee6e7478..a70cfc481e2 100644
--- a/drools-test-coverage/standalone/kie-ci-with-domain/tests/pom.xml
+++ b/drools-test-coverage/standalone/kie-ci-with-domain/tests/pom.xml
@@ -28,7 +28,7 @@
   
     org.drools.testcoverage
     drools-kie-ci-with-domain-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   drools-kie-ci-with-domain-tests
diff --git a/drools-test-coverage/standalone/kie-ci-without-domain/pom.xml b/drools-test-coverage/standalone/kie-ci-without-domain/pom.xml
index fee188e731b..47900c09518 100644
--- a/drools-test-coverage/standalone/kie-ci-without-domain/pom.xml
+++ b/drools-test-coverage/standalone/kie-ci-without-domain/pom.xml
@@ -28,7 +28,7 @@
   
     org.drools.testcoverage
     drools-standalone-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   drools-kie-ci-without-domain-parent
diff --git a/drools-test-coverage/standalone/kie-ci-without-domain/test-domain/pom.xml b/drools-test-coverage/standalone/kie-ci-without-domain/test-domain/pom.xml
index fd52c34ca44..1aaf0450110 100644
--- a/drools-test-coverage/standalone/kie-ci-without-domain/test-domain/pom.xml
+++ b/drools-test-coverage/standalone/kie-ci-without-domain/test-domain/pom.xml
@@ -28,7 +28,7 @@
   
     org.drools.testcoverage
     drools-kie-ci-without-domain-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   drools-kie-ci-without-domain-test-domain
diff --git a/drools-test-coverage/standalone/kie-ci-without-domain/test-kjar/pom.xml b/drools-test-coverage/standalone/kie-ci-without-domain/test-kjar/pom.xml
index 6f6f69b4c65..1e507c6bfb9 100644
--- a/drools-test-coverage/standalone/kie-ci-without-domain/test-kjar/pom.xml
+++ b/drools-test-coverage/standalone/kie-ci-without-domain/test-kjar/pom.xml
@@ -28,7 +28,7 @@
   
     org.drools.testcoverage
     drools-kie-ci-without-domain-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   drools-kie-ci-without-domain-test-kjar
diff --git a/drools-test-coverage/standalone/kie-ci-without-domain/tests/pom.xml b/drools-test-coverage/standalone/kie-ci-without-domain/tests/pom.xml
index 9aed5bac7f7..ec49f1a26f4 100644
--- a/drools-test-coverage/standalone/kie-ci-without-domain/tests/pom.xml
+++ b/drools-test-coverage/standalone/kie-ci-without-domain/tests/pom.xml
@@ -28,7 +28,7 @@
   
     org.drools.testcoverage
     drools-kie-ci-without-domain-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   drools-kie-ci-without-domain-tests
diff --git a/drools-test-coverage/standalone/pom.xml b/drools-test-coverage/standalone/pom.xml
index 225f940a165..bf8ae857b9d 100644
--- a/drools-test-coverage/standalone/pom.xml
+++ b/drools-test-coverage/standalone/pom.xml
@@ -28,7 +28,7 @@
   
     org.drools.testcoverage
     drools-test-coverage-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   drools-standalone-parent
diff --git a/drools-test-coverage/test-compiler-integration/pom.xml b/drools-test-coverage/test-compiler-integration/pom.xml
index 49ba51a98be..cb65d7966c7 100644
--- a/drools-test-coverage/test-compiler-integration/pom.xml
+++ b/drools-test-coverage/test-compiler-integration/pom.xml
@@ -26,7 +26,7 @@
   
     drools-test-coverage-parent
     org.drools.testcoverage
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   4.0.0
 
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 13641acfe0b..a1b4bda3fb8 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 @@
 
 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/KieBuilderTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieBuilderTest.java
index a819366f5a5..a57101c8a95 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieBuilderTest.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieBuilderTest.java
@@ -98,8 +98,8 @@ public void testResourceInclusion() {
 
         final String kmodule = "\n" +
-                "  \n" +
-                "    \n" +
+                "  \n" +
+                "    \n" +
                 "  \n" +
                 "";
 
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 fa47533cfef..008f6644108 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.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-compiler-integration/src/test/resources/META-INF/kmodule.xml b/drools-test-coverage/test-compiler-integration/src/test/resources/META-INF/kmodule.xml
index ba432d56502..5c4fd952307 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/resources/META-INF/kmodule.xml
+++ b/drools-test-coverage/test-compiler-integration/src/test/resources/META-INF/kmodule.xml
@@ -32,7 +32,7 @@
         
 
     
-        
+        
         
     
 
diff --git a/drools-test-coverage/test-integration-nomvel/pom.xml b/drools-test-coverage/test-integration-nomvel/pom.xml
index 5ff7b47f21a..3c359edb3ad 100644
--- a/drools-test-coverage/test-integration-nomvel/pom.xml
+++ b/drools-test-coverage/test-integration-nomvel/pom.xml
@@ -26,7 +26,7 @@
     
         drools-test-coverage-parent
         org.drools.testcoverage
-        8.45.0-SNAPSHOT
+        9.45.0-SNAPSHOT
     
     4.0.0
 
@@ -106,11 +106,6 @@
             jaxb-core
             test
         
-        
-            com.sun.xml.bind
-            jaxb-impl
-            test
-        
         
             jakarta.xml.bind
             jakarta.xml.bind-api
diff --git a/drools-test-coverage/test-integration-notms/pom.xml b/drools-test-coverage/test-integration-notms/pom.xml
index 20bbff6bd2f..845b03dbe08 100644
--- a/drools-test-coverage/test-integration-notms/pom.xml
+++ b/drools-test-coverage/test-integration-notms/pom.xml
@@ -26,7 +26,7 @@
     
         drools-test-coverage-parent
         org.drools.testcoverage
-        8.45.0-SNAPSHOT
+        9.45.0-SNAPSHOT
     
     4.0.0
 
diff --git a/drools-test-coverage/test-integration-noxml/pom.xml b/drools-test-coverage/test-integration-noxml/pom.xml
index 217e09e7cca..89103842bcd 100644
--- a/drools-test-coverage/test-integration-noxml/pom.xml
+++ b/drools-test-coverage/test-integration-noxml/pom.xml
@@ -26,7 +26,7 @@
     
         drools-test-coverage-parent
         org.drools.testcoverage
-        8.45.0-SNAPSHOT
+        9.45.0-SNAPSHOT
     
     4.0.0
 
diff --git a/drools-test-coverage/test-integration-ruleunits/pom.xml b/drools-test-coverage/test-integration-ruleunits/pom.xml
index 8df277e6a92..202fc56ee8f 100644
--- a/drools-test-coverage/test-integration-ruleunits/pom.xml
+++ b/drools-test-coverage/test-integration-ruleunits/pom.xml
@@ -26,7 +26,7 @@
   
     drools-test-coverage-parent
     org.drools.testcoverage
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-jar/pom.xml b/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-jar/pom.xml
index 3bd52db4494..7111dfa05b0 100644
--- a/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-jar/pom.xml
+++ b/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-jar/pom.xml
@@ -26,7 +26,7 @@
   
     test-integration-ruleunits
     org.drools.testcoverage
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-tests/pom.xml b/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-tests/pom.xml
index 8696d9c7b87..b26d985c825 100644
--- a/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-tests/pom.xml
+++ b/drools-test-coverage/test-integration-ruleunits/test-integration-ruleunits-tests/pom.xml
@@ -26,7 +26,7 @@
   
     test-integration-ruleunits
     org.drools.testcoverage
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   4.0.0
 
diff --git a/drools-test-coverage/test-suite/pom.xml b/drools-test-coverage/test-suite/pom.xml
index e7f61605266..c751822ebc6 100644
--- a/drools-test-coverage/test-suite/pom.xml
+++ b/drools-test-coverage/test-suite/pom.xml
@@ -28,7 +28,7 @@
   
     org.drools.testcoverage
     drools-test-coverage-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   drools-test-suite
diff --git a/drools-tms/pom.xml b/drools-tms/pom.xml
index 52ccebf93fa..06bb0b52170 100644
--- a/drools-tms/pom.xml
+++ b/drools-tms/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-traits/pom.xml b/drools-traits/pom.xml
index b717b853857..415278ca326 100644
--- a/drools-traits/pom.xml
+++ b/drools-traits/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
     ../build-parent/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 36800ba01f5..845fcc9f72a 100644
--- a/drools-traits/src/test/filtered-resources/META-INF/persistence.xml
+++ b/drools-traits/src/test/filtered-resources/META-INF/persistence.xml
@@ -19,10 +19,10 @@
     under the License.
 
 -->
-
+             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
 
     
       org.hibernate.jpa.HibernatePersistenceProvider
diff --git a/drools-traits/src/test/java/org/drools/traits/persistence/DroolsPersistenceUtil.java b/drools-traits/src/test/java/org/drools/traits/persistence/DroolsPersistenceUtil.java
index 2adf906eee4..126aa6a7bf3 100644
--- a/drools-traits/src/test/java/org/drools/traits/persistence/DroolsPersistenceUtil.java
+++ b/drools-traits/src/test/java/org/drools/traits/persistence/DroolsPersistenceUtil.java
@@ -20,7 +20,7 @@
 
 import java.util.Map;
 
-import javax.transaction.UserTransaction;
+import jakarta.transaction.UserTransaction;
 
 import org.drools.core.base.MapGlobalResolver;
 import org.drools.core.impl.EnvironmentFactory;
diff --git a/drools-util/pom.xml b/drools-util/pom.xml
index 415a3ac2581..ee66d173ffe 100644
--- a/drools-util/pom.xml
+++ b/drools-util/pom.xml
@@ -27,7 +27,7 @@
     
         org.kie
         drools-build-parent
-        8.45.0-SNAPSHOT
+        9.45.0-SNAPSHOT
         ../build-parent/pom.xml
     
 
diff --git a/drools-verifier/drools-verifier-api/pom.xml b/drools-verifier/drools-verifier-api/pom.xml
index a66a20184f8..63bee372ed3 100644
--- a/drools-verifier/drools-verifier-api/pom.xml
+++ b/drools-verifier/drools-verifier-api/pom.xml
@@ -26,7 +26,7 @@
     
         org.drools
         drools-verifier
-        8.45.0-SNAPSHOT
+        9.45.0-SNAPSHOT
     
     4.0.0
 
diff --git a/drools-verifier/drools-verifier-core/pom.xml b/drools-verifier/drools-verifier-core/pom.xml
index 28ce4467959..df2a476e13c 100644
--- a/drools-verifier/drools-verifier-core/pom.xml
+++ b/drools-verifier/drools-verifier-core/pom.xml
@@ -25,7 +25,7 @@
     
         drools-verifier
         org.drools
-        8.45.0-SNAPSHOT
+        9.45.0-SNAPSHOT
     
     4.0.0
 
diff --git a/drools-verifier/drools-verifier-drl/pom.xml b/drools-verifier/drools-verifier-drl/pom.xml
index 36821ffabdd..f7b739b2a66 100644
--- a/drools-verifier/drools-verifier-drl/pom.xml
+++ b/drools-verifier/drools-verifier-drl/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-verifier
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   drools-verifier-drl
diff --git a/drools-verifier/pom.xml b/drools-verifier/pom.xml
index 17cda824e53..7d295e98219 100644
--- a/drools-verifier/pom.xml
+++ b/drools-verifier/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-wiring/drools-wiring-api/pom.xml b/drools-wiring/drools-wiring-api/pom.xml
index e15aaff05b5..2ad186a8f68 100755
--- a/drools-wiring/drools-wiring-api/pom.xml
+++ b/drools-wiring/drools-wiring-api/pom.xml
@@ -26,7 +26,7 @@
     
         org.drools
         drools-wiring
-        8.45.0-SNAPSHOT
+        9.45.0-SNAPSHOT
     
 
     org.drools
diff --git a/drools-wiring/drools-wiring-dynamic/pom.xml b/drools-wiring/drools-wiring-dynamic/pom.xml
index b207771d957..a0244f20eeb 100755
--- a/drools-wiring/drools-wiring-dynamic/pom.xml
+++ b/drools-wiring/drools-wiring-dynamic/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-wiring
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   org.drools
@@ -53,11 +53,6 @@
       jaxb-core
       provided
     
-    
-      com.sun.xml.bind
-      jaxb-impl
-      provided
-    
     
       jakarta.xml.bind
       jakarta.xml.bind-api
diff --git a/drools-wiring/drools-wiring-static/pom.xml b/drools-wiring/drools-wiring-static/pom.xml
index 1cc4ac9701e..001b3154f92 100755
--- a/drools-wiring/drools-wiring-static/pom.xml
+++ b/drools-wiring/drools-wiring-static/pom.xml
@@ -26,7 +26,7 @@
   
     org.drools
     drools-wiring
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   org.drools
diff --git a/drools-wiring/pom.xml b/drools-wiring/pom.xml
index 1b0be1851f6..5968d228057 100644
--- a/drools-wiring/pom.xml
+++ b/drools-wiring/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-xml-support/pom.xml b/drools-xml-support/pom.xml
index dbc8ffd59a9..04bd5bd2af4 100644
--- a/drools-xml-support/pom.xml
+++ b/drools-xml-support/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/drools-xml-support/src/test/java/org/drools/xml/support/CommandSerializationTest.java b/drools-xml-support/src/test/java/org/drools/xml/support/CommandSerializationTest.java
index 8f867a445df..eb2f89ed199 100644
--- a/drools-xml-support/src/test/java/org/drools/xml/support/CommandSerializationTest.java
+++ b/drools-xml-support/src/test/java/org/drools/xml/support/CommandSerializationTest.java
@@ -34,9 +34,9 @@
 import java.util.UUID;
 import java.util.regex.Pattern;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElements;
 
 import org.drools.core.ClassObjectFilter;
 import org.drools.core.ClassObjectSerializationFilter;
diff --git a/efesto/efesto-common-utils/pom.xml b/efesto/efesto-common-utils/pom.xml
index d04739c0653..0c28ad8467e 100644
--- a/efesto/efesto-common-utils/pom.xml
+++ b/efesto/efesto-common-utils/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   efesto-common-utils
diff --git a/efesto/efesto-core/efesto-common-api/pom.xml b/efesto/efesto-core/efesto-common-api/pom.xml
index 4abc6af3351..db9f8080a4d 100644
--- a/efesto/efesto-core/efesto-common-api/pom.xml
+++ b/efesto/efesto-core/efesto-common-api/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto-core
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   efesto-common-api
diff --git a/efesto/efesto-core/efesto-common-core/pom.xml b/efesto/efesto-core/efesto-common-core/pom.xml
index a1b8d8dfddf..891c6010c58 100644
--- a/efesto/efesto-core/efesto-common-core/pom.xml
+++ b/efesto/efesto-core/efesto-common-core/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto-core
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   efesto-common-core
diff --git a/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-api/pom.xml b/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-api/pom.xml
index c2d30943af4..3ba3580e23c 100644
--- a/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-api/pom.xml
+++ b/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-api/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto-compilation-manager
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   efesto-compilation-manager-api
diff --git a/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-core/pom.xml b/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-core/pom.xml
index 014ef2bd832..d77a1518fb3 100644
--- a/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-core/pom.xml
+++ b/efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-core/pom.xml
@@ -39,7 +39,7 @@
   
     org.kie
     efesto-compilation-manager
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   efesto-compilation-manager-core
diff --git a/efesto/efesto-core/efesto-compilation-manager/pom.xml b/efesto/efesto-core/efesto-compilation-manager/pom.xml
index 76bf18454e3..41dffada1ac 100644
--- a/efesto/efesto-core/efesto-compilation-manager/pom.xml
+++ b/efesto/efesto-core/efesto-compilation-manager/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto-core
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   pom
 
diff --git a/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-api/pom.xml b/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-api/pom.xml
index 1a86dfa3b0b..7345ac7469d 100644
--- a/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-api/pom.xml
+++ b/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-api/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto-runtime-manager
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
  efesto-runtime-manager-api
diff --git a/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/pom.xml b/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/pom.xml
index 37395b6167e..f33f950a4f3 100644
--- a/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/pom.xml
+++ b/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto-runtime-manager
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   efesto-runtime-manager-core
diff --git a/efesto/efesto-core/efesto-runtime-manager/pom.xml b/efesto/efesto-core/efesto-runtime-manager/pom.xml
index 6749f94a474..e89ac591ba5 100644
--- a/efesto/efesto-core/efesto-runtime-manager/pom.xml
+++ b/efesto/efesto-core/efesto-runtime-manager/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto-core
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   pom
 
diff --git a/efesto/efesto-core/pom.xml b/efesto/efesto-core/pom.xml
index dc54b246e4c..7cea4485c46 100644
--- a/efesto/efesto-core/pom.xml
+++ b/efesto/efesto-core/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     efesto
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   pom
 
diff --git a/efesto/efesto-dependencies/pom.xml b/efesto/efesto-dependencies/pom.xml
index cc1d1ee5e29..7c5eadcec42 100644
--- a/efesto/efesto-dependencies/pom.xml
+++ b/efesto/efesto-dependencies/pom.xml
@@ -25,7 +25,7 @@
   
     efesto
     org.kie
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   4.0.0
 
diff --git a/efesto/pom.xml b/efesto/pom.xml
index a8d7adbe6ee..4da0b4a6c94 100644
--- a/efesto/pom.xml
+++ b/efesto/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     drools-build-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/jpmml-migration-recipe/pom.xml b/jpmml-migration-recipe/pom.xml
index 055a1e40b0d..70ba3e1ce22 100644
--- a/jpmml-migration-recipe/pom.xml
+++ b/jpmml-migration-recipe/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-api/pom.xml b/kie-api/pom.xml
index 2e9ebda2be0..25488cf21f7 100644
--- a/kie-api/pom.xml
+++ b/kie-api/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-api/src/main/java/org/kie/api/builder/model/KieBaseModel.java b/kie-api/src/main/java/org/kie/api/builder/model/KieBaseModel.java
index 2f451e17516..6898c2fc6c0 100644
--- a/kie-api/src/main/java/org/kie/api/builder/model/KieBaseModel.java
+++ b/kie-api/src/main/java/org/kie/api/builder/model/KieBaseModel.java
@@ -183,7 +183,7 @@ public interface KieBaseModel {
 
     /**
      * Returns the CDI scope of this KieBaseModel
-     * Default is javax.enterprise.context.ApplicationScoped
+     * Default is jakarta.enterprise.context.ApplicationScoped
      */
     String getScope();
 
diff --git a/kie-api/src/main/java/org/kie/api/builder/model/KieSessionModel.java b/kie-api/src/main/java/org/kie/api/builder/model/KieSessionModel.java
index ea96087e077..ef7f4b33fc1 100644
--- a/kie-api/src/main/java/org/kie/api/builder/model/KieSessionModel.java
+++ b/kie-api/src/main/java/org/kie/api/builder/model/KieSessionModel.java
@@ -100,7 +100,7 @@ public interface KieSessionModel {
     
     /**
      * Sets the CDI scope for this KieSessionModel
-     * Default is javax.enterprise.context.ApplicationScoped
+     * Default is jakarta.enterprise.context.ApplicationScoped
      */
     KieSessionModel setScope(String scope);
 
diff --git a/kie-api/src/main/java/org/kie/api/internal/utils/KieServiceLoader.java b/kie-api/src/main/java/org/kie/api/internal/utils/KieServiceLoader.java
index eba502dc9a2..82ae6d55a94 100644
--- a/kie-api/src/main/java/org/kie/api/internal/utils/KieServiceLoader.java
+++ b/kie-api/src/main/java/org/kie/api/internal/utils/KieServiceLoader.java
@@ -47,7 +47,7 @@  T lookup(Class serviceClass, String tag) {
     }
 
      T load(Class serviceClass, String tag) {
-        ServiceLoader loader = ServiceLoader.load(serviceClass, serviceClass.getClassLoader());
+        ServiceLoader loader = ServiceLoader.load(serviceClass);
         T service = null;
         for (T impl : loader) {
             if ( tag.equals(impl.serviceTag()) ) { // accept only services with the specified tag
diff --git a/kie-api/src/main/java/org/kie/api/pmml/AbstractOutput.java b/kie-api/src/main/java/org/kie/api/pmml/AbstractOutput.java
index 9c727454aca..6c41a29dfb5 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/AbstractOutput.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/AbstractOutput.java
@@ -18,11 +18,11 @@
  */
 package org.kie.api.pmml;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name="pmmlOutput")
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/kie-api/src/main/java/org/kie/api/pmml/DoubleFieldOutput.java b/kie-api/src/main/java/org/kie/api/pmml/DoubleFieldOutput.java
index 54fbc053050..73a2b9ce6e4 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/DoubleFieldOutput.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/DoubleFieldOutput.java
@@ -18,9 +18,9 @@
  */
 package org.kie.api.pmml;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name="value")
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/kie-api/src/main/java/org/kie/api/pmml/IntegerFieldOutput.java b/kie-api/src/main/java/org/kie/api/pmml/IntegerFieldOutput.java
index eebb975416d..82d2a1fb5c1 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/IntegerFieldOutput.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/IntegerFieldOutput.java
@@ -18,9 +18,9 @@
  */
 package org.kie.api.pmml;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name="value")
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/kie-api/src/main/java/org/kie/api/pmml/PMML4DataField.java b/kie-api/src/main/java/org/kie/api/pmml/PMML4DataField.java
index 63515db55ad..ebe972d8616 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/PMML4DataField.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/PMML4DataField.java
@@ -18,10 +18,10 @@
  */
 package org.kie.api.pmml;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import org.kie.api.definition.type.Role;
 import org.kie.api.definition.type.Role.Type;
diff --git a/kie-api/src/main/java/org/kie/api/pmml/PMML4OutputField.java b/kie-api/src/main/java/org/kie/api/pmml/PMML4OutputField.java
index cf5a1191036..8424cea547f 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/PMML4OutputField.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/PMML4OutputField.java
@@ -18,11 +18,11 @@
  */
 package org.kie.api.pmml;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import org.kie.api.definition.type.Role;
 import org.kie.api.definition.type.Role.Type;
diff --git a/kie-api/src/main/java/org/kie/api/pmml/PMML4Result.java b/kie-api/src/main/java/org/kie/api/pmml/PMML4Result.java
index d3421b3bff6..530096a9fe9 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/PMML4Result.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/PMML4Result.java
@@ -24,13 +24,13 @@
 import java.util.Map;
 import java.util.Optional;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.kie.api.definition.type.PropertyReactive;
 import org.slf4j.Logger;
diff --git a/kie-api/src/main/java/org/kie/api/pmml/PMMLRequestData.java b/kie-api/src/main/java/org/kie/api/pmml/PMMLRequestData.java
index 235999635f0..88cef278062 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/PMMLRequestData.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/PMMLRequestData.java
@@ -25,12 +25,12 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * This class provides a vanilla mechanism for sending data to
diff --git a/kie-api/src/main/java/org/kie/api/pmml/ParameterInfo.java b/kie-api/src/main/java/org/kie/api/pmml/ParameterInfo.java
index 2f83078daab..9bea0c17b27 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/ParameterInfo.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/ParameterInfo.java
@@ -18,12 +18,12 @@
  */
 package org.kie.api.pmml;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlType(name="ParameterInfo")
 @XmlAccessorType(XmlAccessType.NONE)
diff --git a/kie-api/src/main/java/org/kie/api/pmml/StringFieldOutput.java b/kie-api/src/main/java/org/kie/api/pmml/StringFieldOutput.java
index f21eb8951ad..d52c9a9e3f5 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/StringFieldOutput.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/StringFieldOutput.java
@@ -18,9 +18,9 @@
  */
 package org.kie.api.pmml;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name="value")
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/kie-api/src/main/java/org/kie/api/runtime/query/QueryContext.java b/kie-api/src/main/java/org/kie/api/runtime/query/QueryContext.java
index 024a9187638..77968f77a3a 100644
--- a/kie-api/src/main/java/org/kie/api/runtime/query/QueryContext.java
+++ b/kie-api/src/main/java/org/kie/api/runtime/query/QueryContext.java
@@ -20,11 +20,11 @@
 
 import java.io.Serializable;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlType(name="kieQueryContext")
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/kie-api/src/main/java/org/kie/api/task/model/Status.java b/kie-api/src/main/java/org/kie/api/task/model/Status.java
index 57a6b11146c..7dc485aa7d5 100644
--- a/kie-api/src/main/java/org/kie/api/task/model/Status.java
+++ b/kie-api/src/main/java/org/kie/api/task/model/Status.java
@@ -18,7 +18,7 @@
  */
 package org.kie.api.task.model;
 
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 @XmlType
diff --git a/kie-api/src/test/resources/org/kie/api/kmod1.xml b/kie-api/src/test/resources/org/kie/api/kmod1.xml
index 714fcc93ead..0db133f6f72 100644
--- a/kie-api/src/test/resources/org/kie/api/kmod1.xml
+++ b/kie-api/src/test/resources/org/kie/api/kmod1.xml
@@ -29,7 +29,7 @@
     
 
 
-    
+    
         
     
 
@@ -47,7 +47,7 @@
     
 
     
-        
+        
             
         
 
@@ -105,5 +105,3 @@
         
     
 
-
-
diff --git a/kie-archetypes/kie-drools-dmn-archetype/pom.xml b/kie-archetypes/kie-drools-dmn-archetype/pom.xml
index aa7e6094007..a48db650fb9 100644
--- a/kie-archetypes/kie-drools-dmn-archetype/pom.xml
+++ b/kie-archetypes/kie-drools-dmn-archetype/pom.xml
@@ -24,7 +24,7 @@
   
     org.kie
     kie-archetypes
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   kie-drools-dmn-archetype
diff --git a/kie-archetypes/kie-drools-exec-model-archetype/pom.xml b/kie-archetypes/kie-drools-exec-model-archetype/pom.xml
index e12b110a15a..87bf9d6d34a 100644
--- a/kie-archetypes/kie-drools-exec-model-archetype/pom.xml
+++ b/kie-archetypes/kie-drools-exec-model-archetype/pom.xml
@@ -24,7 +24,7 @@
   
     org.kie
     kie-archetypes
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   kie-drools-exec-model-archetype
diff --git a/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/pom.xml b/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/pom.xml
index 29606922214..40df8a27420 100644
--- a/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/pom.xml
+++ b/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/pom.xml
@@ -24,7 +24,7 @@
   
     org.kie
     kie-archetypes
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   kie-drools-exec-model-ruleunit-archetype
diff --git a/kie-archetypes/pom.xml b/kie-archetypes/pom.xml
index d06d304611c..3ccb736bf9a 100644
--- a/kie-archetypes/pom.xml
+++ b/kie-archetypes/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-ci/pom.xml b/kie-ci/pom.xml
index 353541dfa35..157586b56aa 100644
--- a/kie-ci/pom.xml
+++ b/kie-ci/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-dmn/kie-dmn-api/pom.xml b/kie-dmn/kie-dmn-api/pom.xml
index 23f4e95a2cd..236ea377c66 100644
--- a/kie-dmn/kie-dmn-api/pom.xml
+++ b/kie-dmn/kie-dmn-api/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     kie-dmn
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   kie-dmn-api
diff --git a/kie-dmn/kie-dmn-backend/pom.xml b/kie-dmn/kie-dmn-backend/pom.xml
index 6726a681cef..b7934217b86 100644
--- a/kie-dmn/kie-dmn-backend/pom.xml
+++ b/kie-dmn/kie-dmn-backend/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     kie-dmn
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   kie-dmn-backend
diff --git a/kie-dmn/kie-dmn-core-jsr223-jq/pom.xml b/kie-dmn/kie-dmn-core-jsr223-jq/pom.xml
index 492be9ad8cf..424d6d24d63 100644
--- a/kie-dmn/kie-dmn-core-jsr223-jq/pom.xml
+++ b/kie-dmn/kie-dmn-core-jsr223-jq/pom.xml
@@ -23,7 +23,7 @@
     
         org.kie
         kie-dmn
-        8.45.0-SNAPSHOT
+        9.45.0-SNAPSHOT
     
     kie-dmn-core-jsr223-jq
     KIE :: Decision Model Notation :: JSR-223 JQ ScriptEngine
diff --git a/kie-dmn/kie-dmn-core-jsr223/pom.xml b/kie-dmn/kie-dmn-core-jsr223/pom.xml
index a7dc14441f4..ac7f8c97f5d 100644
--- a/kie-dmn/kie-dmn-core-jsr223/pom.xml
+++ b/kie-dmn/kie-dmn-core-jsr223/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   kie-dmn-core-jsr223
   KIE :: Decision Model Notation :: Core JSR-223
diff --git a/kie-dmn/kie-dmn-core/pom.xml b/kie-dmn/kie-dmn-core/pom.xml
index e55daeaceba..daa96f74543 100644
--- a/kie-dmn/kie-dmn-core/pom.xml
+++ b/kie-dmn/kie-dmn-core/pom.xml
@@ -27,7 +27,7 @@
   
     kie-dmn
     org.kie
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   kie-dmn-core
diff --git a/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/DMNImportPMMLInfo.java b/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/DMNImportPMMLInfo.java
index cf32659cdcc..bf47f624c0c 100644
--- a/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/DMNImportPMMLInfo.java
+++ b/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/DMNImportPMMLInfo.java
@@ -64,7 +64,7 @@ public static Either from(InputStream is, DMNCompi
             final PMML pmml = org.jpmml.model.PMMLUtil.unmarshal(is);
             PMMLHeaderInfo h = PMMLInfo.pmmlToHeaderInfo(pmml, pmml.getHeader());
             for (DataField df : pmml.getDataDictionary().getDataFields()) {
-                String dfName = df.getName().getValue();
+                String dfName =df.getName();
                 BuiltInType ft = getBuiltInTypeByDataType(df.getDataType());
                 List helperFEELProfiles = cc.getFeelProfiles();
                 DMNFEELHelper feel = new DMNFEELHelper(cc.getRootClassLoader(), helperFEELProfiles);
@@ -120,7 +120,7 @@ private static void registerOutputFieldType(Model pmmlModel, DMNModelImpl dmnMod
                 // register ., being a composite type of the different model outputs fields
                 Map typeMap = new HashMap<>();
                 outputFields.stream().forEach(field -> {
-                    String fieldName = field.getName().getValue();
+                    String fieldName =field.getName();
                     BuiltInType ft = getBuiltInTypeByDataType(field.getDataType());
                     DMNType type = new SimpleTypeImpl(i.getNamespace(), fieldName, null, false, null, dmnModel.getTypeRegistry().resolveType(dmnModel.getDefinitions().getURIFEEL(), ft.getName()), ft);
                     typeMap.put(fieldName, type);
diff --git a/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/PMMLInfo.java b/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/PMMLInfo.java
index e51f9a16ce8..179cbf1d2ab 100644
--- a/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/PMMLInfo.java
+++ b/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/PMMLInfo.java
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 
 import org.dmg.pmml.Extension;
 import org.dmg.pmml.Header;
@@ -75,15 +75,15 @@ public static PMMLModelInfo pmmlToModelInfo(Model pm) {
         miningSchema.getMiningFields()
                     .stream()
                     .filter(mf -> mf.getUsageType() == UsageType.ACTIVE)
-                    .forEach(fn -> inputFields.add(fn.getName().getValue()));
+                    .forEach(fn -> inputFields.add(fn.getName()));
         Collection targetFields = new ArrayList<>();
         miningSchema.getMiningFields()
                     .stream()
                     .filter(mf -> mf.getUsageType() == UsageType.PREDICTED)
-                    .forEach(fn -> targetFields.add(fn.getName().getValue()));
+                    .forEach(fn -> targetFields.add(fn.getName()));
         Collection outputFields = new ArrayList<>();
         if (pm.getOutput() != null && pm.getOutput().getOutputFields() != null) {
-            pm.getOutput().getOutputFields().forEach(of -> outputFields.add(of.getName().getValue()));
+            pm.getOutput().getOutputFields().forEach(of -> outputFields.add(of.getName()));
         }
         return new PMMLModelInfo(pm.getModelName(), pm.getClass().getSimpleName(), inputFields, targetFields, outputFields);
     }
diff --git a/kie-dmn/kie-dmn-feel/pom.xml b/kie-dmn/kie-dmn-feel/pom.xml
index ab7e6244b04..a21f5530fd9 100644
--- a/kie-dmn/kie-dmn-feel/pom.xml
+++ b/kie-dmn/kie-dmn-feel/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     kie-dmn
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   kie-dmn-feel
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/util/Generated.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/util/Generated.java
index d81ed31e148..0d81acb15a5 100644
--- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/util/Generated.java
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/util/Generated.java
@@ -34,7 +34,7 @@
 /**
  * For internal use for the scope of https://github.com/jacoco/jacoco/issues/731
  * and coverage analysis.
- * Similar to {@link javax.annotation.Generated}, but with RetentionPolicy.CLASS
+ * Similar to {@link jakarta.annotation.Generated}, but with RetentionPolicy.CLASS
  */
 @Retention(RetentionPolicy.CLASS)
 @Target({PACKAGE, TYPE, ANNOTATION_TYPE, METHOD, CONSTRUCTOR, FIELD,
diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/jandex/AbstractJandexTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/jandex/AbstractJandexTest.java
index d5bc785f513..046555611e9 100644
--- a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/jandex/AbstractJandexTest.java
+++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/jandex/AbstractJandexTest.java
@@ -31,9 +31,9 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
-import javax.json.bind.JsonbConfig;
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+import jakarta.json.bind.JsonbConfig;
 
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
diff --git a/kie-dmn/kie-dmn-legacy-tests/pom.xml b/kie-dmn/kie-dmn-legacy-tests/pom.xml
index 9b630cd5d81..3df4119a74a 100644
--- a/kie-dmn/kie-dmn-legacy-tests/pom.xml
+++ b/kie-dmn/kie-dmn-legacy-tests/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   kie-dmn-legacy-tests
   
@@ -123,11 +123,6 @@
       jaxb-core
       provided
     
-    
-      com.sun.xml.bind
-      jaxb-impl
-      provided
-    
     
       jakarta.xml.bind
       jakarta.xml.bind-api
diff --git a/kie-dmn/kie-dmn-model/pom.xml b/kie-dmn/kie-dmn-model/pom.xml
index 82cc8414c1e..ba046a93601 100644
--- a/kie-dmn/kie-dmn-model/pom.xml
+++ b/kie-dmn/kie-dmn-model/pom.xml
@@ -27,7 +27,7 @@
   
     kie-dmn
     org.kie
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   kie-dmn-model
diff --git a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DMNDiagram.java b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DMNDiagram.java
index 73c6e9a0dcc..5afed613ea2 100644
--- a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DMNDiagram.java
+++ b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DMNDiagram.java
@@ -21,7 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 
 public class DMNDiagram extends Diagram implements org.kie.dmn.model.api.dmndi.DMNDiagram {
 
diff --git a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DiagramElement.java b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DiagramElement.java
index 6c7d93324b3..7d0166c1cfd 100644
--- a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DiagramElement.java
+++ b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DiagramElement.java
@@ -21,7 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 
 import org.kie.dmn.model.v1_2.KieDMNModelInstrumentedBase;
 
diff --git a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DMNDiagram.java b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DMNDiagram.java
index 07d10ee3b74..56c12fed1f6 100644
--- a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DMNDiagram.java
+++ b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DMNDiagram.java
@@ -21,7 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 
 public class DMNDiagram extends Diagram implements org.kie.dmn.model.api.dmndi.DMNDiagram {
 
diff --git a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DiagramElement.java b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DiagramElement.java
index 3a1d68e30e3..a05148e753c 100644
--- a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DiagramElement.java
+++ b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DiagramElement.java
@@ -21,7 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 
 import org.kie.dmn.model.v1_3.KieDMNModelInstrumentedBase;
 
diff --git a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/jandex/KieDMNModelJandexTest.java b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/jandex/KieDMNModelJandexTest.java
index fec094247e7..44999d32c37 100644
--- a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/jandex/KieDMNModelJandexTest.java
+++ b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/jandex/KieDMNModelJandexTest.java
@@ -31,9 +31,9 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
-import javax.json.bind.JsonbConfig;
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+import jakarta.json.bind.JsonbConfig;
 
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
diff --git a/kie-dmn/kie-dmn-openapi/pom.xml b/kie-dmn/kie-dmn-openapi/pom.xml
index 9f0f46d211d..871b3faf13e 100644
--- a/kie-dmn/kie-dmn-openapi/pom.xml
+++ b/kie-dmn/kie-dmn-openapi/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   kie-dmn-openapi
   
@@ -81,11 +81,6 @@
       jaxb-core
       provided
     
-    
-      com.sun.xml.bind
-      jaxb-impl
-      provided
-    
     
       jakarta.xml.bind
       jakarta.xml.bind-api
diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests-trusty/pom.xml b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests-trusty/pom.xml
index 1a92672a977..7124ebeda64 100644
--- a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests-trusty/pom.xml
+++ b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests-trusty/pom.xml
@@ -25,7 +25,7 @@
   
     kie-dmn-pmml-tests-parent
     org.kie
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/pom.xml b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/pom.xml
index 6751b8fa07e..4955b211594 100644
--- a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/pom.xml
+++ b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/pom.xml
@@ -25,7 +25,7 @@
   
     kie-dmn-pmml-tests-parent
     org.kie
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   4.0.0
 
@@ -85,11 +85,6 @@
       jaxb-core
       provided
     
-    
-      com.sun.xml.bind
-      jaxb-impl
-      provided
-    
     
       jakarta.xml.bind
       jakarta.xml.bind-api
diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/pom.xml b/kie-dmn/kie-dmn-pmml-tests-parent/pom.xml
index 366af61b419..ab67994276c 100644
--- a/kie-dmn/kie-dmn-pmml-tests-parent/pom.xml
+++ b/kie-dmn/kie-dmn-pmml-tests-parent/pom.xml
@@ -25,7 +25,7 @@
   
     kie-dmn
     org.kie
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   4.0.0
   pom
diff --git a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn-cli/pom.xml b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn-cli/pom.xml
index 814380c895e..2ba8d7f020d 100644
--- a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn-cli/pom.xml
+++ b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn-cli/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn-ruleset2dmn-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   kie-dmn-ruleset2dmn-cli
   
diff --git a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/pom.xml b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/pom.xml
index 595ea5ce156..8f58d25ad7d 100644
--- a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/pom.xml
+++ b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn-ruleset2dmn-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   kie-dmn-ruleset2dmn
 
diff --git a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/Converter.java b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/Converter.java
index fcfde77a26e..06dd73a2396 100644
--- a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/Converter.java
+++ b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/Converter.java
@@ -38,7 +38,6 @@
 import org.dmg.pmml.DataDictionary;
 import org.dmg.pmml.DataField;
 import org.dmg.pmml.DataType;
-import org.dmg.pmml.FieldName;
 import org.dmg.pmml.Model;
 import org.dmg.pmml.PMML;
 import org.dmg.pmml.SimplePredicate;
@@ -145,7 +144,7 @@ public static String parse(String dmnModelName, InputStream is) throws Exception
             for (String input : usedPredictors) {
                 List predicatesForInput = r.map.get(input);
                 if (predicatesForInput != null && !predicatesForInput.isEmpty())  {
-                    FieldName fnLookup = FieldName.create(input);
+                     String fnLookup =input;
                     Optional df = pmml.getDataDictionary().getDataFields().stream().filter(x-> x.getName().equals(fnLookup)).findFirst();
                     UnaryTests ut = processSimplePredicateUnaryOrBinary(predicatesForInput, df);
                     if (ut.getText().startsWith("\"") && ut.getText().endsWith("\"")) {
@@ -197,9 +196,9 @@ public static String parse(String dmnModelName, InputStream is) throws Exception
         }
 
         for (DataField df : pmml.getDataDictionary().getDataFields()) {
-            if (df.getDataType() == DataType.STRING && predictorsLoVs.containsKey(df.getName().getValue())) {
+            if (df.getDataType() == DataType.STRING && predictorsLoVs.containsKey(df.getName())) {
                 for (Value value : df.getValues()) {
-                    predictorsLoVs.get(df.getName().getValue()).add("\""+value.getValue().toString()+"\"");
+                    predictorsLoVs.get(df.getName()).add("\""+value.getValue().toString()+"\"");
                 }
             }
         }
@@ -478,7 +477,7 @@ private static void appendInputData(Definitions definitions, PMML pmml, Set opt = dd.getDataFields().stream().filter(df -> df.getName().equals(lookup)).findFirst();
         if (opt.isEmpty()) {
             return "Any";
diff --git a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/SimpleRuleRow.java b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/SimpleRuleRow.java
index b5fd23ed65b..9d789df4a46 100644
--- a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/SimpleRuleRow.java
+++ b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/SimpleRuleRow.java
@@ -39,7 +39,7 @@ public SimpleRuleRow(SimpleRule r) {
         Predicate rootPredicate = r.getPredicate();
         if (rootPredicate instanceof SimplePredicate) {
             SimplePredicate sp = (SimplePredicate) rootPredicate;
-            map.computeIfAbsent(sp.getField().getValue(), k -> new ArrayList()).add(sp);
+            map.computeIfAbsent(sp.getField(), k -> new ArrayList()).add(sp);
         } else {
             if (!(rootPredicate instanceof CompoundPredicate)) {
                 throw new UnsupportedOperationException("Was expecting a CompoundPredicate, found: "+rootPredicate.getClass());
@@ -50,7 +50,7 @@ public SimpleRuleRow(SimpleRule r) {
             }
             for (Predicate c : cPredicate.getPredicates()) {
                 SimplePredicate sp = (SimplePredicate) c;
-                map.computeIfAbsent(sp.getField().getValue(), k -> new ArrayList()).add(sp);
+                map.computeIfAbsent(sp.getField(), k -> new ArrayList()).add(sp);
             }
         }
     }
diff --git a/kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml b/kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml
index a6a723eb8ab..c30761fb897 100644
--- a/kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml
+++ b/kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   kie-dmn-ruleset2dmn-parent
   pom
diff --git a/kie-dmn/kie-dmn-signavio/pom.xml b/kie-dmn/kie-dmn-signavio/pom.xml
index 2439b7ddb9b..a72709926d2 100644
--- a/kie-dmn/kie-dmn-signavio/pom.xml
+++ b/kie-dmn/kie-dmn-signavio/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   kie-dmn-signavio
   
diff --git a/kie-dmn/kie-dmn-tck/pom.xml b/kie-dmn/kie-dmn-tck/pom.xml
index e6f4647b103..259a36c9e43 100644
--- a/kie-dmn/kie-dmn-tck/pom.xml
+++ b/kie-dmn/kie-dmn-tck/pom.xml
@@ -26,7 +26,7 @@
   
     kie-dmn
     org.kie
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   4.0.0
   pom
diff --git a/kie-dmn/kie-dmn-trisotech/pom.xml b/kie-dmn/kie-dmn-trisotech/pom.xml
index e6da98641d3..ed7e9738027 100644
--- a/kie-dmn/kie-dmn-trisotech/pom.xml
+++ b/kie-dmn/kie-dmn-trisotech/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-dmn
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   kie-dmn-trisotech
 
diff --git a/kie-dmn/kie-dmn-validation-bootstrap/pom.xml b/kie-dmn/kie-dmn-validation-bootstrap/pom.xml
index 02b183f883a..4ba13d7e188 100644
--- a/kie-dmn/kie-dmn-validation-bootstrap/pom.xml
+++ b/kie-dmn/kie-dmn-validation-bootstrap/pom.xml
@@ -25,7 +25,7 @@
   
     org.kie
     kie-dmn
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   kie-dmn-validation-bootstrap
 
diff --git a/kie-dmn/kie-dmn-validation/pom.xml b/kie-dmn/kie-dmn-validation/pom.xml
index f07f93f7977..54e016f3d4c 100644
--- a/kie-dmn/kie-dmn-validation/pom.xml
+++ b/kie-dmn/kie-dmn-validation/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   kie-dmn-validation
     jar
diff --git a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/MCDC2TCKGenerator.java b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/MCDC2TCKGenerator.java
index c9ef7d523df..a33228f2c20 100644
--- a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/MCDC2TCKGenerator.java
+++ b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/MCDC2TCKGenerator.java
@@ -23,10 +23,10 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
 
 import org.kie.dmn.model.api.DecisionTable;
 import org.kie.dmn.validation.dtanalysis.mcdc.MCDCAnalyser.PosNegBlock;
diff --git a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ObjectFactory.java b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ObjectFactory.java
index 2bf017df45a..096c084b795 100644
--- a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ObjectFactory.java
+++ b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ObjectFactory.java
@@ -20,9 +20,9 @@
 package org.kie.dmn.validation.dtanalysis.mcdc.dmntck;
 
 import org.kie.dmn.feel.util.Generated;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 
 
diff --git a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCaseType.java b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCaseType.java
index cbed707d7f4..8d47bb97734 100644
--- a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCaseType.java
+++ b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCaseType.java
@@ -20,9 +20,9 @@
 package org.kie.dmn.validation.dtanalysis.mcdc.dmntck;
 
 import org.kie.dmn.feel.util.Generated;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCases.java b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCases.java
index bad57fe70d5..963513552ee 100644
--- a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCases.java
+++ b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCases.java
@@ -25,16 +25,16 @@
 import java.util.Map;
 
 import org.kie.dmn.feel.util.Generated;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyAttribute;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
 
 import org.w3c.dom.Element;
diff --git a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ValueType.java b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ValueType.java
index 4d9b58d9a1a..e06798a5f03 100644
--- a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ValueType.java
+++ b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ValueType.java
@@ -25,17 +25,17 @@
 import java.util.Map;
 
 import org.kie.dmn.feel.util.Generated;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyAttribute;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
 
 import org.w3c.dom.Element;
diff --git a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/package-info.java b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/package-info.java
index feed0d61962..9d09b429e7c 100644
--- a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/package-info.java
+++ b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/package-info.java
@@ -17,9 +17,9 @@
  * under the License.
  */
 // Copied under Apache License from https://github.com/dmn-tck/tck/blob/8c23dc13caa508a33d11b47cca318d7c3a3ca2fc/LICENSE-ASL-2.0.txt
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.omg.org/spec/DMN/20160719/testcase",
-                                     elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED,
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.omg.org/spec/DMN/20160719/testcase",
+                                     elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED,
                                      xmlns = {@XmlNs(prefix = "tc", namespaceURI = "http://www.omg.org/spec/DMN/20160719/testcase")})
 package org.kie.dmn.validation.dtanalysis.mcdc.dmntck;
 
-import javax.xml.bind.annotation.XmlNs;
+import jakarta.xml.bind.annotation.XmlNs;
diff --git a/kie-dmn/kie-dmn-xls2dmn-cli/pom.xml b/kie-dmn/kie-dmn-xls2dmn-cli/pom.xml
index 1f2bc4765c9..ab62ff24c0e 100644
--- a/kie-dmn/kie-dmn-xls2dmn-cli/pom.xml
+++ b/kie-dmn/kie-dmn-xls2dmn-cli/pom.xml
@@ -23,7 +23,7 @@
   
     org.kie
     kie-dmn
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   kie-dmn-xls2dmn-cli
   jar
diff --git a/kie-dmn/pom.xml b/kie-dmn/pom.xml
index f91e9a70725..e49354d4288 100644
--- a/kie-dmn/pom.xml
+++ b/kie-dmn/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-drl/kie-drl-api/pom.xml b/kie-drl/kie-drl-api/pom.xml
index 9d6e47297fc..29b5ed01c04 100644
--- a/kie-drl/kie-drl-api/pom.xml
+++ b/kie-drl/kie-drl-api/pom.xml
@@ -25,7 +25,7 @@
   
     kie-drl
     org.kie
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-drl/kie-drl-compilation-common/pom.xml b/kie-drl/kie-drl-compilation-common/pom.xml
index 1e28ad9046a..a4ac8ebe008 100644
--- a/kie-drl/kie-drl-compilation-common/pom.xml
+++ b/kie-drl/kie-drl-compilation-common/pom.xml
@@ -25,7 +25,7 @@
   
     kie-drl
     org.kie
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/kie-drl-kiesession-local-runtime/pom.xml b/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/kie-drl-kiesession-local-runtime/pom.xml
index 038712c663e..bd1ca71c1dc 100644
--- a/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/kie-drl-kiesession-local-runtime/pom.xml
+++ b/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/kie-drl-kiesession-local-runtime/pom.xml
@@ -25,7 +25,7 @@
   
     kie-drl-kiesession-local
     org.kie
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/pom.xml b/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/pom.xml
index 37935844692..7176464d7ae 100644
--- a/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/pom.xml
+++ b/kie-drl/kie-drl-implementations/kie-drl-kiesession-local/pom.xml
@@ -25,7 +25,7 @@
     
         kie-drl-implementations
         org.kie
-        8.45.0-SNAPSHOT
+        9.45.0-SNAPSHOT
     
     4.0.0
     pom
diff --git a/kie-drl/kie-drl-implementations/kie-drl-map-input/kie-drl-map-input-runtime/pom.xml b/kie-drl/kie-drl-implementations/kie-drl-map-input/kie-drl-map-input-runtime/pom.xml
index 6ac9940fb7b..cf8eb5e4f96 100644
--- a/kie-drl/kie-drl-implementations/kie-drl-map-input/kie-drl-map-input-runtime/pom.xml
+++ b/kie-drl/kie-drl-implementations/kie-drl-map-input/kie-drl-map-input-runtime/pom.xml
@@ -26,7 +26,7 @@
   
     kie-drl-map-input
     org.kie
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
 
   kie-drl-map-input-runtime
diff --git a/kie-drl/kie-drl-implementations/kie-drl-map-input/pom.xml b/kie-drl/kie-drl-implementations/kie-drl-map-input/pom.xml
index 94ad6154c72..d26cf758228 100644
--- a/kie-drl/kie-drl-implementations/kie-drl-map-input/pom.xml
+++ b/kie-drl/kie-drl-implementations/kie-drl-map-input/pom.xml
@@ -25,7 +25,7 @@
     
         kie-drl-implementations
         org.kie
-        8.45.0-SNAPSHOT
+        9.45.0-SNAPSHOT
     
     4.0.0
     pom
diff --git a/kie-drl/kie-drl-implementations/pom.xml b/kie-drl/kie-drl-implementations/pom.xml
index b8982276af6..87124f19b5f 100644
--- a/kie-drl/kie-drl-implementations/pom.xml
+++ b/kie-drl/kie-drl-implementations/pom.xml
@@ -27,7 +27,7 @@
     
         kie-drl
         org.kie
-        8.45.0-SNAPSHOT
+        9.45.0-SNAPSHOT
     
 
     KIE :: DRL :: Implementations
diff --git a/kie-drl/kie-drl-runtime-common/pom.xml b/kie-drl/kie-drl-runtime-common/pom.xml
index dc1af215142..1723951b9b0 100644
--- a/kie-drl/kie-drl-runtime-common/pom.xml
+++ b/kie-drl/kie-drl-runtime-common/pom.xml
@@ -25,7 +25,7 @@
   
     kie-drl
     org.kie
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-drl/kie-drl-tests-without-index-file/pom.xml b/kie-drl/kie-drl-tests-without-index-file/pom.xml
index da66e39b4da..1349defadb7 100644
--- a/kie-drl/kie-drl-tests-without-index-file/pom.xml
+++ b/kie-drl/kie-drl-tests-without-index-file/pom.xml
@@ -25,7 +25,7 @@
   
     kie-drl
     org.kie
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-drl/kie-drl-tests/pom.xml b/kie-drl/kie-drl-tests/pom.xml
index bdf6c6d3795..f4f3c908fef 100644
--- a/kie-drl/kie-drl-tests/pom.xml
+++ b/kie-drl/kie-drl-tests/pom.xml
@@ -25,7 +25,7 @@
   
     kie-drl
     org.kie
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
   
   4.0.0
 
diff --git a/kie-drl/pom.xml b/kie-drl/pom.xml
index cb27a3fa8c6..dc9568a701f 100644
--- a/kie-drl/pom.xml
+++ b/kie-drl/pom.xml
@@ -27,7 +27,7 @@
   
     org.kie
     drools-build-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
diff --git a/kie-internal/pom.xml b/kie-internal/pom.xml
index b73b2477666..ce7db8a9cbb 100644
--- a/kie-internal/pom.xml
+++ b/kie-internal/pom.xml
@@ -26,7 +26,7 @@
   
     org.kie
     drools-build-parent
-    8.45.0-SNAPSHOT
+    9.45.0-SNAPSHOT
     ../build-parent/pom.xml
   
 
@@ -95,11 +95,6 @@
       jaxb-core
        provided
     
-    
-      com.sun.xml.bind
-      jaxb-impl
-      provided
-    
 
     
       jakarta.xml.bind
@@ -113,6 +108,13 @@
       provided
     
 
+    
+    
+      org.glassfish.jaxb
+      jaxb-runtime
+      provided
+    
+
     
       ch.qos.logback
       logback-classic
diff --git a/kie-internal/src/main/java/org/kie/internal/builder/help/DroolsJaxbHelperProvider.java b/kie-internal/src/main/java/org/kie/internal/builder/help/DroolsJaxbHelperProvider.java
index 5a70bf3a038..63f6154f20c 100644
--- a/kie-internal/src/main/java/org/kie/internal/builder/help/DroolsJaxbHelperProvider.java
+++ b/kie-internal/src/main/java/org/kie/internal/builder/help/DroolsJaxbHelperProvider.java
@@ -21,8 +21,8 @@
 import java.io.IOException;
 import java.util.Map;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 
 import com.sun.tools.xjc.Options;
 import org.kie.api.KieBase;
diff --git a/kie-internal/src/main/java/org/kie/internal/builder/help/KnowledgeBuilderHelper.java b/kie-internal/src/main/java/org/kie/internal/builder/help/KnowledgeBuilderHelper.java
index d60aa2bcccc..77728250818 100644
--- a/kie-internal/src/main/java/org/kie/internal/builder/help/KnowledgeBuilderHelper.java
+++ b/kie-internal/src/main/java/org/kie/internal/builder/help/KnowledgeBuilderHelper.java
@@ -22,8 +22,8 @@
 import java.util.Collections;
 import java.util.Map;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 
 import com.sun.tools.xjc.Options;
 import org.kie.api.KieBase;
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/CorrelationKeyXmlAdapter.java b/kie-internal/src/main/java/org/kie/internal/jaxb/CorrelationKeyXmlAdapter.java
index a66ab3e1559..c859e47bf83 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/CorrelationKeyXmlAdapter.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/CorrelationKeyXmlAdapter.java
@@ -24,7 +24,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 import org.kie.internal.KieInternalServices;
 import org.kie.internal.process.CorrelationKey;
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateTimeXmlAdapter.java b/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateTimeXmlAdapter.java
index b74e99d2f50..880169eef4b 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateTimeXmlAdapter.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateTimeXmlAdapter.java
@@ -24,7 +24,7 @@
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.temporal.ChronoField;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 public class LocalDateTimeXmlAdapter extends XmlAdapter {
 
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateXmlAdapter.java b/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateXmlAdapter.java
index fb733055ac1..4ae10ef641a 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateXmlAdapter.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateXmlAdapter.java
@@ -21,7 +21,7 @@
 import java.time.DateTimeException;
 import java.time.LocalDate;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 public class LocalDateXmlAdapter extends XmlAdapter {
 
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/LocalTimeXmlAdapter.java b/kie-internal/src/main/java/org/kie/internal/jaxb/LocalTimeXmlAdapter.java
index 9c9f66d6184..b269f3fd6ca 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/LocalTimeXmlAdapter.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/LocalTimeXmlAdapter.java
@@ -24,7 +24,7 @@
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.temporal.ChronoField;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 public class LocalTimeXmlAdapter extends XmlAdapter {
 
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/OffsetDateTimeXmlAdapter.java b/kie-internal/src/main/java/org/kie/internal/jaxb/OffsetDateTimeXmlAdapter.java
index 705641b07c9..52e5d2933ca 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/OffsetDateTimeXmlAdapter.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/OffsetDateTimeXmlAdapter.java
@@ -24,7 +24,7 @@
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.temporal.ChronoField;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 public class OffsetDateTimeXmlAdapter extends XmlAdapter {
 
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueEntry.java b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueEntry.java
index f74cfffc611..967d0070a44 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueEntry.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueEntry.java
@@ -20,12 +20,12 @@
 
 import java.util.Map.Entry;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlValue;
 
 
 @XmlType
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMap.java b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMap.java
index df560c3a853..6436952334c 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMap.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMap.java
@@ -26,10 +26,10 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import static org.kie.internal.jaxb.StringKeyObjectValueMapXmlAdapter.createJaxbStringObjectMapEntry;
 import static org.kie.internal.jaxb.StringKeyObjectValueMapXmlAdapter.deserializeObject;
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMapXmlAdapter.java b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMapXmlAdapter.java
index bb2aa1f32af..34807c6d2a6 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMapXmlAdapter.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMapXmlAdapter.java
@@ -28,7 +28,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueEntry.java b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueEntry.java
index 88c9abcd742..6a3bc0a122b 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueEntry.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueEntry.java
@@ -18,10 +18,10 @@
  */
 package org.kie.internal.jaxb;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 @XmlType
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMap.java b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMap.java
index 8561a4f2666..cac273d1262 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMap.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMap.java
@@ -26,10 +26,10 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * This implements {@link Map} in order to fool JSON..
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMapXmlAdapter.java b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMapXmlAdapter.java
index e996b22b08e..ec05798634b 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMapXmlAdapter.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMapXmlAdapter.java
@@ -22,7 +22,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 /**
  * This is a {@link XmlAdapter} for mapping Map<String, String> instances
diff --git a/kie-internal/src/main/java/org/kie/internal/query/QueryContext.java b/kie-internal/src/main/java/org/kie/internal/query/QueryContext.java
index de305a5d934..125af0455ab 100644
--- a/kie-internal/src/main/java/org/kie/internal/query/QueryContext.java
+++ b/kie-internal/src/main/java/org/kie/internal/query/QueryContext.java
@@ -18,9 +18,9 @@
  */
 package org.kie.internal.query;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlType
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/kie-internal/src/main/java/org/kie/internal/query/QueryFilter.java b/kie-internal/src/main/java/org/kie/internal/query/QueryFilter.java
index 2e514b2534c..5967f783934 100644
--- a/kie-internal/src/main/java/org/kie/internal/query/QueryFilter.java
+++ b/kie-internal/src/main/java/org/kie/internal/query/QueryFilter.java
@@ -22,9 +22,9 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.kie.internal.jaxb.StringKeyObjectValueMapXmlAdapter;
 
diff --git a/kie-internal/src/main/java/org/kie/internal/query/data/QueryData.java b/kie-internal/src/main/java/org/kie/internal/query/data/QueryData.java
index 3196813c535..6460e835435 100644
--- a/kie-internal/src/main/java/org/kie/internal/query/data/QueryData.java
+++ b/kie-internal/src/main/java/org/kie/internal/query/data/QueryData.java
@@ -18,10 +18,10 @@
  */
 package org.kie.internal.query.data;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.kie.internal.query.QueryContext;
 
diff --git a/kie-internal/src/main/java/org/kie/internal/query/data/QueryParameters.java b/kie-internal/src/main/java/org/kie/internal/query/data/QueryParameters.java
index c68575a7846..b6d2272d679 100644
--- a/kie-internal/src/main/java/org/kie/internal/query/data/QueryParameters.java
+++ b/kie-internal/src/main/java/org/kie/internal/query/data/QueryParameters.java
@@ -24,12 +24,12 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.kie.internal.jaxb.StringKeyObjectValueMapXmlAdapter;
 
diff --git a/kie-internal/src/main/java/org/kie/internal/runtime/conf/DeploymentDescriptor.java b/kie-internal/src/main/java/org/kie/internal/runtime/conf/DeploymentDescriptor.java
index 65a87112256..1a893de3365 100644
--- a/kie-internal/src/main/java/org/kie/internal/runtime/conf/DeploymentDescriptor.java
+++ b/kie-internal/src/main/java/org/kie/internal/runtime/conf/DeploymentDescriptor.java
@@ -20,8 +20,8 @@
 
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.kie.api.remote.Remotable;
 
diff --git a/kie-internal/src/main/java/org/kie/internal/runtime/conf/MergeMode.java b/kie-internal/src/main/java/org/kie/internal/runtime/conf/MergeMode.java
index 1ac2d744d3d..97c512830da 100644
--- a/kie-internal/src/main/java/org/kie/internal/runtime/conf/MergeMode.java
+++ b/kie-internal/src/main/java/org/kie/internal/runtime/conf/MergeMode.java
@@ -18,7 +18,7 @@
  */
 package org.kie.internal.runtime.conf;
 
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * Defines merging strategy of two descriptors
diff --git a/kie-internal/src/main/java/org/kie/internal/runtime/conf/NamedObjectModel.java b/kie-internal/src/main/java/org/kie/internal/runtime/conf/NamedObjectModel.java
index 8421eeda8ee..6e7d6ebfb34 100644
--- a/kie-internal/src/main/java/org/kie/internal/runtime/conf/NamedObjectModel.java
+++ b/kie-internal/src/main/java/org/kie/internal/runtime/conf/NamedObjectModel.java
@@ -18,11 +18,11 @@
  */
 package org.kie.internal.runtime.conf;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
 
 /**
  * Extension of ObjectModel that provides unique name for the object model
diff --git a/kie-internal/src/main/java/org/kie/internal/runtime/conf/ObjectModel.java b/kie-internal/src/main/java/org/kie/internal/runtime/conf/ObjectModel.java
index 71306f0345c..6268d19d31f 100644
--- a/kie-internal/src/main/java/org/kie/internal/runtime/conf/ObjectModel.java
+++ b/kie-internal/src/main/java/org/kie/internal/runtime/conf/ObjectModel.java
@@ -23,12 +23,12 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
 /**
  * Object model that defines how and of what type the object instance should be created.

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

From a79c4af5d59e9c0b7e55708a29e9b273cd719ced Mon Sep 17 00:00:00 2001
From: mariofusco 
Date: Wed, 22 Nov 2023 15:30:02 +0100
Subject: [PATCH 2/6] wip

---
 .../common/di/DependencyInjectionAnnotator.java  |  8 ++++----
 .../di/impl/CDIDependencyInjectionAnnotator.java | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/DependencyInjectionAnnotator.java b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/DependencyInjectionAnnotator.java
index e31288ebea4..133e55e4334 100644
--- a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/DependencyInjectionAnnotator.java
+++ b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/DependencyInjectionAnnotator.java
@@ -18,6 +18,9 @@
  */
 package org.drools.codegen.common.di;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.expr.ArrayInitializerExpr;
 import com.github.javaparser.ast.expr.Expression;
@@ -29,9 +32,6 @@
 import com.github.javaparser.ast.expr.StringLiteralExpr;
 import com.github.javaparser.ast.nodeTypes.NodeWithAnnotations;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Generic abstraction for dependency injection annotations that allow to
  * use different frameworks based needs.
@@ -183,7 +183,7 @@ default > T withSecurityRoles(T node, String[]
                 rolesExpr.add(new StringLiteralExpr(role.trim()));
             }
 
-            node.addAnnotation(new SingleMemberAnnotationExpr(new Name("javax.annotation.security.RolesAllowed"), new ArrayInitializerExpr(NodeList.nodeList(rolesExpr))));
+            node.addAnnotation(new SingleMemberAnnotationExpr(new Name("jakarta.annotation.security.RolesAllowed"), new ArrayInitializerExpr(NodeList.nodeList(rolesExpr))));
         }
         return node;
     }
diff --git a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/impl/CDIDependencyInjectionAnnotator.java b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/impl/CDIDependencyInjectionAnnotator.java
index 47e33bd14cb..0631364e819 100644
--- a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/impl/CDIDependencyInjectionAnnotator.java
+++ b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/impl/CDIDependencyInjectionAnnotator.java
@@ -36,7 +36,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot
 
     @Override
     public > T withProduces(T node, boolean isDefault) {
-        node.addAndGetAnnotation("javax.enterprise.inject.Produces");
+        node.addAndGetAnnotation("jakarta.enterprise.inject.Produces");
         if (isDefault) {
             node.addAndGetAnnotation("io.quarkus.arc.DefaultBean");
         }
@@ -45,13 +45,13 @@ public > T withProduces(T node, boolean isDefau
 
     @Override
     public > T withNamed(T node, String name) {
-        node.addAnnotation(new SingleMemberAnnotationExpr(new Name("javax.inject.Named"), new StringLiteralExpr(name)));
+        node.addAnnotation(new SingleMemberAnnotationExpr(new Name("jakarta.inject.Named"), new StringLiteralExpr(name)));
         return node;
     }
 
     @Override
     public > T withApplicationComponent(T node) {
-        node.addAnnotation("javax.enterprise.context.ApplicationScoped");
+        node.addAnnotation("jakarta.enterprise.context.ApplicationScoped");
         return node;
     }
 
@@ -62,7 +62,7 @@ public > T withNamedApplicationComponent(T node
 
     @Override
     public > T withSingletonComponent(T node) {
-        node.addAnnotation("javax.inject.Singleton");
+        node.addAnnotation("jakarta.inject.Singleton");
         return node;
     }
 
@@ -73,7 +73,7 @@ public > T withNamedSingletonComponent(T node,
 
     @Override
     public > T withInjection(T node, boolean lazy) {
-        node.addAnnotation("javax.inject.Inject");
+        node.addAnnotation("jakarta.inject.Inject");
         return node;
     }
 
@@ -107,7 +107,7 @@ public MethodCallExpr withMessageProducer(MethodCallExpr produceMethod, String c
 
     @Override
     public String optionalInstanceInjectionType() {
-        return "javax.enterprise.inject.Instance";
+        return "jakarta.enterprise.inject.Instance";
     }
 
     @Override
@@ -134,7 +134,7 @@ public Expression getMultiInstance(String fieldName) {
 
     @Override
     public String applicationComponentType() {
-        return "javax.enterprise.context.ApplicationScoped";
+        return "jakarta.enterprise.context.ApplicationScoped";
     }
 
     @Override
@@ -174,7 +174,7 @@ public > T withFactoryClass(T node) {
 
     @Override
     public > T withFactoryMethod(T node) {
-        node.addAnnotation("javax.enterprise.inject.Produces");
+        node.addAnnotation("jakarta.enterprise.inject.Produces");
         return node;
     }
 

From 7a449ac81f3f0acd768ab0026f9d29cca555d9fa Mon Sep 17 00:00:00 2001
From: mariofusco 
Date: Thu, 23 Nov 2023 10:15:13 +0100
Subject: [PATCH 3/6] wip

---
 kie-internal/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/kie-internal/pom.xml b/kie-internal/pom.xml
index ce7db8a9cbb..8e08575b0cd 100644
--- a/kie-internal/pom.xml
+++ b/kie-internal/pom.xml
@@ -90,11 +90,6 @@
       jaxb-xjc
       provided
     
-    
-      com.sun.xml.bind
-      jaxb-core
-       provided
-    
 
     
       jakarta.xml.bind

From c1dbe7f71e3aeee6a456b3c7ac7d67f72df976a6 Mon Sep 17 00:00:00 2001
From: mariofusco 
Date: Thu, 23 Nov 2023 11:29:54 +0100
Subject: [PATCH 4/6] remove duplicated dependencies

---
 build-parent/pom.xml                          |  3 +++
 .../drools-quarkus-deployment/pom.xml         | 22 ++++++++++++++-----
 .../drools-quarkus-examples-multiunit/pom.xml | 10 +++++++++
 .../drools-quarkus-examples-reactive/pom.xml  | 10 +++++++++
 .../pom.xml                                   | 10 +++++++++
 .../drools-quarkus-integration-test/pom.xml   | 10 +++++++++
 .../drools-quarkus-quickstart-test/pom.xml    | 10 +++++++++
 .../pom.xml                                   | 10 +++++++++
 .../drools-quarkus/pom.xml                    | 10 +++++++++
 9 files changed, 89 insertions(+), 6 deletions(-)

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 737da61673e..406f168a468 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -1407,6 +1407,9 @@
                     
                       
                       javax.inject.*
+                      
+                      
+                      com.google.inject.*
                       
                       org.xmlpull.v1.XmlPullParserException
                       org.xmlpull.v1.XmlPullParser
diff --git a/drools-quarkus-extension/drools-quarkus-deployment/pom.xml b/drools-quarkus-extension/drools-quarkus-deployment/pom.xml
index 20fe8a88e59..af9b3a4be0d 100644
--- a/drools-quarkus-extension/drools-quarkus-deployment/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-deployment/pom.xml
@@ -89,12 +89,22 @@
             quarkus-vertx-http-deployment-spi
         
 
-        
-        
-            io.quarkus
-            quarkus-junit5-internal
-            test
-        
+    
+    
+      io.quarkus
+      quarkus-junit5-internal
+      test
+      
+        
+          org.codehaus.plexus
+          plexus-xml
+        
+        
+          org.apache.maven
+          maven-xml-impl
+        
+      
+    
     
       io.rest-assured
       rest-assured
diff --git a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml
index 927d0a2f3fe..87a381a194c 100644
--- a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml
@@ -57,6 +57,16 @@
       io.quarkus
       quarkus-junit5
       test
+      
+        
+          org.codehaus.plexus
+          plexus-xml
+        
+        
+          org.apache.maven
+          maven-xml-impl
+        
+