You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kie.apache.org by ma...@apache.org on 2023/12/15 13:51:58 UTC
(incubator-kie-drools) branch main updated: Bump to Quarkus 3.2 LTS and Jakarta namespace (#5625)
This is an automated email from the ASF dual-hosted git repository.
mariofusco pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-drools.git
The following commit(s) were added to refs/heads/main by this push:
new f358b7c467 Bump to Quarkus 3.2 LTS and Jakarta namespace (#5625)
f358b7c467 is described below
commit f358b7c467e4e9d4c57494d40dfb19de66fe1193
Author: Mario Fusco <ma...@gmail.com>
AuthorDate: Fri Dec 15 14:51:54 2023 +0100
Bump to Quarkus 3.2 LTS and Jakarta namespace (#5625)
* bump to 999-SNAPSHOT
* restore version 9.46.0-SNAPSHOT
* TEMPORARY: adjust pipeline config
* CI - limit generated jobs
* CI: update mvn and jdk in GHA
---------
Co-authored-by: jstastny-cz <ja...@ibm.com>
---
.ci/environments/quarkus-3/before.sh | 2 +-
.../CreateKieQuarkusProjectMigrationRecipe.java | 10 +-
.../quarkus-3/patches/0001_before_sh.patch | 850 ++++++++++++---------
.../patches/0004_hardcoded-javax-string.patch | 4 +-
.../quarkus-3/patches/0006_package-info.patch | 2 +-
.../patches/0010_remaining_javax_jakarta.patch | 10 +-
.ci/environments/quarkus-3/quarkus3.yml | 8 +-
.ci/jenkins/config/branch.yaml | 58 +-
.github/workflows/pr-downstream-full.yml | 4 +-
.github/workflows/pr-downstream.yml | 4 +-
.github/workflows/pr-drools-ansible.yml | 2 +-
.github/workflows/pr-drools-docs.yml | 4 +-
.github/workflows/pr-drools.yml | 4 +-
bom/drools-bom/pom.xml | 2 +-
bom/kie-core-bom/pom.xml | 2 +-
bom/kie-dmn-bom/pom.xml | 2 +-
bom/kie-efesto-bom/pom.xml | 2 +-
bom/kie-pmml-bom/pom.xml | 2 +-
bom/pom.xml | 2 +-
build-parent/pom.xml | 132 ++--
drools-alphanetwork-compiler/pom.xml | 2 +-
drools-base/pom.xml | 7 +-
drools-beliefs/pom.xml | 2 +-
drools-commands/pom.xml | 2 +-
.../org/drools/commands/GetVariableCommand.java | 10 +-
.../org/drools/commands/jaxb/JaxbListAdapter.java | 2 +-
.../org/drools/commands/jaxb/JaxbListWrapper.java | 10 +-
.../org/drools/commands/jaxb/JaxbMapAdapter.java | 2 +-
.../drools/commands/jaxb/JaxbObjectObjectPair.java | 10 +-
.../drools/commands/jaxb/JaxbStringObjectPair.java | 12 +-
.../drools/commands/jaxb/JaxbUnknownAdapter.java | 2 +-
.../org/drools/commands/jaxb/ObjectFactory.java | 2 +-
.../runtime/AdvanceSessionTimeCommand.java | 8 +-
.../runtime/BatchExecutionCommandImpl.java | 14 +-
.../drools/commands/runtime/DisposeCommand.java | 6 +-
.../commands/runtime/ExecutionResultImpl.java | 10 +-
.../commands/runtime/ExecutionResultsMap.java | 2 +-
.../drools/commands/runtime/FlatQueryResults.java | 14 +-
.../commands/runtime/GetFactCountCommand.java | 8 +-
.../drools/commands/runtime/GetGlobalCommand.java | 8 +-
.../org/drools/commands/runtime/GetIdCommand.java | 8 +-
.../commands/runtime/GetSessionTimeCommand.java | 8 +-
.../org/drools/commands/runtime/ObjectFactory.java | 2 +-
.../commands/runtime/QueryResultsJaxbAdapter.java | 2 +-
.../drools/commands/runtime/SetGlobalCommand.java | 12 +-
.../runtime/pmml/ApplyPmmlModelCommand.java | 12 +-
.../process/AbortProcessInstanceCommand.java | 8 +-
.../runtime/process/AbortWorkItemCommand.java | 8 +-
.../runtime/process/CompleteWorkItemCommand.java | 12 +-
.../CreateCorrelatedProcessInstanceCommand.java | 12 +-
.../process/CreateProcessInstanceCommand.java | 12 +-
.../process/GetProcessEventListenersCommand.java | 6 +-
.../runtime/process/GetProcessIdsCommand.java | 8 +-
.../GetProcessInstanceByCorrelationKeyCommand.java | 12 +-
.../runtime/process/GetProcessInstanceCommand.java | 8 +-
.../process/GetProcessInstancesCommand.java | 8 +-
.../runtime/process/GetWorkItemCommand.java | 8 +-
.../runtime/process/GetWorkItemIdsCommand.java | 8 +-
.../commands/runtime/process/ObjectFactory.java | 2 +-
.../runtime/process/ReTryWorkItemCommand.java | 10 +-
.../process/RegisterWorkItemHandlerCommand.java | 8 +-
.../SetProcessInstanceVariablesCommand.java | 12 +-
.../runtime/process/SignalEventCommand.java | 12 +-
.../process/StartCorrelatedProcessCommand.java | 14 +-
.../runtime/process/StartProcessCommand.java | 16 +-
.../process/StartProcessFromNodeIdsCommand.java | 12 +-
.../process/StartProcessInstanceCommand.java | 6 +-
.../runtime/rule/AgendaGroupSetFocusCommand.java | 8 +-
.../runtime/rule/ClearActivationGroupCommand.java | 8 +-
.../commands/runtime/rule/ClearAgendaCommand.java | 6 +-
.../runtime/rule/ClearAgendaGroupCommand.java | 8 +-
.../runtime/rule/ClearRuleFlowGroupCommand.java | 8 +-
.../commands/runtime/rule/DeleteCommand.java | 8 +-
.../runtime/rule/DeleteFromEntryPointCommand.java | 8 +-
.../commands/runtime/rule/DeleteObjectCommand.java | 8 +-
.../runtime/rule/EnableAuditLogCommand.java | 8 +-
.../commands/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 +-
.../rule/GetFactHandleInEntryPointCommand.java | 2 +-
.../runtime/rule/GetFactHandlesCommand.java | 6 +-
.../commands/runtime/rule/GetObjectCommand.java | 12 +-
.../runtime/rule/GetObjectInEntryPointCommand.java | 8 +-
.../commands/runtime/rule/GetObjectsCommand.java | 8 +-
.../rule/GetObjectsInEntryPointCommand.java | 6 +-
.../runtime/rule/InsertElementsCommand.java | 10 +-
.../commands/runtime/rule/InsertObjectCommand.java | 12 +-
.../rule/InsertObjectInEntryPointCommand.java | 8 +-
.../commands/runtime/rule/ModifyCommand.java | 10 +-
.../commands/runtime/rule/ObjectFactory.java | 2 +-
.../drools/commands/runtime/rule/QueryCommand.java | 8 +-
.../commands/runtime/rule/UpdateCommand.java | 12 +-
.../runtime/rule/UpdateInEntryPointCommand.java | 4 +-
drools-compiler/pom.xml | 7 +-
.../compiler/kproject/models/KieBaseModelImpl.java | 2 +-
.../impl/DroolsJaxbHelperProviderImpl.java | 4 +-
drools-core/pom.xml | 7 +-
.../core/ClassObjectSerializationFilter.java | 8 +-
.../java/org/drools/core/base/ArrayElements.java | 8 +-
.../core/base/RuleNameEndsWithAgendaFilter.java | 8 +-
.../core/base/RuleNameEqualsAgendaFilter.java | 8 +-
.../core/base/RuleNameMatchesAgendaFilter.java | 8 +-
.../core/base/RuleNameStartsWithAgendaFilter.java | 8 +-
.../org/drools/core/common/DefaultFactHandle.java | 8 +-
.../drools/core/common/DisconnectedFactHandle.java | 14 +-
.../java/org/drools/core/common/ObjectFactory.java | 2 +-
.../drools/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 +-
...roc-kogito-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-integration-tests/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 +-
drools-examples-api/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 +-
drools-examples-api/kiefilesystem-example/pom.xml | 2 +-
drools-examples-api/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 +-
drools-examples-api/reactive-kiesession/pom.xml | 2 +-
drools-examples/pom.xml | 2 +-
drools-fastutil/pom.xml | 2 +-
.../drools-impact-analysis-graph-common/pom.xml | 2 +-
.../drools-impact-analysis-graph-graphviz/pom.xml | 2 +-
.../drools-impact-analysis-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 +-
.../test/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 +-
.../context/QuarkusDroolsModelBuildContext.java | 4 +-
.../common/di/DependencyInjectionAnnotator.java | 8 +-
.../di/impl/CDIDependencyInjectionAnnotator.java | 16 +-
drools-model/drools-model-codegen/pom.xml | 2 +-
.../config/RuleConfigQuarkusTemplate.java | 6 +-
.../rules/ProjectRuntimeQuarkusTemplate.java | 2 +-
.../ruleunits/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 +-
.../java/org/drools/mvel/parser/MvelParser.java | 6 +-
.../drools-mvel-parser/src/main/javacc/mvel.jj | 32 +-
drools-model/pom.xml | 2 +-
drools-mvel/pom.xml | 7 +-
.../test/java/org/drools/mvel/compiler/Person.java | 4 +-
drools-persistence/drools-persistence-api/pom.xml | 7 +-
.../persistence/api/PersistenceContextManager.java | 2 +-
.../TransactionSynchronizationRegistryHelper.java | 2 +-
.../persistence/jta/JtaTransactionManager.java | 30 +-
.../jta/JtaTransactionManagerFactory.java | 4 +-
.../jta/JtaTransactionSynchronizationAdapter.java | 4 +-
.../jta/TransactionLockInterceptor.java | 2 +-
drools-persistence/drools-persistence-jpa/pom.xml | 16 +-
.../TriggerUpdateTransactionSynchronization.java | 2 +-
.../org/drools/persistence/info/SessionInfo.java | 18 +-
.../org/drools/persistence/info/WorkItemInfo.java | 18 +-
.../jpa/AbstractPersistenceContextManager.java | 4 +-
.../persistence/jpa/JpaPersistenceContext.java | 4 +-
.../jpa/JpaPersistenceContextManager.java | 2 +-
.../jpa/OptimisticLockRetryInterceptor.java | 2 +-
.../jpa/marshaller/EntityPersister.java | 2 +-
.../marshaller/JPAPlaceholderResolverStrategy.java | 10 +-
.../persistence/jpa/marshaller/MappedVariable.java | 14 +-
.../persistence/jpa/marshaller/VariableEntity.java | 10 +-
.../filtered-resources/META-INF/persistence.xml | 6 +-
.../jta/JtaTransactionManagerFactoryTest.java | 14 +-
.../persistence/jta/JtaTransactionManagerTest.java | 8 +-
.../persistence/jta/TransactionTestCommand.java | 4 +-
.../persistence/jta/TransactionTestObject.java | 14 +-
.../session/JpaPersistentStatefulSessionTest.java | 2 +-
.../map/impl/JpaBasedPersistenceTest.java | 2 +-
.../session/JpaPersistentStatefulSessionTest.java | 2 +-
.../persistence/session/ReloadSessionTest.java | 4 +-
.../persistence/util/DroolsPersistenceUtil.java | 2 +-
drools-persistence/pom.xml | 2 +-
.../drools-quarkus-deployment/pom.xml | 26 +-
.../quarkus/deployment/DroolsAssetsProcessor.java | 2 +-
.../drools-quarkus-examples-multiunit/pom.xml | 12 +-
.../ruleunit/examples/multiunit/RuntimeTest.java | 2 +-
.../drools-quarkus-examples-reactive/pom.xml | 12 +-
.../ruleunit/examples/reactive/Adaptor.java | 6 +-
.../KafkaTestResourceLifecycleManager.java | 2 +-
.../ruleunit/examples/reactive/RuntimeTest.java | 8 +-
.../drools-quarkus-examples/pom.xml | 2 +-
.../pom.xml | 12 +-
.../quarkus/test/hotreload/FindAdultEndpoint.java | 12 +-
.../drools-quarkus-integration-test/pom.xml | 12 +-
.../org/drools/quarkus/test/TestableResource.java | 19 +-
.../java/org/drools/quarkus/test/RuntimeTest.java | 9 +-
.../drools-quarkus-quickstart-test/pom.xml | 12 +-
.../quarkus/quickstart/test/HomeAlertsBean.java | 4 +-
.../drools/quarkus/quickstart/test/BeanTest.java | 2 +-
.../drools/quarkus/quickstart/test/RuntimeIT.java | 2 +-
.../pom.xml | 12 +-
.../quarkus/ruleunit/test/TestableResource.java | 8 +-
.../ruleunit/test/RuntimeDslRuleUnitTest.java | 2 +-
.../drools/quarkus/ruleunit/test/RuntimeTest.java | 2 +-
.../drools-quarkus-util-deployment/pom.xml | 2 +-
.../deployment/DroolsQuarkusResourceUtils.java | 4 +-
drools-quarkus-extension/drools-quarkus/pom.xml | 14 +-
drools-quarkus-extension/pom.xml | 2 +-
drools-reliability/drools-reliability-core/pom.xml | 2 +-
.../drools-reliability-h2mvstore/pom.xml | 2 +-
.../drools-reliability-infinispan/pom.xml | 6 +-
.../drools-reliability-tests/pom.xml | 8 +-
drools-reliability/pom.xml | 2 +-
drools-retediagram/pom.xml | 2 +-
drools-ruleunits/drools-ruleunits-api/pom.xml | 2 +-
drools-ruleunits/drools-ruleunits-dsl/pom.xml | 2 +-
drools-ruleunits/drools-ruleunits-engine/pom.xml | 2 +-
drools-ruleunits/drools-ruleunits-impl/pom.xml | 2 +-
.../ruleunits/impl/SimpleRuleUnitVariable.java | 14 +-
drools-ruleunits/pom.xml | 2 +-
.../drools-scenario-simulation-api/pom.xml | 2 +-
.../drools-scenario-simulation-backend/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 +-
.../standalone/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 +-
.../standalone/kie-ci-without-domain/tests/pom.xml | 2 +-
drools-test-coverage/standalone/pom.xml | 2 +-
.../test-compiler-integration/pom.xml | 2 +-
.../test/java/org/drools/mvel/compiler/Person.java | 4 +-
.../mvel/integrationtests/KieBuilderTest.java | 4 +-
.../drools/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 +-
.../filtered-resources/META-INF/persistence.xml | 6 +-
.../traits/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-core/efesto-compilation-manager/pom.xml | 2 +-
.../efesto-runtime-manager-api/pom.xml | 2 +-
.../efesto-runtime-manager-core/pom.xml | 2 +-
efesto/efesto-core/efesto-runtime-manager/pom.xml | 2 +-
efesto/efesto-core/pom.xml | 2 +-
efesto/efesto-dependencies/pom.xml | 2 +-
efesto/pom.xml | 2 +-
jpmml-migration-recipe/pom.xml | 2 +-
kie-api/pom.xml | 2 +-
.../org/kie/api/builder/model/KieBaseModel.java | 2 +-
.../org/kie/api/builder/model/KieSessionModel.java | 2 +-
.../kie/api/internal/utils/KieServiceLoader.java | 2 +-
.../main/java/org/kie/api/pmml/AbstractOutput.java | 10 +-
.../java/org/kie/api/pmml/DoubleFieldOutput.java | 6 +-
.../java/org/kie/api/pmml/IntegerFieldOutput.java | 6 +-
.../main/java/org/kie/api/pmml/PMML4DataField.java | 8 +-
.../java/org/kie/api/pmml/PMML4OutputField.java | 10 +-
.../main/java/org/kie/api/pmml/PMML4Result.java | 14 +-
.../java/org/kie/api/pmml/PMMLRequestData.java | 12 +-
.../main/java/org/kie/api/pmml/ParameterInfo.java | 12 +-
.../java/org/kie/api/pmml/StringFieldOutput.java | 6 +-
.../org/kie/api/runtime/query/QueryContext.java | 10 +-
.../main/java/org/kie/api/task/model/Status.java | 2 +-
kie-api/src/test/resources/org/kie/api/kmod1.xml | 6 +-
kie-archetypes/kie-drools-dmn-archetype/pom.xml | 2 +-
.../kie-drools-exec-model-archetype/pom.xml | 2 +-
.../pom.xml | 2 +-
kie-archetypes/kie-drools-yaml-archetype/pom.xml | 2 +-
kie-archetypes/pom.xml | 2 +-
kie-ci/pom.xml | 2 +-
kie-dmn/kie-dmn-api/pom.xml | 2 +-
kie-dmn/kie-dmn-backend/pom.xml | 2 +-
kie-dmn/kie-dmn-core-jsr223-jq/pom.xml | 2 +-
kie-dmn/kie-dmn-core-jsr223/pom.xml | 2 +-
kie-dmn/kie-dmn-core/pom.xml | 2 +-
.../org/kie/dmn/core/pmml/DMNImportPMMLInfo.java | 4 +-
.../main/java/org/kie/dmn/core/pmml/PMMLInfo.java | 8 +-
kie-dmn/kie-dmn-feel/pom.xml | 2 +-
.../main/java/org/kie/dmn/feel/util/Generated.java | 2 +-
.../kie/dmn/feel/jandex/AbstractJandexTest.java | 6 +-
kie-dmn/kie-dmn-legacy-tests/pom.xml | 7 +-
kie-dmn/kie-dmn-model/pom.xml | 2 +-
.../org/kie/dmn/model/v1_2/dmndi/DMNDiagram.java | 2 +-
.../kie/dmn/model/v1_2/dmndi/DiagramElement.java | 2 +-
.../org/kie/dmn/model/v1_3/dmndi/DMNDiagram.java | 2 +-
.../kie/dmn/model/v1_3/dmndi/DiagramElement.java | 2 +-
.../dmn/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 +-
.../java/org/kie/dmn/ruleset2dmn/Converter.java | 9 +-
.../org/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/kie-drl-tests-without-index-file/pom.xml | 2 +-
kie-drl/kie-drl-tests/pom.xml | 2 +-
kie-drl/pom.xml | 2 +-
kie-internal/pom.xml | 19 +-
.../builder/help/DroolsJaxbHelperProvider.java | 4 +-
.../builder/help/KnowledgeBuilderHelper.java | 4 +-
.../internal/jaxb/CorrelationKeyXmlAdapter.java | 2 +-
.../kie/internal/jaxb/LocalDateTimeXmlAdapter.java | 2 +-
.../org/kie/internal/jaxb/LocalDateXmlAdapter.java | 2 +-
.../org/kie/internal/jaxb/LocalTimeXmlAdapter.java | 2 +-
.../internal/jaxb/OffsetDateTimeXmlAdapter.java | 2 +-
.../internal/jaxb/StringKeyObjectValueEntry.java | 12 +-
.../kie/internal/jaxb/StringKeyObjectValueMap.java | 8 +-
.../jaxb/StringKeyObjectValueMapXmlAdapter.java | 2 +-
.../internal/jaxb/StringKeyStringValueEntry.java | 8 +-
.../kie/internal/jaxb/StringKeyStringValueMap.java | 8 +-
.../jaxb/StringKeyStringValueMapXmlAdapter.java | 2 +-
.../java/org/kie/internal/query/QueryContext.java | 6 +-
.../java/org/kie/internal/query/QueryFilter.java | 6 +-
.../org/kie/internal/query/data/QueryData.java | 8 +-
.../kie/internal/query/data/QueryParameters.java | 12 +-
.../runtime/conf/DeploymentDescriptor.java | 4 +-
.../org/kie/internal/runtime/conf/MergeMode.java | 2 +-
.../internal/runtime/conf/NamedObjectModel.java | 10 +-
.../org/kie/internal/runtime/conf/ObjectModel.java | 12 +-
.../kie/internal/runtime/conf/RuntimeStrategy.java | 2 +-
.../manager/deploy/DeploymentDescriptorIO.java | 8 +-
.../manager/deploy/DeploymentDescriptorImpl.java | 14 +-
.../manager/deploy/TransientObjectModel.java | 2 +-
.../kie/internal/task/api/model/AccessType.java | 2 +-
.../internal/task/api/model/SubTasksStrategy.java | 2 +-
.../runtime/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 +-
.../java/org/kie/pmml/api/PMMLRuntimeFactory.java | 2 +-
kie-pmml-trusty/kie-pmml-commons/pom.xml | 2 +-
.../kie-pmml-compiler-api/pom.xml | 2 +-
.../compiler/api/dto/CommonCompilationDTO.java | 2 +-
.../kie/pmml/compiler/api/utils/ModelUtils.java | 30 +-
.../org/kie/pmml/compiler/api/mocks/TestModel.java | 10 +
.../compiler/api/testutils/PMMLModelTestUtils.java | 66 +-
.../pmml/compiler/api/utils/ModelUtilsTest.java | 61 +-
.../kie-pmml-compiler-commons/pom.xml | 2 +-
.../KiePMMLDerivedFieldFactory.java | 2 +-
.../codegenfactories/KiePMMLDiscretizeFactory.java | 2 +-
.../KiePMMLFieldColumnPairFactory.java | 2 +-
.../codegenfactories/KiePMMLFieldRefFactory.java | 2 +-
.../KiePMMLMiningFieldFactory.java | 8 +-
.../codegenfactories/KiePMMLModelFactoryUtils.java | 4 +-
.../KiePMMLNormContinuousFactory.java | 2 +-
.../KiePMMLNormDiscreteFactory.java | 2 +-
.../KiePMMLOutputFieldFactory.java | 4 +-
.../KiePMMLParameterFieldFactory.java | 2 +-
.../KiePMMLSimplePredicateFactory.java | 4 +-
.../KiePMMLSimpleSetPredicateFactory.java | 2 +-
.../codegenfactories/KiePMMLTextIndexFactory.java | 2 +-
.../KiePMMLDerivedFieldInstanceFactory.java | 5 +-
.../KiePMMLDiscretizeInstanceFactory.java | 2 +-
.../KiePMMLFieldColumnPairInstanceFactory.java | 2 +-
.../factories/KiePMMLFieldRefInstanceFactory.java | 2 +-
.../KiePMMLMiningFieldInstanceFactory.java | 2 +-
.../KiePMMLNormContinuousInstanceFactory.java | 2 +-
.../KiePMMLNormDiscreteInstanceFactory.java | 2 +-
.../KiePMMLOutputFieldInstanceFactory.java | 4 +-
.../KiePMMLParameterFieldInstanceFactory.java | 2 +-
.../KiePMMLSimplePredicateInstanceFactory.java | 4 +-
.../KiePMMLSimpleSetPredicateInstanceFactory.java | 2 +-
.../factories/KiePMMLTargetInstanceFactory.java | 2 +-
.../factories/KiePMMLTextIndexInstanceFactory.java | 2 +-
.../pmml/compiler/commons/utils/KiePMMLUtil.java | 9 +-
.../codegenfactories/KiePMMLApplyFactoryTest.java | 9 +-
.../KiePMMLDefineFunctionFactoryTest.java | 16 +-
.../KiePMMLDerivedFieldFactoryTest.java | 25 +-
.../KiePMMLDiscretizeFactoryTest.java | 3 +-
.../KiePMMLFieldColumnPairFactoryTest.java | 3 +-
.../KiePMMLFieldRefFactoryTest.java | 3 +-
.../KiePMMLInlineTableFactoryTest.java | 2 +-
.../KiePMMLLocalTransformationsFactoryTest.java | 3 +-
.../KiePMMLMapValuesFactoryTest.java | 2 +-
.../KiePMMLMiningFieldFactoryTest.java | 9 +-
.../KiePMMLNormContinuousFactoryTest.java | 3 +-
.../KiePMMLNormDiscreteFactoryTest.java | 3 +-
.../KiePMMLParameterFieldFactoryTest.java | 3 +-
.../codegenfactories/KiePMMLRowFactoryTest.java | 4 +-
.../KiePMMLSimplePredicateFactoryTest.java | 6 +-
.../KiePMMLSimpleSetPredicateFactoryTest.java | 6 +-
.../KiePMMLTextIndexFactoryTest.java | 3 +-
...KiePMMLTransformationDictionaryFactoryTest.java | 9 +-
.../factories/InstanceFactoriesTestCommon.java | 32 +-
...MMLLocalTransformationsInstanceFactoryTest.java | 2 +-
...ransformationDictionaryInstanceFactoryTest.java | 2 +-
.../commons/utils/JavaParserUtilsTest.java | 3 +-
.../compiler/commons/utils/KiePMMLUtilTest.java | 35 +-
.../kie-pmml-compiler-core/pom.xml | 2 +-
.../pmml/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 +-
.../kie-pmml-models-clustering-compiler/pom.xml | 2 +-
.../factories/KiePMMLClusteringModelFactory.java | 4 +-
.../KiePMMLClusteringModelFactoryTest.java | 9 +-
.../kie-pmml-models-clustering-evaluator/pom.xml | 2 +-
.../kie-pmml-models-clustering-model/pom.xml | 2 +-
.../kie-pmml-models-clustering-tests/pom.xml | 2 +-
.../kie-pmml-models-clustering/pom.xml | 2 +-
.../kie-pmml-models-drools-common/pom.xml | 2 +-
.../factories/KiePMMLDataDictionaryASTFactory.java | 4 +-
.../factories/KiePMMLDerivedFieldASTFactory.java | 4 +-
.../KiePMMLSimplePredicateASTFactory.java | 6 +-
.../KiePMMLSimpleSetPredicateASTFactory.java | 4 +-
.../drools/utils/KiePMMLASTFactoryUtils.java | 6 +-
.../KiePMMLCompoundPredicateASTFactoryTest.java | 4 +-
.../KiePMMLDataDictionaryASTFactoryTest.java | 8 +-
.../KiePMMLDerivedFieldASTFactoryTest.java | 5 +-
.../KiePMMLSimplePredicateASTFactoryTest.java | 4 +-
.../factories/KiePMMLDescrRhsFactoryTest.java | 5 +-
.../drools/provider/DroolsModelProviderTest.java | 6 +-
.../drools/utils/KiePMMLASTFactoryUtilsTest.java | 6 +-
.../models/drools/utils/KiePMMLASTTestUtils.java | 5 +-
.../utils/KiePMMLDroolsModelFactoryUtilsTest.java | 3 +-
.../pom.xml | 2 +-
...ScorecardModelCharacteristicASTFactoryTest.java | 2 +-
.../pom.xml | 2 +-
.../kie-pmml-models-drools-scorecard-model/pom.xml | 2 +-
.../kie-pmml-models-drools-scorecard-tests/pom.xml | 2 +-
.../kie-pmml-models-drools-scorecard/pom.xml | 2 +-
.../kie-pmml-models-drools-tree-compiler/pom.xml | 2 +-
.../factories/KiePMMLTreeModelFactoryTest.java | 2 +-
.../kie-pmml-models-drools-tree-evaluator/pom.xml | 2 +-
.../kie-pmml-models-drools-tree-model/pom.xml | 2 +-
.../kie-pmml-models-drools-tree-tests/pom.xml | 2 +-
.../kie-pmml-models-drools-tree/pom.xml | 2 +-
.../kie-pmml-models/kie-pmml-models-drools/pom.xml | 2 +-
.../kie-pmml-models-mining-compiler/pom.xml | 2 +-
.../factories/AbstractKiePMMLFactoryTest.java | 2 +-
.../factories/KiePMMLMiningModelFactoryTest.java | 2 +-
.../factories/KiePMMLSegmentFactoryTest.java | 2 +-
.../factories/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/kie-pmml-models-mining/pom.xml | 2 +-
.../kie-pmml-models-regression-compiler/pom.xml | 2 +-
.../RegressionModelImplementationProvider.java | 6 +-
.../factories/KiePMMLRegressionTableFactory.java | 16 +-
...iePMMLRegressionTableRegressionFactoryTest.java | 3 +-
.../KiePMMLClassificationTableFactoryTest.java | 15 +-
.../KiePMMLRegressionModelFactoryTest.java | 10 +-
.../KiePMMLRegressionTableFactoryTest.java | 25 +-
.../kie-pmml-models-regression-evaluator/pom.xml | 2 +-
.../kie-pmml-models-regression-model/pom.xml | 2 +-
.../kie-pmml-models-regression-tests/pom.xml | 2 +-
.../kie-pmml-models-regression/pom.xml | 2 +-
.../kie-pmml-models-scorecard-compiler/pom.xml | 2 +-
.../KiePMMLComplexPartialScoreFactoryTest.java | 10 +-
.../kie-pmml-models-scorecard-evaluator/pom.xml | 2 +-
.../kie-pmml-models-scorecard-model/pom.xml | 2 +-
.../kie-pmml-models-scorecard-tests/pom.xml | 2 +-
.../kie-pmml-models-scorecard/pom.xml | 2 +-
.../kie-pmml-models/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/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 +-
.../java/org/kie/test/util/db/PersistenceUtil.java | 4 +-
.../util/db/internal/PoolingDataSourceFactory.java | 4 +-
.../db/internal/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 +-
549 files changed, 1974 insertions(+), 1896 deletions(-)
diff --git a/.ci/environments/quarkus-3/before.sh b/.ci/environments/quarkus-3/before.sh
index 14e515aa97..96d4ddadd4 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.2.9.Final}
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 ef4a67020b..9f4f3842ec 100755
--- a/.ci/environments/quarkus-3/jbang/CreateKieQuarkusProjectMigrationRecipe.java
+++ b/.ci/environments/quarkus-3/jbang/CreateKieQuarkusProjectMigrationRecipe.java
@@ -12,16 +12,16 @@ import java.util.concurrent.Callable;
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.2.9.Final
//DEPS info.picocli:picocli:4.5.0
/*
@@ -45,7 +45,7 @@ import picocli.CommandLine.Option;
@Option(names={ "-v", "--property-version"}, description = "(multi). Add a dynamic property version to the final recipe")
private Map<String, String> 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.2.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 69853c6ce9..7cffde976b 100644
--- a/.ci/environments/quarkus-3/patches/0001_before_sh.patch
+++ b/.ci/environments/quarkus-3/patches/0001_before_sh.patch
@@ -1,38 +1,138 @@
+diff --git a/.ci/environments/quarkus-3/before.sh b/.ci/environments/quarkus-3/before.sh
+index 14e515aa97..96d4ddadd4 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.2.9.Final}
+
+ 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 ef4a67020b..9f4f3842ec 100755
+--- a/.ci/environments/quarkus-3/jbang/CreateKieQuarkusProjectMigrationRecipe.java
++++ b/.ci/environments/quarkus-3/jbang/CreateKieQuarkusProjectMigrationRecipe.java
+@@ -12,16 +12,16 @@ import java.util.concurrent.Callable;
+ 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.2.9.Final
+ //DEPS info.picocli:picocli:4.5.0
+
+ /*
+@@ -45,7 +45,7 @@ import picocli.CommandLine.Option;
+ @Option(names={ "-v", "--property-version"}, description = "(multi). Add a dynamic property version to the final recipe")
+ private Map<String, String> 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.2.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/0004_hardcoded-javax-string.patch b/.ci/environments/quarkus-3/patches/0004_hardcoded-javax-string.patch
+index aef3a0cfa4..2dbb0f0ec8 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 a021d15ee5..82e33a08b8 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 1ee291c717..50d9a5a8e7 100644
+--- a/.ci/environments/quarkus-3/patches/0010_remaining_javax_jakarta.patch
++++ b/.ci/environments/quarkus-3/patches/0010_remaining_javax_jakarta.patch
+@@ -41,17 +41,17 @@ diff --git a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen
+ 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;
++@@ -24,8 +24,8 @@ package org.drools.codegen.common.context;
+ 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/build-parent/pom.xml b/build-parent/pom.xml
-index 0758c53eef..312d76a4f5 100644
+index 445879b659..d2a5d988f7 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
-@@ -60,22 +60,22 @@
+@@ -55,10 +55,10 @@
+ - Version properties must be sorted alphabetically (other form of sorting were found to be unclear and ambiguous).
+ -->
+ <version.ch.qos.logback>1.2.9</version.ch.qos.logback>
+- <version.commons-codec>1.15</version.commons-codec>
++ <version.commons-codec>1.16.0</version.commons-codec>
+ <version.commons-collections>3.2.2</version.commons-collections>
<version.commons-logging>1.1.1</version.commons-logging>
- <version.commons-io>2.11.0</version.commons-io>
+- <version.commons-io>2.11.0</version.commons-io>
++ <version.commons-io>2.13.0</version.commons-io>
<version.common-text>1.10.0</version.common-text>
-- <version.com.fasterxml.jackson>2.15.2</version.com.fasterxml.jackson>
-- <version.com.fasterxml.jackson.databind>2.15.2</version.com.fasterxml.jackson.databind>
-- <version.com.fasterxml.jackson.annotations>2.15.2</version.com.fasterxml.jackson.annotations>
-+ <version.com.fasterxml.jackson>2.14.2</version.com.fasterxml.jackson>
-+ <version.com.fasterxml.jackson.databind>2.14.2</version.com.fasterxml.jackson.databind>
-+ <version.com.fasterxml.jackson.annotations>2.14.2</version.com.fasterxml.jackson.annotations>
- <version.com.github.victools>4.31.0</version.com.github.victools> <!-- victools should align with Jackson if possible -->
- <version.com.miglayout>3.7.4</version.com.miglayout>
- <version.domino-slf4j-logger>1.0.1</version.domino-slf4j-logger>
- <version.com.google.protobuf>3.22.0</version.com.google.protobuf>
-- <version.com.h2database>2.2.220</version.com.h2database>
-+ <version.com.h2database>2.1.214</version.com.h2database>
- <version.com.networknt.json-schema-validator>1.0.86</version.com.networknt.json-schema-validator>
+ <version.com.fasterxml.jackson>2.15.2</version.com.fasterxml.jackson>
+ <version.com.fasterxml.jackson.databind>2.15.2</version.com.fasterxml.jackson.databind>
+@@ -72,10 +72,10 @@
<version.com.sun.xml.bind>2.3.0</version.com.sun.xml.bind>
<version.com.thoughtworks.xstream>1.4.20</version.com.thoughtworks.xstream>
<version.guru.nidi>0.18.0</version.guru.nidi>
- <version.info.picocli>4.7.1</version.info.picocli>
+- <version.info.picocli>4.7.1</version.info.picocli>
- <version.io.micrometer>1.10.2</version.io.micrometer>
-- <version.io.quarkus>2.16.10.Final</version.io.quarkus>
+- <version.io.quarkus>2.16.12.Final</version.io.quarkus>
- <version.io.smallrye.openapi.core>3.1.1</version.io.smallrye.openapi.core>
-+ <version.io.micrometer>1.10.5</version.io.micrometer>
-+ <version.io.quarkus>3.0.0.Final</version.io.quarkus>
-+ <version.io.smallrye.openapi.core>3.3.2</version.io.smallrye.openapi.core>
++ <version.info.picocli>4.7.4</version.info.picocli>
++ <version.io.micrometer>1.11.1</version.io.micrometer>
++ <version.io.quarkus>3.2.9.Final</version.io.quarkus>
++ <version.io.smallrye.openapi.core>3.4.0</version.io.smallrye.openapi.core>
<version.it.unimi.dsi.fastutil>8.5.11</version.it.unimi.dsi.fastutil>
<version.junit>4.13.1</version.junit>
<version.net.java.dev.glazedlists>1.8.0</version.net.java.dev.glazedlists>
-@@ -88,42 +88,42 @@
+@@ -88,43 +88,43 @@
<version.org.apache.httpcomponents.httpcore>4.4.15</version.org.apache.httpcomponents.httpcore>
<version.org.apache.maven>3.8.6</version.org.apache.maven>
<version.org.apache.maven.resolver>1.7.3</version.org.apache.maven.resolver>
@@ -46,16 +146,16 @@ index 0758c53eef..312d76a4f5 100644
<version.org.eclipse.jdt>3.33.0</version.org.eclipse.jdt>
<version.org.freemarker>2.3.32</version.org.freemarker>
- <version.org.glassfish.jaxb>2.3.6</version.org.glassfish.jaxb>
-+ <version.org.glassfish.jaxb>4.0.3</version.org.glassfish.jaxb>
++ <version.org.glassfish.jaxb>4.0.4</version.org.glassfish.jaxb>
<!--This needs to be in sync with JUnit-->
<version.org.hamcrest>1.3</version.org.hamcrest>
- <version.org.hibernate>5.6.12.Final</version.org.hibernate>
-+ <version.org.hibernate>6.2.0.Final</version.org.hibernate>
++ <version.org.hibernate>6.2.13.Final</version.org.hibernate>
<version.org.hsqldb>2.3.0</version.org.hsqldb>
<version.org.infinispan>14.0.13.Final</version.org.infinispan>
<version.org.javassist>3.26.0-GA</version.org.javassist>
- <version.org.jboss.narayana.tomcat>5.13.1.Final</version.org.jboss.narayana.tomcat>
-+ <version.org.jboss.narayana.tomcat>6.0.0.Final</version.org.jboss.narayana.tomcat>
++ <version.org.jboss.narayana.tomcat>6.0.1.Final</version.org.jboss.narayana.tomcat>
<version.org.jboss.transaction.spi>7.6.1.Final</version.org.jboss.transaction.spi>
<version.org.jboss.weld.weld>3.1.6.Final</version.org.jboss.weld.weld>
- <version.org.eclipse.microprofile.config>2.0.1</version.org.eclipse.microprofile.config>
@@ -64,10 +164,10 @@ index 0758c53eef..312d76a4f5 100644
- <version.jakarta.activation-api>1.2.1</version.jakarta.activation-api>
- <version.jakarta.inject-api>1.0</version.jakarta.inject-api>
- <version.jakarta.annotation-api>1.3.5</version.jakarta.annotation-api>
-+ <version.org.eclipse.microprofile.config>3.0.2</version.org.eclipse.microprofile.config>
++ <version.org.eclipse.microprofile.config>3.0.3</version.org.eclipse.microprofile.config>
+ <version.jakarta.enterprise.cdi-api>4.0.1</version.jakarta.enterprise.cdi-api>
-+ <version.jakarta.activation>2.0.0</version.jakarta.activation>
-+ <version.jakarta.activation-api>2.1.1</version.jakarta.activation-api>
++ <version.jakarta.activation>2.0.1</version.jakarta.activation>
++ <version.jakarta.activation-api>2.1.2</version.jakarta.activation-api>
+ <version.jakarta.inject-api>2.0.1</version.jakarta.inject-api>
+ <version.jakarta.annotation-api>2.1.1</version.jakarta.annotation-api>
<version.jakarta.ejb-api>3.2.6</version.jakarta.ejb-api>
@@ -83,29 +183,31 @@ index 0758c53eef..312d76a4f5 100644
- <version.jakarta.json>1.1.6</version.jakarta.json>
- <version.jakarta.json-api>1.1.6</version.jakarta.json-api>
- <version.org.jpmml.model>1.5.1</version.org.jpmml.model> <!-- jpmml-model BSD 3C license - ATTENTION 1.5.1 intentional, because 1.5.1 evaluators works with 1.5.1 -->
+- <version.org.junit>5.9.2</version.org.junit>
+ <version.jakarta.transaction-api>2.0.1</version.jakarta.transaction-api>
+ <version.jakarta.ws.rs-api>3.1.0</version.jakarta.ws.rs-api>
-+ <version.jakarta.xml.ws-api>4.0.0</version.jakarta.xml.ws-api>
++ <version.jakarta.xml.ws-api>4.0.1</version.jakarta.xml.ws-api>
+ <version.jakarta.persistence-api>3.1.0</version.jakarta.persistence-api>
+ <version.jakarta.servlet-api>6.0.0</version.jakarta.servlet-api>
+ <version.jakarta.xml.bind-api>4.0.0</version.jakarta.xml.bind-api>
+ <version.jakarta.json.bind-api>3.0.0</version.jakarta.json.bind-api>
-+ <version.jakarta.json>1.1.1</version.jakarta.json>
-+ <version.jakarta.json-api>2.1.1</version.jakarta.json-api>
++ <version.jakarta.json>1.1.2</version.jakarta.json>
++ <version.jakarta.json-api>2.1.2</version.jakarta.json-api>
+ <version.org.jpmml.model>1.6.4</version.org.jpmml.model> <!-- jpmml-model BSD 3C license - ATTENTION 1.5.1 intentional, because 1.5.1 evaluators works with 1.5.1 -->
- <version.org.junit>5.9.2</version.org.junit>
++ <version.org.junit>5.9.3</version.org.junit>
<version.org.mvel>2.5.0.Final</version.org.mvel>
<version.org.powermock>2.0.7</version.org.powermock>
-@@ -152,7 +152,7 @@
- <version.org.asciidoctor.asciidoctorj>2.2.0</version.org.asciidoctor.asciidoctorj>
- <version.org.asciidoctor.asciidoctorj-pdf>1.5.0</version.org.asciidoctor.asciidoctorj-pdf>
- <version.org.w3c.dom>2.3.0-jaxb-1.0.6</version.org.w3c.dom>
-- <version.org.mockito>4.11.0</version.org.mockito>
-+ <version.org.mockito>5.2.0</version.org.mockito>
- <!-- Version of JMH -->
- <version.org.openjdk.jmh>1.21</version.org.openjdk.jmh>
-
-@@ -171,10 +171,10 @@
+ <version.org.slf4j>1.7.30</version.org.slf4j>
+@@ -138,7 +138,7 @@
+ <!-- New and overwritten dependencies -->
+ <!-- ################################################################################ -->
+
+- <version.org.antlr4>4.13.0</version.org.antlr4>
++ <version.org.antlr4>4.10.1</version.org.antlr4>
+ <version.org.jboss.arquillian.selenium>3.13.0</version.org.jboss.arquillian.selenium>
+ <version.org.jboss.errai>4.15.0.Final</version.org.jboss.errai>
+ <version.com.google.elemental2>1.1.0</version.com.google.elemental2>
+@@ -171,7 +171,7 @@
<version.surefire.plugin>2.22.1</version.surefire.plugin>
<!-- Add for kie-maven-plugin -->
<version.plugin.plugin>3.6.4</version.plugin.plugin>
@@ -113,33 +215,33 @@ index 0758c53eef..312d76a4f5 100644
+ <version.plugin.annotations>3.7.1</version.plugin.annotations>
<version.artifact.transfer>0.9.1</version.artifact.transfer>
<version.shared.utils>3.3.4</version.shared.utils>
-- <version.common.compress>1.22</version.common.compress>
-+ <version.common.compress>1.23.0</version.common.compress>
- <version.common.exec>1.3</version.common.exec>
- <!-- -->
- <!-- Jacoco plugin configurations -->
-@@ -202,16 +202,16 @@
+ <version.common.compress>1.24.0</version.common.compress>
+@@ -200,18 +200,18 @@
+ <version.compiler.plugin>3.8.1</version.compiler.plugin>
+ <version.shade.plugin>3.3.0</version.shade.plugin>
- <version.net.byte-buddy>1.12.18</version.net.byte-buddy>
+- <version.net.byte-buddy>1.12.18</version.net.byte-buddy>
++ <version.net.byte-buddy>1.14.7</version.net.byte-buddy>
- <version.org.postgresql>42.5.4</version.org.postgresql>
+ <version.org.postgresql>42.6.0</version.org.postgresql>
<version.ch.obermuhlner>2.0.1</version.ch.obermuhlner>
- <version.io.smallrye.jandex>3.0.5</version.io.smallrye.jandex>
+- <version.io.smallrye.jandex>3.0.5</version.io.smallrye.jandex>
++ <version.io.smallrye.jandex>3.1.2</version.io.smallrye.jandex>
<version.io.smallrye.jandex-maven-plugin>${version.io.smallrye.jandex}</version.io.smallrye.jandex-maven-plugin>
- <version.org.eclipse.yasson>1.0.11</version.org.eclipse.yasson>
-+ <version.org.eclipse.yasson>3.0.2</version.org.eclipse.yasson>
++ <version.org.eclipse.yasson>3.0.3</version.org.eclipse.yasson>
- <version.com.github.javaparser>3.24.2</version.com.github.javaparser>
-+ <version.com.github.javaparser>3.25.1</version.com.github.javaparser>
++ <version.com.github.javaparser>3.25.3</version.com.github.javaparser>
- <version.com.google.guava>32.0.1-jre</version.com.google.guava>
-+ <version.com.google.guava>31.1-jre</version.com.google.guava>
++ <version.com.google.guava>32.0.0-jre</version.com.google.guava>
<!-- JaCoCo coverage data file location -->
<!--suppress UnresolvedMavenProperty -->
-@@ -287,7 +287,7 @@
+@@ -283,7 +283,7 @@
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
@@ -148,7 +250,7 @@ index 0758c53eef..312d76a4f5 100644
<version>${version.com.fasterxml.jackson.annotations}</version>
</dependency>
<dependency>
-@@ -296,8 +296,8 @@
+@@ -292,8 +292,8 @@
<version>${version.com.fasterxml.jackson}</version>
</dependency>
<dependency>
@@ -159,7 +261,7 @@ index 0758c53eef..312d76a4f5 100644
<version>${version.com.fasterxml.jackson}</version>
</dependency>
<dependency>
-@@ -371,9 +371,9 @@
+@@ -367,9 +367,9 @@
<version>${version.com.sun.xml.bind}</version>
</dependency>
<dependency>
@@ -168,11 +270,11 @@ index 0758c53eef..312d76a4f5 100644
- <version>${version.com.sun.xml.bind}</version>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
-+ <version>4.0.2</version>
++ <version>4.0.3</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
-@@ -423,8 +423,8 @@
+@@ -419,8 +419,8 @@
</dependency>
<dependency>
@@ -183,7 +285,7 @@ index 0758c53eef..312d76a4f5 100644
<version>${version.jakarta.json}</version>
</dependency>
<dependency>
-@@ -459,8 +459,8 @@
+@@ -455,8 +455,8 @@
</dependency>
<dependency>
@@ -194,7 +296,7 @@ index 0758c53eef..312d76a4f5 100644
<version>${version.jakarta.activation}</version>
</dependency>
<dependency>
-@@ -795,12 +795,12 @@
+@@ -791,12 +791,12 @@
</dependency>
<dependency>
@@ -209,7 +311,7 @@ index 0758c53eef..312d76a4f5 100644
<artifactId>hibernate-jpamodelgen</artifactId>
<version>${version.org.hibernate}</version>
<exclusions>
-@@ -1119,7 +1119,7 @@
+@@ -1113,7 +1113,7 @@
</dependency>
<dependency>
@@ -218,7 +320,7 @@ index 0758c53eef..312d76a4f5 100644
<artifactId>hibernate-core</artifactId>
<version>${version.org.hibernate}</version>
<exclusions>
-@@ -1141,31 +1141,16 @@
+@@ -1135,31 +1135,16 @@
</exclusion>
</exclusions>
</dependency>
@@ -257,7 +359,7 @@ index 0758c53eef..312d76a4f5 100644
</dependency>
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 +371,7 @@ index 68468e2a45..8773e29d79 100644
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
-+ <version>4.0.3</version>
++ <version>4.0.4</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
@@ -1309,22 +1411,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 +1742,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 @@
<scope>provided</scope>
</dependency>
<dependency>
@@ -1652,18 +1754,18 @@ index 5e08c4dbc8..8c58653b77 100644
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
-+ <version>4.0.3</version>
++ <version>4.0.4</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
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 +1774,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 +1786,7 @@ index 42092de797..08beb7b1f4 100644
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
-+ <version>4.0.3</version>
++ <version>4.0.4</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
@@ -1708,13 +1810,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 +1829,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 +1844,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 +1863,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 +1882,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 +1901,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 +1920,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 +1945,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 +1962,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 +1975,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 +1995,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 @@
- <plugins>
- <plugin>
- <groupId>io.quarkus</groupId>
-- <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
-+ <artifactId>quarkus-extension-maven-plugin</artifactId>
- <version>${version.io.quarkus}</version>
- <executions>
- <execution>
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 +2011,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 +2023,7 @@ index 32920b00fc..755633ec43 100644
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
-+ <version>4.0.3</version>
++ <version>4.0.4</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
@@ -2174,7 +2043,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 +2055,7 @@ index c5b6465541..6387089e97 100644
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
-+ <version>4.0.3</version>
++ <version>4.0.4</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
@@ -2333,7 +2202,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 +2214,7 @@ index 7706d4c655..1cfd38fa65 100644
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
-+ <version>4.0.3</version>
++ <version>4.0.4</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
@@ -2741,6 +2610,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 @@
+ <plugins>
+ <plugin>
+ <groupId>io.quarkus</groupId>
+- <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
++ <artifactId>quarkus-extension-maven-plugin</artifactId>
+ <version>${version.io.quarkus}</version>
+ <executions>
+ <execution>
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 +2894,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 +2906,12 @@ index 5ff7b47f21..e7dc861938 100644
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
<scope>test</scope>
-+ <version>4.0.3</version>
++ <version>4.0.4</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
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 +2969,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 +2981,7 @@ index b207771d95..e654092670 100755
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
-+ <version>4.0.3</version>
++ <version>4.0.4</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
@@ -3189,10 +3291,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 @@
<scope>provided</scope>
</dependency>
<dependency>
@@ -3201,7 +3303,7 @@ index d8fd3fb209..3494e8924e 100644
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
-+ <version>4.0.3</version>
++ <version>4.0.4</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
@@ -3275,7 +3377,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 +3389,15 @@ index 9f0f46d211..d282dc46c3 100644
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
-+ <version>4.0.3</version>
++ <version>4.0.4</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
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 @@
<scope>provided</scope>
</dependency>
<dependency>
@@ -3304,7 +3406,7 @@ index 5c3b3ebe87..2c5331a1f4 100644
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
-+ <version>4.0.3</version>
++ <version>4.0.4</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
@@ -3500,7 +3602,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 +3614,7 @@ index b73b247766..2c20438303 100644
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
-+ <version>4.0.3</version>
++ <version>4.0.4</version>
</dependency>
<dependency>
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 aef3a0cfa4..2dbb0f0ec8 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 a021d15ee5..82e33a08b8 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 1ee291c717..50d9a5a8e7 100644
--- a/.ci/environments/quarkus-3/patches/0010_remaining_javax_jakarta.patch
+++ b/.ci/environments/quarkus-3/patches/0010_remaining_javax_jakarta.patch
@@ -41,17 +41,17 @@ diff --git a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen
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;
+@@ -24,8 +24,8 @@ package org.drools.codegen.common.context;
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 a2664acb7c..2ea117819c 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.2.9.Final,
key: version.io.quarkus
}
- org.kie.drools.Quarkus3Migration
@@ -117,7 +117,7 @@ recipeList:
}
- org.kie.openrewrite.recipe.jpmml.JPMMLRecipe
---
-displayName: Update Managed Dependencies
+type: specs.openrewrite.org/v1beta/recipe
recipeList:
- org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId: {
oldGroupId: javax.activation,
@@ -502,9 +502,9 @@ 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
name: io.quarkus.updates.core.quarkus30.UpgradeQuarkiverse
diff --git a/.ci/jenkins/config/branch.yaml b/.ci/jenkins/config/branch.yaml
index f49107e9b9..d465d10d9b 100644
--- a/.ci/jenkins/config/branch.yaml
+++ b/.ci/jenkins/config/branch.yaml
@@ -1,3 +1,20 @@
+generation_config:
+ missing_environment: ignore
+
+job_types:
+ setup-branch:
+ disabled: true
+ nightly:
+ disabled: false
+ other:
+ disabled: true
+ pullrequest:
+ disabled: true
+ release:
+ disabled: true
+ tools:
+ disabled: true
+
environments:
default:
env_vars:
@@ -10,46 +27,17 @@ environments:
ADDITIONAL_TIMEOUT: 720
ids:
- native
- quarkus-main:
- enabled: false
- env_vars:
- QUARKUS_BRANCH: main
- DROOLS_BUILD_MVN_OPTS: -Dfull
- ids:
- - quarkus
- quarkus-3:
- pull_request_default_check: false
- env_vars:
- BUILD_MAVEN_TOOL: maven_3.9.3
- BUILD_JDK_TOOL: jdk_17_latest
- BUILD_MVN_OPTS: -Denforcer.skip
- # DROOLS_BUILD_MVN_OPTS: -Dfull # "No enabled as it does not compile in quarkus-3
- # BUILD_MVN_OPTS_QUARKUS_UPDATE: -Dfull
- ids:
- - quarkus
- - quarkus3
- quarkus-branch:
- env_vars:
- QUARKUS_BRANCH: '2.16'
- DROOLS_BUILD_MVN_OPTS: -Dfull
- ids:
- - quarkus
- sonarcloud:
- auto_generation: false
- env_vars:
- ENABLE_SONARCLOUD: true
- DROOLS_BUILD_MVN_OPTS: -Dfull
- ids:
- - sonarcloud
- - coverage
+disable:
+ deploy: true
+ pr_checks: true
repositories:
- name: incubator-kie-drools
job_display_name: drools
# Not yet migrated to Apache
# - name: incubator-kie-drools-website
# job_display_name: drools-website
-- name: incubator-kie-benchmarks
- job_display_name: kie-benchmarks
+# - name: incubator-kie-benchmarks
+# job_display_name: kie-benchmarks
## TODO to check if should be enabled
# - name: incubator-kie-jpmml-integration
# job_display_name: kie-jpmml-integration
@@ -102,7 +90,7 @@ jenkins:
agent:
docker:
builder:
- image: quay.io/kiegroup/kogito-ci-build:main-latest
+ image: quay.io/kiegroup/kogito-ci-build:quarkus-3.2LTS-latest
args: --privileged --group-add docker
default_tools:
jdk: jdk_11_latest
diff --git a/.github/workflows/pr-downstream-full.yml b/.github/workflows/pr-downstream-full.yml
index 02c0479df5..30749769df 100644
--- a/.github/workflows/pr-downstream-full.yml
+++ b/.github/workflows/pr-downstream-full.yml
@@ -23,8 +23,8 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
- java-version: [11]
- maven-version: ['3.8.7']
+ java-version: [17]
+ maven-version: ['3.9.3']
fail-fast: false
runs-on: ${{ matrix.os }}
name: Build Chain (${{ matrix.os }} / Java-${{ matrix.java-version }} / Maven-${{ matrix.maven-version }})
diff --git a/.github/workflows/pr-downstream.yml b/.github/workflows/pr-downstream.yml
index b8ad43bfa0..3d1cecd0e6 100644
--- a/.github/workflows/pr-downstream.yml
+++ b/.github/workflows/pr-downstream.yml
@@ -22,8 +22,8 @@ jobs:
matrix:
job_name: [ kogito-runtimes, kogito-apps, kogito-quarkus-examples, kogito-springboot-examples, serverless-workflow-examples ]
os: [ubuntu-latest]
- java-version: [11]
- maven-version: ['3.8.7']
+ java-version: [17]
+ maven-version: ['3.9.3']
include:
- job_name: kogito-runtimes
repository: incubator-kie-kogito-runtimes
diff --git a/.github/workflows/pr-drools-ansible.yml b/.github/workflows/pr-drools-ansible.yml
index 5aae441d1c..44f4abc86d 100644
--- a/.github/workflows/pr-drools-ansible.yml
+++ b/.github/workflows/pr-drools-ansible.yml
@@ -22,7 +22,7 @@ jobs:
matrix:
os: [ubuntu-latest]
java-version: [17]
- maven-version: ['3.8.7']
+ maven-version: ['3.9.3']
fail-fast: false
runs-on: ${{ matrix.os }}
name: Ansible Integration / ${{ matrix.os }} / Java-${{ matrix.java-version }} / Maven-${{ matrix.maven-version }}
diff --git a/.github/workflows/pr-drools-docs.yml b/.github/workflows/pr-drools-docs.yml
index ee4d8fadb5..01cb88d166 100644
--- a/.github/workflows/pr-drools-docs.yml
+++ b/.github/workflows/pr-drools-docs.yml
@@ -15,8 +15,8 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
- java-version: [11]
- maven-version: ['3.8.7']
+ java-version: [17]
+ maven-version: ['3.9.3']
fail-fast: false
runs-on: ${{ matrix.os }}
name: ${{ matrix.os }} / Java-${{ matrix.java-version }} / Maven-${{ matrix.maven-version }}
diff --git a/.github/workflows/pr-drools.yml b/.github/workflows/pr-drools.yml
index 9a8c6e8663..4f36e03ab2 100644
--- a/.github/workflows/pr-drools.yml
+++ b/.github/workflows/pr-drools.yml
@@ -21,8 +21,8 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
- java-version: [11]
- maven-version: ['3.8.7']
+ java-version: [17]
+ maven-version: ['3.9.3']
fail-fast: false
runs-on: ${{ matrix.os }}
name: ${{ matrix.os }} / Java-${{ matrix.java-version }} / Maven-${{ matrix.maven-version }}
diff --git a/bom/drools-bom/pom.xml b/bom/drools-bom/pom.xml
index 5b5041bd75..29113e6069 100644
--- a/bom/drools-bom/pom.xml
+++ b/bom/drools-bom/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-core-bom</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../kie-core-bom/pom.xml</relativePath>
</parent>
diff --git a/bom/kie-core-bom/pom.xml b/bom/kie-core-bom/pom.xml
index ded79ed27c..218e56abd2 100644
--- a/bom/kie-core-bom/pom.xml
+++ b/bom/kie-core-bom/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/bom/kie-dmn-bom/pom.xml b/bom/kie-dmn-bom/pom.xml
index a44ee6a207..29f0e66e8c 100644
--- a/bom/kie-dmn-bom/pom.xml
+++ b/bom/kie-dmn-bom/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-core-bom</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../kie-core-bom/pom.xml</relativePath>
</parent>
diff --git a/bom/kie-efesto-bom/pom.xml b/bom/kie-efesto-bom/pom.xml
index 0eb8b276c2..057bfbf01c 100644
--- a/bom/kie-efesto-bom/pom.xml
+++ b/bom/kie-efesto-bom/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-core-bom</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../kie-core-bom/pom.xml</relativePath>
</parent>
diff --git a/bom/kie-pmml-bom/pom.xml b/bom/kie-pmml-bom/pom.xml
index 43bfb09a21..bfcad96f6e 100644
--- a/bom/kie-pmml-bom/pom.xml
+++ b/bom/kie-pmml-bom/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-core-bom</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../kie-core-bom/pom.xml</relativePath>
</parent>
diff --git a/bom/pom.xml b/bom/pom.xml
index e4031b7896..abca80b30b 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>drools-parent</artifactId>
<groupId>org.kie</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index dd8ed8e673..75c04d16d6 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>drools-parent</artifactId>
<groupId>org.kie</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -55,10 +55,10 @@
- Version properties must be sorted alphabetically (other form of sorting were found to be unclear and ambiguous).
-->
<version.ch.qos.logback>1.2.9</version.ch.qos.logback>
- <version.commons-codec>1.15</version.commons-codec>
+ <version.commons-codec>1.16.0</version.commons-codec>
<version.commons-collections>3.2.2</version.commons-collections>
<version.commons-logging>1.1.1</version.commons-logging>
- <version.commons-io>2.11.0</version.commons-io>
+ <version.commons-io>2.13.0</version.commons-io>
<version.common-text>1.10.0</version.common-text>
<version.com.fasterxml.jackson>2.15.2</version.com.fasterxml.jackson>
<version.com.fasterxml.jackson.databind>2.15.2</version.com.fasterxml.jackson.databind>
@@ -72,10 +72,10 @@
<version.com.sun.xml.bind>2.3.0</version.com.sun.xml.bind>
<version.com.thoughtworks.xstream>1.4.20</version.com.thoughtworks.xstream>
<version.guru.nidi>0.18.0</version.guru.nidi>
- <version.info.picocli>4.7.1</version.info.picocli>
- <version.io.micrometer>1.10.2</version.io.micrometer>
- <version.io.quarkus>2.16.12.Final</version.io.quarkus>
- <version.io.smallrye.openapi.core>3.1.1</version.io.smallrye.openapi.core>
+ <version.info.picocli>4.7.4</version.info.picocli>
+ <version.io.micrometer>1.11.1</version.io.micrometer>
+ <version.io.quarkus>3.2.9.Final</version.io.quarkus>
+ <version.io.smallrye.openapi.core>3.4.0</version.io.smallrye.openapi.core>
<version.it.unimi.dsi.fastutil>8.5.11</version.it.unimi.dsi.fastutil>
<version.junit>4.13.1</version.junit>
<version.net.java.dev.glazedlists>1.8.0</version.net.java.dev.glazedlists>
@@ -88,43 +88,43 @@
<version.org.apache.httpcomponents.httpcore>4.4.15</version.org.apache.httpcomponents.httpcore>
<version.org.apache.maven>3.8.6</version.org.apache.maven>
<version.org.apache.maven.resolver>1.7.3</version.org.apache.maven.resolver>
- <version.org.apache.maven.wagon>3.5.1</version.org.apache.maven.wagon>
+ <version.org.apache.maven.wagon>3.5.3</version.org.apache.maven.wagon>
<version.org.apache.pdfbox>2.0.28</version.org.apache.pdfbox>
<version.org.apache.poi>5.1.0</version.org.apache.poi>
- <version.org.apache.tomcat.tomcat-dbcp>9.0.21</version.org.apache.tomcat.tomcat-dbcp>
+ <version.org.apache.tomcat.tomcat-dbcp>10.1.7</version.org.apache.tomcat.tomcat-dbcp>
<version.org.assertj>3.23.1</version.org.assertj>
<version.org.eclipse.jdt>3.33.0</version.org.eclipse.jdt>
<version.org.freemarker>2.3.32</version.org.freemarker>
- <version.org.glassfish.jaxb>2.3.6</version.org.glassfish.jaxb>
+ <version.org.glassfish.jaxb>4.0.4</version.org.glassfish.jaxb>
<!--This needs to be in sync with JUnit-->
<version.org.hamcrest>1.3</version.org.hamcrest>
- <version.org.hibernate>5.6.12.Final</version.org.hibernate>
+ <version.org.hibernate>6.2.13.Final</version.org.hibernate>
<version.org.hsqldb>2.3.0</version.org.hsqldb>
<version.org.infinispan>14.0.13.Final</version.org.infinispan>
<version.org.javassist>3.26.0-GA</version.org.javassist>
- <version.org.jboss.narayana.tomcat>5.13.1.Final</version.org.jboss.narayana.tomcat>
+ <version.org.jboss.narayana.tomcat>6.0.1.Final</version.org.jboss.narayana.tomcat>
<version.org.jboss.transaction.spi>7.6.1.Final</version.org.jboss.transaction.spi>
<version.org.jboss.weld.weld>3.1.6.Final</version.org.jboss.weld.weld>
- <version.org.eclipse.microprofile.config>2.0.1</version.org.eclipse.microprofile.config>
- <version.jakarta.enterprise.cdi-api>2.0.2</version.jakarta.enterprise.cdi-api>
- <version.jakarta.activation>1.2.1</version.jakarta.activation>
- <version.jakarta.activation-api>1.2.1</version.jakarta.activation-api>
- <version.jakarta.inject-api>1.0</version.jakarta.inject-api>
- <version.jakarta.annotation-api>1.3.5</version.jakarta.annotation-api>
+ <version.org.eclipse.microprofile.config>3.0.3</version.org.eclipse.microprofile.config>
+ <version.jakarta.enterprise.cdi-api>4.0.1</version.jakarta.enterprise.cdi-api>
+ <version.jakarta.activation>2.0.1</version.jakarta.activation>
+ <version.jakarta.activation-api>2.1.2</version.jakarta.activation-api>
+ <version.jakarta.inject-api>2.0.1</version.jakarta.inject-api>
+ <version.jakarta.annotation-api>2.1.1</version.jakarta.annotation-api>
<version.jakarta.ejb-api>3.2.6</version.jakarta.ejb-api>
<version.jakarta.servlet.jsp-api>2.3.6</version.jakarta.servlet.jsp-api>
<version.jakarta.servlet.jsp.jstl-api>2.0.0</version.jakarta.servlet.jsp.jstl-api>
- <version.jakarta.transaction-api>1.3.3</version.jakarta.transaction-api>
- <version.jakarta.ws.rs-api>2.1.6</version.jakarta.ws.rs-api>
- <version.jakarta.xml.ws-api>2.3.3</version.jakarta.xml.ws-api>
- <version.jakarta.persistence-api>2.2.3</version.jakarta.persistence-api>
- <version.jakarta.servlet-api>4.0.3</version.jakarta.servlet-api>
- <version.jakarta.xml.bind-api>2.3.3</version.jakarta.xml.bind-api>
- <version.jakarta.json.bind-api>1.0.2</version.jakarta.json.bind-api>
- <version.jakarta.json>1.1.6</version.jakarta.json>
- <version.jakarta.json-api>1.1.6</version.jakarta.json-api>
- <version.org.jpmml.model>1.5.1</version.org.jpmml.model> <!-- jpmml-model BSD 3C license - ATTENTION 1.5.1 intentional, because 1.5.1 evaluators works with 1.5.1 -->
- <version.org.junit>5.9.2</version.org.junit>
+ <version.jakarta.transaction-api>2.0.1</version.jakarta.transaction-api>
+ <version.jakarta.ws.rs-api>3.1.0</version.jakarta.ws.rs-api>
+ <version.jakarta.xml.ws-api>4.0.1</version.jakarta.xml.ws-api>
+ <version.jakarta.persistence-api>3.1.0</version.jakarta.persistence-api>
+ <version.jakarta.servlet-api>6.0.0</version.jakarta.servlet-api>
+ <version.jakarta.xml.bind-api>4.0.0</version.jakarta.xml.bind-api>
+ <version.jakarta.json.bind-api>3.0.0</version.jakarta.json.bind-api>
+ <version.jakarta.json>1.1.2</version.jakarta.json>
+ <version.jakarta.json-api>2.1.2</version.jakarta.json-api>
+ <version.org.jpmml.model>1.6.4</version.org.jpmml.model> <!-- jpmml-model BSD 3C license - ATTENTION 1.5.1 intentional, because 1.5.1 evaluators works with 1.5.1 -->
+ <version.org.junit>5.9.3</version.org.junit>
<version.org.mvel>2.5.1.Final</version.org.mvel>
<version.org.powermock>2.0.7</version.org.powermock>
<version.org.slf4j>1.7.30</version.org.slf4j>
@@ -138,7 +138,7 @@
<!-- New and overwritten dependencies -->
<!-- ################################################################################ -->
- <version.org.antlr4>4.13.0</version.org.antlr4>
+ <version.org.antlr4>4.10.1</version.org.antlr4>
<version.org.jboss.arquillian.selenium>3.13.0</version.org.jboss.arquillian.selenium>
<version.org.jboss.errai>4.15.0.Final</version.org.jboss.errai>
<version.com.google.elemental2>1.1.0</version.com.google.elemental2>
@@ -171,7 +171,7 @@
<version.surefire.plugin>2.22.1</version.surefire.plugin>
<!-- Add for kie-maven-plugin -->
<version.plugin.plugin>3.6.4</version.plugin.plugin>
- <version.plugin.annotations>3.6.0</version.plugin.annotations>
+ <version.plugin.annotations>3.7.1</version.plugin.annotations>
<version.artifact.transfer>0.9.1</version.artifact.transfer>
<version.shared.utils>3.3.4</version.shared.utils>
<version.common.compress>1.24.0</version.common.compress>
@@ -200,18 +200,18 @@
<version.compiler.plugin>3.8.1</version.compiler.plugin>
<version.shade.plugin>3.3.0</version.shade.plugin>
- <version.net.byte-buddy>1.12.18</version.net.byte-buddy>
+ <version.net.byte-buddy>1.14.7</version.net.byte-buddy>
- <version.org.postgresql>42.5.4</version.org.postgresql>
+ <version.org.postgresql>42.6.0</version.org.postgresql>
<version.ch.obermuhlner>2.0.1</version.ch.obermuhlner>
- <version.io.smallrye.jandex>3.0.5</version.io.smallrye.jandex>
+ <version.io.smallrye.jandex>3.1.2</version.io.smallrye.jandex>
<version.io.smallrye.jandex-maven-plugin>${version.io.smallrye.jandex}</version.io.smallrye.jandex-maven-plugin>
- <version.org.eclipse.yasson>1.0.11</version.org.eclipse.yasson>
+ <version.org.eclipse.yasson>3.0.3</version.org.eclipse.yasson>
- <version.com.github.javaparser>3.24.2</version.com.github.javaparser>
+ <version.com.github.javaparser>3.25.3</version.com.github.javaparser>
- <version.com.google.guava>32.0.1-jre</version.com.google.guava>
+ <version.com.google.guava>32.0.0-jre</version.com.google.guava>
<!-- JaCoCo coverage data file location -->
<!--suppress UnresolvedMavenProperty -->
@@ -232,7 +232,7 @@
<!-- These are added as part of the migration from JBoss to Apache parent pom.xml. They may be extracted to a KIE parent bom. -->
<version.maven-checkstyle>3.3.0</version.maven-checkstyle>
<version.build.helper.maven.plugin>3.4.0</version.build.helper.maven.plugin>
- <version.maven-javadoc-plugin.override>3.6.0</version.maven-javadoc-plugin.override>
+ <version.maven-javadoc-plugin.override>3.6.2</version.maven-javadoc-plugin.override>
</properties>
<dependencyManagement>
@@ -283,7 +283,7 @@
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
+ <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
<version>${version.com.fasterxml.jackson.annotations}</version>
</dependency>
<dependency>
@@ -292,8 +292,8 @@
<version>${version.com.fasterxml.jackson}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+ <artifactId>jackson-jakarta-rs-json-provider</artifactId>
<version>${version.com.fasterxml.jackson}</version>
</dependency>
<dependency>
@@ -367,9 +367,9 @@
<version>${version.com.sun.xml.bind}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${version.com.sun.xml.bind}</version>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>4.0.3</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
@@ -419,8 +419,8 @@
</dependency>
<dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>jakarta.json</artifactId>
+ <groupId>org.eclipse.parsson</groupId>
+ <artifactId>parsson</artifactId>
<version>${version.jakarta.json}</version>
</dependency>
<dependency>
@@ -455,8 +455,8 @@
</dependency>
<dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-activation</artifactId>
<version>${version.jakarta.activation}</version>
</dependency>
<dependency>
@@ -791,12 +791,12 @@
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
+ <groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-envers</artifactId>
<version>${version.org.hibernate}</version>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
+ <groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
<version>${version.org.hibernate}</version>
<exclusions>
@@ -1113,7 +1113,7 @@
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
+ <groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-core</artifactId>
<version>${version.org.hibernate}</version>
<exclusions>
@@ -1135,31 +1135,16 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>${version.org.hibernate}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.transaction</groupId>
- <artifactId>jboss-transaction-api_1.2_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<!-- Required for Errai Dynamic Bean validation -->
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>${version.javax.validation}</version>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
+ <version>3.0.2</version>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>${version.javax.validation}</version>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
+ <version>3.0.2</version>
<classifier>sources</classifier>
</dependency>
@@ -1430,6 +1415,9 @@
<ignoreClasses>
<!-- Duplication of javax.inject classes is necessary to also support migration to jakarta namespace. -->
<ignoreClass>javax.inject.*</ignoreClass>
+ <!-- Contained in both com.google.inject:guice:jar and com.google.inject:guice:jar:no_aop -->
+ <!-- and it is impossible to exclude only one of them -->
+ <ignoreClass>com.google.inject.*</ignoreClass>
<!-- Duplicated by XStream's transitive deps, with very little chance to get properly fixed -->
<ignoreClass>org.xmlpull.v1.XmlPullParserException</ignoreClass>
<ignoreClass>org.xmlpull.v1.XmlPullParser</ignoreClass>
diff --git a/drools-alphanetwork-compiler/pom.xml b/drools-alphanetwork-compiler/pom.xml
index 8e0327bff8..197fc0b52c 100644
--- a/drools-alphanetwork-compiler/pom.xml
+++ b/drools-alphanetwork-compiler/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-base/pom.xml b/drools-base/pom.xml
index e0884e4acc..fa5f01b22a 100644
--- a/drools-base/pom.xml
+++ b/drools-base/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
@@ -82,11 +82,6 @@
<artifactId>jaxb-core</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
diff --git a/drools-beliefs/pom.xml b/drools-beliefs/pom.xml
index 6e954649fe..360e358944 100644
--- a/drools-beliefs/pom.xml
+++ b/drools-beliefs/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-commands/pom.xml b/drools-commands/pom.xml
index f18b1da317..312d3c4e7b 100644
--- a/drools-commands/pom.xml
+++ b/drools-commands/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-commands/src/main/java/org/drools/commands/GetVariableCommand.java b/drools-commands/src/main/java/org/drools/commands/GetVariableCommand.java
index 5fc6fea50e..55f012280b 100644
--- a/drools-commands/src/main/java/org/drools/commands/GetVariableCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/GetVariableCommand.java
@@ -18,11 +18,11 @@
*/
package org.drools.commands;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
import org.kie.api.command.ExecutableCommand;
import org.kie.api.runtime.Context;
diff --git a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListAdapter.java b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListAdapter.java
index 2ef2899704..102e011254 100644
--- a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListAdapter.java
+++ b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListAdapter.java
@@ -26,7 +26,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import org.drools.commands.jaxb.JaxbListWrapper.JaxbWrapperType;
import org.slf4j.Logger;
diff --git a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListWrapper.java b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListWrapper.java
index 3731c9cedf..fab61b1b75 100644
--- a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListWrapper.java
+++ b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbListWrapper.java
@@ -18,11 +18,11 @@
*/
package org.drools.commands.jaxb;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
/**
* This is actually a wrapper for the following collections:
diff --git a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbMapAdapter.java b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbMapAdapter.java
index 0086b7b657..413d2595b4 100644
--- a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbMapAdapter.java
+++ b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbMapAdapter.java
@@ -23,7 +23,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbObjectObjectPair.java b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbObjectObjectPair.java
index 4eed12a05b..3d76ab5f2a 100644
--- a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbObjectObjectPair.java
+++ b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbObjectObjectPair.java
@@ -18,11 +18,11 @@
*/
package org.drools.commands.jaxb;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@XmlAccessorType(XmlAccessType.NONE)
public class JaxbObjectObjectPair {
diff --git a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbStringObjectPair.java b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbStringObjectPair.java
index cdbd169168..0b95499a29 100644
--- a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbStringObjectPair.java
+++ b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbStringObjectPair.java
@@ -18,12 +18,12 @@
*/
package org.drools.commands.jaxb;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@XmlAccessorType(XmlAccessType.NONE)
@XmlSeeAlso({JaxbListWrapper.class})
diff --git a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbUnknownAdapter.java b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbUnknownAdapter.java
index 176f5a6e0f..3c28fa5670 100644
--- a/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbUnknownAdapter.java
+++ b/drools-commands/src/main/java/org/drools/commands/jaxb/JaxbUnknownAdapter.java
@@ -31,7 +31,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import org.drools.core.QueryResultsImpl;
import org.drools.core.common.DisconnectedFactHandle;
diff --git a/drools-commands/src/main/java/org/drools/commands/jaxb/ObjectFactory.java b/drools-commands/src/main/java/org/drools/commands/jaxb/ObjectFactory.java
index 6406f23fe1..b243b5191a 100644
--- a/drools-commands/src/main/java/org/drools/commands/jaxb/ObjectFactory.java
+++ b/drools-commands/src/main/java/org/drools/commands/jaxb/ObjectFactory.java
@@ -18,7 +18,7 @@
*/
package org.drools.commands.jaxb;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
@XmlRegistry
public class ObjectFactory {
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/AdvanceSessionTimeCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/AdvanceSessionTimeCommand.java
index 38df33a7f8..56276dd5c5 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/AdvanceSessionTimeCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/AdvanceSessionTimeCommand.java
@@ -19,10 +19,10 @@
package org.drools.commands.runtime;
import java.util.concurrent.TimeUnit;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.drools.commands.IdentifiableResult;
import org.kie.api.command.ExecutableCommand;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/BatchExecutionCommandImpl.java b/drools-commands/src/main/java/org/drools/commands/runtime/BatchExecutionCommandImpl.java
index 4970214a04..e11edabef1 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/BatchExecutionCommandImpl.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/BatchExecutionCommandImpl.java
@@ -20,13 +20,13 @@ package org.drools.commands.runtime;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElements;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.drools.commands.fluent.Batch;
import org.drools.commands.runtime.pmml.ApplyPmmlModelCommand;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/DisposeCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/DisposeCommand.java
index be75a9796a..62154e0afb 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/DisposeCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/DisposeCommand.java
@@ -18,9 +18,9 @@
*/
package org.drools.commands.runtime;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.drools.commands.impl.NotTransactionalCommand;
import org.kie.api.runtime.Context;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultImpl.java b/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultImpl.java
index 7bd405dc16..4b3b07309e 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultImpl.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultImpl.java
@@ -22,11 +22,11 @@ import java.io.Serializable;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.drools.commands.jaxb.JaxbMapAdapter;
import org.kie.api.runtime.ExecutionResults;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultsMap.java b/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultsMap.java
index 0056413ec4..7d4be781ab 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultsMap.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/ExecutionResultsMap.java
@@ -21,7 +21,7 @@ package org.drools.commands.runtime;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.drools.commands.jaxb.JaxbMapAdapter;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/FlatQueryResults.java b/drools-commands/src/main/java/org/drools/commands/runtime/FlatQueryResults.java
index d853414697..997333593a 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/FlatQueryResults.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/FlatQueryResults.java
@@ -25,13 +25,13 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.drools.commands.jaxb.JaxbListAdapter;
import org.drools.commands.jaxb.JaxbListWrapper;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/GetFactCountCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/GetFactCountCommand.java
index cab731bc8f..29063bbc69 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/GetFactCountCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/GetFactCountCommand.java
@@ -18,10 +18,10 @@
*/
package org.drools.commands.runtime;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.kie.api.command.ExecutableCommand;
import org.kie.api.runtime.Context;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/GetGlobalCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/GetGlobalCommand.java
index 27b4865b69..71c9b28373 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/GetGlobalCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/GetGlobalCommand.java
@@ -18,10 +18,10 @@
*/
package org.drools.commands.runtime;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.drools.commands.IdentifiableResult;
import org.kie.api.command.ExecutableCommand;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/GetIdCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/GetIdCommand.java
index 983a6bcfce..c0972f2fa8 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/GetIdCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/GetIdCommand.java
@@ -18,10 +18,10 @@
*/
package org.drools.commands.runtime;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.kie.api.command.ExecutableCommand;
import org.kie.api.runtime.Context;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/GetSessionTimeCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/GetSessionTimeCommand.java
index 032e7b4eb9..87b0b3d821 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/GetSessionTimeCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/GetSessionTimeCommand.java
@@ -18,10 +18,10 @@
*/
package org.drools.commands.runtime;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.drools.commands.IdentifiableResult;
import org.kie.api.command.ExecutableCommand;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/ObjectFactory.java b/drools-commands/src/main/java/org/drools/commands/runtime/ObjectFactory.java
index 458b82e164..c78c199adc 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/ObjectFactory.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/ObjectFactory.java
@@ -18,7 +18,7 @@
*/
package org.drools.commands.runtime;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
@XmlRegistry
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/QueryResultsJaxbAdapter.java b/drools-commands/src/main/java/org/drools/commands/runtime/QueryResultsJaxbAdapter.java
index b89d48c644..bb4631870b 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/QueryResultsJaxbAdapter.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/QueryResultsJaxbAdapter.java
@@ -18,7 +18,7 @@
*/
package org.drools.commands.runtime;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import org.drools.core.QueryResultsImpl;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/SetGlobalCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/SetGlobalCommand.java
index 986a392085..21c5b0b9f5 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/SetGlobalCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/SetGlobalCommand.java
@@ -18,12 +18,12 @@
*/
package org.drools.commands.runtime;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.drools.commands.IdentifiableResult;
import org.drools.commands.jaxb.JaxbUnknownAdapter;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/pmml/ApplyPmmlModelCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/pmml/ApplyPmmlModelCommand.java
index 45487d20b1..0afdc97077 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/pmml/ApplyPmmlModelCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/pmml/ApplyPmmlModelCommand.java
@@ -21,12 +21,12 @@ package org.drools.commands.runtime.pmml;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElements;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.drools.commands.IdentifiableResult;
import org.kie.api.command.ExecutableCommand;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortProcessInstanceCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortProcessInstanceCommand.java
index b198432940..e08edd6530 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortProcessInstanceCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortProcessInstanceCommand.java
@@ -18,10 +18,10 @@
*/
package org.drools.commands.runtime.process;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.kie.api.command.ExecutableCommand;
import org.kie.api.runtime.Context;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortWorkItemCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortWorkItemCommand.java
index 8a1acc9175..20617cda7a 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortWorkItemCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/AbortWorkItemCommand.java
@@ -18,10 +18,10 @@
*/
package org.drools.commands.runtime.process;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.kie.api.command.ExecutableCommand;
import org.kie.api.runtime.Context;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/CompleteWorkItemCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/CompleteWorkItemCommand.java
index 5f063d2cc9..5e770ecfc0 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/process/CompleteWorkItemCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/CompleteWorkItemCommand.java
@@ -21,12 +21,12 @@ package org.drools.commands.runtime.process;
import java.util.HashMap;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.drools.commands.jaxb.JaxbMapAdapter;
import org.kie.api.command.ExecutableCommand;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateCorrelatedProcessInstanceCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateCorrelatedProcessInstanceCommand.java
index 28df02f2bd..088a6dce46 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateCorrelatedProcessInstanceCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateCorrelatedProcessInstanceCommand.java
@@ -21,12 +21,12 @@ package org.drools.commands.runtime.process;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.drools.commands.IdentifiableResult;
import org.drools.commands.jaxb.JaxbMapAdapter;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateProcessInstanceCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateProcessInstanceCommand.java
index 4b6249c07d..aea9aa29d9 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateProcessInstanceCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/CreateProcessInstanceCommand.java
@@ -21,12 +21,12 @@ package org.drools.commands.runtime.process;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.drools.commands.IdentifiableResult;
import org.drools.commands.jaxb.JaxbMapAdapter;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessEventListenersCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessEventListenersCommand.java
index 718504c30e..1d96fd6fdc 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessEventListenersCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessEventListenersCommand.java
@@ -19,9 +19,9 @@
package org.drools.commands.runtime.process;
import java.util.Collection;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
import org.kie.api.command.ExecutableCommand;
import org.kie.api.event.process.ProcessEventListener;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessIdsCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessIdsCommand.java
index f3b25ddfe7..fc1c8196b9 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessIdsCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessIdsCommand.java
@@ -20,10 +20,10 @@ package org.drools.commands.runtime.process;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.kie.api.command.ExecutableCommand;
import org.kie.api.definition.process.Process;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceByCorrelationKeyCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceByCorrelationKeyCommand.java
index 57e4771a89..7cc196e4b4 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceByCorrelationKeyCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceByCorrelationKeyCommand.java
@@ -18,12 +18,12 @@
*/
package org.drools.commands.runtime.process;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.kie.api.command.ExecutableCommand;
import org.kie.api.runtime.Context;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceCommand.java
index 04359a2174..116b6c8a36 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstanceCommand.java
@@ -18,10 +18,10 @@
*/
package org.drools.commands.runtime.process;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.kie.api.command.ExecutableCommand;
import org.kie.api.runtime.Context;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstancesCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstancesCommand.java
index 81eea32909..32c6e91af2 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstancesCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetProcessInstancesCommand.java
@@ -20,10 +20,10 @@ package org.drools.commands.runtime.process;
import java.util.ArrayList;
import java.util.Collection;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.kie.api.command.ExecutableCommand;
import org.kie.api.runtime.Context;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemCommand.java
index cdebb4536e..8edc6eb7bd 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemCommand.java
@@ -18,10 +18,10 @@
*/
package org.drools.commands.runtime.process;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.drools.core.process.WorkItem;
import org.drools.core.process.WorkItemManager;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemIdsCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemIdsCommand.java
index 52d3faf9f5..e13dad8421 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemIdsCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/GetWorkItemIdsCommand.java
@@ -21,10 +21,10 @@ package org.drools.commands.runtime.process;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.drools.core.process.WorkItem;
import org.drools.core.process.WorkItemManager;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/ObjectFactory.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/ObjectFactory.java
index 3e56206305..33bf5f1239 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/process/ObjectFactory.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/ObjectFactory.java
@@ -19,7 +19,7 @@
package org.drools.commands.runtime.process;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
@XmlRegistry
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/ReTryWorkItemCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/ReTryWorkItemCommand.java
index f1092a1f36..a98b83314f 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/process/ReTryWorkItemCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/ReTryWorkItemCommand.java
@@ -21,11 +21,11 @@ package org.drools.commands.runtime.process;
import java.util.HashMap;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.drools.core.process.WorkItemManager;
import org.drools.commands.jaxb.JaxbMapAdapter;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/RegisterWorkItemHandlerCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/RegisterWorkItemHandlerCommand.java
index efa4b6c9b9..d30993a3e8 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/process/RegisterWorkItemHandlerCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/RegisterWorkItemHandlerCommand.java
@@ -18,10 +18,10 @@
*/
package org.drools.commands.runtime.process;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.drools.commands.jaxb.JaxbUnknownAdapter;
import org.kie.api.command.ExecutableCommand;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/SetProcessInstanceVariablesCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/SetProcessInstanceVariablesCommand.java
index 853bdf5626..96d113d426 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/process/SetProcessInstanceVariablesCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/SetProcessInstanceVariablesCommand.java
@@ -21,12 +21,12 @@ package org.drools.commands.runtime.process;
import java.util.HashMap;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.drools.commands.jaxb.JaxbMapAdapter;
import org.kie.api.command.ExecutableCommand;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/SignalEventCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/SignalEventCommand.java
index 927298a7c2..b5867b5636 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/process/SignalEventCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/SignalEventCommand.java
@@ -18,12 +18,12 @@
*/
package org.drools.commands.runtime.process;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.drools.commands.jaxb.JaxbUnknownAdapter;
import org.kie.api.command.ExecutableCommand;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartCorrelatedProcessCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartCorrelatedProcessCommand.java
index f96051e049..37140e853b 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartCorrelatedProcessCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartCorrelatedProcessCommand.java
@@ -21,13 +21,13 @@ package org.drools.commands.runtime.process;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.drools.commands.IdentifiableResult;
import org.drools.commands.jaxb.JaxbMapAdapter;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessCommand.java
index 7d60ff3ab8..2aa2fa1fe5 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessCommand.java
@@ -21,14 +21,14 @@ package org.drools.commands.runtime.process;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.drools.commands.IdentifiableResult;
import org.drools.commands.jaxb.JaxbMapAdapter;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessFromNodeIdsCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessFromNodeIdsCommand.java
index 69cd161651..99f96c11b9 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessFromNodeIdsCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessFromNodeIdsCommand.java
@@ -20,12 +20,12 @@ package org.drools.commands.runtime.process;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.kie.api.runtime.Context;
import org.kie.api.runtime.ExecutionResults;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessInstanceCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessInstanceCommand.java
index 5a7239447d..24598b5605 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessInstanceCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/process/StartProcessInstanceCommand.java
@@ -18,9 +18,9 @@
*/
package org.drools.commands.runtime.process;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
import org.kie.api.command.ExecutableCommand;
import org.kie.api.runtime.Context;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/AgendaGroupSetFocusCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/AgendaGroupSetFocusCommand.java
index cc8d5328e9..0ada06b0a7 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/AgendaGroupSetFocusCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/AgendaGroupSetFocusCommand.java
@@ -18,10 +18,10 @@
*/
package org.drools.commands.runtime.rule;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.kie.api.command.ExecutableCommand;
import org.kie.api.runtime.Context;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearActivationGroupCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearActivationGroupCommand.java
index 0a3ac21740..ab62bd194a 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearActivationGroupCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearActivationGroupCommand.java
@@ -18,10 +18,10 @@
*/
package org.drools.commands.runtime.rule;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.kie.api.command.ExecutableCommand;
import org.kie.api.runtime.Context;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaCommand.java
index 7fa3ec0720..c75db60817 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaCommand.java
@@ -18,9 +18,9 @@
*/
package org.drools.commands.runtime.rule;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.kie.api.command.ExecutableCommand;
import org.kie.api.runtime.Context;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaGroupCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaGroupCommand.java
index 59ff66b145..f894f9ca16 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaGroupCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearAgendaGroupCommand.java
@@ -18,10 +18,10 @@
*/
package org.drools.commands.runtime.rule;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.kie.api.command.ExecutableCommand;
import org.kie.api.runtime.Context;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearRuleFlowGroupCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearRuleFlowGroupCommand.java
index 75aa16956d..3c3b31461c 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearRuleFlowGroupCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ClearRuleFlowGroupCommand.java
@@ -18,10 +18,10 @@
*/
package org.drools.commands.runtime.rule;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.drools.core.common.ReteEvaluator;
import org.kie.api.command.ExecutableCommand;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteCommand.java
index e7b813a991..2671b4521d 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteCommand.java
@@ -18,10 +18,10 @@
*/
package org.drools.commands.runtime.rule;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.drools.core.common.DisconnectedFactHandle;
import org.kie.api.command.ExecutableCommand;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteFromEntryPointCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteFromEntryPointCommand.java
index dbdb2275b5..c93c83b1c8 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteFromEntryPointCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteFromEntryPointCommand.java
@@ -18,10 +18,10 @@
*/
package org.drools.commands.runtime.rule;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
import org.drools.core.common.DisconnectedFactHandle;
import org.kie.api.command.ExecutableCommand;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteObjectCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteObjectCommand.java
index 6e2d286e42..88f585b200 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteObjectCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/DeleteObjectCommand.java
@@ -18,10 +18,10 @@
*/
package org.drools.commands.runtime.rule;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.drools.util.StringUtils;
import org.drools.commands.jaxb.JaxbUnknownAdapter;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/EnableAuditLogCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/EnableAuditLogCommand.java
index 812fc30baf..5055346beb 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/EnableAuditLogCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/EnableAuditLogCommand.java
@@ -18,10 +18,10 @@
*/
package org.drools.commands.runtime.rule;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.kie.api.KieServices;
import org.kie.api.command.ExecutableCommand;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireAllRulesCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireAllRulesCommand.java
index 4d41b24de6..6ed31da31d 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireAllRulesCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireAllRulesCommand.java
@@ -18,12 +18,12 @@
*/
package org.drools.commands.runtime.rule;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.drools.commands.IdentifiableResult;
import org.drools.commands.jaxb.JaxbUnknownAdapter;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireUntilHaltCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireUntilHaltCommand.java
index bc4545d39b..d4fb71df07 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireUntilHaltCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/FireUntilHaltCommand.java
@@ -18,11 +18,11 @@
*/
package org.drools.commands.runtime.rule;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.drools.core.common.InternalWorkingMemory;
import org.drools.commands.jaxb.JaxbUnknownAdapter;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetAgendaEventListenersCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetAgendaEventListenersCommand.java
index d138313dcb..787878bf6d 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetAgendaEventListenersCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetAgendaEventListenersCommand.java
@@ -19,7 +19,7 @@
package org.drools.commands.runtime.rule;
import java.util.Collection;
-import javax.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlAttribute;
import org.kie.api.command.ExecutableCommand;
import org.kie.api.event.rule.AgendaEventListener;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointCommand.java
index 55b5fa7ecb..6c0b549a26 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointCommand.java
@@ -18,7 +18,7 @@
*/
package org.drools.commands.runtime.rule;
-import javax.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlAttribute;
import org.drools.commands.EntryPointCreator;
import org.kie.api.command.ExecutableCommand;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointsCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointsCommand.java
index d0667678ea..4f6cb06d74 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointsCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetEntryPointsCommand.java
@@ -20,7 +20,7 @@ package org.drools.commands.runtime.rule;
import java.util.ArrayList;
import java.util.Collection;
-import javax.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlAttribute;
import org.drools.commands.EntryPointCreator;
import org.kie.api.command.ExecutableCommand;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleCommand.java
index 4e3f871dc9..05b34f4423 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleCommand.java
@@ -18,7 +18,7 @@
*/
package org.drools.commands.runtime.rule;
-import javax.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlAttribute;
import org.drools.core.common.InternalFactHandle;
import org.kie.api.command.ExecutableCommand;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleInEntryPointCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleInEntryPointCommand.java
index 419e108ba3..cddfbf37d2 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleInEntryPointCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandleInEntryPointCommand.java
@@ -18,7 +18,7 @@
*/
package org.drools.commands.runtime.rule;
-import javax.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlAttribute;
import org.drools.core.common.InternalFactHandle;
import org.kie.api.command.ExecutableCommand;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandlesCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandlesCommand.java
index 8507d5836e..9b4373b2f0 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandlesCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetFactHandlesCommand.java
@@ -20,9 +20,9 @@ package org.drools.commands.runtime.rule;
import java.util.ArrayList;
import java.util.Collection;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
import org.drools.core.common.InternalFactHandle;
import org.kie.api.command.ExecutableCommand;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectCommand.java
index 0c42b31768..a9e78c4bd0 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectCommand.java
@@ -18,12 +18,12 @@
*/
package org.drools.commands.runtime.rule;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
import org.drools.commands.IdentifiableResult;
import org.drools.core.common.DefaultFactHandle;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectInEntryPointCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectInEntryPointCommand.java
index bcead60ab8..09429c6000 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectInEntryPointCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectInEntryPointCommand.java
@@ -18,10 +18,10 @@
*/
package org.drools.commands.runtime.rule;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
import org.drools.commands.IdentifiableResult;
import org.drools.core.common.DefaultFactHandle;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsCommand.java
index 5f0df58eae..41214fcccf 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsCommand.java
@@ -21,10 +21,10 @@ package org.drools.commands.runtime.rule;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
import org.drools.commands.IdentifiableResult;
import org.drools.core.ClassObjectSerializationFilter;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsInEntryPointCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsInEntryPointCommand.java
index fdd9184caf..add47b6171 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsInEntryPointCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/GetObjectsInEntryPointCommand.java
@@ -21,9 +21,9 @@ package org.drools.commands.runtime.rule;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
import org.drools.commands.IdentifiableResult;
import org.kie.api.command.ExecutableCommand;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertElementsCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertElementsCommand.java
index d310d5b770..f7d42e08bc 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertElementsCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertElementsCommand.java
@@ -21,11 +21,11 @@ package org.drools.commands.runtime.rule;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.drools.commands.IdentifiableResult;
import org.drools.commands.runtime.ExecutionResultImpl;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectCommand.java
index f6712f538d..40c21a187f 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectCommand.java
@@ -18,12 +18,12 @@
*/
package org.drools.commands.runtime.rule;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.drools.commands.IdentifiableResult;
import org.drools.core.common.DefaultFactHandle;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectInEntryPointCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectInEntryPointCommand.java
index 682f17534a..bf0226eb34 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectInEntryPointCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/InsertObjectInEntryPointCommand.java
@@ -18,10 +18,10 @@
*/
package org.drools.commands.runtime.rule;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
import org.drools.commands.IdentifiableResult;
import org.drools.core.common.DefaultFactHandle;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ModifyCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ModifyCommand.java
index 19eb642aed..d437e09b76 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ModifyCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ModifyCommand.java
@@ -21,11 +21,11 @@ package org.drools.commands.runtime.rule;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.drools.base.base.CoreComponentsBuilder;
import org.drools.core.common.DisconnectedFactHandle;
import org.kie.api.command.ExecutableCommand;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ObjectFactory.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ObjectFactory.java
index 43dc943295..e58a43fe69 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/ObjectFactory.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/ObjectFactory.java
@@ -18,7 +18,7 @@
*/
package org.drools.commands.runtime.rule;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
import org.drools.commands.runtime.rule.ModifyCommand.SetterImpl;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/QueryCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/QueryCommand.java
index f1393f83aa..888d0bf5af 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/QueryCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/QueryCommand.java
@@ -21,10 +21,10 @@ package org.drools.commands.runtime.rule;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
import org.drools.commands.IdentifiableResult;
import org.drools.commands.runtime.FlatQueryResults;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateCommand.java
index 59e46cce81..d14df73251 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateCommand.java
@@ -20,12 +20,12 @@ package org.drools.commands.runtime.rule;
import java.util.Arrays;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.drools.core.common.DisconnectedFactHandle;
import org.drools.commands.jaxb.JaxbUnknownAdapter;
diff --git a/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateInEntryPointCommand.java b/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateInEntryPointCommand.java
index 752e90bb27..ab29649f32 100644
--- a/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateInEntryPointCommand.java
+++ b/drools-commands/src/main/java/org/drools/commands/runtime/rule/UpdateInEntryPointCommand.java
@@ -20,8 +20,8 @@ package org.drools.commands.runtime.rule;
import java.util.Arrays;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
import org.drools.core.common.DisconnectedFactHandle;
import org.kie.api.command.ExecutableCommand;
diff --git a/drools-compiler/pom.xml b/drools-compiler/pom.xml
index 30c41a04d4..de12663f49 100644
--- a/drools-compiler/pom.xml
+++ b/drools-compiler/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
@@ -128,11 +128,6 @@
<artifactId>jaxb-core</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
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 c64a98e84b..c4c1361de0 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<RuleTemplateModel> 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 6b8db5a093..60be4ac0b6 100644
--- a/drools-compiler/src/main/java/org/drools/compiler/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java
+++ b/drools-compiler/src/main/java/org/drools/compiler/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java
@@ -31,8 +31,8 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
import com.sun.codemodel.CodeWriter;
import com.sun.codemodel.JCodeModel;
diff --git a/drools-core/pom.xml b/drools-core/pom.xml
index 97feb88fde..c211045c17 100644
--- a/drools-core/pom.xml
+++ b/drools-core/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
@@ -95,11 +95,6 @@
<artifactId>jaxb-core</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
diff --git a/drools-core/src/main/java/org/drools/core/ClassObjectSerializationFilter.java b/drools-core/src/main/java/org/drools/core/ClassObjectSerializationFilter.java
index 1dbb032c7e..8330b82548 100644
--- a/drools-core/src/main/java/org/drools/core/ClassObjectSerializationFilter.java
+++ b/drools-core/src/main/java/org/drools/core/ClassObjectSerializationFilter.java
@@ -18,10 +18,10 @@
*/
package org.drools.core;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.kie.api.runtime.ClassObjectFilter;
import org.kie.api.runtime.ObjectFilter;
diff --git a/drools-core/src/main/java/org/drools/core/base/ArrayElements.java b/drools-core/src/main/java/org/drools/core/base/ArrayElements.java
index 9301d93da1..09535a5ce9 100644
--- a/drools-core/src/main/java/org/drools/core/base/ArrayElements.java
+++ b/drools-core/src/main/java/org/drools/core/base/ArrayElements.java
@@ -20,10 +20,10 @@ package org.drools.core.base;
import java.util.Arrays;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
@XmlType(name="array-elements")
@XmlAccessorType(XmlAccessType.NONE)
diff --git a/drools-core/src/main/java/org/drools/core/base/RuleNameEndsWithAgendaFilter.java b/drools-core/src/main/java/org/drools/core/base/RuleNameEndsWithAgendaFilter.java
index 50ea110d72..3f838d1258 100644
--- a/drools-core/src/main/java/org/drools/core/base/RuleNameEndsWithAgendaFilter.java
+++ b/drools-core/src/main/java/org/drools/core/base/RuleNameEndsWithAgendaFilter.java
@@ -20,10 +20,10 @@ package org.drools.core.base;
import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.kie.api.runtime.rule.AgendaFilter;
import org.kie.api.runtime.rule.Match;
diff --git a/drools-core/src/main/java/org/drools/core/base/RuleNameEqualsAgendaFilter.java b/drools-core/src/main/java/org/drools/core/base/RuleNameEqualsAgendaFilter.java
index 398651d824..aa7388b8e7 100644
--- a/drools-core/src/main/java/org/drools/core/base/RuleNameEqualsAgendaFilter.java
+++ b/drools-core/src/main/java/org/drools/core/base/RuleNameEqualsAgendaFilter.java
@@ -20,10 +20,10 @@ package org.drools.core.base;
import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.kie.api.runtime.rule.AgendaFilter;
import org.kie.api.runtime.rule.Match;
diff --git a/drools-core/src/main/java/org/drools/core/base/RuleNameMatchesAgendaFilter.java b/drools-core/src/main/java/org/drools/core/base/RuleNameMatchesAgendaFilter.java
index 55a226bd99..8512f85eac 100644
--- a/drools-core/src/main/java/org/drools/core/base/RuleNameMatchesAgendaFilter.java
+++ b/drools-core/src/main/java/org/drools/core/base/RuleNameMatchesAgendaFilter.java
@@ -22,10 +22,10 @@ import java.io.Serializable;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.kie.api.runtime.rule.AgendaFilter;
import org.kie.api.runtime.rule.Match;
diff --git a/drools-core/src/main/java/org/drools/core/base/RuleNameStartsWithAgendaFilter.java b/drools-core/src/main/java/org/drools/core/base/RuleNameStartsWithAgendaFilter.java
index 285b260267..8b9c211c9e 100644
--- a/drools-core/src/main/java/org/drools/core/base/RuleNameStartsWithAgendaFilter.java
+++ b/drools-core/src/main/java/org/drools/core/base/RuleNameStartsWithAgendaFilter.java
@@ -20,10 +20,10 @@ package org.drools.core.base;
import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.kie.api.runtime.rule.AgendaFilter;
import org.kie.api.runtime.rule.Match;
diff --git a/drools-core/src/main/java/org/drools/core/common/DefaultFactHandle.java b/drools-core/src/main/java/org/drools/core/common/DefaultFactHandle.java
index 649d119b36..3e5cd249ec 100644
--- a/drools-core/src/main/java/org/drools/core/common/DefaultFactHandle.java
+++ b/drools-core/src/main/java/org/drools/core/common/DefaultFactHandle.java
@@ -23,10 +23,10 @@ import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.stream.Stream;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.drools.base.factmodel.traits.TraitTypeEnum;
import org.drools.base.rule.EntryPointId;
diff --git a/drools-core/src/main/java/org/drools/core/common/DisconnectedFactHandle.java b/drools-core/src/main/java/org/drools/core/common/DisconnectedFactHandle.java
index f3b76bf144..4eae2aafa3 100644
--- a/drools-core/src/main/java/org/drools/core/common/DisconnectedFactHandle.java
+++ b/drools-core/src/main/java/org/drools/core/common/DisconnectedFactHandle.java
@@ -25,13 +25,13 @@ import java.io.ObjectOutput;
import java.util.function.Consumer;
import java.util.function.Predicate;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
import org.drools.base.factmodel.traits.TraitTypeEnum;
import org.drools.base.rule.EntryPointId;
diff --git a/drools-core/src/main/java/org/drools/core/common/ObjectFactory.java b/drools-core/src/main/java/org/drools/core/common/ObjectFactory.java
index d3c1b5d3e7..52799274d7 100644
--- a/drools-core/src/main/java/org/drools/core/common/ObjectFactory.java
+++ b/drools-core/src/main/java/org/drools/core/common/ObjectFactory.java
@@ -18,7 +18,7 @@
*/
package org.drools.core.common;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
@XmlRegistry
public class ObjectFactory {
diff --git a/drools-core/src/main/java/org/drools/core/common/QueryElementFactHandle.java b/drools-core/src/main/java/org/drools/core/common/QueryElementFactHandle.java
index 97be135e6f..04f6eef60d 100644
--- a/drools-core/src/main/java/org/drools/core/common/QueryElementFactHandle.java
+++ b/drools-core/src/main/java/org/drools/core/common/QueryElementFactHandle.java
@@ -22,9 +22,9 @@ import java.util.Arrays;
import java.util.function.Consumer;
import java.util.function.Predicate;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
import org.drools.base.factmodel.traits.TraitTypeEnum;
import org.drools.base.rule.EntryPointId;
diff --git a/drools-core/src/main/java/org/drools/core/util/AbstractBaseLinkedListNode.java b/drools-core/src/main/java/org/drools/core/util/AbstractBaseLinkedListNode.java
index e37c37fc31..a9aec456b6 100644
--- a/drools-core/src/main/java/org/drools/core/util/AbstractBaseLinkedListNode.java
+++ b/drools-core/src/main/java/org/drools/core/util/AbstractBaseLinkedListNode.java
@@ -18,9 +18,9 @@
*/
package org.drools.core.util;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
/**
* Provides a abstract base implementation that an object can extend so that it can be used in a LinkedList.
diff --git a/drools-decisiontables/pom.xml b/drools-decisiontables/pom.xml
index d5efaab1fe..1c8f945a14 100644
--- a/drools-decisiontables/pom.xml
+++ b/drools-decisiontables/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-distribution/pom.xml b/drools-distribution/pom.xml
index 9869d8f334..ce287c16f5 100644
--- a/drools-distribution/pom.xml
+++ b/drools-distribution/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-docs/pom.xml b/drools-docs/pom.xml
index 83700b558a..16d0b1a53b 100755
--- a/drools-docs/pom.xml
+++ b/drools-docs/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
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 111c12b6c3..4cc2968027 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<org.kie.kogito.queries.LoanUnit> ruleUnit;
public LoanUnitQueryFindApprovedEndpoint() {
diff --git a/drools-drl/drools-drl-ast/pom.xml b/drools-drl/drools-drl-ast/pom.xml
index 6989033c2a..ec0a6387c3 100644
--- a/drools-drl/drools-drl-ast/pom.xml
+++ b/drools-drl/drools-drl-ast/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-drl</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<groupId>org.drools</groupId>
diff --git a/drools-drl/drools-drl-extensions/pom.xml b/drools-drl/drools-drl-extensions/pom.xml
index 7c6cca5275..78c3264351 100644
--- a/drools-drl/drools-drl-extensions/pom.xml
+++ b/drools-drl/drools-drl-extensions/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-drl</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<groupId>org.drools</groupId>
diff --git a/drools-drl/drools-drl-parser/pom.xml b/drools-drl/drools-drl-parser/pom.xml
index e26a471f36..9676f32dc8 100644
--- a/drools-drl/drools-drl-parser/pom.xml
+++ b/drools-drl/drools-drl-parser/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-drl</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<groupId>org.drools</groupId>
diff --git a/drools-drl/pom.xml b/drools-drl/pom.xml
index 913b2f62ee..3e14d84149 100644
--- a/drools-drl/pom.xml
+++ b/drools-drl/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/pom.xml
index 3e5c70447d..328d895a43 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 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-drlonyaml-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>drools-drlonyaml-cli-tests</artifactId>
<name>Drools :: DRL on YAML :: CLI tests</name>
diff --git a/drools-drlonyaml-parent/drools-drlonyaml-cli/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-cli/pom.xml
index 6329794317..89ae43d7c4 100644
--- a/drools-drlonyaml-parent/drools-drlonyaml-cli/pom.xml
+++ b/drools-drlonyaml-parent/drools-drlonyaml-cli/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-drlonyaml-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>drools-drlonyaml-cli</artifactId>
<name>Drools :: DRL on YAML :: CLI</name>
diff --git a/drools-drlonyaml-parent/drools-drlonyaml-integration-tests/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-integration-tests/pom.xml
index 9449a0e789..ddf5fba553 100644
--- a/drools-drlonyaml-parent/drools-drlonyaml-integration-tests/pom.xml
+++ b/drools-drlonyaml-parent/drools-drlonyaml-integration-tests/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-drlonyaml-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>drools-drlonyaml-integration-tests</artifactId>
<name>Drools :: DRL on YAML :: Integration Tests</name>
diff --git a/drools-drlonyaml-parent/drools-drlonyaml-model/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-model/pom.xml
index da3b7ceaa0..154766237f 100644
--- a/drools-drlonyaml-parent/drools-drlonyaml-model/pom.xml
+++ b/drools-drlonyaml-parent/drools-drlonyaml-model/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-drlonyaml-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>drools-drlonyaml-model</artifactId>
<name>Drools :: DRL on YAML :: model</name>
diff --git a/drools-drlonyaml-parent/drools-drlonyaml-schemagen/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-schemagen/pom.xml
index 9eccf371b6..7902be5b09 100644
--- a/drools-drlonyaml-parent/drools-drlonyaml-schemagen/pom.xml
+++ b/drools-drlonyaml-parent/drools-drlonyaml-schemagen/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-drlonyaml-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>drools-drlonyaml-schemagen</artifactId>
<name>Drools :: DRL on YAML :: schema generator</name>
diff --git a/drools-drlonyaml-parent/drools-drlonyaml-todrl/pom.xml b/drools-drlonyaml-parent/drools-drlonyaml-todrl/pom.xml
index 09b295dcb6..947b595952 100644
--- a/drools-drlonyaml-parent/drools-drlonyaml-todrl/pom.xml
+++ b/drools-drlonyaml-parent/drools-drlonyaml-todrl/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-drlonyaml-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>drools-drlonyaml-todrl</artifactId>
<name>Drools :: DRL on YAML :: to DRL emitter</name>
diff --git a/drools-drlonyaml-parent/pom.xml b/drools-drlonyaml-parent/pom.xml
index fe1607bb8e..1e8996b466 100644
--- a/drools-drlonyaml-parent/pom.xml
+++ b/drools-drlonyaml-parent/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
<groupId>org.drools</groupId>
diff --git a/drools-ecj/pom.xml b/drools-ecj/pom.xml
index 1233cb2122..0a9f1a4be0 100644
--- a/drools-ecj/pom.xml
+++ b/drools-ecj/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-engine-classic/pom.xml b/drools-engine-classic/pom.xml
index 2566108e01..e11a55dcde 100644
--- a/drools-engine-classic/pom.xml
+++ b/drools-engine-classic/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-engine/pom.xml b/drools-engine/pom.xml
index 2b5cfc724c..9c0fe6e116 100644
--- a/drools-engine/pom.xml
+++ b/drools-engine/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-examples-api/default-kiesession-from-file/pom.xml b/drools-examples-api/default-kiesession-from-file/pom.xml
index 93b50e77f7..19592f8aae 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 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-examples-api</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>default-kiesession-from-file</artifactId>
diff --git a/drools-examples-api/default-kiesession/pom.xml b/drools-examples-api/default-kiesession/pom.xml
index 63ac93015d..33fcd56c93 100644
--- a/drools-examples-api/default-kiesession/pom.xml
+++ b/drools-examples-api/default-kiesession/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-examples-api</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>default-kiesession</artifactId>
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 5abde83c50..a8b14fdd65 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 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-examples-api</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-module-from-multiple-files</artifactId>
diff --git a/drools-examples-api/kiebase-inclusion/pom.xml b/drools-examples-api/kiebase-inclusion/pom.xml
index 6be25acbad..65078f14f1 100644
--- a/drools-examples-api/kiebase-inclusion/pom.xml
+++ b/drools-examples-api/kiebase-inclusion/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-examples-api</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kiebase-inclusion</artifactId>
diff --git a/drools-examples-api/kiecontainer-from-kierepo/pom.xml b/drools-examples-api/kiecontainer-from-kierepo/pom.xml
index c8f8653039..91231fe598 100644
--- a/drools-examples-api/kiecontainer-from-kierepo/pom.xml
+++ b/drools-examples-api/kiecontainer-from-kierepo/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-examples-api</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kiecontainer-from-kierepo</artifactId>
diff --git a/drools-examples-api/kiefilesystem-example/pom.xml b/drools-examples-api/kiefilesystem-example/pom.xml
index c4cca53c9a..c425cd37d5 100644
--- a/drools-examples-api/kiefilesystem-example/pom.xml
+++ b/drools-examples-api/kiefilesystem-example/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-examples-api</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kiefilesystem-example</artifactId>
diff --git a/drools-examples-api/kiemodulemodel-example/pom.xml b/drools-examples-api/kiemodulemodel-example/pom.xml
index aaf20d358f..d0580834e7 100644
--- a/drools-examples-api/kiemodulemodel-example/pom.xml
+++ b/drools-examples-api/kiemodulemodel-example/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-examples-api</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kiemodulemodel-example</artifactId>
diff --git a/drools-examples-api/multiple-kbases/pom.xml b/drools-examples-api/multiple-kbases/pom.xml
index ad257060c7..63a7a44622 100644
--- a/drools-examples-api/multiple-kbases/pom.xml
+++ b/drools-examples-api/multiple-kbases/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-examples-api</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>multiple-kbases</artifactId>
diff --git a/drools-examples-api/named-kiesession-from-file/pom.xml b/drools-examples-api/named-kiesession-from-file/pom.xml
index 29d3560c38..0143d764b4 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 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-examples-api</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<name>Drools :: API examples :: Named KieSession from File</name>
diff --git a/drools-examples-api/named-kiesession/pom.xml b/drools-examples-api/named-kiesession/pom.xml
index 64351994fa..5e95977023 100644
--- a/drools-examples-api/named-kiesession/pom.xml
+++ b/drools-examples-api/named-kiesession/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-examples-api</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>named-kiesession</artifactId>
diff --git a/drools-examples-api/pom.xml b/drools-examples-api/pom.xml
index 243c4c8248..ece2104a72 100644
--- a/drools-examples-api/pom.xml
+++ b/drools-examples-api/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-examples-api/reactive-kiesession/pom.xml b/drools-examples-api/reactive-kiesession/pom.xml
index 6726fae660..2be3fac933 100644
--- a/drools-examples-api/reactive-kiesession/pom.xml
+++ b/drools-examples-api/reactive-kiesession/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-examples-api</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>reactive-kiesession</artifactId>
diff --git a/drools-examples/pom.xml b/drools-examples/pom.xml
index 70bdf107d8..f8e8c3d83b 100644
--- a/drools-examples/pom.xml
+++ b/drools-examples/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-fastutil/pom.xml b/drools-fastutil/pom.xml
index 79e109ac38..b1555c678c 100644
--- a/drools-fastutil/pom.xml
+++ b/drools-fastutil/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
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 862bc64dd1..5b89620c26 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 @@
<parent>
<artifactId>drools-impact-analysis-graph</artifactId>
<groupId>org.drools</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 f424681a20..86b6d5abed 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 @@
<parent>
<artifactId>drools-impact-analysis-graph</artifactId>
<groupId>org.drools</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/drools-impact-analysis/drools-impact-analysis-graph/pom.xml b/drools-impact-analysis/drools-impact-analysis-graph/pom.xml
index d42cb900dc..5ec3219a0a 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 @@
<parent>
<artifactId>drools-impact-analysis</artifactId>
<groupId>org.drools</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/drools-impact-analysis/drools-impact-analysis-itests/pom.xml b/drools-impact-analysis/drools-impact-analysis-itests/pom.xml
index 7015b8f36a..a08236b8db 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 @@
<parent>
<artifactId>drools-impact-analysis</artifactId>
<groupId>org.drools</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/drools-impact-analysis/drools-impact-analysis-model/pom.xml b/drools-impact-analysis/drools-impact-analysis-model/pom.xml
index 3a8893de2e..9f5ae9a771 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 @@
<parent>
<artifactId>drools-impact-analysis</artifactId>
<groupId>org.drools</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/drools-impact-analysis/drools-impact-analysis-parser/pom.xml b/drools-impact-analysis/drools-impact-analysis-parser/pom.xml
index 682bc401ff..625032e446 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 @@
<parent>
<artifactId>drools-impact-analysis</artifactId>
<groupId>org.drools</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/drools-impact-analysis/pom.xml b/drools-impact-analysis/pom.xml
index 4d8511b29f..1856e1d897 100644
--- a/drools-impact-analysis/pom.xml
+++ b/drools-impact-analysis/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-io/pom.xml b/drools-io/pom.xml
index 06687764ce..170c040b93 100644
--- a/drools-io/pom.xml
+++ b/drools-io/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-kiesession/pom.xml b/drools-kiesession/pom.xml
index bcb863d4ab..cb430877ce 100644
--- a/drools-kiesession/pom.xml
+++ b/drools-kiesession/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-legacy-test-util/pom.xml b/drools-legacy-test-util/pom.xml
index e9d20aed15..5f5953ddf7 100644
--- a/drools-legacy-test-util/pom.xml
+++ b/drools-legacy-test-util/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-legacy-test-util/src/test/java/org/drools/mvel/compiler/Person.java b/drools-legacy-test-util/src/test/java/org/drools/mvel/compiler/Person.java
index 64eb8809ad..dc8e7e8d69 100644
--- a/drools-legacy-test-util/src/test/java/org/drools/mvel/compiler/Person.java
+++ b/drools-legacy-test-util/src/test/java/org/drools/mvel/compiler/Person.java
@@ -20,8 +20,8 @@ package org.drools.mvel.compiler;
import org.drools.base.factmodel.traits.Traitable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
diff --git a/drools-legacy-test-util/src/test/resources/META-INF/kmodule.xml b/drools-legacy-test-util/src/test/resources/META-INF/kmodule.xml
index ba432d5650..5c4fd95230 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 @@
</kbase>
<kbase name="org.kie.kbase3" scope="SessionScoped" equalsBehavior="equality" eventProcessingMode="stream">
- <ksession name="org.kie.kbase3.ksession1" scope="javax.enterprise.context.ApplicationScoped" type="stateful" clockType="pseudo"/>
+ <ksession name="org.kie.kbase3.ksession1" scope="jakarta.enterprise.context.ApplicationScoped" type="stateful" clockType="pseudo"/>
<ksession name="org.kie.kbase3.ksession2" scope="SessionScoped" type="stateful" clockType="realtime"/>
</kbase>
diff --git a/drools-metric/pom.xml b/drools-metric/pom.xml
index 27b400f440..5c777c109a 100644
--- a/drools-metric/pom.xml
+++ b/drools-metric/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-model/drools-canonical-model/pom.xml b/drools-model/drools-canonical-model/pom.xml
index 76a8d5278c..578754fe23 100644
--- a/drools-model/drools-canonical-model/pom.xml
+++ b/drools-model/drools-canonical-model/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-model</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<name>Drools :: Canonical Model</name>
diff --git a/drools-model/drools-codegen-common/pom.xml b/drools-model/drools-codegen-common/pom.xml
index beade7d0f7..8b6e2ff7e7 100644
--- a/drools-model/drools-codegen-common/pom.xml
+++ b/drools-model/drools-codegen-common/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-model</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<groupId>org.drools</groupId>
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 9a4b9005f7..ff25830536 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 @@ import org.drools.codegen.common.rest.impl.CDIRestAnnotator;
public class QuarkusDroolsModelBuildContext extends AbstractDroolsModelBuildContext {
public static final String CONTEXT_NAME = "Quarkus";
- public static final String QUARKUS_REST = "javax.ws.rs.Path";
- public static final String QUARKUS_DI = "javax.inject.Inject";
+ public static final String QUARKUS_REST = "jakarta.ws.rs.Path";
+ public static final String QUARKUS_DI = "jakarta.inject.Inject";
public final boolean hasRest;
public final boolean hasDI;
diff --git a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/DependencyInjectionAnnotator.java b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/DependencyInjectionAnnotator.java
index e31288ebea..133e55e433 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.SingleMemberAnnotationExpr;
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 @@ public interface DependencyInjectionAnnotator {
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 47e33bd14c..0631364e81 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 extends NodeWithAnnotations<?>> 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 class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot
@Override
public <T extends NodeWithAnnotations<?>> 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 extends NodeWithAnnotations<?>> T withApplicationComponent(T node) {
- node.addAnnotation("javax.enterprise.context.ApplicationScoped");
+ node.addAnnotation("jakarta.enterprise.context.ApplicationScoped");
return node;
}
@@ -62,7 +62,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot
@Override
public <T extends NodeWithAnnotations<?>> T withSingletonComponent(T node) {
- node.addAnnotation("javax.inject.Singleton");
+ node.addAnnotation("jakarta.inject.Singleton");
return node;
}
@@ -73,7 +73,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot
@Override
public <T extends NodeWithAnnotations<?>> T withInjection(T node, boolean lazy) {
- node.addAnnotation("javax.inject.Inject");
+ node.addAnnotation("jakarta.inject.Inject");
return node;
}
@@ -107,7 +107,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot
@Override
public String optionalInstanceInjectionType() {
- return "javax.enterprise.inject.Instance";
+ return "jakarta.enterprise.inject.Instance";
}
@Override
@@ -134,7 +134,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot
@Override
public String applicationComponentType() {
- return "javax.enterprise.context.ApplicationScoped";
+ return "jakarta.enterprise.context.ApplicationScoped";
}
@Override
@@ -174,7 +174,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot
@Override
public <T extends NodeWithAnnotations<?>> T withFactoryMethod(T node) {
- node.addAnnotation("javax.enterprise.inject.Produces");
+ node.addAnnotation("jakarta.enterprise.inject.Produces");
return node;
}
diff --git a/drools-model/drools-model-codegen/pom.xml b/drools-model/drools-model-codegen/pom.xml
index 59aafd869a..c9948110b9 100644
--- a/drools-model/drools-model-codegen/pom.xml
+++ b/drools-model/drools-model-codegen/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-model</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<groupId>org.drools</groupId>
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 b9850908b8..c54f3c8d7a 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<RuleEventListenerConfig> ruleEventListenerConfigs,
Instance<AgendaEventListener> 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 6bad1995aa..ee69deb295 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.KieSession;
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 6bc3c5e405..36fc0b8ec4 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.util.List;
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 3cd2a6b68d..c441dfd850 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 338697d185..7780623f58 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 @@ import static java.util.stream.Collectors.toList;
@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 faf8610793..aabad8800e 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.factory.AbstractRuleUnits;
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<RULE_UNIT_CLASS> {
private static final InternalRuleBase ruleBase = KieBaseBuilder.createKieBaseFromModel(new RULE_UNIT_MODEL(), $KieBaseOptions$);
@@ -43,8 +43,8 @@ public class CLASS_NAME extends AbstractRuleUnit<RULE_UNIT_CLASS> {
this((RuleUnits) null);
}
- @javax.inject.Inject
- public CLASS_NAME(javax.enterprise.inject.Instance<RuleUnits> ruleUnits) {
+ @jakarta.inject.Inject
+ public CLASS_NA(jakarta.enterprise.inject.Instance<RuleUnits> 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 99b50c2ae1..d42dea084d 100644
--- a/drools-model/drools-model-compiler/pom.xml
+++ b/drools-model/drools-model-compiler/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-model</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<name>Drools :: Model :: Compiler</name>
diff --git a/drools-model/drools-mvel-compiler/pom.xml b/drools-model/drools-mvel-compiler/pom.xml
index 0581f58cd6..79e1cc9203 100644
--- a/drools-model/drools-mvel-compiler/pom.xml
+++ b/drools-model/drools-mvel-compiler/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-model</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<name>Drools :: MVEL Compiler</name>
diff --git a/drools-model/drools-mvel-parser/pom.xml b/drools-model/drools-mvel-parser/pom.xml
index 7b9a45c4d1..7c063510ec 100644
--- a/drools-model/drools-mvel-parser/pom.xml
+++ b/drools-model/drools-mvel-parser/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-model</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<name>Drools :: MVEL Parser</name>
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 00edf488ce..e641bda95b 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 final class MvelParser {
public MvelParser(ParserConfiguration configuration, boolean optionalSemicolon) {
this.configuration = configuration;
- configuration.getPostProcessors().clear();
+ configuration.getProcessors().clear();
this.optionalSemicolon = optionalSemicolon;
}
@@ -140,8 +140,8 @@ public final class MvelParser {
N resultNode = start.parse(parser);
ParseResult<N> 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 615512de3f..d4752e980d 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.
* <ul>
* <li>This {@code ClassOrInterfaceDeclaration} refers to the {@code NormalClassDeclaration} and {@code NormalInterfaceDeclaration},</li>
- * <li>while {@code AnnotationTypeDeclaration} and {@code EnumDeclaration} are handled separately within this grammar.</li>
+ * <li>while {@code AnnotationTypeDeclaration}, {@code EnumDeclaration}, and {@code RecordDeclaration} are handled separately within this grammar.</li>
* </ul>
- * 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
* <pre>{@code
* ClassDeclaration:
* NormalClassDeclaration
* EnumDeclaration
+ * RecordDeclaration
* NormalClassDeclaration:
* {ClassModifier} class TypeIdentifier [TypeParameters] [Superclass] [Superinterfaces] ClassBody
* }</pre>
@@ -1396,6 +1397,7 @@ ClassOrInterfaceDeclaration ClassOrInterfaceDeclaration(ModifierHolder modifier)
RangedList<TypeParameter> typePar = new RangedList<TypeParameter>(emptyNodeList());
NodeList<ClassOrInterfaceType> extList = emptyNodeList();
NodeList<ClassOrInterfaceType> impList = emptyNodeList();
+ NodeList<ClassOrInterfaceType> permittedTypes = emptyNodeList();
NodeList<BodyDeclaration<?>> 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
* <pre>{@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 8697a510f7..7e77f0d9f3 100644
--- a/drools-model/pom.xml
+++ b/drools-model/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-mvel/pom.xml b/drools-mvel/pom.xml
index 7372effd88..8a6eb92eeb 100644
--- a/drools-mvel/pom.xml
+++ b/drools-mvel/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
@@ -89,11 +89,6 @@
<artifactId>jaxb-core</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
diff --git a/drools-mvel/src/test/java/org/drools/mvel/compiler/Person.java b/drools-mvel/src/test/java/org/drools/mvel/compiler/Person.java
index 13641acfe0..a1b4bda3fb 100644
--- a/drools-mvel/src/test/java/org/drools/mvel/compiler/Person.java
+++ b/drools-mvel/src/test/java/org/drools/mvel/compiler/Person.java
@@ -20,8 +20,8 @@ package org.drools.mvel.compiler;
import org.drools.base.factmodel.traits.Traitable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
diff --git a/drools-persistence/drools-persistence-api/pom.xml b/drools-persistence/drools-persistence-api/pom.xml
index bf7d3d2b9b..a00b6f44a6 100644
--- a/drools-persistence/drools-persistence-api/pom.xml
+++ b/drools-persistence/drools-persistence-api/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-persistence</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>drools-persistence-api</artifactId>
@@ -60,11 +60,6 @@
<groupId>org.drools</groupId>
<artifactId>drools-commands</artifactId>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
diff --git a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/PersistenceContextManager.java b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/PersistenceContextManager.java
index 1037ab3c35..5a20fa88f6 100644
--- a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/PersistenceContextManager.java
+++ b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/PersistenceContextManager.java
@@ -22,7 +22,7 @@ import org.kie.api.runtime.ExecutableRunner;
import org.kie.api.command.Command;
import org.kie.api.runtime.KieSession;
-import javax.transaction.Synchronization;
+import jakarta.transaction.Synchronization;
public interface PersistenceContextManager {
diff --git a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/TransactionSynchronizationRegistryHelper.java b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/TransactionSynchronizationRegistryHelper.java
index 647c178f2b..74654794cf 100644
--- a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/TransactionSynchronizationRegistryHelper.java
+++ b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/api/TransactionSynchronizationRegistryHelper.java
@@ -18,7 +18,7 @@
*/
package org.drools.persistence.api;
-import javax.transaction.TransactionSynchronizationRegistry;
+import jakarta.transaction.TransactionSynchronizationRegistry;
import org.drools.persistence.jta.JtaTransactionSynchronizationAdapter;
import org.slf4j.Logger;
diff --git a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionManager.java b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionManager.java
index 967365339f..7b7869f2ad 100644
--- a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionManager.java
+++ b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionManager.java
@@ -23,10 +23,10 @@ import java.util.HashMap;
import java.util.Map;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.TransactionSynchronizationRegistry;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.Status;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.TransactionSynchronizationRegistry;
+import jakarta.transaction.UserTransaction;
import org.drools.persistence.api.TransactionManager;
import org.drools.persistence.api.TransactionSynchronization;
@@ -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 @@ public class JtaTransactionManager
UserTransaction ut;
Object tsr;
- javax.transaction.TransactionManager tm;
+ jakarta.transaction.TransactionManager tm;
public JtaTransactionManager(Object ut,
Object tsr,
@@ -83,20 +83,20 @@ public class JtaTransactionManager
this.ut = ( UserTransaction ) ( (ut != null) ? ut : findUserTransaction() );
}
- if ( tm instanceof javax.transaction.TransactionManager ) {
- this.tm = ( javax.transaction.TransactionManager ) tm;
+ if ( tm instanceof jakarta.transaction.TransactionManager ) {
+ this.tm = ( jakarta.transaction.TransactionManager ) tm;
} else {
- this.tm = ( javax.transaction.TransactionManager ) ( (tm != null) ? tm : findTransactionManager( this.ut ) );
+ this.tm = ( jakarta.transaction.TransactionManager ) ( (tm != null) ? tm : findTransactionManager( this.ut ) );
}
this.tsr = (tsr != null) ? tsr : findTransactionSynchronizationRegistry( this.ut,
this.tm );
}
- protected javax.transaction.TransactionManager findTransactionManager(UserTransaction ut) {
- if ( ut instanceof javax.transaction.TransactionManager ) {
+ protected jakarta.transaction.TransactionManager findTransactionManager(UserTransaction ut) {
+ if ( ut instanceof jakarta.transaction.TransactionManager ) {
logger.debug( "JTA UserTransaction object [{}] implements TransactionManager",
ut );
- return (javax.transaction.TransactionManager) ut;
+ return (jakarta.transaction.TransactionManager) ut;
}
InitialContext context;
@@ -115,7 +115,7 @@ public class JtaTransactionManager
continue;
}
try {
- javax.transaction.TransactionManager tm = (javax.transaction.TransactionManager) context.lookup( jndiName );
+ jakarta.transaction.TransactionManager tm = (jakarta.transaction.TransactionManager) context.lookup( jndiName );
logger.debug( "JTA TransactionManager found at fallback JNDI location [{}]",
jndiName );
return tm;
@@ -149,7 +149,7 @@ public class JtaTransactionManager
}
protected Object findTransactionSynchronizationRegistry(UserTransaction ut,
- javax.transaction.TransactionManager tm) {
+ jakarta.transaction.TransactionManager tm) {
if ( transactionSynchronizationRegistryClass == null ) {
// JTA 1.1 API not present - skip.
@@ -219,7 +219,7 @@ public class JtaTransactionManager
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 e7c3b5eb52..e99fe58afd 100644
--- a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionManagerFactory.java
+++ b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionManagerFactory.java
@@ -36,8 +36,8 @@ public class JtaTransactionManagerFactory extends TransactionManagerFactory {
}
/**
- * Creates a {@link JtaTransactionManager} instance using any of the {@link javax.transaction.UserTransaction},
- * {@link javax.transaction.TransactionSynchronizationRegistry}, and {@link javax.transaction.TransactionManager}
+ * Creates a {@link JtaTransactionManager} instance using any of the {@link jakarta.transaction.UserTransaction},
+ * {@link jakarta.transaction.TransactionSynchronizationRegistry}, and {@link jakarta.transaction.TransactionManager}
* present in {@code env}.
*
* @param env
diff --git a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionSynchronizationAdapter.java b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionSynchronizationAdapter.java
index fa387cd3a4..79247df16e 100644
--- a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionSynchronizationAdapter.java
+++ b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/JtaTransactionSynchronizationAdapter.java
@@ -18,8 +18,8 @@
*/
package org.drools.persistence.jta;
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
+import jakarta.transaction.Status;
+import jakarta.transaction.Synchronization;
import org.drools.persistence.api.TransactionManager;
import org.drools.persistence.api.TransactionSynchronization;
diff --git a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/TransactionLockInterceptor.java b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/TransactionLockInterceptor.java
index 7673604692..e1dc0b573f 100644
--- a/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/TransactionLockInterceptor.java
+++ b/drools-persistence/drools-persistence-api/src/main/java/org/drools/persistence/jta/TransactionLockInterceptor.java
@@ -21,7 +21,7 @@ package org.drools.persistence.jta;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.locks.ReentrantLock;
-import javax.transaction.Status;
+import jakarta.transaction.Status;
import org.drools.commands.impl.AbstractInterceptor;
import org.drools.persistence.api.OrderedTransactionSynchronization;
diff --git a/drools-persistence/drools-persistence-jpa/pom.xml b/drools-persistence/drools-persistence-jpa/pom.xml
index 7a3ec66da1..d86ded1a39 100644
--- a/drools-persistence/drools-persistence-jpa/pom.xml
+++ b/drools-persistence/drools-persistence-jpa/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-persistence</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>drools-persistence-jpa</artifactId>
@@ -122,11 +122,6 @@
<groupId>org.drools</groupId>
<artifactId>drools-mvel</artifactId>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
@@ -167,13 +162,8 @@
</dependency>
<!-- Hibernate -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
+ <!--~~(No version provided)~~>--><dependency>
+ <groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-core</artifactId>
<scope>test</scope>
<exclusions>
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/TriggerUpdateTransactionSynchronization.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/TriggerUpdateTransactionSynchronization.java
index 82114ee564..71bc7749ff 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/TriggerUpdateTransactionSynchronization.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/TriggerUpdateTransactionSynchronization.java
@@ -19,7 +19,7 @@
package org.drools.persistence;
import java.util.Set;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import org.drools.persistence.api.TransactionManager;
import org.drools.persistence.api.TransactionManagerHelper;
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/SessionInfo.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/SessionInfo.java
index ec5069ad65..54fd6cc38a 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/SessionInfo.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/SessionInfo.java
@@ -20,15 +20,15 @@ package org.drools.persistence.info;
import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Transient;
-import javax.persistence.Version;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Lob;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Transient;
+import jakarta.persistence.Version;
import org.drools.persistence.api.PersistentSession;
import org.drools.persistence.SessionMarshallingHelper;
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/WorkItemInfo.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/WorkItemInfo.java
index 3db72569d3..ce26c9d2f8 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/WorkItemInfo.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/info/WorkItemInfo.java
@@ -23,15 +23,15 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Transient;
-import javax.persistence.Version;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Lob;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Transient;
+import jakarta.persistence.Version;
import org.drools.core.marshalling.MarshallerReaderContext;
import org.drools.core.marshalling.MarshallerWriteContext;
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/AbstractPersistenceContextManager.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/AbstractPersistenceContextManager.java
index 0e2bf94fd7..415ce0724c 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/AbstractPersistenceContextManager.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/AbstractPersistenceContextManager.java
@@ -18,8 +18,8 @@
*/
package org.drools.persistence.jpa;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
import org.drools.persistence.api.TransactionManager;
import org.kie.api.runtime.Environment;
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContext.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContext.java
index 08c24f246f..4ae16e7ed5 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContext.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContext.java
@@ -20,8 +20,8 @@ package org.drools.persistence.jpa;
import java.lang.reflect.Field;
-import javax.persistence.EntityManager;
-import javax.persistence.LockModeType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.LockModeType;
import org.drools.persistence.api.PersistenceContext;
import org.drools.persistence.api.PersistentSession;
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContextManager.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContextManager.java
index 2663169c07..7dc6f58be9 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContextManager.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContextManager.java
@@ -18,7 +18,7 @@
*/
package org.drools.persistence.jpa;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import org.drools.persistence.api.PersistenceContext;
import org.drools.persistence.api.PersistenceContextManager;
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/OptimisticLockRetryInterceptor.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/OptimisticLockRetryInterceptor.java
index ec5e1d68a5..9148566757 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/OptimisticLockRetryInterceptor.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/OptimisticLockRetryInterceptor.java
@@ -24,7 +24,7 @@ import org.kie.api.runtime.RequestContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.persistence.OptimisticLockException;
+import jakarta.persistence.OptimisticLockException;
import java.util.concurrent.atomic.AtomicInteger;
/**
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/EntityPersister.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/EntityPersister.java
index 31c97addfb..80544087bd 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/EntityPersister.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/EntityPersister.java
@@ -21,7 +21,7 @@ package org.drools.persistence.jpa.marshaller;
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
public class EntityPersister {
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/JPAPlaceholderResolverStrategy.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/JPAPlaceholderResolverStrategy.java
index 9e4b4469f6..98c9a5b745 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/JPAPlaceholderResolverStrategy.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/JPAPlaceholderResolverStrategy.java
@@ -27,11 +27,11 @@ import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.Metamodel;
import org.drools.base.common.DroolsObjectInputStream;
import org.drools.persistence.api.TransactionAware;
import org.drools.persistence.api.TransactionManager;
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/MappedVariable.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/MappedVariable.java
index 5448b4c2eb..7f9072b9fc 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/MappedVariable.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/MappedVariable.java
@@ -19,13 +19,13 @@
package org.drools.persistence.jpa.marshaller;
import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Version;
@Entity
@SequenceGenerator(name="mappedVarIdSeq", sequenceName="MAPPED_VAR_ID_SEQ")
diff --git a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/VariableEntity.java b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/VariableEntity.java
index 1cbe51e322..abc061e965 100644
--- a/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/VariableEntity.java
+++ b/drools-persistence/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/VariableEntity.java
@@ -21,11 +21,11 @@ package org.drools.persistence.jpa.marshaller;
import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.JoinColumn;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.OneToMany;
-import javax.persistence.FetchType;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.FetchType;
@MappedSuperclass
public abstract class VariableEntity implements Serializable {
diff --git a/drools-persistence/drools-persistence-jpa/src/test/filtered-resources/META-INF/persistence.xml b/drools-persistence/drools-persistence-jpa/src/test/filtered-resources/META-INF/persistence.xml
index 36800ba01f..845fcc9f72 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/filtered-resources/META-INF/persistence.xml
+++ b/drools-persistence/drools-persistence-jpa/src/test/filtered-resources/META-INF/persistence.xml
@@ -19,10 +19,10 @@
under the License.
-->
-<persistence version="2.1"
- xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+<persistence version="3.0"
+ xmlns="https://jakarta.ee/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
<persistence-unit name="org.drools.persistence.jpa" transaction-type="JTA">
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerFactoryTest.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerFactoryTest.java
index 137814bbcf..d8d57b2d3c 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerFactoryTest.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerFactoryTest.java
@@ -20,13 +20,13 @@ package org.drools.persistence.jta;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.HeuristicMixedException;
+import jakarta.transaction.HeuristicRollbackException;
+import jakarta.transaction.NotSupportedException;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.TransactionManager;
+import jakarta.transaction.UserTransaction;
import org.drools.core.impl.EnvironmentFactory;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerTest.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerTest.java
index 399a743730..449fc7759a 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerTest.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerTest.java
@@ -23,10 +23,10 @@ import java.util.HashMap;
import java.util.Map;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.transaction.RollbackException;
-import javax.transaction.UserTransaction;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.UserTransaction;
import org.drools.commands.impl.CommandBasedStatefulKnowledgeSessionImpl;
import org.drools.kiesession.rulebase.InternalKnowledgeBase;
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestCommand.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestCommand.java
index 973d928459..42df2e5504 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestCommand.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestCommand.java
@@ -19,8 +19,8 @@
package org.drools.persistence.jta;
import java.util.HashMap;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
import com.arjuna.ats.jta.TransactionManager;
import org.drools.core.base.MapGlobalResolver;
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestObject.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestObject.java
index b06c96053c..c9930291c8 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestObject.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/jta/TransactionTestObject.java
@@ -20,13 +20,13 @@ package org.drools.persistence.jta;
import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.SequenceGenerator;
/**
* This class is used to test transactions.
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/kie/persistence/session/JpaPersistentStatefulSessionTest.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/kie/persistence/session/JpaPersistentStatefulSessionTest.java
index 0f5b11a2b2..0863d2fdfa 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/kie/persistence/session/JpaPersistentStatefulSessionTest.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/kie/persistence/session/JpaPersistentStatefulSessionTest.java
@@ -29,7 +29,7 @@ import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
import javax.naming.InitialContext;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.UserTransaction;
import org.drools.core.FlowSessionConfiguration;
import org.drools.core.SessionConfiguration;
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/map/impl/JpaBasedPersistenceTest.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/map/impl/JpaBasedPersistenceTest.java
index 6a001acc5c..730575a1a4 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/map/impl/JpaBasedPersistenceTest.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/map/impl/JpaBasedPersistenceTest.java
@@ -34,7 +34,7 @@ import org.kie.internal.persistence.jpa.JPAKnowledgeService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
import java.util.Arrays;
import java.util.Collection;
import java.util.Map;
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/JpaPersistentStatefulSessionTest.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/JpaPersistentStatefulSessionTest.java
index d7e3a61ae4..f61559f90b 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/JpaPersistentStatefulSessionTest.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/JpaPersistentStatefulSessionTest.java
@@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.IntStream;
import javax.naming.InitialContext;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.UserTransaction;
import org.drools.commands.ChainableRunner;
import org.drools.commands.impl.CommandBasedStatefulKnowledgeSessionImpl;
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/ReloadSessionTest.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/ReloadSessionTest.java
index 67d4e42d62..b49aff7838 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/ReloadSessionTest.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/session/ReloadSessionTest.java
@@ -23,8 +23,8 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Map;
import java.util.Random;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
import org.drools.core.common.DefaultFactHandle;
import org.drools.kiesession.rulebase.InternalKnowledgeBase;
diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/util/DroolsPersistenceUtil.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/util/DroolsPersistenceUtil.java
index 563b210269..a61ec15cbe 100644
--- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/util/DroolsPersistenceUtil.java
+++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/util/DroolsPersistenceUtil.java
@@ -22,7 +22,7 @@ import static org.kie.api.runtime.EnvironmentName.GLOBALS;
import static org.kie.api.runtime.EnvironmentName.TRANSACTION;
import java.util.Map;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.UserTransaction;
import org.drools.core.base.MapGlobalResolver;
import org.drools.core.impl.EnvironmentFactory;
import org.kie.api.runtime.Environment;
diff --git a/drools-persistence/pom.xml b/drools-persistence/pom.xml
index 2f262cf666..b17eb40598 100644
--- a/drools-persistence/pom.xml
+++ b/drools-persistence/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-quarkus-extension/drools-quarkus-deployment/pom.xml b/drools-quarkus-extension/drools-quarkus-deployment/pom.xml
index 86e7cf5b15..996771b4e7 100644
--- a/drools-quarkus-extension/drools-quarkus-deployment/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-deployment/pom.xml
@@ -24,9 +24,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.drools</groupId>
+ <groupId>org.drools</groupId>
<artifactId>drools-quarkus-extension</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<name>Drools :: Quarkus Extension :: Deployment</name>
@@ -89,12 +89,22 @@
<artifactId>quarkus-vertx-http-deployment-spi</artifactId>
</dependency>
- <!-- test -->
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-junit5-internal</artifactId>
- <scope>test</scope>
- </dependency>
+ <!-- test -->
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-junit5-internal</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-xml</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-xml-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
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/pom.xml b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml
index 7775183a6f..0da7901901 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 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-quarkus-examples</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<name>Drools :: Quarkus Extension :: Examples :: Reactive</name>
@@ -57,6 +57,16 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-xml</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-xml-impl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- this is used implicitly by quarkus tests so let's make Maven aware
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/pom.xml b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/pom.xml
index 6d3e0dc044..cc03fb0957 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 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-quarkus-examples</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<name>Drools :: Quarkus Extension :: Examples :: Reactive</name>
@@ -61,6 +61,16 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-xml</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-xml-impl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.smallrye.reactive</groupId>
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-examples/pom.xml b/drools-quarkus-extension/drools-quarkus-examples/pom.xml
index af6bd0eb31..49114a40b7 100644
--- a/drools-quarkus-extension/drools-quarkus-examples/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-examples/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-quarkus-extension</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<name>Drools :: Quarkus Extension :: Examples</name>
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 a2f06a4e36..a3233611e9 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 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-quarkus-extension</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<name>Drools :: Quarkus Extension :: Integration Test :: Hotreload</name>
@@ -59,6 +59,16 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-xml</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-xml-impl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
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/pom.xml b/drools-quarkus-extension/drools-quarkus-integration-test/pom.xml
index 7760a875dc..1d3f53b5ac 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 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-quarkus-extension</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<name>Drools :: Quarkus Extension :: Integration Test</name>
@@ -67,6 +67,16 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-xml</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-xml-impl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
diff --git a/drools-quarkus-extension/drools-quarkus-integration-test/src/main/java/org/drools/quarkus/test/TestableResource.java b/drools-quarkus-extension/drools-quarkus-integration-test/src/main/java/org/drools/quarkus/test/TestableResource.java
index 9cb7dd190f..2f2724fdf5 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
@@ -18,16 +18,6 @@
*/
package org.drools.quarkus.test;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Response;
-
import org.kie.api.KieBase;
import org.kie.api.definition.KiePackage;
import org.kie.api.runtime.KieRuntimeBuilder;
@@ -35,6 +25,15 @@ import org.kie.api.runtime.KieSession;
import org.kie.api.runtime.rule.FactHandle;
import org.kie.api.time.SessionPseudoClock;
+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;
+import java.util.stream.Collectors;
+
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
diff --git a/drools-quarkus-extension/drools-quarkus-integration-test/src/test/java/org/drools/quarkus/test/RuntimeTest.java b/drools-quarkus-extension/drools-quarkus-integration-test/src/test/java/org/drools/quarkus/test/RuntimeTest.java
index 602a4064d0..4a6806ccc0 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
@@ -18,17 +18,16 @@
*/
package org.drools.quarkus.test;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-
import io.quarkus.test.junit.QuarkusTest;
import org.junit.jupiter.api.Test;
import org.kie.api.definition.KiePackage;
import org.kie.api.runtime.KieRuntimeBuilder;
import org.kie.api.runtime.KieSession;
+import jakarta.inject.Inject;
+import java.util.List;
+import java.util.stream.Collectors;
+
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml b/drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml
index 65b5885a69..cf9791129a 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 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-quarkus-extension</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<name>Drools :: Quarkus Extension :: Quickstart Integration Test</name>
@@ -54,6 +54,16 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-xml</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-xml-impl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
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/pom.xml b/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/pom.xml
index 00076fa06b..c393cdea5f 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 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-quarkus-extension</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<name>Drools :: Quarkus Extension :: Integration Test with Rule Unit</name>
@@ -66,6 +66,16 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-xml</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-xml-impl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
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-util-deployment/pom.xml b/drools-quarkus-extension/drools-quarkus-util-deployment/pom.xml
index 39ea799dde..cc32fcc859 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 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-quarkus-extension</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<name>Drools :: Quarkus Extension :: Util :: Deployment</name>
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 6cd06cbdc7..4aa6fee038 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
@@ -219,8 +219,8 @@ public class DroolsQuarkusResourceUtils {
}
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 f750a840a6..f42935a155 100644
--- a/drools-quarkus-extension/drools-quarkus/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-quarkus-extension</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<name>Drools :: Quarkus Extension :: Runtime</name>
@@ -85,6 +85,16 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5-internal</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-xml</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-xml-impl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
@@ -103,7 +113,7 @@
<plugins>
<plugin>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+ <artifactId>quarkus-extension-maven-plugin</artifactId>
<version>${version.io.quarkus}</version>
<executions>
<execution>
diff --git a/drools-quarkus-extension/pom.xml b/drools-quarkus-extension/pom.xml
index 06d4b6c3b8..b07c74a41c 100644
--- a/drools-quarkus-extension/pom.xml
+++ b/drools-quarkus-extension/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-reliability/drools-reliability-core/pom.xml b/drools-reliability/drools-reliability-core/pom.xml
index c88d3a7bf8..75adfa5d2a 100644
--- a/drools-reliability/drools-reliability-core/pom.xml
+++ b/drools-reliability/drools-reliability-core/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-reliability</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/drools-reliability/drools-reliability-h2mvstore/pom.xml b/drools-reliability/drools-reliability-h2mvstore/pom.xml
index 75e21b2772..e782256163 100644
--- a/drools-reliability/drools-reliability-h2mvstore/pom.xml
+++ b/drools-reliability/drools-reliability-h2mvstore/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-reliability</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/drools-reliability/drools-reliability-infinispan/pom.xml b/drools-reliability/drools-reliability-infinispan/pom.xml
index 487918d0d2..6e2734a1e4 100644
--- a/drools-reliability/drools-reliability-infinispan/pom.xml
+++ b/drools-reliability/drools-reliability-infinispan/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-reliability</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -52,7 +52,7 @@
<dependencies>
<dependency>
<groupId>org.infinispan</groupId>
- <artifactId>infinispan-core</artifactId>
+ <artifactId>infinispan-core-jakarta</artifactId>
</dependency>
<dependency>
<groupId>org.infinispan.protostream</groupId>
@@ -61,7 +61,7 @@
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
- <artifactId>infinispan-client-hotrod</artifactId>
+ <artifactId>infinispan-client-hotrod-jakarta</artifactId>
</dependency>
<dependency>
<groupId>org.drools</groupId>
diff --git a/drools-reliability/drools-reliability-tests/pom.xml b/drools-reliability/drools-reliability-tests/pom.xml
index b473f8678a..778d5d8ada 100644
--- a/drools-reliability/drools-reliability-tests/pom.xml
+++ b/drools-reliability/drools-reliability-tests/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-reliability</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -123,7 +123,7 @@
<dependency>
<groupId>org.infinispan</groupId>
- <artifactId>infinispan-server-testdriver-core</artifactId>
+ <artifactId>infinispan-server-testdriver-core-jakarta</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -138,10 +138,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-jboss-marshalling</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/drools-reliability/pom.xml b/drools-reliability/pom.xml
index ff408140e1..04cf276f68 100644
--- a/drools-reliability/pom.xml
+++ b/drools-reliability/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/drools-retediagram/pom.xml b/drools-retediagram/pom.xml
index 56d1c9782b..337ce3aac3 100644
--- a/drools-retediagram/pom.xml
+++ b/drools-retediagram/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-ruleunits/drools-ruleunits-api/pom.xml b/drools-ruleunits/drools-ruleunits-api/pom.xml
index 60aa9dbf3d..c3bc586256 100755
--- a/drools-ruleunits/drools-ruleunits-api/pom.xml
+++ b/drools-ruleunits/drools-ruleunits-api/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-ruleunits</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<groupId>org.drools</groupId>
diff --git a/drools-ruleunits/drools-ruleunits-dsl/pom.xml b/drools-ruleunits/drools-ruleunits-dsl/pom.xml
index e934c03d41..23fcc1ef9f 100755
--- a/drools-ruleunits/drools-ruleunits-dsl/pom.xml
+++ b/drools-ruleunits/drools-ruleunits-dsl/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-ruleunits</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<groupId>org.drools</groupId>
diff --git a/drools-ruleunits/drools-ruleunits-engine/pom.xml b/drools-ruleunits/drools-ruleunits-engine/pom.xml
index 12b76c2184..7d82836464 100644
--- a/drools-ruleunits/drools-ruleunits-engine/pom.xml
+++ b/drools-ruleunits/drools-ruleunits-engine/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-ruleunits</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>drools-ruleunits-engine</artifactId>
diff --git a/drools-ruleunits/drools-ruleunits-impl/pom.xml b/drools-ruleunits/drools-ruleunits-impl/pom.xml
index cdaeec7b16..a7c529a124 100755
--- a/drools-ruleunits/drools-ruleunits-impl/pom.xml
+++ b/drools-ruleunits/drools-ruleunits-impl/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-ruleunits</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<groupId>org.drools</groupId>
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 f3f4aca02f..b492c0cda6 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 final class SimpleRuleUnitVariable implements RuleUnitVariable {
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 098fdfd1bb..0de6b31d8d 100644
--- a/drools-ruleunits/pom.xml
+++ b/drools-ruleunits/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-scenario-simulation/drools-scenario-simulation-api/pom.xml b/drools-scenario-simulation/drools-scenario-simulation-api/pom.xml
index e27fc491e7..e7e5515f0b 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 @@
<parent>
<artifactId>drools-scenario-simulation</artifactId>
<groupId>org.drools</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/pom.xml b/drools-scenario-simulation/drools-scenario-simulation-backend/pom.xml
index 799532daea..38a77da640 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 @@
<parent>
<artifactId>drools-scenario-simulation</artifactId>
<groupId>org.drools</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/drools-scenario-simulation/drools-scenario-simulation-integrationtest/pom.xml b/drools-scenario-simulation/drools-scenario-simulation-integrationtest/pom.xml
index 11ec6d899b..d4b4f4d746 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 @@
<parent>
<artifactId>drools-scenario-simulation</artifactId>
<groupId>org.drools</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/drools-scenario-simulation/pom.xml b/drools-scenario-simulation/pom.xml
index 39fb27775a..130cc7552d 100644
--- a/drools-scenario-simulation/pom.xml
+++ b/drools-scenario-simulation/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-serialization-protobuf/pom.xml b/drools-serialization-protobuf/pom.xml
index 53cabcc542..6d5f60524b 100644
--- a/drools-serialization-protobuf/pom.xml
+++ b/drools-serialization-protobuf/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-templates/pom.xml b/drools-templates/pom.xml
index 862b20c2a5..0f2bd94a12 100644
--- a/drools-templates/pom.xml
+++ b/drools-templates/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-test-coverage/pom.xml b/drools-test-coverage/pom.xml
index d762453cd2..2c8ec509b1 100644
--- a/drools-test-coverage/pom.xml
+++ b/drools-test-coverage/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
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 392762027d..9bae1496ad 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 @@
<parent>
<groupId>org.drools.testcoverage</groupId>
<artifactId>drools-standalone-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>drools-kie-ci-with-domain-parent</artifactId>
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 02ddd2f528..97db998c63 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 @@
<parent>
<groupId>org.drools.testcoverage</groupId>
<artifactId>drools-kie-ci-with-domain-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>drools-kie-ci-with-domain-test-domain</artifactId>
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 d13f40b44c..c3b227a1b8 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 @@
<parent>
<groupId>org.drools.testcoverage</groupId>
<artifactId>drools-kie-ci-with-domain-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>drools-kie-ci-with-domain-test-kjar</artifactId>
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 daf9c8358e..539a0a7fad 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 @@
<parent>
<groupId>org.drools.testcoverage</groupId>
<artifactId>drools-kie-ci-with-domain-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>drools-kie-ci-with-domain-tests</artifactId>
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 a99b211273..a4448ae039 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 @@
<parent>
<groupId>org.drools.testcoverage</groupId>
<artifactId>drools-standalone-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>drools-kie-ci-without-domain-parent</artifactId>
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 0fd2323fdb..919e661d43 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 @@
<parent>
<groupId>org.drools.testcoverage</groupId>
<artifactId>drools-kie-ci-without-domain-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>drools-kie-ci-without-domain-test-domain</artifactId>
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 c65051d86d..1e22b4a2e0 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 @@
<parent>
<groupId>org.drools.testcoverage</groupId>
<artifactId>drools-kie-ci-without-domain-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>drools-kie-ci-without-domain-test-kjar</artifactId>
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 83a42a715c..6a28a13427 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 @@
<parent>
<groupId>org.drools.testcoverage</groupId>
<artifactId>drools-kie-ci-without-domain-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>drools-kie-ci-without-domain-tests</artifactId>
diff --git a/drools-test-coverage/standalone/pom.xml b/drools-test-coverage/standalone/pom.xml
index ac12e2e49d..d168bfccce 100644
--- a/drools-test-coverage/standalone/pom.xml
+++ b/drools-test-coverage/standalone/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.drools.testcoverage</groupId>
<artifactId>drools-test-coverage-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>drools-standalone-parent</artifactId>
diff --git a/drools-test-coverage/test-compiler-integration/pom.xml b/drools-test-coverage/test-compiler-integration/pom.xml
index 357f8fb74e..1dcdd9700b 100644
--- a/drools-test-coverage/test-compiler-integration/pom.xml
+++ b/drools-test-coverage/test-compiler-integration/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>drools-test-coverage-parent</artifactId>
<groupId>org.drools.testcoverage</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/Person.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/Person.java
index 13641acfe0..a1b4bda3fb 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/Person.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/Person.java
@@ -20,8 +20,8 @@ package org.drools.mvel.compiler;
import org.drools.base.factmodel.traits.Traitable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieBuilderTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieBuilderTest.java
index a819366f5a..a57101c8a9 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 class KieBuilderTest {
final String kmodule = "<kmodule xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \n" +
" xmlns=\"http://www.drools.org/xsd/kmodule\">\n" +
- " <kbase name=\"kbase1\" default=\"true\" eventProcessingMode=\"stream\" equalsBehavior=\"identity\" scope=\"javax.enterprise.context.ApplicationScoped\">\n" +
- " <ksession name=\"ksession1\" type=\"stateful\" default=\"true\" clockType=\"realtime\" scope=\"javax.enterprise.context.ApplicationScoped\"/>\n" +
+ " <kbase name=\"kbase1\" default=\"true\" eventProcessingMode=\"stream\" equalsBehavior=\"identity\" scope=\"jakarta.enterprise.context.ApplicationScoped\">\n" +
+ " <ksession name=\"ksession1\" type=\"stateful\" default=\"true\" clockType=\"realtime\" scope=\"jakarta.enterprise.context.ApplicationScoped\"/>\n" +
" </kbase>\n" +
"</kmodule>";
diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/QueryTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/QueryTest.java
index fa47533cfe..008f664410 100644
--- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/QueryTest.java
+++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/QueryTest.java
@@ -58,7 +58,7 @@ import org.kie.api.runtime.rule.Row;
import org.kie.api.runtime.rule.Variable;
import org.kie.api.runtime.rule.ViewChangedEventListener;
-import javax.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBContext;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.StringWriter;
diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/META-INF/kmodule.xml b/drools-test-coverage/test-compiler-integration/src/test/resources/META-INF/kmodule.xml
index ba432d5650..5c4fd95230 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 @@
</kbase>
<kbase name="org.kie.kbase3" scope="SessionScoped" equalsBehavior="equality" eventProcessingMode="stream">
- <ksession name="org.kie.kbase3.ksession1" scope="javax.enterprise.context.ApplicationScoped" type="stateful" clockType="pseudo"/>
+ <ksession name="org.kie.kbase3.ksession1" scope="jakarta.enterprise.context.ApplicationScoped" type="stateful" clockType="pseudo"/>
<ksession name="org.kie.kbase3.ksession2" scope="SessionScoped" type="stateful" clockType="realtime"/>
</kbase>
diff --git a/drools-test-coverage/test-integration-nomvel/pom.xml b/drools-test-coverage/test-integration-nomvel/pom.xml
index f76e70c805..19054c6863 100644
--- a/drools-test-coverage/test-integration-nomvel/pom.xml
+++ b/drools-test-coverage/test-integration-nomvel/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>drools-test-coverage-parent</artifactId>
<groupId>org.drools.testcoverage</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -106,11 +106,6 @@
<artifactId>jaxb-core</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
diff --git a/drools-test-coverage/test-integration-notms/pom.xml b/drools-test-coverage/test-integration-notms/pom.xml
index fc332872e0..b5541768c8 100644
--- a/drools-test-coverage/test-integration-notms/pom.xml
+++ b/drools-test-coverage/test-integration-notms/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>drools-test-coverage-parent</artifactId>
<groupId>org.drools.testcoverage</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/drools-test-coverage/test-integration-noxml/pom.xml b/drools-test-coverage/test-integration-noxml/pom.xml
index acdc2110f1..2cd51ff3e1 100644
--- a/drools-test-coverage/test-integration-noxml/pom.xml
+++ b/drools-test-coverage/test-integration-noxml/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>drools-test-coverage-parent</artifactId>
<groupId>org.drools.testcoverage</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/drools-test-coverage/test-integration-ruleunits/pom.xml b/drools-test-coverage/test-integration-ruleunits/pom.xml
index 093a52dcea..7685d2abc4 100644
--- a/drools-test-coverage/test-integration-ruleunits/pom.xml
+++ b/drools-test-coverage/test-integration-ruleunits/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>drools-test-coverage-parent</artifactId>
<groupId>org.drools.testcoverage</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 ed43b4b927..c62c1de753 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 @@
<parent>
<artifactId>test-integration-ruleunits</artifactId>
<groupId>org.drools.testcoverage</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 f4b9e6da6b..7bde04802b 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 @@
<parent>
<artifactId>test-integration-ruleunits</artifactId>
<groupId>org.drools.testcoverage</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/drools-test-coverage/test-suite/pom.xml b/drools-test-coverage/test-suite/pom.xml
index 6eefc3e28c..429796c452 100644
--- a/drools-test-coverage/test-suite/pom.xml
+++ b/drools-test-coverage/test-suite/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.drools.testcoverage</groupId>
<artifactId>drools-test-coverage-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>drools-test-suite</artifactId>
diff --git a/drools-tms/pom.xml b/drools-tms/pom.xml
index 367417f075..f275dd9428 100644
--- a/drools-tms/pom.xml
+++ b/drools-tms/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-traits/pom.xml b/drools-traits/pom.xml
index 3ba095bb36..cf1f66b00f 100644
--- a/drools-traits/pom.xml
+++ b/drools-traits/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
@@ -158,8 +158,8 @@
</dependency>
<!-- Hibernate -->
- <dependency>
- <groupId>org.hibernate</groupId>
+ <!--~~(No version provided)~~>--><dependency>
+ <groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-core</artifactId>
<scope>test</scope>
<exclusions>
@@ -178,11 +178,6 @@
<artifactId>jandex</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
diff --git a/drools-traits/src/test/filtered-resources/META-INF/persistence.xml b/drools-traits/src/test/filtered-resources/META-INF/persistence.xml
index 36800ba01f..845fcc9f72 100644
--- a/drools-traits/src/test/filtered-resources/META-INF/persistence.xml
+++ b/drools-traits/src/test/filtered-resources/META-INF/persistence.xml
@@ -19,10 +19,10 @@
under the License.
-->
-<persistence version="2.1"
- xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+<persistence version="3.0"
+ xmlns="https://jakarta.ee/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
<persistence-unit name="org.drools.persistence.jpa" transaction-type="JTA">
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
diff --git a/drools-traits/src/test/java/org/drools/traits/persistence/DroolsPersistenceUtil.java b/drools-traits/src/test/java/org/drools/traits/persistence/DroolsPersistenceUtil.java
index 2adf906eee..126aa6a7bf 100644
--- a/drools-traits/src/test/java/org/drools/traits/persistence/DroolsPersistenceUtil.java
+++ b/drools-traits/src/test/java/org/drools/traits/persistence/DroolsPersistenceUtil.java
@@ -20,7 +20,7 @@ package org.drools.traits.persistence;
import java.util.Map;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.UserTransaction;
import org.drools.core.base.MapGlobalResolver;
import org.drools.core.impl.EnvironmentFactory;
diff --git a/drools-util/pom.xml b/drools-util/pom.xml
index ae537454a0..fea264ed26 100644
--- a/drools-util/pom.xml
+++ b/drools-util/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-verifier/drools-verifier-api/pom.xml b/drools-verifier/drools-verifier-api/pom.xml
index d1e724eb50..c7a012b7c6 100644
--- a/drools-verifier/drools-verifier-api/pom.xml
+++ b/drools-verifier/drools-verifier-api/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-verifier</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/drools-verifier/drools-verifier-core/pom.xml b/drools-verifier/drools-verifier-core/pom.xml
index aa0b05f6ef..7c4208ea61 100644
--- a/drools-verifier/drools-verifier-core/pom.xml
+++ b/drools-verifier/drools-verifier-core/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>drools-verifier</artifactId>
<groupId>org.drools</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/drools-verifier/drools-verifier-drl/pom.xml b/drools-verifier/drools-verifier-drl/pom.xml
index 9b6b501518..39b2a490c3 100644
--- a/drools-verifier/drools-verifier-drl/pom.xml
+++ b/drools-verifier/drools-verifier-drl/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-verifier</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>drools-verifier-drl</artifactId>
diff --git a/drools-verifier/pom.xml b/drools-verifier/pom.xml
index bdbd2c6afd..58e711cdd2 100644
--- a/drools-verifier/pom.xml
+++ b/drools-verifier/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-wiring/drools-wiring-api/pom.xml b/drools-wiring/drools-wiring-api/pom.xml
index 59bde229b1..56738b6117 100755
--- a/drools-wiring/drools-wiring-api/pom.xml
+++ b/drools-wiring/drools-wiring-api/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-wiring</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<groupId>org.drools</groupId>
diff --git a/drools-wiring/drools-wiring-dynamic/pom.xml b/drools-wiring/drools-wiring-dynamic/pom.xml
index f03da3d19e..a55951ff43 100755
--- a/drools-wiring/drools-wiring-dynamic/pom.xml
+++ b/drools-wiring/drools-wiring-dynamic/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-wiring</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<groupId>org.drools</groupId>
@@ -53,11 +53,6 @@
<artifactId>jaxb-core</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
diff --git a/drools-wiring/drools-wiring-static/pom.xml b/drools-wiring/drools-wiring-static/pom.xml
index 8a559cc87b..d3eb30c498 100755
--- a/drools-wiring/drools-wiring-static/pom.xml
+++ b/drools-wiring/drools-wiring-static/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.drools</groupId>
<artifactId>drools-wiring</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<groupId>org.drools</groupId>
diff --git a/drools-wiring/pom.xml b/drools-wiring/pom.xml
index b4a11cc99f..d6a958ce68 100644
--- a/drools-wiring/pom.xml
+++ b/drools-wiring/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-xml-support/pom.xml b/drools-xml-support/pom.xml
index 8a617cc402..ca212a2c4b 100644
--- a/drools-xml-support/pom.xml
+++ b/drools-xml-support/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/drools-xml-support/src/test/java/org/drools/xml/support/CommandSerializationTest.java b/drools-xml-support/src/test/java/org/drools/xml/support/CommandSerializationTest.java
index 8f867a445d..eb2f89ed19 100644
--- a/drools-xml-support/src/test/java/org/drools/xml/support/CommandSerializationTest.java
+++ b/drools-xml-support/src/test/java/org/drools/xml/support/CommandSerializationTest.java
@@ -34,9 +34,9 @@ import java.util.Random;
import java.util.UUID;
import java.util.regex.Pattern;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElements;
import org.drools.core.ClassObjectFilter;
import org.drools.core.ClassObjectSerializationFilter;
diff --git a/efesto/efesto-common-utils/pom.xml b/efesto/efesto-common-utils/pom.xml
index c5d9bdfb80..faff12a313 100644
--- a/efesto/efesto-common-utils/pom.xml
+++ b/efesto/efesto-common-utils/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>efesto</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>efesto-common-utils</artifactId>
diff --git a/efesto/efesto-core/efesto-common-api/pom.xml b/efesto/efesto-core/efesto-common-api/pom.xml
index 091dbf1ab5..e083232c2a 100644
--- a/efesto/efesto-core/efesto-common-api/pom.xml
+++ b/efesto/efesto-core/efesto-common-api/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>efesto-core</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>efesto-common-api</artifactId>
diff --git a/efesto/efesto-core/efesto-common-core/pom.xml b/efesto/efesto-core/efesto-common-core/pom.xml
index 71eaba144c..4488d7dc72 100644
--- a/efesto/efesto-core/efesto-common-core/pom.xml
+++ b/efesto/efesto-core/efesto-common-core/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>efesto-core</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>efesto-common-core</artifactId>
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 31fec980e8..cf10dbf0c4 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 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>efesto-compilation-manager</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>efesto-compilation-manager-api</artifactId>
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 d2f8105cd4..aa9e9108a3 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 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>efesto-compilation-manager</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>efesto-compilation-manager-core</artifactId>
diff --git a/efesto/efesto-core/efesto-compilation-manager/pom.xml b/efesto/efesto-core/efesto-compilation-manager/pom.xml
index 6ab2912c75..bed0864d9a 100644
--- a/efesto/efesto-core/efesto-compilation-manager/pom.xml
+++ b/efesto/efesto-core/efesto-compilation-manager/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>efesto-core</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
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 f8e7ff014c..d6cdc38cfc 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 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>efesto-runtime-manager</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>efesto-runtime-manager-api</artifactId>
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 9d49428f86..6327eceeba 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 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>efesto-runtime-manager</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>efesto-runtime-manager-core</artifactId>
diff --git a/efesto/efesto-core/efesto-runtime-manager/pom.xml b/efesto/efesto-core/efesto-runtime-manager/pom.xml
index b89f22d3c9..933b674841 100644
--- a/efesto/efesto-core/efesto-runtime-manager/pom.xml
+++ b/efesto/efesto-core/efesto-runtime-manager/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>efesto-core</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
diff --git a/efesto/efesto-core/pom.xml b/efesto/efesto-core/pom.xml
index bdb5b5991d..b4fbf23e98 100644
--- a/efesto/efesto-core/pom.xml
+++ b/efesto/efesto-core/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>efesto</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
diff --git a/efesto/efesto-dependencies/pom.xml b/efesto/efesto-dependencies/pom.xml
index d4c9ef7817..b5dac1332c 100644
--- a/efesto/efesto-dependencies/pom.xml
+++ b/efesto/efesto-dependencies/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>efesto</artifactId>
<groupId>org.kie</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/efesto/pom.xml b/efesto/pom.xml
index 4dd86f47e9..8864c32572 100644
--- a/efesto/pom.xml
+++ b/efesto/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/jpmml-migration-recipe/pom.xml b/jpmml-migration-recipe/pom.xml
index 81a0719f44..af0a2fd98f 100644
--- a/jpmml-migration-recipe/pom.xml
+++ b/jpmml-migration-recipe/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/kie-api/pom.xml b/kie-api/pom.xml
index 183162d7f1..c39c6a0c4a 100644
--- a/kie-api/pom.xml
+++ b/kie-api/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
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 2f451e1751..6898c2fc6c 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 ea96087e07..ef7f4b33fc 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 eba502dc9a..82ae6d55a9 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 @@ public class KieServiceLoader {
}
<T extends KieService> T load(Class<T> serviceClass, String tag) {
- ServiceLoader<T> loader = ServiceLoader.load(serviceClass, serviceClass.getClassLoader());
+ ServiceLoader<T> 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 9c727454ac..6c41a29dfb 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/AbstractOutput.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/AbstractOutput.java
@@ -18,11 +18,11 @@
*/
package org.kie.api.pmml;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name="pmmlOutput")
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/kie-api/src/main/java/org/kie/api/pmml/DoubleFieldOutput.java b/kie-api/src/main/java/org/kie/api/pmml/DoubleFieldOutput.java
index 54fbc05305..73a2b9ce6e 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/DoubleFieldOutput.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/DoubleFieldOutput.java
@@ -18,9 +18,9 @@
*/
package org.kie.api.pmml;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name="value")
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/kie-api/src/main/java/org/kie/api/pmml/IntegerFieldOutput.java b/kie-api/src/main/java/org/kie/api/pmml/IntegerFieldOutput.java
index eebb975416..82d2a1fb5c 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/IntegerFieldOutput.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/IntegerFieldOutput.java
@@ -18,9 +18,9 @@
*/
package org.kie.api.pmml;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name="value")
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/kie-api/src/main/java/org/kie/api/pmml/PMML4DataField.java b/kie-api/src/main/java/org/kie/api/pmml/PMML4DataField.java
index 63515db55a..ebe972d861 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/PMML4DataField.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/PMML4DataField.java
@@ -18,10 +18,10 @@
*/
package org.kie.api.pmml;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.kie.api.definition.type.Role;
import org.kie.api.definition.type.Role.Type;
diff --git a/kie-api/src/main/java/org/kie/api/pmml/PMML4OutputField.java b/kie-api/src/main/java/org/kie/api/pmml/PMML4OutputField.java
index cf5a119103..8424cea547 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/PMML4OutputField.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/PMML4OutputField.java
@@ -18,11 +18,11 @@
*/
package org.kie.api.pmml;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.kie.api.definition.type.Role;
import org.kie.api.definition.type.Role.Type;
diff --git a/kie-api/src/main/java/org/kie/api/pmml/PMML4Result.java b/kie-api/src/main/java/org/kie/api/pmml/PMML4Result.java
index d3421b3bff..530096a9fe 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/PMML4Result.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/PMML4Result.java
@@ -24,13 +24,13 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.kie.api.definition.type.PropertyReactive;
import org.slf4j.Logger;
diff --git a/kie-api/src/main/java/org/kie/api/pmml/PMMLRequestData.java b/kie-api/src/main/java/org/kie/api/pmml/PMMLRequestData.java
index 235999635f..88cef27806 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/PMMLRequestData.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/PMMLRequestData.java
@@ -25,12 +25,12 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
/**
* This class provides a vanilla mechanism for sending data to
diff --git a/kie-api/src/main/java/org/kie/api/pmml/ParameterInfo.java b/kie-api/src/main/java/org/kie/api/pmml/ParameterInfo.java
index 2f83078daa..9bea0c17b2 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/ParameterInfo.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/ParameterInfo.java
@@ -18,12 +18,12 @@
*/
package org.kie.api.pmml;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
@XmlType(name="ParameterInfo")
@XmlAccessorType(XmlAccessType.NONE)
diff --git a/kie-api/src/main/java/org/kie/api/pmml/StringFieldOutput.java b/kie-api/src/main/java/org/kie/api/pmml/StringFieldOutput.java
index f21eb8951a..d52c9a9e3f 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/StringFieldOutput.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/StringFieldOutput.java
@@ -18,9 +18,9 @@
*/
package org.kie.api.pmml;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name="value")
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/kie-api/src/main/java/org/kie/api/runtime/query/QueryContext.java b/kie-api/src/main/java/org/kie/api/runtime/query/QueryContext.java
index 024a918763..77968f77a3 100644
--- a/kie-api/src/main/java/org/kie/api/runtime/query/QueryContext.java
+++ b/kie-api/src/main/java/org/kie/api/runtime/query/QueryContext.java
@@ -20,11 +20,11 @@ package org.kie.api.runtime.query;
import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
@XmlType(name="kieQueryContext")
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/kie-api/src/main/java/org/kie/api/task/model/Status.java b/kie-api/src/main/java/org/kie/api/task/model/Status.java
index 57a6b11146..7dc485aa7d 100644
--- a/kie-api/src/main/java/org/kie/api/task/model/Status.java
+++ b/kie-api/src/main/java/org/kie/api/task/model/Status.java
@@ -18,7 +18,7 @@
*/
package org.kie.api.task.model;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
@XmlType
diff --git a/kie-api/src/test/resources/org/kie/api/kmod1.xml b/kie-api/src/test/resources/org/kie/api/kmod1.xml
index 714fcc93ea..0db133f6f7 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 @@
</kbase>
- <kbase name="org.kie.example3" includes="org.kie.example1, org.kie.example1" equalsBehavior="identity" scope="javax.enterprise.context.ApplicationScoped">
+ <kbase name="org.kie.example3" includes="org.kie.example1, org.kie.example1" equalsBehavior="identity" scope="jakarta.enterprise.context.ApplicationScoped">
<ksession name="ksession1"/>
</kbase>
@@ -47,7 +47,7 @@
</kbase>
<kbase name="org.kie.example6" includes="org.kie.example1, org.kie.example1" eventProcessingMode="cloud" packages="org.kie.pkg1, org.kie.pkg2">
- <ksession name="ksession6" type="stateless" clockType="pseudo" scope="javax.enterprise.context.ApplicationScoped">
+ <ksession name="ksession6" type="stateless" clockType="pseudo" scope="jakarta.enterprise.context.ApplicationScoped">
<consoleLogger />
</ksession>
@@ -105,5 +105,3 @@
</ksession>
</kbase>
</kmodule>
-
-
diff --git a/kie-archetypes/kie-drools-dmn-archetype/pom.xml b/kie-archetypes/kie-drools-dmn-archetype/pom.xml
index 6a8b8d044f..031120f023 100644
--- a/kie-archetypes/kie-drools-dmn-archetype/pom.xml
+++ b/kie-archetypes/kie-drools-dmn-archetype/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-archetypes</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-drools-dmn-archetype</artifactId>
diff --git a/kie-archetypes/kie-drools-exec-model-archetype/pom.xml b/kie-archetypes/kie-drools-exec-model-archetype/pom.xml
index 4a760e940b..11492e3485 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 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-archetypes</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-drools-exec-model-archetype</artifactId>
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 e3819d8fc4..760bc16e05 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 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-archetypes</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-drools-exec-model-ruleunit-archetype</artifactId>
diff --git a/kie-archetypes/kie-drools-yaml-archetype/pom.xml b/kie-archetypes/kie-drools-yaml-archetype/pom.xml
index 1a7b7c6388..e28761f13c 100644
--- a/kie-archetypes/kie-drools-yaml-archetype/pom.xml
+++ b/kie-archetypes/kie-drools-yaml-archetype/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-archetypes</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-drools-yaml-archetype</artifactId>
diff --git a/kie-archetypes/pom.xml b/kie-archetypes/pom.xml
index cb5ef4806c..db39906da6 100644
--- a/kie-archetypes/pom.xml
+++ b/kie-archetypes/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/kie-ci/pom.xml b/kie-ci/pom.xml
index 8f5a8f84f7..3463106ca1 100644
--- a/kie-ci/pom.xml
+++ b/kie-ci/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/kie-dmn/kie-dmn-api/pom.xml b/kie-dmn/kie-dmn-api/pom.xml
index f0f678c47d..29dc0ce3f5 100644
--- a/kie-dmn/kie-dmn-api/pom.xml
+++ b/kie-dmn/kie-dmn-api/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-dmn</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-dmn-api</artifactId>
diff --git a/kie-dmn/kie-dmn-backend/pom.xml b/kie-dmn/kie-dmn-backend/pom.xml
index 0eabb95f9f..46414eb916 100644
--- a/kie-dmn/kie-dmn-backend/pom.xml
+++ b/kie-dmn/kie-dmn-backend/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-dmn</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-dmn-backend</artifactId>
diff --git a/kie-dmn/kie-dmn-core-jsr223-jq/pom.xml b/kie-dmn/kie-dmn-core-jsr223-jq/pom.xml
index 661b87db6d..903328c2a2 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 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-dmn</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-dmn-core-jsr223-jq</artifactId>
<name>KIE :: Decision Model Notation :: JSR-223 JQ ScriptEngine</name>
diff --git a/kie-dmn/kie-dmn-core-jsr223/pom.xml b/kie-dmn/kie-dmn-core-jsr223/pom.xml
index 9bdd20601f..1e5d21c520 100644
--- a/kie-dmn/kie-dmn-core-jsr223/pom.xml
+++ b/kie-dmn/kie-dmn-core-jsr223/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-dmn</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-dmn-core-jsr223</artifactId>
<name>KIE :: Decision Model Notation :: Core JSR-223</name>
diff --git a/kie-dmn/kie-dmn-core/pom.xml b/kie-dmn/kie-dmn-core/pom.xml
index 2add1f6675..7eae5d4ded 100644
--- a/kie-dmn/kie-dmn-core/pom.xml
+++ b/kie-dmn/kie-dmn-core/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>kie-dmn</artifactId>
<groupId>org.kie</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-dmn-core</artifactId>
diff --git a/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/DMNImportPMMLInfo.java b/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/DMNImportPMMLInfo.java
index cf32659cdc..bf47f624c0 100644
--- a/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/DMNImportPMMLInfo.java
+++ b/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/DMNImportPMMLInfo.java
@@ -64,7 +64,7 @@ public class DMNImportPMMLInfo extends PMMLInfo<DMNPMMLModelInfo> {
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<FEELProfile> helperFEELProfiles = cc.getFeelProfiles();
DMNFEELHelper feel = new DMNFEELHelper(cc.getRootClassLoader(), helperFEELProfiles);
@@ -120,7 +120,7 @@ public class DMNImportPMMLInfo extends PMMLInfo<DMNPMMLModelInfo> {
// register <import name>.<pmml MODEL name>, being a composite type of the different model outputs fields
Map<String, DMNType> typeMap = new HashMap<>();
outputFields.stream().forEach(field -> {
- String fieldName = field.getName().getValue();
+ String fieldName =field.getName();
BuiltInType ft = getBuiltInTypeByDataType(field.getDataType());
DMNType type = new SimpleTypeImpl(i.getNamespace(), fieldName, null, false, null, dmnModel.getTypeRegistry().resolveType(dmnModel.getDefinitions().getURIFEEL(), ft.getName()), ft);
typeMap.put(fieldName, type);
diff --git a/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/PMMLInfo.java b/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/PMMLInfo.java
index e51f9a16ce..179cbf1d2a 100644
--- a/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/PMMLInfo.java
+++ b/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/pmml/PMMLInfo.java
@@ -26,7 +26,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
import org.dmg.pmml.Extension;
import org.dmg.pmml.Header;
@@ -75,15 +75,15 @@ public class PMMLInfo<M extends PMMLModelInfo> {
miningSchema.getMiningFields()
.stream()
.filter(mf -> mf.getUsageType() == UsageType.ACTIVE)
- .forEach(fn -> inputFields.add(fn.getName().getValue()));
+ .forEach(fn -> inputFields.add(fn.getName()));
Collection<String> 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<String> 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 4c38b6a733..25cd680ffc 100644
--- a/kie-dmn/kie-dmn-feel/pom.xml
+++ b/kie-dmn/kie-dmn-feel/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-dmn</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-dmn-feel</artifactId>
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 d81ed31e14..0d81acb15a 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 @@ import static java.lang.annotation.ElementType.TYPE;
/**
* 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 d5bc785f51..046555611e 100644
--- a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/jandex/AbstractJandexTest.java
+++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/jandex/AbstractJandexTest.java
@@ -31,9 +31,9 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
-import javax.json.bind.JsonbConfig;
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+import jakarta.json.bind.JsonbConfig;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
diff --git a/kie-dmn/kie-dmn-legacy-tests/pom.xml b/kie-dmn/kie-dmn-legacy-tests/pom.xml
index a47b9a6440..16a31d57fd 100644
--- a/kie-dmn/kie-dmn-legacy-tests/pom.xml
+++ b/kie-dmn/kie-dmn-legacy-tests/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-dmn</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-dmn-legacy-tests</artifactId>
@@ -123,11 +123,6 @@
<artifactId>jaxb-core</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
diff --git a/kie-dmn/kie-dmn-model/pom.xml b/kie-dmn/kie-dmn-model/pom.xml
index 2cafe5c03a..4b9e1ee9f9 100644
--- a/kie-dmn/kie-dmn-model/pom.xml
+++ b/kie-dmn/kie-dmn-model/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>kie-dmn</artifactId>
<groupId>org.kie</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-dmn-model</artifactId>
diff --git a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DMNDiagram.java b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DMNDiagram.java
index 73c6e9a0dc..5afed613ea 100644
--- a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DMNDiagram.java
+++ b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DMNDiagram.java
@@ -21,7 +21,7 @@ package org.kie.dmn.model.v1_2.dmndi;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
public class DMNDiagram extends Diagram implements org.kie.dmn.model.api.dmndi.DMNDiagram {
diff --git a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DiagramElement.java b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DiagramElement.java
index 6c7d93324b..7d0166c1cf 100644
--- a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DiagramElement.java
+++ b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_2/dmndi/DiagramElement.java
@@ -21,7 +21,7 @@ package org.kie.dmn.model.v1_2.dmndi;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
import org.kie.dmn.model.v1_2.KieDMNModelInstrumentedBase;
diff --git a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DMNDiagram.java b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DMNDiagram.java
index 07d10ee3b7..56c12fed1f 100644
--- a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DMNDiagram.java
+++ b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DMNDiagram.java
@@ -21,7 +21,7 @@ package org.kie.dmn.model.v1_3.dmndi;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
public class DMNDiagram extends Diagram implements org.kie.dmn.model.api.dmndi.DMNDiagram {
diff --git a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DiagramElement.java b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DiagramElement.java
index 3a1d68e30e..a05148e753 100644
--- a/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DiagramElement.java
+++ b/kie-dmn/kie-dmn-model/src/main/java/org/kie/dmn/model/v1_3/dmndi/DiagramElement.java
@@ -21,7 +21,7 @@ package org.kie.dmn.model.v1_3.dmndi;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
import org.kie.dmn.model.v1_3.KieDMNModelInstrumentedBase;
diff --git a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/jandex/KieDMNModelJandexTest.java b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/jandex/KieDMNModelJandexTest.java
index fec094247e..44999d32c3 100644
--- a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/jandex/KieDMNModelJandexTest.java
+++ b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/jandex/KieDMNModelJandexTest.java
@@ -31,9 +31,9 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
-import javax.json.bind.JsonbConfig;
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+import jakarta.json.bind.JsonbConfig;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
diff --git a/kie-dmn/kie-dmn-openapi/pom.xml b/kie-dmn/kie-dmn-openapi/pom.xml
index 27a7588cf6..b63ab9f81f 100644
--- a/kie-dmn/kie-dmn-openapi/pom.xml
+++ b/kie-dmn/kie-dmn-openapi/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-dmn</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-dmn-openapi</artifactId>
@@ -81,11 +81,6 @@
<artifactId>jaxb-core</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
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 36e719f5fe..64dacbfe40 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 @@
<parent>
<artifactId>kie-dmn-pmml-tests-parent</artifactId>
<groupId>org.kie</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 a00be0eb21..9da9e7d335 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 @@
<parent>
<artifactId>kie-dmn-pmml-tests-parent</artifactId>
<groupId>org.kie</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -85,11 +85,6 @@
<artifactId>jaxb-core</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/pom.xml b/kie-dmn/kie-dmn-pmml-tests-parent/pom.xml
index 08a405f28f..db909667c2 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 @@
<parent>
<artifactId>kie-dmn</artifactId>
<groupId>org.kie</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
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 468c7ea1b5..290e81ebff 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 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-dmn-ruleset2dmn-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-dmn-ruleset2dmn-cli</artifactId>
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 29d70f6139..a49b93b00f 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 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-dmn-ruleset2dmn-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-dmn-ruleset2dmn</artifactId>
diff --git a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/Converter.java b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/Converter.java
index fcfde77a26..06dd73a239 100644
--- a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/Converter.java
+++ b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/Converter.java
@@ -38,7 +38,6 @@ import javax.xml.namespace.QName;
import org.dmg.pmml.DataDictionary;
import org.dmg.pmml.DataField;
import org.dmg.pmml.DataType;
-import org.dmg.pmml.FieldName;
import org.dmg.pmml.Model;
import org.dmg.pmml.PMML;
import org.dmg.pmml.SimplePredicate;
@@ -145,7 +144,7 @@ public class Converter {
for (String input : usedPredictors) {
List<SimplePredicate> predicatesForInput = r.map.get(input);
if (predicatesForInput != null && !predicatesForInput.isEmpty()) {
- FieldName fnLookup = FieldName.create(input);
+ String fnLookup =input;
Optional<DataField> df = pmml.getDataDictionary().getDataFields().stream().filter(x-> x.getName().equals(fnLookup)).findFirst();
UnaryTests ut = processSimplePredicateUnaryOrBinary(predicatesForInput, df);
if (ut.getText().startsWith("\"") && ut.getText().endsWith("\"")) {
@@ -197,9 +196,9 @@ public class Converter {
}
for (DataField df : pmml.getDataDictionary().getDataFields()) {
- if (df.getDataType() == DataType.STRING && predictorsLoVs.containsKey(df.getName().getValue())) {
+ if (df.getDataType() == DataType.STRING && predictorsLoVs.containsKey(df.getName())) {
for (Value value : df.getValues()) {
- predictorsLoVs.get(df.getName().getValue()).add("\""+value.getValue().toString()+"\"");
+ predictorsLoVs.get(df.getName()).add("\""+value.getValue().toString()+"\"");
}
}
}
@@ -478,7 +477,7 @@ public class Converter {
}
private static String feelTypeFromDD(DataDictionary dd, String id) {
- FieldName lookup = FieldName.create(id);
+ String lookup =id;
Optional<DataField> opt = dd.getDataFields().stream().filter(df -> df.getName().equals(lookup)).findFirst();
if (opt.isEmpty()) {
return "Any";
diff --git a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/SimpleRuleRow.java b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/SimpleRuleRow.java
index b5fd23ed65..9d789df4a4 100644
--- a/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/SimpleRuleRow.java
+++ b/kie-dmn/kie-dmn-ruleset2dmn-parent/kie-dmn-ruleset2dmn/src/main/java/org/kie/dmn/ruleset2dmn/SimpleRuleRow.java
@@ -39,7 +39,7 @@ public class SimpleRuleRow {
Predicate rootPredicate = r.getPredicate();
if (rootPredicate instanceof SimplePredicate) {
SimplePredicate sp = (SimplePredicate) rootPredicate;
- map.computeIfAbsent(sp.getField().getValue(), k -> new ArrayList<SimplePredicate>()).add(sp);
+ map.computeIfAbsent(sp.getField(), k -> new ArrayList<SimplePredicate>()).add(sp);
} else {
if (!(rootPredicate instanceof CompoundPredicate)) {
throw new UnsupportedOperationException("Was expecting a CompoundPredicate, found: "+rootPredicate.getClass());
@@ -50,7 +50,7 @@ public class SimpleRuleRow {
}
for (Predicate c : cPredicate.getPredicates()) {
SimplePredicate sp = (SimplePredicate) c;
- map.computeIfAbsent(sp.getField().getValue(), k -> new ArrayList<SimplePredicate>()).add(sp);
+ map.computeIfAbsent(sp.getField(), k -> new ArrayList<SimplePredicate>()).add(sp);
}
}
}
diff --git a/kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml b/kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml
index 6b02aa7a2b..597b84a0e6 100644
--- a/kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml
+++ b/kie-dmn/kie-dmn-ruleset2dmn-parent/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-dmn</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-dmn-ruleset2dmn-parent</artifactId>
<packaging>pom</packaging>
diff --git a/kie-dmn/kie-dmn-signavio/pom.xml b/kie-dmn/kie-dmn-signavio/pom.xml
index b6754c2f39..c4f4a9efbb 100644
--- a/kie-dmn/kie-dmn-signavio/pom.xml
+++ b/kie-dmn/kie-dmn-signavio/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-dmn</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-dmn-signavio</artifactId>
diff --git a/kie-dmn/kie-dmn-tck/pom.xml b/kie-dmn/kie-dmn-tck/pom.xml
index 81121a0c9b..dbe80e0350 100644
--- a/kie-dmn/kie-dmn-tck/pom.xml
+++ b/kie-dmn/kie-dmn-tck/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>kie-dmn</artifactId>
<groupId>org.kie</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
diff --git a/kie-dmn/kie-dmn-trisotech/pom.xml b/kie-dmn/kie-dmn-trisotech/pom.xml
index fde1d5226c..6ec9214099 100644
--- a/kie-dmn/kie-dmn-trisotech/pom.xml
+++ b/kie-dmn/kie-dmn-trisotech/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-dmn</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-dmn-trisotech</artifactId>
diff --git a/kie-dmn/kie-dmn-validation-bootstrap/pom.xml b/kie-dmn/kie-dmn-validation-bootstrap/pom.xml
index 5e8ee5f2f9..3d78022cbb 100644
--- a/kie-dmn/kie-dmn-validation-bootstrap/pom.xml
+++ b/kie-dmn/kie-dmn-validation-bootstrap/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-dmn</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-dmn-validation-bootstrap</artifactId>
diff --git a/kie-dmn/kie-dmn-validation/pom.xml b/kie-dmn/kie-dmn-validation/pom.xml
index 727f8aa7a6..5ab7798b37 100644
--- a/kie-dmn/kie-dmn-validation/pom.xml
+++ b/kie-dmn/kie-dmn-validation/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-dmn</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-dmn-validation</artifactId>
<packaging>jar</packaging>
diff --git a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/MCDC2TCKGenerator.java b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/MCDC2TCKGenerator.java
index c9ef7d523d..a33228f2c2 100644
--- a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/MCDC2TCKGenerator.java
+++ b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/MCDC2TCKGenerator.java
@@ -23,10 +23,10 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
import org.kie.dmn.model.api.DecisionTable;
import org.kie.dmn.validation.dtanalysis.mcdc.MCDCAnalyser.PosNegBlock;
diff --git a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ObjectFactory.java b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ObjectFactory.java
index 2bf017df45..096c084b79 100644
--- a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ObjectFactory.java
+++ b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ObjectFactory.java
@@ -20,9 +20,9 @@
package org.kie.dmn.validation.dtanalysis.mcdc.dmntck;
import org.kie.dmn.feel.util.Generated;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
import javax.xml.namespace.QName;
diff --git a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCaseType.java b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCaseType.java
index cbed707d7f..8d47bb9773 100644
--- a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCaseType.java
+++ b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCaseType.java
@@ -20,9 +20,9 @@
package org.kie.dmn.validation.dtanalysis.mcdc.dmntck;
import org.kie.dmn.feel.util.Generated;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
/**
diff --git a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCases.java b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCases.java
index bad57fe70d..963513552e 100644
--- a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCases.java
+++ b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/TestCases.java
@@ -25,16 +25,16 @@ import java.util.HashMap;
import java.util.Map;
import org.kie.dmn.feel.util.Generated;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyAttribute;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
diff --git a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ValueType.java b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ValueType.java
index 4d9b58d9a1..e06798a5f0 100644
--- a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ValueType.java
+++ b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/ValueType.java
@@ -25,17 +25,17 @@ import java.util.HashMap;
import java.util.Map;
import org.kie.dmn.feel.util.Generated;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyAttribute;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlType;
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
diff --git a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/package-info.java b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/package-info.java
index feed0d6196..9d09b429e7 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 354a8bb822..3f742cf8eb 100644
--- a/kie-dmn/kie-dmn-xls2dmn-cli/pom.xml
+++ b/kie-dmn/kie-dmn-xls2dmn-cli/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-dmn</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-dmn-xls2dmn-cli</artifactId>
<packaging>jar</packaging>
diff --git a/kie-dmn/pom.xml b/kie-dmn/pom.xml
index f0010781fc..47e3bdf220 100644
--- a/kie-dmn/pom.xml
+++ b/kie-dmn/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/kie-drl/kie-drl-api/pom.xml b/kie-drl/kie-drl-api/pom.xml
index c7e7b9fffd..3dca87da61 100644
--- a/kie-drl/kie-drl-api/pom.xml
+++ b/kie-drl/kie-drl-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>kie-drl</artifactId>
<groupId>org.kie</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/kie-drl/kie-drl-compilation-common/pom.xml b/kie-drl/kie-drl-compilation-common/pom.xml
index 407d732593..ca1074f6fa 100644
--- a/kie-drl/kie-drl-compilation-common/pom.xml
+++ b/kie-drl/kie-drl-compilation-common/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>kie-drl</artifactId>
<groupId>org.kie</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 894441b526..0141af12e4 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 @@
<parent>
<artifactId>kie-drl-kiesession-local</artifactId>
<groupId>org.kie</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 5bfe225af2..474b22726e 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 @@
<parent>
<artifactId>kie-drl-implementations</artifactId>
<groupId>org.kie</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
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 a50217799a..ea2da4e457 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 @@
<parent>
<artifactId>kie-drl-map-input</artifactId>
<groupId>org.kie</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<artifactId>kie-drl-map-input-runtime</artifactId>
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 9189bcb051..5f793fb020 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 @@
<parent>
<artifactId>kie-drl-implementations</artifactId>
<groupId>org.kie</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
diff --git a/kie-drl/kie-drl-implementations/pom.xml b/kie-drl/kie-drl-implementations/pom.xml
index 6530d40440..a6555a95a8 100644
--- a/kie-drl/kie-drl-implementations/pom.xml
+++ b/kie-drl/kie-drl-implementations/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>kie-drl</artifactId>
<groupId>org.kie</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<name>KIE :: DRL :: Implementations</name>
diff --git a/kie-drl/kie-drl-runtime-common/pom.xml b/kie-drl/kie-drl-runtime-common/pom.xml
index 6d6d19759f..0099f5638c 100644
--- a/kie-drl/kie-drl-runtime-common/pom.xml
+++ b/kie-drl/kie-drl-runtime-common/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>kie-drl</artifactId>
<groupId>org.kie</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 f257190ff5..fe73310120 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 @@
<parent>
<artifactId>kie-drl</artifactId>
<groupId>org.kie</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/kie-drl/kie-drl-tests/pom.xml b/kie-drl/kie-drl-tests/pom.xml
index 00d65fe85d..3c535f5a81 100644
--- a/kie-drl/kie-drl-tests/pom.xml
+++ b/kie-drl/kie-drl-tests/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>kie-drl</artifactId>
<groupId>org.kie</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/kie-drl/pom.xml b/kie-drl/pom.xml
index 3ce72ba34a..3631ff868e 100644
--- a/kie-drl/pom.xml
+++ b/kie-drl/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/kie-internal/pom.xml b/kie-internal/pom.xml
index 85f776de10..64da37681c 100644
--- a/kie-internal/pom.xml
+++ b/kie-internal/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
@@ -90,16 +90,6 @@
<artifactId>jaxb-xjc</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
@@ -113,6 +103,13 @@
<scope>provided</scope>
</dependency>
+ <!-- JAXB Runtime -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
diff --git a/kie-internal/src/main/java/org/kie/internal/builder/help/DroolsJaxbHelperProvider.java b/kie-internal/src/main/java/org/kie/internal/builder/help/DroolsJaxbHelperProvider.java
index 5a70bf3a03..63f6154f20 100644
--- a/kie-internal/src/main/java/org/kie/internal/builder/help/DroolsJaxbHelperProvider.java
+++ b/kie-internal/src/main/java/org/kie/internal/builder/help/DroolsJaxbHelperProvider.java
@@ -21,8 +21,8 @@ package org.kie.internal.builder.help;
import java.io.IOException;
import java.util.Map;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
import com.sun.tools.xjc.Options;
import org.kie.api.KieBase;
diff --git a/kie-internal/src/main/java/org/kie/internal/builder/help/KnowledgeBuilderHelper.java b/kie-internal/src/main/java/org/kie/internal/builder/help/KnowledgeBuilderHelper.java
index d60aa2bccc..7772825081 100644
--- a/kie-internal/src/main/java/org/kie/internal/builder/help/KnowledgeBuilderHelper.java
+++ b/kie-internal/src/main/java/org/kie/internal/builder/help/KnowledgeBuilderHelper.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.util.Collections;
import java.util.Map;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
import com.sun.tools.xjc.Options;
import org.kie.api.KieBase;
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/CorrelationKeyXmlAdapter.java b/kie-internal/src/main/java/org/kie/internal/jaxb/CorrelationKeyXmlAdapter.java
index a66ab3e155..c859e47bf8 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/CorrelationKeyXmlAdapter.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/CorrelationKeyXmlAdapter.java
@@ -24,7 +24,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import org.kie.internal.KieInternalServices;
import org.kie.internal.process.CorrelationKey;
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateTimeXmlAdapter.java b/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateTimeXmlAdapter.java
index b74e99d2f5..880169eef4 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateTimeXmlAdapter.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateTimeXmlAdapter.java
@@ -24,7 +24,7 @@ import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
import java.time.temporal.ChronoField;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
public class LocalDateTimeXmlAdapter extends XmlAdapter<String, LocalDateTime> {
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateXmlAdapter.java b/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateXmlAdapter.java
index fb733055ac..4ae10ef641 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateXmlAdapter.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/LocalDateXmlAdapter.java
@@ -21,7 +21,7 @@ package org.kie.internal.jaxb;
import java.time.DateTimeException;
import java.time.LocalDate;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
public class LocalDateXmlAdapter extends XmlAdapter<String, LocalDate> {
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/LocalTimeXmlAdapter.java b/kie-internal/src/main/java/org/kie/internal/jaxb/LocalTimeXmlAdapter.java
index 9c9f66d618..b269f3fd6c 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/LocalTimeXmlAdapter.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/LocalTimeXmlAdapter.java
@@ -24,7 +24,7 @@ import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
import java.time.temporal.ChronoField;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
public class LocalTimeXmlAdapter extends XmlAdapter<String, LocalTime> {
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/OffsetDateTimeXmlAdapter.java b/kie-internal/src/main/java/org/kie/internal/jaxb/OffsetDateTimeXmlAdapter.java
index 705641b07c..52e5d2933c 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/OffsetDateTimeXmlAdapter.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/OffsetDateTimeXmlAdapter.java
@@ -24,7 +24,7 @@ import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
import java.time.temporal.ChronoField;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
public class OffsetDateTimeXmlAdapter extends XmlAdapter<String, OffsetDateTime> {
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueEntry.java b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueEntry.java
index f74cfffc61..967d0070a4 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueEntry.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueEntry.java
@@ -20,12 +20,12 @@ package org.kie.internal.jaxb;
import java.util.Map.Entry;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlValue;
@XmlType
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMap.java b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMap.java
index df560c3a85..6436952334 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMap.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMap.java
@@ -26,10 +26,10 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import static org.kie.internal.jaxb.StringKeyObjectValueMapXmlAdapter.createJaxbStringObjectMapEntry;
import static org.kie.internal.jaxb.StringKeyObjectValueMapXmlAdapter.deserializeObject;
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMapXmlAdapter.java b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMapXmlAdapter.java
index bb2aa1f32a..34807c6d2a 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMapXmlAdapter.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyObjectValueMapXmlAdapter.java
@@ -28,7 +28,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueEntry.java b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueEntry.java
index 88c9abcd74..6a3bc0a122 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueEntry.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueEntry.java
@@ -18,10 +18,10 @@
*/
package org.kie.internal.jaxb;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
@XmlType
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMap.java b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMap.java
index 8561a4f266..cac273d126 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMap.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMap.java
@@ -26,10 +26,10 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
/**
* This implements {@link Map} in order to fool JSON..
diff --git a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMapXmlAdapter.java b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMapXmlAdapter.java
index e996b22b08..ec05798634 100644
--- a/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMapXmlAdapter.java
+++ b/kie-internal/src/main/java/org/kie/internal/jaxb/StringKeyStringValueMapXmlAdapter.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
/**
* This is a {@link XmlAdapter} for mapping Map<String, String> instances
diff --git a/kie-internal/src/main/java/org/kie/internal/query/QueryContext.java b/kie-internal/src/main/java/org/kie/internal/query/QueryContext.java
index de305a5d93..125af0455a 100644
--- a/kie-internal/src/main/java/org/kie/internal/query/QueryContext.java
+++ b/kie-internal/src/main/java/org/kie/internal/query/QueryContext.java
@@ -18,9 +18,9 @@
*/
package org.kie.internal.query;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/kie-internal/src/main/java/org/kie/internal/query/QueryFilter.java b/kie-internal/src/main/java/org/kie/internal/query/QueryFilter.java
index 2e514b2534..5967f78393 100644
--- a/kie-internal/src/main/java/org/kie/internal/query/QueryFilter.java
+++ b/kie-internal/src/main/java/org/kie/internal/query/QueryFilter.java
@@ -22,9 +22,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.kie.internal.jaxb.StringKeyObjectValueMapXmlAdapter;
diff --git a/kie-internal/src/main/java/org/kie/internal/query/data/QueryData.java b/kie-internal/src/main/java/org/kie/internal/query/data/QueryData.java
index 3196813c53..6460e83543 100644
--- a/kie-internal/src/main/java/org/kie/internal/query/data/QueryData.java
+++ b/kie-internal/src/main/java/org/kie/internal/query/data/QueryData.java
@@ -18,10 +18,10 @@
*/
package org.kie.internal.query.data;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.kie.internal.query.QueryContext;
diff --git a/kie-internal/src/main/java/org/kie/internal/query/data/QueryParameters.java b/kie-internal/src/main/java/org/kie/internal/query/data/QueryParameters.java
index c68575a784..b6d2272d67 100644
--- a/kie-internal/src/main/java/org/kie/internal/query/data/QueryParameters.java
+++ b/kie-internal/src/main/java/org/kie/internal/query/data/QueryParameters.java
@@ -24,12 +24,12 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.kie.internal.jaxb.StringKeyObjectValueMapXmlAdapter;
diff --git a/kie-internal/src/main/java/org/kie/internal/runtime/conf/DeploymentDescriptor.java b/kie-internal/src/main/java/org/kie/internal/runtime/conf/DeploymentDescriptor.java
index 65a8711225..1a893de336 100644
--- a/kie-internal/src/main/java/org/kie/internal/runtime/conf/DeploymentDescriptor.java
+++ b/kie-internal/src/main/java/org/kie/internal/runtime/conf/DeploymentDescriptor.java
@@ -20,8 +20,8 @@ package org.kie.internal.runtime.conf;
import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.kie.api.remote.Remotable;
diff --git a/kie-internal/src/main/java/org/kie/internal/runtime/conf/MergeMode.java b/kie-internal/src/main/java/org/kie/internal/runtime/conf/MergeMode.java
index 1ac2d744d3..97c512830d 100644
--- a/kie-internal/src/main/java/org/kie/internal/runtime/conf/MergeMode.java
+++ b/kie-internal/src/main/java/org/kie/internal/runtime/conf/MergeMode.java
@@ -18,7 +18,7 @@
*/
package org.kie.internal.runtime.conf;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
/**
* Defines merging strategy of two descriptors
diff --git a/kie-internal/src/main/java/org/kie/internal/runtime/conf/NamedObjectModel.java b/kie-internal/src/main/java/org/kie/internal/runtime/conf/NamedObjectModel.java
index 8421eeda8e..6e7d6ebfb3 100644
--- a/kie-internal/src/main/java/org/kie/internal/runtime/conf/NamedObjectModel.java
+++ b/kie-internal/src/main/java/org/kie/internal/runtime/conf/NamedObjectModel.java
@@ -18,11 +18,11 @@
*/
package org.kie.internal.runtime.conf;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
/**
* Extension of <code>ObjectModel</code> that provides unique name for the object model
diff --git a/kie-internal/src/main/java/org/kie/internal/runtime/conf/ObjectModel.java b/kie-internal/src/main/java/org/kie/internal/runtime/conf/ObjectModel.java
index 71306f0345..6268d19d31 100644
--- a/kie-internal/src/main/java/org/kie/internal/runtime/conf/ObjectModel.java
+++ b/kie-internal/src/main/java/org/kie/internal/runtime/conf/ObjectModel.java
@@ -23,12 +23,12 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
/**
* Object model that defines how and of what type the object instance should be created.<br>
* The how is actually delegated to resolved implementation <code>ObjectModelResolver</code>
diff --git a/kie-internal/src/main/java/org/kie/internal/runtime/conf/RuntimeStrategy.java b/kie-internal/src/main/java/org/kie/internal/runtime/conf/RuntimeStrategy.java
index 7356288e5e..3389c78f73 100644
--- a/kie-internal/src/main/java/org/kie/internal/runtime/conf/RuntimeStrategy.java
+++ b/kie-internal/src/main/java/org/kie/internal/runtime/conf/RuntimeStrategy.java
@@ -18,7 +18,7 @@
*/
package org.kie.internal.runtime.conf;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
@XmlType
public enum RuntimeStrategy {
diff --git a/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/DeploymentDescriptorIO.java b/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/DeploymentDescriptorIO.java
index 87ff5dd215..d9917b3d1b 100644
--- a/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/DeploymentDescriptorIO.java
+++ b/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/DeploymentDescriptorIO.java
@@ -23,10 +23,10 @@ import java.io.StringWriter;
import java.net.URL;
import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
diff --git a/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/DeploymentDescriptorImpl.java b/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/DeploymentDescriptorImpl.java
index a93615ec76..d5281d43e9 100644
--- a/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/DeploymentDescriptorImpl.java
+++ b/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/DeploymentDescriptorImpl.java
@@ -29,13 +29,13 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlTransient;
import org.kie.internal.runtime.conf.AuditMode;
import org.kie.internal.runtime.conf.BuilderHandler;
diff --git a/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/TransientObjectModel.java b/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/TransientObjectModel.java
index 572cc4412a..9026d35f5d 100644
--- a/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/TransientObjectModel.java
+++ b/kie-internal/src/main/java/org/kie/internal/runtime/manager/deploy/TransientObjectModel.java
@@ -18,7 +18,7 @@
*/
package org.kie.internal.runtime.manager.deploy;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlTransient;
import org.kie.internal.runtime.conf.ObjectModel;
diff --git a/kie-internal/src/main/java/org/kie/internal/task/api/model/AccessType.java b/kie-internal/src/main/java/org/kie/internal/task/api/model/AccessType.java
index 406ddf4e70..3caaedb165 100644
--- a/kie-internal/src/main/java/org/kie/internal/task/api/model/AccessType.java
+++ b/kie-internal/src/main/java/org/kie/internal/task/api/model/AccessType.java
@@ -21,7 +21,7 @@
*/
package org.kie.internal.task.api.model;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
@XmlType
public enum AccessType {
diff --git a/kie-internal/src/main/java/org/kie/internal/task/api/model/SubTasksStrategy.java b/kie-internal/src/main/java/org/kie/internal/task/api/model/SubTasksStrategy.java
index b79d5bc55c..209a283f4f 100644
--- a/kie-internal/src/main/java/org/kie/internal/task/api/model/SubTasksStrategy.java
+++ b/kie-internal/src/main/java/org/kie/internal/task/api/model/SubTasksStrategy.java
@@ -18,7 +18,7 @@
*/
package org.kie.internal.task.api.model;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
@XmlType
public enum SubTasksStrategy{
diff --git a/kie-internal/src/test/java/org/kie/internal/runtime/manager/deploy/JaxbMarshalingTest.java b/kie-internal/src/test/java/org/kie/internal/runtime/manager/deploy/JaxbMarshalingTest.java
index 4cbd3f3192..5038a1806f 100644
--- a/kie-internal/src/test/java/org/kie/internal/runtime/manager/deploy/JaxbMarshalingTest.java
+++ b/kie-internal/src/test/java/org/kie/internal/runtime/manager/deploy/JaxbMarshalingTest.java
@@ -20,9 +20,9 @@ package org.kie.internal.runtime.manager.deploy;
import java.io.StringWriter;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
import org.junit.Test;
import org.kie.internal.runtime.conf.DeploymentDescriptor;
diff --git a/kie-maven-plugin/pom.xml b/kie-maven-plugin/pom.xml
index 16fa86657a..1a1f0170e2 100644
--- a/kie-maven-plugin/pom.xml
+++ b/kie-maven-plugin/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/kie-memory-compiler/pom.xml b/kie-memory-compiler/pom.xml
index 7982be9f8f..bc681e6a1b 100644
--- a/kie-memory-compiler/pom.xml
+++ b/kie-memory-compiler/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-build-parent</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
<relativePath>../build-parent/pom.xml</relativePath>
</parent>
diff --git a/kie-pmml-trusty/kie-pmml-api/pom.xml b/kie-pmml-trusty/kie-pmml-api/pom.xml
index 938b5affaa..ecfe6df4d1 100644
--- a/kie-pmml-trusty/kie-pmml-api/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>kie-pmml-trusty</artifactId>
<groupId>org.kie</groupId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/kie-pmml-trusty/kie-pmml-api/src/main/java/org/kie/pmml/api/PMMLRuntimeFactory.java b/kie-pmml-trusty/kie-pmml-api/src/main/java/org/kie/pmml/api/PMMLRuntimeFactory.java
index d5394fdcee..d24bd5c3b1 100644
--- a/kie-pmml-trusty/kie-pmml-api/src/main/java/org/kie/pmml/api/PMMLRuntimeFactory.java
+++ b/kie-pmml-trusty/kie-pmml-api/src/main/java/org/kie/pmml/api/PMMLRuntimeFactory.java
@@ -26,7 +26,7 @@ public interface PMMLRuntimeFactory {
/**
* Retrieve a <code>PMMLRuntime</code> bound to the given <code><File</code>
- * with an <i>on-the-fly</i> compilation.
+ * with an on-the-fly compilation.
* @param pmmlFile
* @return
*/
diff --git a/kie-pmml-trusty/kie-pmml-commons/pom.xml b/kie-pmml-trusty/kie-pmml-commons/pom.xml
index d9d231d6b3..3460285aab 100644
--- a/kie-pmml-trusty/kie-pmml-commons/pom.xml
+++ b/kie-pmml-trusty/kie-pmml-commons/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-pmml-trusty</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 dec1881eb3..5f411cc826 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 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-pmml-compiler</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/main/java/org/kie/pmml/compiler/api/dto/CommonCompilationDTO.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/main/java/org/kie/pmml/compiler/api/dto/CommonCompilationDTO.java
index b4d12b531b..505d54d07a 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/main/java/org/kie/pmml/compiler/api/dto/CommonCompilationDTO.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/main/java/org/kie/pmml/compiler/api/dto/CommonCompilationDTO.java
@@ -119,7 +119,7 @@ public class CommonCompilationDTO<T extends Model> implements CompilationDTO<T>
targetDataField = this.fields.stream()
.filter(DataField.class::isInstance)
.map(DataField.class::cast)
- .filter(field -> Objects.equals(getTargetFieldName(), field.getName().getValue()))
+ .filter(field -> Objects.equals(getTargetFieldName(),field.getName()))
.findFirst().orElse(null);
} else {
targetDataField = null;
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/main/java/org/kie/pmml/compiler/api/utils/ModelUtils.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/main/java/org/kie/pmml/compiler/api/utils/ModelUtils.java
index 45015d4b37..6a404100e9 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/main/java/org/kie/pmml/compiler/api/utils/ModelUtils.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/main/java/org/kie/pmml/compiler/api/utils/ModelUtils.java
@@ -51,8 +51,8 @@ import org.dmg.pmml.TargetValue;
import org.dmg.pmml.Targets;
import org.dmg.pmml.TransformationDictionary;
import org.dmg.pmml.Value;
-import org.jpmml.model.inlinetable.InputCell;
-import org.jpmml.model.inlinetable.OutputCell;
+import org.jpmml.model.cells.InputCell;
+import org.jpmml.model.cells.OutputCell;
import org.kie.pmml.api.enums.CAST_INTEGER;
import org.kie.pmml.api.enums.DATA_TYPE;
import org.kie.pmml.api.enums.FIELD_USAGE_TYPE;
@@ -123,8 +123,8 @@ public class ModelUtils {
if (model.getMiningSchema() != null && model.getMiningSchema().getMiningFields() != null) {
for (MiningField miningField : model.getMiningSchema().getMiningFields()) {
if (MiningField.UsageType.TARGET.equals(miningField.getUsageType()) || MiningField.UsageType.PREDICTED.equals(miningField.getUsageType())) {
- OP_TYPE opType = getOpType(fields, model, miningField.getName().getValue());
- toReturn.add(new KiePMMLNameOpType(miningField.getName().getValue(), opType));
+ OP_TYPE opType = getOpType(fields, model,miningField.getName());
+ toReturn.add(new KiePMMLNameOpType(miningField.getName(), opType));
}
}
}
@@ -145,8 +145,7 @@ public class ModelUtils {
if (model.getMiningSchema() != null && model.getMiningSchema().getMiningFields() != null) {
for (MiningField miningField : model.getMiningSchema().getMiningFields()) {
if (MiningField.UsageType.TARGET.equals(miningField.getUsageType()) || MiningField.UsageType.PREDICTED.equals(miningField.getUsageType())) {
- toReturn.put(miningField.getName().getValue(), getDATA_TYPE(fields,
- miningField.getName().getValue()));
+ toReturn.put(miningField.getName(), getDATA_TYPE(fields,miningField.getName()));
}
}
}
@@ -182,7 +181,7 @@ public class ModelUtils {
final String fieldName) {
return fields == null ? Optional.empty() :
fields.stream()
- .filter(dataField -> Objects.equals(fieldName, dataField.getName().getValue()) && dataField.getOpType() != null)
+ .filter(dataField -> Objects.equals(fieldName,dataField.getName()) && dataField.getOpType() != null)
.map(dataField -> OP_TYPE.byName(dataField.getOpType().value()))
.findFirst();
}
@@ -196,7 +195,7 @@ public class ModelUtils {
public static Optional<OP_TYPE> getOpTypeFromMiningFields(MiningSchema miningSchema, String fieldName) {
if (miningSchema != null && miningSchema.getMiningFields() != null) {
return miningSchema.getMiningFields().stream()
- .filter(miningField -> Objects.equals(fieldName, miningField.getName().getValue()) && miningField.getOpType() != null)
+ .filter(miningField -> Objects.equals(fieldName,miningField.getName()) && miningField.getOpType() != null)
.findFirst()
.map(dataField -> OP_TYPE.byName(dataField.getOpType().value()));
} else {
@@ -213,7 +212,7 @@ public class ModelUtils {
public static Optional<OP_TYPE> getOpTypeFromTargets(Targets targets, String fieldName) {
if (targets != null && targets.getTargets() != null) {
return targets.getTargets().stream()
- .filter(target -> Objects.equals(fieldName, target.getField().getValue()) && target.getOpType() != null)
+ .filter(target -> Objects.equals(fieldName,target.getField()) && target.getOpType() != null)
.findFirst()
.map(dataField -> OP_TYPE.byName(dataField.getOpType().value()));
} else {
@@ -231,7 +230,7 @@ public class ModelUtils {
public static DataType getDataType(final List<Field<?>> fields,
final String fieldName) {
return fields.stream()
- .filter(fld -> Objects.equals(fieldName, fld.getName().getValue()))
+ .filter(fld -> Objects.equals(fieldName,fld.getName()))
.map(Field::getDataType)
.findFirst()
.orElseThrow(() -> new KiePMMLInternalException(String.format("Failed to find DataType for " +
@@ -247,7 +246,7 @@ public class ModelUtils {
*/
public static DATA_TYPE getDATA_TYPE(final List<Field<?>> fields, String fieldName) {
Optional<DATA_TYPE> toReturn = fields.stream()
- .filter(fld -> Objects.equals(fieldName, fld.getName().getValue()))
+ .filter(fld -> Objects.equals(fieldName,fld.getName()))
.findFirst()
.map(dataField -> DATA_TYPE.byName(dataField.getDataType().value()));
return toReturn.orElseThrow(() -> new KiePMMLInternalException(String.format("Failed to find DATA_TYPE for " +
@@ -331,7 +330,7 @@ public class ModelUtils {
*/
public static org.kie.pmml.api.models.MiningField convertToKieMiningField(final MiningField toConvert,
final Field<?> field) {
- final String name = toConvert.getName() != null ? toConvert.getName().getValue() : null;
+ final String name = toConvert.getName() != null ?toConvert.getName() : null;
final FIELD_USAGE_TYPE fieldUsageType = toConvert.getUsageType() != null ?
FIELD_USAGE_TYPE.byName(toConvert.getUsageType().value()) : null;
final OP_TYPE opType = toConvert.getOpType() != null ? OP_TYPE.byName(toConvert.getOpType().value()) : null;
@@ -408,13 +407,13 @@ public class ModelUtils {
*/
public static org.kie.pmml.api.models.OutputField convertToKieOutputField(final OutputField toConvert,
final Field<?> field) {
- final String name = toConvert.getName() != null ? toConvert.getName().getValue() : null;
+ final String name = toConvert.getName() != null ?toConvert.getName() : null;
final OP_TYPE opType = toConvert.getOpType() != null ? OP_TYPE.byName(toConvert.getOpType().value()) : null;
final DATA_TYPE dataFieldDataType = field != null ? DATA_TYPE.byName(field.getDataType().value()) :
null;
final DATA_TYPE dataType = toConvert.getDataType() != null ?
DATA_TYPE.byName(toConvert.getDataType().value()) : dataFieldDataType;
- final String targetField = toConvert.getTargetField() != null ? toConvert.getTargetField().getValue() : null;
+ final String targetField = toConvert.getTargetField() != null ?toConvert.getTargetField() : null;
final RESULT_FEATURE resultFeature = toConvert.getResultFeature() != null ?
RESULT_FEATURE.byName(toConvert.getResultFeature().value()) : null;
final List<String> allowedValues = field instanceof DataField ?
@@ -459,8 +458,7 @@ public class ModelUtils {
toConvert.getRescaleConstant().doubleValue() : null;
final Double rescaleFactor = toConvert.getRescaleFactor() != null ? toConvert.getRescaleFactor().doubleValue() : null;
return new TargetField(targetValues,
- opType,
- toConvert.getField().getValue(),
+ opType,toConvert.getField(),
castInteger,
min,
max,
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/mocks/TestModel.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/mocks/TestModel.java
index 32c3b862ca..aab45ac852 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/mocks/TestModel.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/mocks/TestModel.java
@@ -125,4 +125,14 @@ public class TestModel extends Model {
public VisitorAction accept(Visitor visitor) {
return null;
}
+
+ @Override
+ public MiningFunction requireMiningFunction() {
+ return null;
+ }
+
+ @Override
+ public MiningSchema requireMiningSchema() {
+ return null;
+ }
}
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/testutils/PMMLModelTestUtils.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/testutils/PMMLModelTestUtils.java
index c668e1a6ff..8f919c3e92 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/testutils/PMMLModelTestUtils.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/testutils/PMMLModelTestUtils.java
@@ -31,6 +31,7 @@ import org.dmg.pmml.Apply;
import org.dmg.pmml.Array;
import org.dmg.pmml.CompareFunction;
import org.dmg.pmml.ComparisonMeasure;
+import org.dmg.pmml.ComplexScoreDistribution;
import org.dmg.pmml.CompoundPredicate;
import org.dmg.pmml.Constant;
import org.dmg.pmml.DataDictionary;
@@ -43,7 +44,6 @@ import org.dmg.pmml.DiscretizeBin;
import org.dmg.pmml.Euclidean;
import org.dmg.pmml.Field;
import org.dmg.pmml.FieldColumnPair;
-import org.dmg.pmml.FieldName;
import org.dmg.pmml.FieldRef;
import org.dmg.pmml.InlineTable;
import org.dmg.pmml.Interval;
@@ -89,8 +89,8 @@ import org.dmg.pmml.regression.NumericPredictor;
import org.dmg.pmml.regression.PredictorTerm;
import org.dmg.pmml.regression.RegressionModel;
import org.dmg.pmml.regression.RegressionTable;
-import org.jpmml.model.inlinetable.InputCell;
-import org.jpmml.model.inlinetable.OutputCell;
+import org.jpmml.model.cells.InputCell;
+import org.jpmml.model.cells.OutputCell;
import org.kie.pmml.api.enums.DATA_TYPE;
import org.kie.pmml.api.enums.Named;
import org.kie.pmml.api.enums.RESULT_FEATURE;
@@ -194,7 +194,7 @@ public class PMMLModelTestUtils {
miningSchema.addMiningFields(predictedMiningField);
Output output = new Output();
OutputField outputField = new OutputField();
- outputField.setName(FieldName.create("OUTPUT_" + lastDataField.getName().getValue()));
+ outputField.setName("OUTPUT_" +lastDataField.getName());
outputField.setDataType(lastDataField.getDataType());
outputField.setOpType(getRandomOpType());
toReturn.setModelName(RandomStringUtils.random(6, true, false));
@@ -222,7 +222,7 @@ public class PMMLModelTestUtils {
miningSchema.addMiningFields(predictedMiningField);
Output output = new Output();
OutputField outputField = new OutputField();
- outputField.setName(FieldName.create("OUTPUT_" + lastDataField.getName().getValue()));
+ outputField.setName("OUTPUT_" +lastDataField.getName());
outputField.setDataType(lastDataField.getDataType());
outputField.setOpType(getRandomOpType());
toReturn.setModelName(RandomStringUtils.random(6, true, false));
@@ -282,7 +282,7 @@ public class PMMLModelTestUtils {
public static CategoricalPredictor getCategoricalPredictor(String name, double value, double coefficient) {
CategoricalPredictor toReturn = new CategoricalPredictor();
- toReturn.setField(FieldName.create(name));
+ toReturn.setField(name);
toReturn.setValue(value);
toReturn.setCoefficient(coefficient);
return toReturn;
@@ -290,7 +290,7 @@ public class PMMLModelTestUtils {
public static NumericPredictor getNumericPredictor(String name, int exponent, double coefficient) {
NumericPredictor toReturn = new NumericPredictor();
- toReturn.setField(FieldName.create(name));
+ toReturn.setField(name);
toReturn.setExponent(exponent);
toReturn.setCoefficient(coefficient);
return toReturn;
@@ -298,7 +298,7 @@ public class PMMLModelTestUtils {
public static PredictorTerm getPredictorTerm(String name, double coefficient, List<String> fieldRefNames) {
PredictorTerm toReturn = new PredictorTerm();
- toReturn.setName(FieldName.create(name));
+ toReturn.setName(name);
toReturn.setCoefficient(coefficient);
toReturn.addFieldRefs(fieldRefNames.stream().map(PMMLModelTestUtils::getFieldRef).toArray(FieldRef[]::new));
return toReturn;
@@ -323,7 +323,7 @@ public class PMMLModelTestUtils {
public static DataField getDataField(String fieldName, OpType opType) {
DataField toReturn = new DataField();
- toReturn.setName(FieldName.create(fieldName));
+ toReturn.setName(fieldName);
toReturn.setOpType(opType);
return toReturn;
}
@@ -336,14 +336,14 @@ public class PMMLModelTestUtils {
public static MiningField getMiningField(String fieldName, MiningField.UsageType usageType) {
MiningField toReturn = getRandomMiningField();
- toReturn.setName(FieldName.create(fieldName));
+ toReturn.setName(fieldName);
toReturn.setUsageType(usageType);
return toReturn;
}
public static Target getTarget(String fieldTarget, OpType opType) {
Target toReturn = new Target();
- toReturn.setField(FieldName.create(fieldTarget));
+ toReturn.setField(fieldTarget);
toReturn.setOpType(opType);
return toReturn;
}
@@ -362,7 +362,7 @@ public class PMMLModelTestUtils {
public static DerivedField getDerivedField(String fieldName) {
DerivedField toReturn = new DerivedField();
- toReturn.setName(FieldName.create(fieldName));
+ toReturn.setName(fieldName);
toReturn.setDataType(getRandomDataType());
toReturn.setOpType(getRandomOpType());
Constant expression = new Constant(5);
@@ -386,7 +386,7 @@ public class PMMLModelTestUtils {
public static DataField getRandomDataField() {
DataField toReturn = new DataField();
- toReturn.setName(FieldName.create(RandomStringUtils.random(6, true, false)));
+ toReturn.setName(RandomStringUtils.random(6, true, false));
toReturn.setDataType(getRandomDataType());
toReturn.setOpType(getRandomOpType());
IntStream.range(0, 3).forEach(i -> {
@@ -413,7 +413,7 @@ public class PMMLModelTestUtils {
public static MiningField getRandomMiningField() {
Random random = new Random();
- MiningField toReturn = new MiningField(FieldName.create(RandomStringUtils.random(6, true, false)));
+ MiningField toReturn = new MiningField(RandomStringUtils.random(6, true, false));
toReturn.setInvalidValueTreatment(getRandomInvalidValueTreatmentMethod());
toReturn.setMissingValueTreatment(getRandomMissingValueTreatmentMethod());
toReturn.setOutlierTreatment(getRandomOutlierTreatmentMethod());
@@ -436,13 +436,13 @@ public class PMMLModelTestUtils {
}
public static OutputField getRandomOutputField() {
- FieldName fieldName = FieldName.create(RandomStringUtils.random(6, true, false));
+ String fieldName =RandomStringUtils.random(6, true, false);
OutputField toReturn = new OutputField();
toReturn.setName(fieldName);
toReturn.setOpType(getRandomOpType());
toReturn.setDataType(getRandomDataType());
toReturn.setValue(getRandomValue(toReturn.getDataType()));
- fieldName = FieldName.create(RandomStringUtils.random(6, true, false));
+ fieldName =RandomStringUtils.random(6, true, false);
toReturn.setTargetField(fieldName);
toReturn.setResultFeature(getRandomResultFeature());
toReturn.setExpression(getRandomConstant());
@@ -452,7 +452,7 @@ public class PMMLModelTestUtils {
public static Target getRandomTarget() {
Random random = new Random();
Target toReturn = new Target();
- toReturn.setField(FieldName.create(RandomStringUtils.random(6, true, false)));
+ toReturn.setField(RandomStringUtils.random(6, true, false));
toReturn.setOpType(getRandomOpType());
toReturn.setMax(random.nextInt(234));
toReturn.setMin(random.nextInt(23));
@@ -476,7 +476,7 @@ public class PMMLModelTestUtils {
public static FieldColumnPair getRandomFieldColumnPair() {
FieldColumnPair toReturn = new FieldColumnPair();
- toReturn.setField(FieldName.create(RandomStringUtils.random(6, true, false)));
+ toReturn.setField(RandomStringUtils.random(6, true, false));
toReturn.setColumn(RandomStringUtils.random(6, true, false));
return toReturn;
}
@@ -493,7 +493,7 @@ public class PMMLModelTestUtils {
Random random = new Random();
ClusteringField toReturn = new ClusteringField();
toReturn.setCenterField(getRandomClusteringFieldCenterField());
- toReturn.setField(FieldName.create(RandomStringUtils.random(6, true, false)));
+ toReturn.setField(RandomStringUtils.random(6, true, false));
toReturn.setCompareFunction(getRandomCompareFunction());
toReturn.setFieldWeight(random.nextDouble());
toReturn.setComparisons(getRandomComparisons());
@@ -531,7 +531,7 @@ public class PMMLModelTestUtils {
Discretize toReturn = new Discretize();
toReturn.setDataType(getRandomDataType());
toReturn.setDefaultValue(RandomStringUtils.random(6, true, false));
- toReturn.setField(FieldName.create(RandomStringUtils.random(6, true, false)));
+ toReturn.setField(RandomStringUtils.random(6, true, false));
toReturn.setMapMissingTo(RandomStringUtils.random(6, true, false));
IntStream.range(0, 3).forEach(i -> toReturn.addDiscretizeBins(getRandomDiscretizeBin()));
return toReturn;
@@ -539,7 +539,7 @@ public class PMMLModelTestUtils {
public static FieldRef getRandomFieldRef() {
FieldRef toReturn = new FieldRef();
- toReturn.setField(FieldName.create(RandomStringUtils.random(6, true, false)));
+ toReturn.setField(RandomStringUtils.random(6, true, false));
toReturn.setMapMissingTo(RandomStringUtils.random(6, true, false));
return toReturn;
}
@@ -565,7 +565,7 @@ public class PMMLModelTestUtils {
double mapMissingTo = random.nextInt(100) / 10;
NormContinuous toReturn = new NormContinuous();
IntStream.range(0, 3).forEach(i -> toReturn.addLinearNorms(getRandomLinearNorm()));
- toReturn.setField(FieldName.create(RandomStringUtils.random(6, true, false)));
+ toReturn.setField(RandomStringUtils.random(6, true, false));
toReturn.setOutliers(getRandomOutlierTreatmentMethod());
toReturn.setMapMissingTo(mapMissingTo);
return toReturn;
@@ -573,7 +573,7 @@ public class PMMLModelTestUtils {
public static NormDiscrete getRandomNormDiscrete() {
NormDiscrete toReturn = new NormDiscrete();
- toReturn.setField(FieldName.create(RandomStringUtils.random(6, true, false)));
+ toReturn.setField(RandomStringUtils.random(6, true, false));
toReturn.setValue(getRandomObject(DataType.INTEGER));
toReturn.setMapMissingTo((Number) getRandomObject(DataType.INTEGER));
toReturn.setMethod(getRandomMethod());
@@ -583,14 +583,14 @@ public class PMMLModelTestUtils {
public static TextIndex getRandomTextIndex() {
Random random = new Random();
TextIndex toReturn = new TextIndex();
- toReturn.setField(FieldName.create(RandomStringUtils.random(6, true, false)));
+ toReturn.setField(RandomStringUtils.random(6, true, false));
toReturn.setExpression(getRandomFieldRef());
toReturn.setLocalTermWeights(getRandomLocalTermWeights());
toReturn.setWordSeparatorCharacterRE(RandomStringUtils.random(1, true, false));
toReturn.setTokenize(true);
toReturn.setCaseSensitive(false);
toReturn.setMaxLevenshteinDistance(random.nextInt(10));
- toReturn.setTextField(FieldName.create(RandomStringUtils.random(6, true, false)));
+ toReturn.setTextField(RandomStringUtils.random(6, true, false));
IntStream.range(0, 3).forEach(i -> toReturn.addTextIndexNormalizations(getRandomTextIndexNormalization()));
return toReturn;
}
@@ -603,7 +603,7 @@ public class PMMLModelTestUtils {
}
public static ParameterField getParameterField(String fieldName) {
- ParameterField toReturn = new ParameterField(FieldName.create(fieldName));
+ ParameterField toReturn = new ParameterField(fieldName);
toReturn.setDataType(getRandomDataType());
toReturn.setOpType(getRandomOpType());
toReturn.setDisplayName("Display-" + fieldName);
@@ -611,7 +611,7 @@ public class PMMLModelTestUtils {
}
public static ParameterField getParameterField(String fieldName, DataType dataType) {
- ParameterField toReturn = new ParameterField(FieldName.create(fieldName));
+ ParameterField toReturn = new ParameterField(fieldName);
toReturn.setDataType(dataType);
return toReturn;
}
@@ -638,7 +638,7 @@ public class PMMLModelTestUtils {
public static SimplePredicate getSimplePredicate(final String predicateName,
final Object value,
final SimplePredicate.Operator operator) {
- FieldName fieldName = FieldName.create(predicateName);
+ String fieldName =predicateName;
SimplePredicate toReturn = new SimplePredicate();
toReturn.setField(fieldName);
toReturn.setOperator(operator);
@@ -657,7 +657,7 @@ public class PMMLModelTestUtils {
final Array.Type arrayType,
final List<String> values,
final SimpleSetPredicate.BooleanOperator booleanOperator) {
- FieldName fieldName = FieldName.create(predicateName);
+ String fieldName =predicateName;
SimpleSetPredicate toReturn = new SimpleSetPredicate();
toReturn.setField(fieldName);
toReturn.setBooleanOperator(booleanOperator);
@@ -674,7 +674,7 @@ public class PMMLModelTestUtils {
}
public static FieldRef getFieldRef(final String fieldName) {
- return new FieldRef(FieldName.create(fieldName));
+ return new FieldRef(fieldName);
}
public static Object getRandomObject(DataType dataType) {
@@ -876,7 +876,7 @@ public class PMMLModelTestUtils {
public static ScoreDistribution getRandomPMMLScoreDistribution(Double probability) {
Random random = new Random();
- ScoreDistribution toReturn = new ScoreDistribution();
+ ScoreDistribution toReturn = new ComplexScoreDistribution();
toReturn.setValue(RandomStringUtils.random(6, true, false));
toReturn.setRecordCount(random.nextInt(100));
toReturn.setConfidence((double) random.nextInt(1) / 100);
@@ -928,7 +928,7 @@ public class PMMLModelTestUtils {
}
public static SimplePredicate getRandomSimplePredicate() {
- FieldName fieldName = FieldName.create(RandomStringUtils.random(6, true, false));
+ String fieldName =RandomStringUtils.random(6, true, false);
SimplePredicate toReturn = new SimplePredicate();
toReturn.setField(fieldName);
toReturn.setOperator(getRandomSimplePredicateOperator());
@@ -948,7 +948,7 @@ public class PMMLModelTestUtils {
}
public static SimpleSetPredicate getRandomSimpleSetPredicate() {
- FieldName fieldName = FieldName.create(RandomStringUtils.random(6, true, false));
+ String fieldName =RandomStringUtils.random(6, true, false);
SimpleSetPredicate toReturn = new SimpleSetPredicate();
toReturn.setField(fieldName);
toReturn.setBooleanOperator(getRandomSimpleSetPredicateOperator());
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/utils/ModelUtilsTest.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/utils/ModelUtilsTest.java
index cbf3518fac..a5ee7e7868 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/utils/ModelUtilsTest.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-api/src/test/java/org/kie/pmml/compiler/api/utils/ModelUtilsTest.java
@@ -36,7 +36,6 @@ import org.dmg.pmml.DataField;
import org.dmg.pmml.DataType;
import org.dmg.pmml.DerivedField;
import org.dmg.pmml.Field;
-import org.dmg.pmml.FieldName;
import org.dmg.pmml.MiningField;
import org.dmg.pmml.MiningSchema;
import org.dmg.pmml.Model;
@@ -47,8 +46,8 @@ import org.dmg.pmml.Row;
import org.dmg.pmml.Target;
import org.dmg.pmml.Targets;
import org.dmg.pmml.regression.RegressionModel;
-import org.jpmml.model.inlinetable.InputCell;
-import org.jpmml.model.inlinetable.OutputCell;
+import org.jpmml.model.cells.InputCell;
+import org.jpmml.model.cells.OutputCell;
import org.junit.jupiter.api.Test;
import org.kie.pmml.api.enums.DATA_TYPE;
import org.kie.pmml.api.enums.FIELD_USAGE_TYPE;
@@ -198,10 +197,10 @@ public class ModelUtilsTest {
retrieved.forEach(kiePMMLNameOpType -> {
assertThat(miningSchema.getMiningFields()
.stream()
- .anyMatch(fld -> kiePMMLNameOpType.getName().equals(fld.getName().getValue()))).isTrue();
+ .anyMatch(fld -> kiePMMLNameOpType.getName().equals(fld.getName()))).isTrue();
Optional<DataField> optionalDataField = dataDictionary.getDataFields()
.stream()
- .filter(fld -> kiePMMLNameOpType.getName().equals(fld.getName().getValue()))
+ .filter(fld -> kiePMMLNameOpType.getName().equals(fld.getName()))
.findFirst();
assertThat(optionalDataField).isPresent();
DataField dataField = optionalDataField.get();
@@ -230,7 +229,7 @@ public class ModelUtilsTest {
retrieved.forEach(kiePMMLNameOpType -> {
Optional<MiningField> optionalMiningField = miningSchema.getMiningFields()
.stream()
- .filter(fld -> kiePMMLNameOpType.getName().equals(fld.getName().getValue()))
+ .filter(fld -> kiePMMLNameOpType.getName().equals(fld.getName()))
.findFirst();
assertThat(optionalMiningField).isPresent();
MiningField miningField = optionalMiningField.get();
@@ -263,7 +262,7 @@ public class ModelUtilsTest {
retrieved.forEach(kiePMMLNameOpType -> {
Optional<MiningField> optionalMiningField = miningSchema.getMiningFields()
.stream()
- .filter(fld -> kiePMMLNameOpType.getName().equals(fld.getName().getValue()))
+ .filter(fld -> kiePMMLNameOpType.getName().equals(fld.getName()))
.findFirst();
assertThat(optionalMiningField).isPresent();
MiningField miningField = optionalMiningField.get();
@@ -296,7 +295,7 @@ public class ModelUtilsTest {
retrieved.forEach(kiePMMLNameOpType -> {
Optional<Target> optionalTarget = targets.getTargets()
.stream()
- .filter(fld -> kiePMMLNameOpType.getName().equals(fld.getField().getValue()))
+ .filter(fld -> kiePMMLNameOpType.getName().equals(fld.getField()))
.findFirst();
assertThat(optionalTarget).isPresent();
Target target = optionalTarget.get();
@@ -313,7 +312,7 @@ public class ModelUtilsTest {
IntStream.range(0, 3).forEach(i -> {
final DataField dataField = getRandomDataField();
dataDictionary.addDataFields(dataField);
- final MiningField miningField = getMiningField(dataField.getName().getValue(),
+ final MiningField miningField = getMiningField(dataField.getName(),
MiningField.UsageType.PREDICTED);
miningSchema.addMiningFields(miningField);
});
@@ -343,7 +342,7 @@ public class ModelUtilsTest {
IntStream.range(0, 3).forEach(i -> {
final DataField dataField = getRandomDataField();
dataDictionary.addDataFields(dataField);
- final MiningField miningField = getMiningField(dataField.getName().getValue(),
+ final MiningField miningField = getMiningField(dataField.getName(),
MiningField.UsageType.ACTIVE);
miningSchema.addMiningFields(miningField);
});
@@ -362,10 +361,10 @@ public class ModelUtilsTest {
IntStream.range(0, 3).forEach(i -> {
final DataField dataField = getRandomDataField();
dataDictionary.addDataFields(dataField);
- final MiningField miningField = getMiningField(dataField.getName().getValue(),
+ final MiningField miningField = getMiningField(dataField.getName(),
MiningField.UsageType.ACTIVE);
miningSchema.addMiningFields(miningField);
- final Target targetField = getTarget(dataField.getName().getValue(), null);
+ final Target targetField = getTarget(dataField.getName(), null);
targets.addTargets(targetField);
});
model.setMiningSchema(miningSchema);
@@ -388,8 +387,7 @@ public class ModelUtilsTest {
dataDictionary.getDataFields().forEach(dataField -> {
OP_TYPE retrieved =
org.kie.pmml.compiler.api.utils.ModelUtils.getOpType(getFieldsFromDataDictionary(dataDictionary),
- model,
- dataField.getName().getValue());
+ model,dataField.getName());
assertThat(retrieved).isNotNull();
OP_TYPE expected = OP_TYPE.byName(dataField.getOpType().value());
assertThat(retrieved).isEqualTo(expected);
@@ -404,7 +402,7 @@ public class ModelUtilsTest {
IntStream.range(0, 3).forEach(i -> {
String fieldName = "field" + i;
final DataField dataField = getRandomDataField();
- dataField.setName(FieldName.create(fieldName));
+ dataField.setName(fieldName);
dataDictionary.addDataFields(dataField);
});
org.kie.pmml.compiler.api.utils.ModelUtils.getOpType(getFieldsFromDataDictionary(dataDictionary), model,
@@ -428,8 +426,7 @@ public class ModelUtilsTest {
miningSchema.getMiningFields().forEach(miningField -> {
OP_TYPE retrieved =
org.kie.pmml.compiler.api.utils.ModelUtils.getOpType(getFieldsFromDataDictionary(dataDictionary),
- model,
- miningField.getName().getValue());
+ model,miningField.getName());
assertThat(retrieved).isNotNull();
OP_TYPE expected = OP_TYPE.byName(miningField.getOpType().value());
assertThat(retrieved).isEqualTo(expected);
@@ -445,7 +442,7 @@ public class ModelUtilsTest {
IntStream.range(0, 3).forEach(i -> {
String fieldName = "field" + i;
final DataField dataField = getRandomDataField();
- dataField.setName(FieldName.create(fieldName));
+ dataField.setName(fieldName);
dataDictionary.addDataFields(dataField);
final MiningField miningField = getRandomMiningField();
miningField.setName(dataField.getName());
@@ -479,8 +476,7 @@ public class ModelUtilsTest {
targets.getTargets().forEach(target -> {
OP_TYPE retrieved =
org.kie.pmml.compiler.api.utils.ModelUtils.getOpType(getFieldsFromDataDictionary(dataDictionary),
- model,
- target.getField().getValue());
+ model,target.getField());
assertThat(retrieved).isNotNull();
OP_TYPE expected = OP_TYPE.byName(target.getOpType().value());
assertThat(retrieved).isEqualTo(expected);
@@ -497,7 +493,7 @@ public class ModelUtilsTest {
IntStream.range(0, 3).forEach(i -> {
String fieldName = "field" + i;
final DataField dataField = getRandomDataField();
- dataField.setName(FieldName.create(fieldName));
+ dataField.setName(fieldName);
dataDictionary.addDataFields(dataField);
final MiningField miningField = getRandomMiningField();
miningField.setName(dataField.getName());
@@ -530,8 +526,7 @@ public class ModelUtilsTest {
fields.clear();
fields.addAll(getFieldsFromDataDictionary(dataDictionary));
dataDictionary.getDataFields().forEach(dataField -> {
- Optional<OP_TYPE> retrieved = org.kie.pmml.compiler.api.utils.ModelUtils.getOpTypeFromFields(fields,
- dataField.getName().getValue());
+ Optional<OP_TYPE> retrieved = org.kie.pmml.compiler.api.utils.ModelUtils.getOpTypeFromFields(fields,dataField.getName());
assertThat(retrieved).isNotNull();
assertThat(retrieved).isPresent();
OP_TYPE expected = OP_TYPE.byName(dataField.getOpType().value());
@@ -554,8 +549,7 @@ public class ModelUtilsTest {
});
miningSchema.getMiningFields().forEach(miningField -> {
Optional<OP_TYPE> retrieved =
- org.kie.pmml.compiler.api.utils.ModelUtils.getOpTypeFromMiningFields(miningSchema,
- miningField.getName().getValue());
+ org.kie.pmml.compiler.api.utils.ModelUtils.getOpTypeFromMiningFields(miningSchema,miningField.getName());
assertThat(retrieved).isNotNull();
assertThat(retrieved).isPresent();
OP_TYPE expected = OP_TYPE.byName(miningField.getOpType().value());
@@ -577,8 +571,7 @@ public class ModelUtilsTest {
targets.addTargets(target);
});
targets.getTargets().forEach(target -> {
- Optional<OP_TYPE> retrieved = org.kie.pmml.compiler.api.utils.ModelUtils.getOpTypeFromTargets(targets,
- target.getField().getValue());
+ Optional<OP_TYPE> retrieved = org.kie.pmml.compiler.api.utils.ModelUtils.getOpTypeFromTargets(targets,target.getField());
assertThat(retrieved).isNotNull();
assertThat(retrieved).isPresent();
OP_TYPE expected = OP_TYPE.byName(target.getOpType().value());
@@ -597,7 +590,7 @@ public class ModelUtilsTest {
.stream()
.map(dataField -> {
DerivedField toReturn = new DerivedField();
- toReturn.setName(FieldName.create("DER_" + dataField.getName().getValue()));
+ toReturn.setName("DER_" +dataField.getName());
DataType dataType = getRandomDataType();
while (dataType.equals(dataField.getDataType())) {
dataType = getRandomDataType();
@@ -614,14 +607,14 @@ public class ModelUtilsTest {
.map(Field.class::cast)
.forEach(fields::add);
dataDictionary.getDataFields().forEach(dataField -> {
- String fieldName = dataField.getName().getValue();
+ String fieldName =dataField.getName();
DataType retrieved = org.kie.pmml.compiler.api.utils.ModelUtils.getDataType(fields, fieldName);
assertThat(retrieved).isNotNull();
DataType expected = dataField.getDataType();
assertThat(retrieved).isEqualTo(expected);
});
derivedFields.forEach(derivedField -> {
- String fieldName = derivedField.getName().getValue();
+ String fieldName =derivedField.getName();
DataType retrieved = org.kie.pmml.compiler.api.utils.ModelUtils.getDataType(fields, fieldName);
assertThat(retrieved).isNotNull();
DataType expected = derivedField.getDataType();
@@ -638,7 +631,7 @@ public class ModelUtilsTest {
});
dataDictionary.getDataFields().forEach(dataField -> {
DATA_TYPE retrieved =
- org.kie.pmml.compiler.api.utils.ModelUtils.getDATA_TYPE(getFieldsFromDataDictionary(dataDictionary), dataField.getName().getValue());
+ org.kie.pmml.compiler.api.utils.ModelUtils.getDATA_TYPE(getFieldsFromDataDictionary(dataDictionary),dataField.getName());
assertThat(retrieved).isNotNull();
DATA_TYPE expected = DATA_TYPE.byName(dataField.getDataType().value());
assertThat(retrieved).isEqualTo(expected);
@@ -652,7 +645,7 @@ public class ModelUtilsTest {
IntStream.range(0, 3).forEach(i -> {
String fieldName = "field" + i;
final DataField dataField = getRandomDataField();
- dataField.setName(FieldName.create(fieldName));
+ dataField.setName(fieldName);
dataDictionary.addDataFields(dataField);
});
org.kie.pmml.compiler.api.utils.ModelUtils.getDATA_TYPE(getFieldsFromDataDictionary(dataDictionary),
@@ -718,12 +711,12 @@ public class ModelUtilsTest {
org.kie.pmml.api.models.OutputField retrieved =
org.kie.pmml.compiler.api.utils.ModelUtils.convertToKieOutputField(toConvert, null);
assertThat(retrieved).isNotNull();
- assertThat(retrieved.getName()).isEqualTo(toConvert.getName().getValue());
+ assertThat(retrieved.getName()).isEqualTo(toConvert.getName());
OP_TYPE expectedOpType = OP_TYPE.byName(toConvert.getOpType().value());
assertThat(retrieved.getOpType()).isEqualTo(expectedOpType);
DATA_TYPE expectedDataType = DATA_TYPE.byName(toConvert.getDataType().value());
assertThat(retrieved.getDataType()).isEqualTo(expectedDataType);
- assertThat(retrieved.getTargetField()).isEqualTo(toConvert.getTargetField().getValue());
+ assertThat(retrieved.getTargetField()).isEqualTo(toConvert.getTargetField());
RESULT_FEATURE expectedResultFeature = RESULT_FEATURE.byName(toConvert.getResultFeature().value());
assertThat(retrieved.getResultFeature()).isEqualTo(expectedResultFeature);
toConvert.setOpType(null);
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/pom.xml b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/pom.xml
index 9fdb3f70aa..395ecbd498 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 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-pmml-compiler</artifactId>
- <version>8.46.0-SNAPSHOT</version>
+ <version>9.46.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDerivedFieldFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDerivedFieldFactory.java
index 0267b4f905..4cc3591f28 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDerivedFieldFactory.java
+++ b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDerivedFieldFactory.java
@@ -84,7 +84,7 @@ public class KiePMMLDerivedFieldFactory {
final MethodCallExpr builder = getChainedMethodCallExprFrom("builder", initializer);
final Expression dataTypeExpression = getExpressionForDataType(derivedField.getDataType());
final Expression opTypeExpression = getExpressionForOpType(derivedField.getOpType());
- builder.setArgument(0, new StringLiteralExpr(derivedField.getName().getValue()));
+ builder.setArgument(0, new StringLiteralExpr(derivedField.getName()));
builder.setArgument(2, dataTypeExpression);
builder.setArgument(3, opTypeExpression);
builder.setArgument(4, new NameExpr(nestedVariableName));
diff --git a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDiscretizeFactory.java b/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDiscretizeFactory.java
index 302047678f..0a3e7e371f 100644
--- a/kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/main/java/org/kie/pmml/compiler/commons/codegenfactories/KiePMMLDiscretizeFactory.java
... 2891 lines suppressed ...
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org